bri-components 1.3.76 → 1.3.77

package/package.json

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

package/src/components/form/DshForm.vue

@@ -198,16 +198,14 @@
                 },
 
                 forceValidateTypes: [
-                    "select", "cascader", "regions", "cascaders", "file", "coordinates", "editor",
+                    "select", "region", "cascader", "regions", "cascaders", "file", "coordinates", "editor",
                     "users", "departments", "labels", "flatTable", "reference", "referenceBy"
                 ],
                 ignoreProperties: [
-                    "_name", "_key", "_default", "_required", "_span", "_br", "_line", "_noLabel", "_clearable",
+                    "_name", "_key", "_default", "_required", "_regStr", "_regMessage", "_span", "_br", "_line", "_noLabel", "_clearable",
                     "_disabledBtns", "_disabledOldDataRow"
-                ],
-                subIgnoreProperties: [
-                    "_regStr", "_regMessage"
                 ]
+                // subIgnoreProperties: []
             };
         },
         computed: {
@@ -290,11 +288,9 @@
                 if (this.$refs.dshFormUnit) {
                     errorRefs = this.$refs.dshFormUnit.filter(refItem => !refItem.validate());
                     bool = !errorRefs.length;
-                } else {
-                    bool = true;
                 }
-                cb && cb(bool, errorRefs.map(errorRefItem => errorRefItem.formItem));
 
+                cb && cb(bool, errorRefs.map(errorRefItem => errorRefItem.formItem));
                 return bool;
             },
             // iview的校验回调
@@ -342,9 +338,9 @@
                         _displayType: "show",
                         canEdit: !["createdAt", "updatedAt", "_creaters"].includes(formData._key)
                     }).forEach(arr => {
-                        !this.ignoreProperties.includes(arr[0]) &&
-                            (formData.__parentKey__ ? !this.subIgnoreProperties.includes(arr[0]) : true) &&
+                        if (!this.ignoreProperties.includes(arr[0])) {
                             this.$set(formItem, arr[0], arr[1]);
+                        }
                     });
                 }
 
@@ -378,7 +374,7 @@
                 if (ruleConfig.regs && ruleConfig.regs.length) {
                     rules.push({
                         message: formItem._regMessage || `${formItem._name}格式不正确!`,
-                        trigger: "blur",
+                        trigger: "blur, change",
                         type: "string",
                         transform: (val) => {
                             return this.$isEmptyData(val)

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

@@ -339,7 +339,7 @@ export default {
                         }, row);
                     }
 
-                    // 初次进来把前端存的状态值全部清除（除了__readonly__）
+                    // 初次进来把前端存的状态值全部清除（除了__readonly__和__isQuote__不处理）
                     if (this.initFlag) {
                         this.deleteProperties.forEach(property => {
                             delete row[property];