fix: merge master

README.md

@@ -42,6 +42,8 @@ Vue.use(ElButton)
 - ElButton
 - ElSwitch
 - ElProgress
+- ElLink
+- ElIcon
 
 ## Join Discussion Group
 

build/bin/build-entry.js

@@ -118,7 +118,6 @@ ComponentNames.forEach((name) => {
       'pagination',
       'notification',
       'page-header',
-      'message',
       'timeline',
       'timeline-item',
       'input-number',

examples/docs/zh-CN/loading.md

@@ -2,7 +2,7 @@
 
 加载数据时显示动效。
 
-<!--
+
 ### 区域加载
 
 在表格等容器中加载数据时显示。
@@ -118,6 +118,7 @@
 ```
 :::
 
+
 ### 整页加载
 
 页面数据加载时显示。
@@ -129,14 +130,11 @@
   <el-button
     type="primary"
     @click="openFullScreen1"
-    v-loading.fullscreen.lock="fullscreenLoading">
+    v-loading.fullscreen.lock="fullscreenLoading"
+  >
     指令方式
   </el-button>
-  <el-button
-    type="primary"
-    @click="openFullScreen2">
-    服务方式
-  </el-button>
+  <el-button type="primary" @click="openFullScreen2"> 服务方式 </el-button>
 </template>
 
 <script>
@@ -148,28 +146,29 @@
     },
     methods: {
       openFullScreen1() {
-        this.fullscreenLoading = true;
+        this.fullscreenLoading = true
         setTimeout(() => {
-          this.fullscreenLoading = false;
-        }, 2000);
+          this.fullscreenLoading = false
+        }, 2000)
       },
-      openFullScreen2() {
+      openFullScreen2(e) {
         const loading = this.$loading({
-          lock: true,
-          text: 'Loading',
+          // lock: true,
+          // target: e.target,
+          text: 'Loading...',
           spinner: 'el-icon-loading',
           background: 'rgba(0, 0, 0, 0.7)'
-        });
+        })
         setTimeout(() => {
-          loading.close();
-        }, 2000);
+          loading.close()
+        }, 2000)
       }
     }
   }
 </script>
 ```
+
 :::
--->
 
 ### 服务
 

examples/i18n/page.json

@@ -4,7 +4,7 @@
     "pages": {
       "index": {
         "1": "网站快速成型工具",
-        "2": "Element，一套为开发者、设计师和产品经理准备的基于 Vue 2.0 的桌面端组件库",
+        "2": "Element，一套为开发者、设计师和产品经理准备的基于 Vue 3.0 的桌面端组件库",
         "3": "指南",
         "4": "了解设计指南，帮助产品设计人员搭建逻辑清晰、结构合理且高效易用的产品。",
         "5": "查看详情",

examples/versions.json

@@ -1 +1 @@
-{"1.4.13":"1.4","2.0.11":"2.0","2.1.0":"2.1","2.2.2":"2.2","2.3.9":"2.3","2.4.11":"2.4","2.5.4":"2.5","2.6.3":"2.6","2.7.2":"2.7","2.8.2":"2.8","2.9.2":"2.9","2.10.1":"2.10","2.11.1":"2.11","2.12.0":"2.12","0.0.5":"2.13"}
+{"1.4.13":"1.4","2.0.11":"2.0","2.1.0":"2.1","2.2.2":"2.2","2.3.9":"2.3","2.4.11":"2.4","2.5.4":"2.5","2.6.3":"2.6","2.7.2":"2.7","2.8.2":"2.8","2.9.2":"2.9","2.10.1":"2.10","2.11.1":"2.11","2.12.0":"2.12","0.0.8":"2.13"}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "element3",
-  "version": "0.0.5",
-  "description": "A Component Library for Vue.js.",
+  "version": "0.0.8",
+  "description": "A Component Library for Vue3",
   "main": "dist/element3-ui.esm.js",
   "module": "dist/element3-ui.esm.js",
   "files": [
@@ -32,7 +32,8 @@
     "test": "npm run lint && npm run build:theme && cross-env CI_ENV=/dev/ BABEL_ENV=test karma start test/unit/karma.conf.js --single-run",
     "test:watch": "npm run build:theme && cross-env BABEL_ENV=test karma start test/unit/karma.conf.js",
     "test:unit": "jest",
-    "build:next": "rollup -c"
+    "build:next": "rollup -c",
+    "release": "node scripts/release.js"
   },
   "faas": [
     {
@@ -50,17 +51,21 @@
   ],
   "repository": {
     "type": "git",
-    "url": "[email protected]:ElemeFE/element.git"
+    "url": "[email protected]:kkbjs/element3.git"
   },
-  "homepage": "http://element.eleme.io",
+  "homepage": "https://element3.vercel.app/#/zh-CN",
   "keywords": [
     "eleme",
     "vue",
-    "components"
+    "components",
+    "element",
+    "ui",
+    "vue3",
+    "vue-next"
   ],
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/ElemeFE/element/issues"
+    "url": "https://github.com/kkbjs/element3/issues"
   },
   "unpkg": "lib/index.js",
   "style": "lib/theme-chalk/index.css",
@@ -114,12 +119,14 @@
     "babel-preset-stage-2": "^6.24.1",
     "babel-regenerator-runtime": "^6.5.0",
     "chai": "^4.2.0",
+    "chalk": "^4.1.0",
     "chokidar": "^1.7.0",
     "copy-webpack-plugin": "^5.0.0",
     "coveralls": "^3.0.3",
     "cp-cli": "^1.0.2",
     "cross-env": "^3.1.3",
     "css-loader": "^2.1.0",
+    "enquirer": "^2.3.6",
     "es6-promise": "^4.0.5",
     "eslint": "^7.7.0",
     "eslint-config-prettier": "^6.11.0",
@@ -131,6 +138,7 @@
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.1",
     "eslint-plugin-vue": "^6.2.2",
+    "execa": "^4.0.3",
     "file-loader": "^1.1.11",
     "file-save": "^0.2.0",
     "gulp": "^4.0.0",
@@ -156,6 +164,7 @@
     "markdown-it-chain": "^1.3.0",
     "markdown-it-container": "^2.0.0",
     "mini-css-extract-plugin": "^0.4.1",
+    "minimist": "^1.2.5",
     "mitt": "^2.1.0",
     "mocha": "^6.0.2",
     "node-sass": "^4.11.0",

packages/icon/index.js

@@ -1,4 +1,4 @@
-import ElIcon from './Icon'
+import ElIcon from './Icon.vue'
 
 /* istanbul ignore next */
 ElIcon.install = function (app) {

packages/link/index.js

@@ -1,8 +1,8 @@
-import Link from './Link.vue'
+import ElLink from './Link.vue'
 
 /* istanbul ignore next */
-Link.install = function (app) {
-  app.component(Link.name, Link)
+ElLink.install = function (app) {
+  app.component(ElLink.name, ElLink)
 }
 
-export default Link
+export default ElLink

packages/loading/Loading.vue

@@ -54,13 +54,21 @@ export default {
     const handleAfterLeave = () => {
       emit('afterLeave')
     }
+    const show = () => {
+      $data.visible = true
+    }
     const close = () => {
       $data.visible = false
     }
+    const setText = (text) => {
+      $data.text = text
+    }
     return {
       ...toRefs($data),
       handleAfterLeave,
-      close
+      show,
+      close,
+      setText
     }
   }
 }