bri-components 1.3.70 → 1.3.71

package/package.json

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

package/src/components/form/DshForm.vue

@@ -154,6 +154,12 @@
                     return {};
                 }
             },
+            inTableType: {
+                type: String,
+                validator (val) {
+                    return ["flatTable", "cascaderTable", "treeTable"].includes(val);
+                }
+            },
 
             changedFields: {
                 type: Array,
@@ -346,21 +352,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) {
                     // 其他配置
@@ -383,6 +374,15 @@
                                 }
                             }
                         },
+                        cascaderTable: {
+                            fields: {
+                                tree: {
+                                    required: true,
+                                    message: `${formItem._name} 不能为空行！`,
+                                    type: "array"
+                                }
+                            }
+                        },
                         referenceBy: {
                             fields: {
                                 count: {
@@ -410,6 +410,49 @@
                     });
                 }
 
+                // 格式校验 （不依赖必填）
+                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 (["number", "date"].includes(formItem._type)) {
+                    const tipObj = {};
+                    rules.push({
+                        message: "对比不通过!",
+                        trigger: "blur, change",
+                        transform: (val) => {
+                            const comparedBool = this.$normalComparedFunc(
+                                formItem,
+                                this.formData,
+                                this.parentObj,
+                                formItem._isCompareByParent ? this.parentObj : undefined,
+                                formItem._isCompareByParent ? this.parentFormList : this.allFormList,
+                                tipObj,
+                                this.inTableType
+                            ) && this.$levelComparedFunc(formItem, this.formData, tipObj, this.inTableType);
+
+                            if (comparedBool) {
+                                return val;
+                            } else {
+                                return false;
+                            }
+                        },
+                        ...ruleConfig
+                    });
+                }
+
                 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__),

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])
@@ -517,10 +529,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 +826,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(() => {
@@ -999,7 +1006,27 @@ export default {
             col = this.$transformDynamicProperty(col, row, this.parentObj);
 
             if ((this.ruleRecordMap[`${row._id}dsh${col._key}`] || {}).showRuleMessage || this.showRuleMessage) {
-                return this.$getFieldRuleResult(col, row);
+                const ruleResultObj = this.$getFieldRuleResult(col, row);
+
+                if (ruleResultObj.bool) {
+                    const tipObj = {};
+                    const comparedBool = this.$normalComparedFunc(
+                        col,
+                        row,
+                        this.parentObj,
+                        col._isCompareByParent ? this.parentObj : undefined,
+                        col._isCompareByParent ? this.allFormList : this.columns,
+                        tipObj,
+                        this.inTableType
+                    ) && this.$levelComparedFunc(col, row, tipObj, this.inTableType);
+
+                    return {
+                        bool: comparedBool,
+                        message: tipObj.message
+                    };
+                } else {
+                    return ruleResultObj;
+                }
             } else {
                 return {
                     bool: true
@@ -1019,7 +1046,7 @@ 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)