bri-components 1.3.69 → 1.3.71

package/package.json

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

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

@@ -119,7 +119,7 @@
                         const curDateStr = this.$transformDate(date, "/", this.subType);
 
                         // 日期字段的对比
-                        const compareResult = this.$validateComparedRuleFunc(
+                        const compareResult = this.$normalComparedFunc(
                             this.selfPropsObj,
                             {
                                 ...this.value,

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/DshFlatTableMixin.js

@@ -7,7 +7,7 @@ export default {
     },
     computed: {
         allListData () {
-            console.log("allListData");
+            // console.log("allListData");
             this.data.forEach(item => {
                 !item._id && this.$set(item, "_id", this.$ObjectID().str);
 
@@ -20,7 +20,6 @@ export default {
                 item.__isSearchShow__ = false;
             });
 
-            console.log(this.initFlag);
             this.initFlag = false;
             return this.data;
         },

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

@@ -22,31 +22,31 @@ export default {
         },
 
         allTreeData () {
-            console.log("allTreeData");
+            // console.log("allTreeData");
             return this.getCalcuedTree(this.data, this.columns);
         },
         allListData () {
-            console.log("allListData");
+            // console.log("allListData");
             return this.$getTreeFlatArr(this.allTreeData);
         },
         footerData () {
-            console.log("footerData");
+            // console.log("footerData");
             return this.isSearching
                 ? []
                 : this.useSummary && this.allListData.length
                     ? [
-                        this.filterColumns.reduce((obj, col) => {
+                        this.filterColumns.reduce((obj, column) => {
                             return {
                                 ...obj,
-                                [col._key]: col._type === "number" && ![undefined, null, "", "no"].includes(col._summaryType)
+                                [column._key]: column._type === "number" && ![undefined, null, "", "no"].includes(column._summaryType)
                                     ? this.$calNumList(
                                         this.allListData
                                             .filter(item => item.level === 1)
-                                            .map(item => item[col._key]),
-                                        col._summaryType,
-                                        { ...col, _defaultDigit: 2 }
+                                            .map(item => item[column._key]),
+                                        column._summaryType,
+                                        { ...column, _defaultDigit: 2 }
                                     )
-                                    : (obj[col._key] || "--")
+                                    : (obj[column._key] || "--")
                             };
                         }, {
                             _id: this.$ObjectID().str,
@@ -76,11 +76,11 @@ export default {
                                 ? row.__isSearchShow__ === false
                                     ? " bri-table-td-hide"
                                     : ""
-                                : row.__isShow__ === false
-                                    ? " bri-table-td-hide"
-                                    : this.isExpandAction
+                                : row.__isShow__ === true
+                                    ? this.isExpandAction
                                         ? " bri-table-td-visible"
                                         : ""
+                                    : " bri-table-td-hide"
                             }` +
                             `${["__isExpand__"].includes(column._key)
                                 ? " bri-table-td-expand"
@@ -214,7 +214,6 @@ export default {
         // 展开／隐藏节点
         toggleExpand (row, bool = true) {
             this.isExpandAction = true;
-            // row.__isExpand__ = bool;
             this.$set(row, "__isExpand__", bool);
 
             this.toggleDescendantsShow(row, bool);
@@ -268,21 +267,18 @@ export default {
         getCalcuedTree (treeData = [], columns = []) {
             const loop = (list = [], parentRow) =>
                 list.forEach((row) => {
-                    // 递归到叶子节点前 从上往下要处理的
-                    columns.reduce((newRow, col) => {
-                        const isNumberSummary = col._type === "number" && ![undefined, null, "", "no"].includes(col._summaryType);
-                        const isDateSummary = col._type === "date" && ![undefined, null, ""].includes(col._writeSort);
-
-                        if (isNumberSummary || isDateSummary) {
-                            const val = isNumberSummary
-                                ? newRow[col._key]
-                                : ["downToUp"].includes(col._writeSort)
-                                    ? newRow[col._key]
-                                    : !parentRow || parentRow[col._key]
-                                        ? newRow[col._key]
-                                        : undefined;
+                    // 递归到叶子节点前 从上往下执行 要处理的
+                    columns.reduce((newRow, column) => {
+                        if (
+                            ["number", "date"].includes(column._type) &&
+                            ["upToDown"].includes(column._writeSort)
+                        ) {
+                            // 第一级的和父级有值的，否则置空
+                            const val = parentRow && !parentRow[column._key]
+                                ? this.$deepCopy(this.initDftValMap[column._type])
+                                : newRow[column._key];
 
-                            this.$set(newRow, col._key, val);
+                            this.$set(newRow, column._key, val);
                         }
 
                         return newRow;
@@ -292,34 +288,54 @@ export default {
                         row.isLeaf = false;
                         loop(row.children, row);
 
-                        // 递归到叶子节点后 从下往上要处理的
-                        columns.reduce((newRow, col) => {
-                            const isNumberSummary = col._type === "number" && ![undefined, null, "", "no"].includes(col._summaryType);
-                            const isDateSummary = col._type === "date" && ![undefined, null, ""].includes(col._writeSort);
+                        // 递归到叶子节点后到 从下往上执行 要处理的（非叶子节点）
+                        columns.reduce((newRow, column) => {
+                            // if (
+                            //     ["number", "date"].includes(column._type) &&
+                            //     ["downToUp"].includes(column._writeSort)
+                            // ) {
+                            //     // 第一级的和父级有值的，否则置空
+                            //     const val = newRow[column._key];
+
+                            //     this.$set(newRow, column._key, val);
+                            // }
 
-                            if (isNumberSummary || isDateSummary) {
-                                const val = isNumberSummary
+                            if (
+                                ["number", "date"].includes(column._type) &&
+                                ![undefined, null, "", "no"].includes(column._summaryType)
+                            ) {
+                                const val = ["number"].includes(column._type)
                                     ? this.$calNumList(
-                                        newRow.children.map(subRow => subRow[col._key]),
-                                        col._summaryType,
-                                        { ...col, _defaultDigit: 2 },
+                                        newRow.children.map(subRow => subRow[column._key]),
+                                        column._summaryType,
+                                        { ...column, _defaultDigit: 2 },
                                         false
                                     )
-                                    : ["downToUp"].includes(col._writeSort)
-                                        ? this.$calDateList(
-                                            newRow.children.map(subRow => subRow[col._key]),
-                                            col._compareOperator,
-                                            col._dateType
-                                        )
-                                        : newRow[col._key];
+                                    : this.$calDateList(
+                                        newRow.children.map(subRow => subRow[column._key]),
+                                        column._summaryType,
+                                        column._dateType
+                                    );
 
-                                this.$set(newRow, col._key, val);
+                                this.$set(newRow, column._key, val);
                             }
 
                             return newRow;
                         }, row);
                     } else {
                         row.isLeaf = true;
+
+                        // 递归到叶子节点前 从上往下执行 要处理的（叶子节点）
+                        columns.reduce((newRow, column) => {
+                            if (
+                                ["number", "date"].includes(column._type) &&
+                                ![undefined, null, "", "no"].includes(column._summaryType)
+                            ) {
+                                this.$set(newRow, column._key, newRow[column._key]);
+                            }
+
+                            return newRow;
+                        }, row);
                     }
 
                     // 初次进来把前端存的状态值全部清除（除了__readonly__）
@@ -329,6 +345,7 @@ export default {
                         });
 
                         row.__old__ = true; // 老的数据都打上标记 尽管不一定会用
+
                         // row.__isExpand__ = false;
                         // row.__isSearchShow__ = false;
                         // 第一级的需要显示出来

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;
         // },
@@ -337,7 +342,7 @@ export default {
         },
 
         renderedListData () {
-            console.log("renderedListData");
+            // console.log("renderedListData");
             return this.allListData.filter(row => {
                 if (this.isSearching) {
                     const bool = this.$isAdvRelyAccord(this.finalTableAdvSearch, row);
@@ -354,7 +359,7 @@ export default {
             });
         },
         showListData () {
-            console.log("showListData");
+            // console.log("showListData");
             return this.renderedListData.filter(row =>
                 this.isSearching
                     ? !!row.__isSearchShow__
@@ -446,18 +451,24 @@ 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
             };
         },
 
         filterColumns () {
-            console.log("filterColumns");
+            // console.log("filterColumns");
             return this.columns.filter(col => this.$isAdvRelyShow(col, this.allListData, this.parentObj, true));
         },
         contentColumns () {
-            console.log("contentColumns");
+            // console.log("contentColumns");
             return this.filterColumns.map(colItem => ({
                 filter: undefined,
                 sortBy: undefined,
@@ -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
                     ];
                 },
@@ -718,15 +730,26 @@ export default {
         // 引用回调
         quoteCb (dataObj) {
             if (dataObj) {
-                const cb = () => {
-                    this.$Message.success("引用成功！");
-                    this.reset();
-                    this.selfReset && this.selfReset();
+                const fieldVal = dataObj[this.controlKey];
+                const isEmpty = this.$isEmptyData(fieldVal) || (
+                    ["flatTable"].includes(this.controlType)
+                        ? !fieldVal.list || !fieldVal.list.length
+                        : ["cascaderTable"].includes(this.controlType)
+                            ? !fieldVal.tree || !fieldVal.tree.length
+                            : false
+                );
 
+                if (isEmpty) {
+                    this.$Modal.confirm({
+                        title: "提示",
+                        content: "该数据下此内容为空，无法引用！",
+                        onOk: () => { }
+                    });
+                } else {
                     if (["flatTable"].includes(this.controlType)) {
                         this.parentObj[this.controlKey] = {
-                            ...dataObj[this.controlKey],
-                            list: dataObj[this.controlKey].list.map(item => ({
+                            ...fieldVal,
+                            list: fieldVal.list.map(item => ({
                                 ...item,
                                 __isQuote__: true
                             }))
@@ -744,28 +767,15 @@ export default {
                         };
 
                         this.parentObj[this.controlKey] = {
-                            ...dataObj[this.controlKey],
-                            tree: transformData(dataObj[this.controlKey].tree)
+                            ...fieldVal,
+                            tree: transformData(fieldVal.tree)
                         };
                     }
 
+                    this.$Message.success("引用成功！");
+                    this.reset();
+                    this.selfReset && this.selfReset();
                     this.change("quote");
-                };
-
-                const isEmpty = this.$isEmptyData(dataObj[this.controlKey]) ||
-                    (["flatTable"].includes(this.controlType)
-                        ? !dataObj[this.controlKey].list || !dataObj[this.controlKey].list.length
-                        : ["cascaderTable"].includes(this.controlType)
-                            ? !dataObj[this.controlKey].tree || !dataObj[this.controlKey].tree.length
-                            : false);
-                if (isEmpty) {
-                    this.$Modal.confirm({
-                        title: "提示",
-                        content: "该数据下此内容为空，无法引用！",
-                        onOk: () => { }
-                    });
-                } else {
-                    cb();
                 }
             } else {
                 this.$Message.error("未选择引用数据！");
@@ -816,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(() => {
@@ -1001,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
@@ -1021,22 +1046,14 @@ export default {
         // 列本身是否可编辑
         getColCanEdit (col, row) {
             return (
-                ["cascaderTable"].includes(this.controlType)
-                    ? (
-                        // 树形表格 -“需要计算的数字列 且 不是叶子行的”不可编辑（必须用isLeaf !== false判断，因为牵扯内部表格也在用）
-                        ["number"].includes(col._type) && ![undefined, null, "", "no"].includes(col._summaryType)
-                            ? row.isLeaf === true
-                            : true
-                    ) && (
-                        // 树形表格 -“需要限制的日期列 且 不是叶子行的”不可编辑（必须用isLeaf !== false判断，因为牵扯内部表格也在用）
-                        ["date"].includes(col._type)
-                            ? ["downToUp"].includes(col._writeSort)
-                                ? row.isLeaf === true
-                                : ["upToDown"].includes(col._writeSort)
-                                    ? row.level === 1 || !!this.getParentNode(row, this.allTreeData)[col._key]
-                                    : true
+                ["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]
                             : true
-                    )
                     : true
             ) &&
                 (col._oldReadonly ? row.__old__ !== true : true) && // 老数据行里某些列不可编辑