bri-components 1.4.39 → 1.4.41

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.4.39",
+    "version": "1.4.41",
     "author": "dengshanghui",
     "description": "a component lib for vue project",
     "main": "src/index.js",

package/src/components/controls/base/DshInput/DshInput.vue

@@ -203,6 +203,7 @@
             // 参数event
             onChange (event) {
                 this.quickChange(); // 立马触发
+
                 clearTimeout(this.timer);
                 this.timer = setTimeout(() => {
                     this.change();

package/src/components/form/DshForm.vue

@@ -17,6 +17,7 @@
                         :span="formItem._br ? 24 : (formItem._span || 24)"
                     >
                         <FormItem
+                            v-if="hideMap[formItem._key] !== true"
                             class="DshForm-item-FormItem"
                             :prop="formItem._key"
                             @click.native="clickControl(formItem)"
@@ -192,6 +193,7 @@
         data () {
             return {
                 rules: {},
+                hideMap: {},
                 errorObj: {
                     errors: []
                 },
@@ -277,6 +279,17 @@
 
                 return bool;
             },
+            // 强制校验，动态校验切换时-单选多选的校验文字无法消失
+            forceValidateField (formItem) {
+                if (["select", "checkbox"].includes(formItem._type) && !this.rules[formItem._key].length) {
+                    this.$set(this.hideMap, formItem._key, true);
+                    this.$nextTick(() => {
+                        this.$set(this.hideMap, formItem._key, false);
+                    });
+                } else {
+                    this.$refs.form.validateField(formItem._key);
+                }
+            },
 
             // 控件自己的校验
             selfValidate (cb) {

package/src/components/list/mixins/DshFlatTableMixin.js

@@ -275,18 +275,20 @@ export default {
             });
         },
         quickChangeVal (operationItem, row, rowIndex, column, params) {
-            this.$set(this.ruleRecordMap, this.getMixKey(row, column), { showRuleMessage: true });
-            this.dealSameRowsVal({ row, rowIndex, column });
+            if (this.isUseQuickChange({ row, rowIndex, column })) {
+                this.$set(this.ruleRecordMap, this.getMixKey(row, column), { showRuleMessage: true });
+                this.dealSameRowsVal({ row, rowIndex, column });
 
-            this.change("quickChangeVal", row, rowIndex, column, ...params);
+                this.change("quickChangeVal", row, rowIndex, column, ...params);
+            }
         },
         changeVal (operationItem, row, rowIndex, column, params) {
-            this.$set(this.ruleRecordMap, this.getMixKey(row, column), { showRuleMessage: true });
-            if (!["text", "textarea", "idcard", "email", "phone", "url", "password"].includes(column._key)) {
+            if (!this.isUseQuickChange({ row, rowIndex, column })) {
+                this.$set(this.ruleRecordMap, this.getMixKey(row, column), { showRuleMessage: true });
                 this.dealSameRowsVal({ row, rowIndex, column });
-            }
 
-            this.change("changeVal", row, rowIndex, column, ...params);
+                this.change("changeVal", row, rowIndex, column, ...params);
+            }
         },
 
         /* ----------- 方法 ---------- */
@@ -337,15 +339,19 @@ export default {
 
             return rowspan;
         },
+        // 是都满足使用quickChange
+        isUseQuickChange ({ row, rowIndex, column }) {
+            return ["text", "textarea", "idcard", "email", "phone", "url", "password"].includes(column._type) &&
+                this.mergeRowColKeys.includes(column._key) &&
+                this.rowspanMap[this.getMixKey(row, column)] > 1;
+        },
         // 合并单元格的行，某列的值全部跟着修改
         dealSameRowsVal ({ row, rowIndex, column }, list = this.allListData) {
-            if (this.mergeRowColKeys.includes(column._key) && this.rowspanMap[this.getMixKey(row, column)] > 1) {
-                const indexInAll = list.findIndex(dataItem => dataItem._id === row._id);
-                list.slice(indexInAll + 1, indexInAll + this.rowspanMap[this.getMixKey(row, column)])
-                    .forEach(rowItem => {
-                        rowItem[column._key] = this.$deepCopy(row[column._key]);
-                });
-            }
+            const indexInAll = list.findIndex(dataItem => dataItem._id === row._id);
+            list.slice(indexInAll + 1, indexInAll + this.rowspanMap[this.getMixKey(row, column)])
+                .forEach(rowItem => {
+                    rowItem[column._key] = this.$deepCopy(row[column._key]);
+            });
         }
     }
 };

package/src/components/list/mixins/tableBaseMixin.js

@@ -813,8 +813,7 @@ export default {
         },
         // 输入框值改变立即
         quickChangeVal (operationItem, row, rowIndex, column, params) {
-            this.$set(this.ruleRecordMap, this.getMixKey(row, column), { showRuleMessage: true });
-            this.change("quickChangeVal", row, rowIndex, column, ...params);
+            // 啥也不做，平级表格合并单元格时用这个方法
         },
         // 输入框值改变
         changeVal (operationItem, row, rowIndex, column, params) {