doway-coms 2.9.8 → 2.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "2.9.8",
+  "version": "2.10.0",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",
@@ -25,7 +25,7 @@
     "vue-router": "3.6.5",
     "vuedraggable": "^2.24.3",
     "vuex": "3.6.2",
-    "vxe-table": "3.7.10",
+    "vxe-table": "3.8.24",
     "xe-clipboard": "1.10.2",
     "xe-utils": "3.5.4"
   },

package/packages/BaseGrid/src/index.vue

@@ -55,7 +55,7 @@
       @preSearch="preSearch"
       @pulldownBtnClick="pulldownBtnClick"
       @pulldownMultiSelect="pulldownMultiSelect"
-      :edit-rules="validRules"
+      :edit-rules="editRules"
       :tree-config="treeConfig"
       :row-config="rowConfig"
       @resizable-change="resizableChange"
@@ -808,6 +808,7 @@ export default {
       internalColumns: [],
       gridEdit: false,
       addBtnEdit: true,
+      editRules:null,
       validRules: {},
       footerSum: [],
       mergeFields: [],
@@ -1206,6 +1207,9 @@ export default {
         this.internalColumns[i].slots.header = this.columns[i].field
       }
     }
+    //设置验证规则信息，如果没有验证规则的情况下一定要设置null值，设置{}的话会导致点击编辑行会有问题
+    this.editRules =XEUtils.isEmpty(this.validRules)?null:this.validRules 
+      
 
     // 初始化排序和筛选
     if (this.sortRemote) {
@@ -1371,6 +1375,9 @@ export default {
           this.internalColumns[i].slots.header = this.columns[i].field
         }
       }
+      //设置验证规则信息，如果没有验证规则的情况下一定要设置null值，设置{}的话会导致点击编辑行会有问题
+      this.editRules =XEUtils.isEmpty(this.validRules)?null:this.validRules 
+      
     },
     // 关闭所有展开行
     closeAllExpand() {
@@ -2899,12 +2906,20 @@ export default {
       columns.forEach((column) => {
         this.internalColumns.push(this.initColumns(column))
       })
+      //设置验证规则信息，如果没有验证规则的情况下一定要设置null值，设置{}的话会导致点击编辑行会有问题
+      this.editRules =XEUtils.isEmpty(this.validRules)?null:this.validRules 
+      
       this.$refs.baseGrid.refreshColumn()
     },
     addRules(fields, rules) {
+      this.validRules = {}
       fields.forEach((field) => {
-        this.$set(this.validRules, field, rules)
+        this.validRules[field] = rules
+        // this.$set(this.validRules, field, rules)
       })
+      //设置验证规则信息，如果没有验证规则的情况下一定要设置null值，设置{}的话会导致点击编辑行会有问题
+      this.editRules =XEUtils.isEmpty(this.validRules)?null:this.validRules 
+      
       this.$refs.baseGrid.refreshColumn()
     },
     displayValueSearchTextChange(colInfo) {