build v3.5.3

nmxiaowei · Oct 16, 2024 · 0e64346 · 0e64346
1 parent 827c359
commit 0e64346
Show file tree

Hide file tree

Showing 17 changed files with 27,009 additions and 1,539 deletions.
diff --git a/examples/cdn/element-plus/index.css b/examples/cdn/element-plus/index.css
diff --git a/examples/cdn/element-plus/index.full.min.js b/examples/cdn/element-plus/index.full.min.js
diff --git a/lib/avue.js b/lib/avue.js
diff --git a/lib/avue.min.js b/lib/avue.min.js
diff --git a/package.json b/package.json
@@ -1,16 +1,15 @@
 {
   "name": "@smallwei/avue",
-  "version": "3.5.2",
+  "version": "3.5.3",
   "description": "A Magic Configurable Web Framework",
   "main": "lib/avue.min.js",
   "unpkg": "lib/avue.min.js",
   "jsdelivr": "lib/avue.min.js",
   "scripts": {
-    "bootstrap": "yarn --registry https://registry.npm.taobao.org || npm install --registry https://registry.npm.taobao.org && yarn gen:version",
-    "dev": "yarn gen:version && cross-env TARGET=dev gulp watch",
+    "dev": "pnpm gen:version && cross-env TARGET=dev gulp watch",
     "gen:version": "node build/version.js",
-    "build": "yarn gen:version && cross-env TARGET=prod UINAME=element-ui gulp build",
-    "all": "yarn build && yarn dev"
+    "build": "pnpm gen:version && cross-env TARGET=prod UINAME=element-ui gulp build",
+    "all": "pnpm build && pnpm dev"
   },
   "keywords": [
     "vue",
@@ -64,7 +63,8 @@
   "dependencies": {
     "@element-plus/icons-vue": "^2.0.6",
     "countup.js": "^1.9.3",
-    "dayjs": "^1.10.4"
+    "dayjs": "^1.10.4",
+    "loadsh": "^0.0.4"
   },
   "files": [
     "lib",

diff --git a/packages/element-ui/checkbox/index.vue b/packages/element-ui/checkbox/index.vue
@@ -17,7 +17,6 @@
                        @click="handleClick">
       <component :is="componentName"
                  v-for="(item,index) in dic"
-                 :label="item[valueKey]"
                  :border="border"
                  :size="size"
                  :value="item[valueKey]"

diff --git a/packages/element-ui/crud/index.vue b/packages/element-ui/crud/index.vue
@@ -240,6 +240,7 @@ export default create({
     'tab-click',
     'error',
     'date-change',
+    'grid-status-change',
     'update:search',
     'update:page',
     'search-change',
@@ -567,8 +568,8 @@ export default create({
       return this.tableOption[name] ? this.tableOption[name].trim() : config[name];
     },
     //对部分表单字段进行校验的方法
-    validateField (val) {
-      return this.$refs.dialogForm.$refs.tableForm.validateField(val);
+    validateField (val, fn) {
+      return this.$refs.dialogForm.$refs.tableForm.validateField(val, fn);
     },
     clearSelection () {
       this.$emit('selection-clear', this.deepClone(this.tableSelect))

diff --git a/packages/element-ui/crud/menu/header-menu.vue b/packages/element-ui/crud/menu/header-menu.vue
@@ -112,47 +112,28 @@ export default create({
   data () {
     return {
       dateCreate: false,
-      shortcuts: [{
-        text: '今日',
-        onClick (picker) {
-          const end = new Date();
-          const start = new Date();
-          start.setTime(start.getTime());
-          picker.$emit('pick', [start, end]);
-        }
-      }, {
-        text: '昨日',
-        onClick (picker) {
-          const end = new Date();
-          const start = new Date();
-          start.setTime(start.getTime() - 3600 * 1000 * 24 * 1);
-          picker.$emit('pick', [start, end]);
-        }
-      }, {
-        text: '最近一周',
-        onClick (picker) {
-          const end = new Date();
-          const start = new Date();
-          start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-          picker.$emit('pick', [start, end]);
-        }
-      }, {
-        text: '最近一个月',
-        onClick (picker) {
-          const end = new Date();
-          const start = new Date();
-          start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-          picker.$emit('pick', [start, end]);
-        }
-      }, {
-        text: '最近三个月',
-        onClick (picker) {
-          const end = new Date();
-          const start = new Date();
-          start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-          picker.$emit('pick', [start, end]);
-        }
-      }],
+      shortcuts: [
+        {
+          text: '今天',
+          value: new Date(),
+        },
+        {
+          text: '昨天',
+          value: () => {
+            const date = new Date();
+            date.setTime(date.getTime() - 3600 * 1000 * 24);
+            return date;
+          },
+        },
+        {
+          text: '一周前',
+          value: () => {
+            const date = new Date();
+            date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
+            return date;
+          },
+        },
+      ],
       config: config
     };
   },

diff --git a/packages/element-ui/date/index.vue b/packages/element-ui/date/index.vue
@@ -30,7 +30,7 @@
                 v-if="$slots.default">
           </slot>
           <span class="el-date-table-cell__text"
-                v-else>{{ cell.text }}</span>
+                v-else>{{  cell.renderText || cell.text }}</span>
         </div>
       </template>
     </el-date-picker>

diff --git a/packages/element-ui/form/index.vue b/packages/element-ui/form/index.vue
@@ -554,8 +554,8 @@ export default create({
       return isPx ? this.setPx(result) : result
     },
     //对部分表单字段进行校验的方法
-    validateField (val) {
-      return this.$refs.form.validateField(val);
+    validateField (val, fn) {
+      return this.$refs.form.validateField(val, fn);
     },
     scrollToField (val) {
       return this.$refs.form.scrollToField(val);

diff --git a/packages/element-ui/radio/index.vue b/packages/element-ui/radio/index.vue
@@ -6,7 +6,6 @@
                     :disabled="disabled">
       <component :is="componentName"
                  v-for="(item,index) in dic"
-                 :label="item[valueKey]"
                  :value="item[valueKey]"
                  :border="border"
                  :readonly="readonly"