bri-components 1.3.75 → 1.3.77

package/package.json

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

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

@@ -93,18 +93,8 @@
                     ...this.commonDealPropsObj
                 };
             },
-
-            curValDate: {
-                get () {
-                    const val = this.value[this.controlKey];
-                    return this.$transformDateCompatible(val, this.subType);
-                },
-                set (val) {
-                    this.$set(this.value, this.controlKey, this.$transformDate(val, "-", this.subType));
-                }
-            },
             subType () {
-                return this.selfPropsObj._dateType;
+                return this.selfPropsObj._dateType; // 5种，"date", "datetime", "year", "month", "time"
             },
             options () {
                 return {
@@ -123,6 +113,16 @@
                         return !compareBool || !caluBool;
                     }
                 };
+            },
+
+            curValDate: {
+                get () {
+                    const val = this.value[this.controlKey];
+                    return this.$transformDateCompatible(val, this.subType);
+                },
+                set (val) {
+                    this.$set(this.value, this.controlKey, this.$transformDate(val, "-", this.subType));
+                }
             }
         },
         created () {},

package/src/components/controls/base/DshDate/DshDaterange.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="DshDaterange">
-        <template v-if="['time', 'timerange'].includes(subType)">
+        <template v-if="['time'].includes(subType)">
             <!-- 时间范围 -->
             <TimePicker
                 style="width: 100%;"

package/src/components/controls/senior/selectDepartments.vue

@@ -168,7 +168,7 @@
         computed: {
             selfPropsObj () {
                 return {
-                    _icon: this.multipleMode ? "ios-people" : "ios-person",
+                    _icon: this.propsObj._multiple === true ? "ios-people" : "ios-person",
                     _highSearch: false,
                     _changeOnSelect: true,
                     _searchString: "",

package/src/components/controls/senior/selectUsers/selectUsers.vue

@@ -283,7 +283,7 @@
         computed: {
             selfPropsObj () {
                 return {
-                    _icon: this.multipleMode ? "ios-people" : "ios-person",
+                    _icon: this.propsObj._multiple === true ? "ios-people" : "ios-person",
                     _highSearch: false,
                     _reverseFilter: false, // 是否反向过滤，默认正向过滤
                     _userDepartFilterVals: [], // 过滤的数据

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,8 +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]);
+                        }
                     });
                 }
 
@@ -377,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)
@@ -388,16 +385,31 @@
                     });
                 }
 
-                // 对比校验（横向对比和层级对比）-虽然暂时只number和date对比校验，但为了扩展到其他类型时，不修改此处。用type判断：大量使用DshForm的地方有复合类型，type参数(数据类型)没有定义，会出现校验文字
-                // if (ruleConfig.type) {
-                if (["number", "date"].includes(formItem._type)) {
+                // 对比校验（横向同类型字段对比）-暂时只number和date对比校验
+                if (formItem._saveRuleConfigs) {
                     const ruleObj = {
                         message: `${formItem._name}对比不通过!`,
                         trigger: "blur, change",
                         type: "string",
                         transform: (val) => {
-                            return this.$normalComparedFunc(formItem, this.formData, this.allFormList, this.parentObj, this.parentFormList, this.inTableType, ruleObj) &&
-                                this.$levelComparedFunc(formItem, this.formData, this.allListRows, this.inTableType, ruleObj)
+                            return this.$normalComparedFunc(formItem, this.formData, this.allFormList, this.parentObj, this.parentFormList, this.inTableType, ruleObj)
+                                ? val
+                                : false;
+                        },
+                        ...ruleConfig
+                    };
+
+                    rules.push(ruleObj);
+                }
+
+                // 对比校验（层级表格的层级对比）-暂时只number和date对比校验
+                if (this.inTableType === "treeTable" && ["downToUp", "upToDown"].includes(formItem._writeSort)) {
+                    const ruleObj = {
+                        message: `${formItem._name}层级对比不通过!`,
+                        trigger: "blur, change",
+                        type: "string",
+                        transform: (val) => {
+                            return this.$levelComparedFunc(formItem, this.formData, this.allListRows, this.inTableType, ruleObj)
                                 ? val
                                 : false;
                         },

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

@@ -328,7 +328,6 @@ export default {
                         columns.reduce((newRow, column) => {
                             if (["number", "date"].includes(column._type)) {
                                 if (![undefined, null, "", "no"].includes(column._summaryType)) {
-                                    console.log(newRow);
                                     this.$set(newRow, column._key, newRow[column._key]);
                                 }
                                 else if (["downToUp"].includes(column._writeSort) && column._noLimitWrite !== true) {
@@ -340,7 +339,7 @@ export default {
                         }, row);
                     }
 
-                    // 初次进来把前端存的状态值全部清除（除了__readonly__）
+                    // 初次进来把前端存的状态值全部清除（除了__readonly__和__isQuote__不处理）
                     if (this.initFlag) {
                         this.deleteProperties.forEach(property => {
                             delete row[property];