bri-components 1.3.70 → 1.3.72

package/package.json

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

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

@@ -109,40 +109,30 @@
             writeSort () {
                 return this.selfPropsObj._writeSort;
             },
-            compareOperator () {
-                return this.selfPropsObj._compareOperator;
-            },
             options () {
                 return {
                     shortcuts: [],
                     disabledDate: (date) => {
-                        const curDateStr = this.$transformDate(date, "/", this.subType);
+                        const selfValue = {
+                            ...this.value,
+                            [this.controlKey]: this.$transformDate(date, "/", this.subType)
+                        };
 
-                        // 日期字段的对比
-                        const compareResult = this.$normalComparedFunc(
-                            this.selfPropsObj,
-                            {
-                                ...this.value,
-                                [this.controlKey]: curDateStr
-                            },
-                            this.parentObj,
-                            this.selfPropsObj._isCompareByParent === true ? this.parentObj : undefined,
-                            this.selfPropsObj._isCompareByParent === true ? this.parentFormList : this.allFormList
-                        );
+                        // 日期字段的平级对比
+                        const compareBool = this.$normalComparedFunc(this.selfPropsObj, selfValue, this.allFormList, this.parentObj, this.parentFormList, this.inTableType);
 
-                        // 表格里上下列的汇总
-                        let calResultObj = {
-                            bool: true
-                        };
-                        if (this.isInTable && this.writeSort === "upToDown" && this.value.level !== 1) {
-                            const parentRow = this.allListRows.find(row =>
-                                row.level === this.value.level - 1 && row.children.some(childNode => childNode._id === this.value._id)
-                            ) || {};
-                            const parentDateStr = parentRow[this.controlKey];
-                            calResultObj = this.$isComparedAccord(curDateStr, parentDateStr, this.compareOperator, "date", this.subType, this.subType);
-                        }
+                        // 层级表格里-日期字段的上下级对比（从下往上时，子行的值全有时，才启用置灰）
+                        const caluBool = (
+                            this.inTableType === "treeTable" &&
+                            this.writeSort === "downToUp" &&
+                            this.value.children &&
+                            this.value.children.length &&
+                            this.value.children.some(child => this.$isEmptyData(child[this.controlKey]))
+                        )
+                            ? true
+                            : this.$levelComparedFunc(this.selfPropsObj, selfValue, this.allListRows, this.inTableType);
 
-                        return !compareResult || !calResultObj.bool;
+                        return !compareBool || !caluBool;
                     }
                 };
             }

package/src/components/controls/mixins/controlMixin.js

@@ -25,6 +25,12 @@ export default {
         },
 
         /* 内部表，层级表内的字段用到的 */
+        inTableType: {
+            type: String,
+            validator (val) {
+                return ["flatTable", "cascaderTable", "treeTable"].includes(val);
+            }
+        },
         allListRows: {
             type: Array,
             default () {

package/src/components/form/DshForm.vue

@@ -27,6 +27,7 @@
                                 :formData="formData"
                                 :formItem="formItem"
                                 :allFormList="allFormList"
+                                :inTableType="inTableType"
                                 :allListRows="allListRows"
                                 :rowIndex="rowIndex"
                                 :parentFormList="parentFormList"
@@ -135,6 +136,12 @@
             },
 
             /* 内部表，层级表内的字段用到的 */
+            inTableType: {
+                type: String,
+                validator (val) {
+                    return ["flatTable", "cascaderTable", "treeTable"].includes(val);
+                }
+            },
             allListRows: {
                 type: Array,
                 default () {
@@ -230,7 +237,7 @@
             },
             // 初始化校验
             initRules () {
-                // 此处代码可以改，但写法不能改！不然会引起表单页面渲染完就自动校验
+                // 此处代码可以改，但写法不能改!不然会引起表单页面渲染完就自动校验
                 this.formList.reduce((rulesObj, formItem) => {
                     rulesObj[formItem._key] = this.getRules(formItem);
                     return rulesObj;
@@ -268,7 +275,7 @@
                     bool = bool && valid;
 
                     errorFormList.forEach(formItem => {
-                        this.validateCb(formItem._key, false, `${formItem._name} 内部校验不正确！`);
+                        this.validateCb(formItem._key, false, `"${formItem._name}"内部校验不正确!`);
                     });
                 });
 
@@ -346,21 +353,6 @@
                 let rules = [];
                 let ruleConfig = this.$getFieldRuleConfig(formItem);
 
-                // 格式校验 （不依赖必填）
-                if (ruleConfig.regs.length) {
-                    rules.push({
-                        message: formItem._regMessage || `${formItem._name} 格式不正确！`,
-                        trigger: "blur",
-                        transform: (val) => {
-                            if (this.$isEmptyData(val)) {
-                                return val;
-                            } else {
-                                return ruleConfig.regs.every(regItem => regItem.test(val)) && val;
-                            }
-                        },
-                        ...ruleConfig
-                    });
-                }
                 // 必填校验
                 if (formItem._required) {
                     // 其他配置
@@ -369,7 +361,7 @@
                             fields: {
                                 lnglat: {
                                     required: true,
-                                    message: `${formItem._name} 为必填项！`,
+                                    message: `${formItem._name}为必填项!`,
                                     type: "array"
                                 }
                             }
@@ -378,7 +370,16 @@
                             fields: {
                                 list: {
                                     required: true,
-                                    message: `${formItem._name} 不能为空行！`,
+                                    message: `${formItem._name}不能为空行!`,
+                                    type: "array"
+                                }
+                            }
+                        },
+                        cascaderTable: {
+                            fields: {
+                                tree: {
+                                    required: true,
+                                    message: `${formItem._name}不能为空行!`,
                                     type: "array"
                                 }
                             }
@@ -386,7 +387,7 @@
                         referenceBy: {
                             fields: {
                                 count: {
-                                    message: `${formItem._name} 必须关联数据！`,
+                                    message: `${formItem._name}必须关联数据!`,
                                     type: "number",
                                     transform: (val) => {
                                         if (val && val > 0) {
@@ -402,7 +403,7 @@
 
                     rules.push({
                         required: true,
-                        message: `${formItem._name} 为必填项！`,
+                        message: `${formItem._name}为必填项!`,
                         trigger: "blur, change",
                         type: "string",
                         ...(subFieldsMap[formItem._type] || {}),
@@ -410,6 +411,38 @@
                     });
                 }
 
+                // 格式校验（不依赖必填）
+                if (ruleConfig.regs && ruleConfig.regs.length) {
+                    rules.push({
+                        message: formItem._regMessage || `${formItem._name}格式不正确!`,
+                        trigger: "blur",
+                        transform: (val) => {
+                            if (this.$isEmptyData(val)) {
+                                return val;
+                            } else {
+                                return ruleConfig.regs.every(regItem => regItem.test(val)) && val;
+                            }
+                        },
+                        ...ruleConfig
+                    });
+                }
+
+                // 对比校验（横向对比和层级对比）
+                const tipObj = {
+                    message: `${formItem._name}对比不通过!`,
+                    trigger: "blur, change",
+                    transform: (val) => {
+                        const comparedBool = (
+                            this.$normalComparedFunc(formItem, this.formData, this.allFormList, this.parentObj, this.parentFormList, this.inTableType, tipObj) &&
+                            this.$levelComparedFunc(formItem, this.formData, this.allListRows, this.inTableType, tipObj)
+                        );
+
+                        return comparedBool ? val : false;
+                    },
+                    ...ruleConfig
+                };
+                rules.push(tipObj);
+
                 return rules;
             },
             // 强行执行一些校验

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

@@ -155,7 +155,7 @@ export default {
                     return [
                         h("div", {
                             style: {
-                                paddingLeft: `${(row.level - 1) * 18} px`,
+                                paddingLeft: `${(row.level - 1) * 18}px`,
                                 fontWeight: "500"
                             }
                         }, row.__treeIndex__),
@@ -274,7 +274,7 @@ export default {
                             ["upToDown"].includes(column._writeSort)
                         ) {
                             // 第一级的和父级有值的，否则置空
-                            const val = parentRow && !parentRow[column._key]
+                            const val = parentRow && this.$isEmptyData(parentRow[column._key])
                                 ? this.$deepCopy(this.initDftValMap[column._type])
                                 : newRow[column._key];
 

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

@@ -223,6 +223,11 @@ export default {
                 ...this.commonPropsObj
             };
         },
+        inTableType () {
+            return this.controlType === "cascaderTable" && ["treeTable"].includes(this.selfPropsObj._showMode)
+                ? this.selfPropsObj._showMode
+                : this.controlType;
+        },
         // isShare () {
         //     return this.selfPropsObj.isShare;
         // },
@@ -446,9 +451,15 @@ export default {
             return {
                 _id: this.parentDataId,
                 _key: this.controlKey,
-                importType: this.controlType === "cascaderTable" && ["treeTable"].includes(this.selfPropsObj._showMode)
-                    ? this.selfPropsObj._showMode
-                    : this.controlType
+                importType: this.inTableType
+            };
+        },
+        exportParams () {
+            return {
+                screenKey: this.screenKey,
+                _id: this.parentDataId,
+                _key: this.controlKey,
+                advSearch: this.finalTableAdvSearch
             };
         },
 
@@ -465,6 +476,7 @@ export default {
                     column = this.$transformDynamicProperty(column, row, this.parentObj);
                     column = this.resetCol(column, row);
                     const unitCanEdit = this.getUnitCanEdit(column, row);
+                    const ruleResultObj = this.getColRuleResult(column, row, rowIndex);
 
                     return [
                         this.isShowCompare(column, row, this.compareListData[rowIndex])
@@ -487,6 +499,7 @@ export default {
                                             formData: row,
                                             formItem: column,
                                             allFormList: this.columns,
+                                            inTableType: this.inTableType,
                                             allListRows: this.allListData,
                                             rowIndex: rowIndex,
                                             parentFormList: this.allFormList,
@@ -505,6 +518,7 @@ export default {
                                     formData: row,
                                     formItem: column,
                                     allFormList: this.columns,
+                                    inTableType: this.inTableType,
                                     allListRows: this.allListData,
                                     rowIndex: rowIndex,
                                     parentFormList: this.allFormList,
@@ -517,10 +531,10 @@ export default {
                             }),
 
                         // 校验文字
-                        !this.getColRuleResult(column, row, rowIndex).bool
+                        !ruleResultObj.bool
                             ? h("span", {
                                 class: "bri-table-td-tip"
-                            }, this.getColRuleResult(column, row, rowIndex).message)
+                            }, ruleResultObj.message)
                             : undefined
                     ];
                 },
@@ -814,12 +828,7 @@ export default {
                     module: "sheet",
                     name: ["flatTable"].includes(this.controlType) ? "exportFlatTableExcel" : "exportCascaderTableExcel"
                 },
-                params: {
-                    screenKey: this.screenKey,
-                    _id: this.parentObj._id,
-                    _key: this.controlKey,
-                    advSearch: this.finalTableAdvSearch
-                },
+                params: this.exportParams,
                 callback: data => {
                     this.getJobStatus(operationItem, data.jobId, data.excel_url);
                     this.exportTimer = setInterval(() => {
@@ -998,8 +1007,20 @@ export default {
         getColRuleResult (col, row, rowIndex) {
             col = this.$transformDynamicProperty(col, row, this.parentObj);
 
+            // 未触发校验时 不显示错误
             if ((this.ruleRecordMap[`${row._id}dsh${col._key}`] || {}).showRuleMessage || this.showRuleMessage) {
-                return this.$getFieldRuleResult(col, row);
+                // 校验必填不通过 => 校验对比
+                const tipObj = this.$getFieldRuleResult(col, row);
+                const comparedBool = (
+                    tipObj.bool &&
+                    this.$normalComparedFunc(col, row, this.columns, this.parentObj, this.allFormList, this.inTableType, tipObj) &&
+                    this.$levelComparedFunc(col, row, this.allListData, this.inTableType, tipObj)
+                );
+
+                return {
+                    bool: comparedBool,
+                    message: tipObj.message
+                };
             } else {
                 return {
                     bool: true
@@ -1019,13 +1040,13 @@ export default {
         // 列本身是否可编辑
         getColCanEdit (col, row) {
             return (
-                ["cascaderTable"].includes(this.controlType) && ["number", "date"].includes(col._type)
+                ["treeTable"].includes(this.inTableType) && ["number", "date"].includes(col._type)
                     ? ![undefined, null, "", "no"].includes(col._summaryType)
                         ? row.isLeaf === true
                         // : ["downToUp"].includes(col._writeSort)
                         //     ? row.isLeaf === true
                         : ["upToDown"].includes(col._writeSort)
-                            ? row.level === 1 || !!this.getParentNode(row, this.allTreeData)[col._key]
+                            ? row.level === 1 || !this.$isEmptyData(this.getParentNode(row, this.allTreeData)[col._key])
                             : true
                     : true
             ) &&

package/src/components/unit/DshFormUnit.vue

@@ -77,6 +77,7 @@
                     :value="formData"
                     :propsObj="formItem"
                     :allFormList="allFormList"
+                    :inTableType="inTableType"
                     :allListRows="allListRows"
                     :rowIndex="rowIndex"
                     :parentFormList="parentFormList"
@@ -342,18 +343,20 @@
         }
 
         &-required {
-            .DshFormUnit-label::before {
-                position: absolute;
-                left: -10px;
-
-                content: '*';
-                display: inline-block;
-                width: 6px;
-                line-height: 1.5;
-                font-family: SimSun;
-                font-weight: 500;
-                font-size: @textSize;
-                color: #E94829;
+            > .DshFormUnit-label {
+                &::before {
+                    position: absolute;
+                    left: -10px;
+
+                    content: '*';
+                    display: inline-block;
+                    width: 6px;
+                    line-height: 1.5;
+                    font-family: SimSun;
+                    font-weight: 500;
+                    font-size: @textSize;
+                    color: #E94829;
+                }
             }
         }
 

package/src/components/unit/DshListUnit.vue

@@ -24,6 +24,7 @@
                     inTable: true
                 }"
                 :allFormList="allFormList"
+                :inTableType="inTableType"
                 :allListRows="allListRows"
                 :rowIndex="rowIndex"
                 :parentFormList="parentFormList"

package/src/components/unit/unitMixin.js

@@ -27,13 +27,19 @@ export default {
         },
 
         /* 内部表，层级表内的字段用到的 */
-        rowIndex: Number,
+        inTableType: {
+            type: String,
+            validator (val) {
+                return ["flatTable", "cascaderTable", "treeTable"].includes(val);
+            }
+        },
         allListRows: {
             type: Array,
             default () {
                 return [];
             }
         },
+        rowIndex: Number,
         parentFormList: {
             type: Array,
             default () {