bri-components 1.3.73 → 1.3.75

package/package.json

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

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

@@ -143,15 +143,13 @@
                 return {
                     _fileType: "file",
                     _showMode: this.isHeightAuto ? "old" : "inline", // 宽度为100%、且不在级联表格或内部表格里的 显示老版
-                    // _multiple: true,
+                    _multiple: true,
                     _useType: "drag",
                     _maxSize: 1024 * 1024,
                     _format: [],
 
                     ...this.propsObj,
-                    ...this.commonDealPropsObj,
-
-                    _multiple: true // TODO: 解决后端返回的配置数据里，内部表格里的上传字段有脏属性_multiple且为false，早晚要删除这行用上面的那行
+                    ...this.commonDealPropsObj
                 };
             },
             subType () {

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

@@ -106,9 +106,6 @@
             subType () {
                 return this.selfPropsObj._dateType;
             },
-            writeSort () {
-                return this.selfPropsObj._writeSort;
-            },
             options () {
                 return {
                     shortcuts: [],
@@ -120,17 +117,8 @@
 
                         // 日期字段的平级对比
                         const compareBool = this.$normalComparedFunc(this.selfPropsObj, selfValue, this.allFormList, this.parentObj, this.parentFormList, this.inTableType);
-
-                        // 层级表格里-日期字段的上下级对比（从下往上时，子行的值全有时，才启用置灰）
-                        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);
+                        // 层级表格里-日期字段的上下级对比
+                        const caluBool = this.$levelComparedFunc(this.selfPropsObj, selfValue, this.allListRows, this.inTableType, undefined, true);
 
                         return !compareBool || !caluBool;
                     }

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

@@ -15,7 +15,7 @@
         </template>
 
         <!-- 动态日期 -->
-        <template v-else-if="['date', 'datetime', 'daterange', 'datetimerange', 'year', 'month'].includes(subType)">
+        <template v-else-if="['date', 'datetime', 'year', 'month'].includes(subType)">
             <DatePicker
                 class="DshDaterange-left"
                 :model-value="val0"
@@ -94,115 +94,115 @@
                         _key: "dyn_today_start",
                         name: "今天",
                         numbers: [0],
-                        dateTypes: ["date", "datetime", "daterange", "datetimerange"]
+                        dateTypes: ["date", "datetime"]
                     },
                     {
                         _key: "dyn_today_end",
                         name: "今天",
                         numbers: [1],
-                        dateTypes: ["date", "datetime", "daterange", "datetimerange"]
+                        dateTypes: ["date", "datetime"]
                     },
                     {
                         _key: "dyn_now",
                         name: "现在",
                         numbers: [0, 1],
-                        dateTypes: ["date", "datetime", "daterange", "datetimerange"]
+                        dateTypes: ["date", "datetime"]
                     },
                     {
                         _key: "dyn_yesterday",
                         name: "昨天",
                         numbers: [0],
-                        dateTypes: ["date", "datetime", "daterange", "datetimerange"]
+                        dateTypes: ["date", "datetime"]
                     },
                     {
                         _key: "dyn_subtract_3_days",
                         name: "三天前",
                         numbers: [0],
-                        dateTypes: ["date", "datetime", "daterange", "datetimerange"]
+                        dateTypes: ["date", "datetime"]
                     },
                     {
                         _key: "dyn_subtract_7_days",
                         name: "七天前",
                         numbers: [0],
-                        dateTypes: ["date", "datetime", "daterange", "datetimerange"]
+                        dateTypes: ["date", "datetime"]
                     },
                     {
                         _key: "dyn_subtract_30_days",
                         name: "三十天前",
                         numbers: [0],
-                        dateTypes: ["date", "datetime", "daterange", "datetimerange"]
+                        dateTypes: ["date", "datetime"]
                     },
                     {
                         _key: "dyn_add_3_days",
                         name: "三天后",
                         numbers: [1],
-                        dateTypes: ["date", "datetime", "daterange", "datetimerange"]
+                        dateTypes: ["date", "datetime"]
                     },
                     {
                         _key: "dyn_add_7_days",
                         name: "七天后",
                         numbers: [1],
-                        dateTypes: ["date", "datetime", "daterange", "datetimerange"]
+                        dateTypes: ["date", "datetime"]
                     },
                     {
                         _key: "dyn_add_30_days",
                         name: "三十后",
                         numbers: [1],
-                        dateTypes: ["date", "datetime", "daterange", "datetimerange"]
+                        dateTypes: ["date", "datetime"]
                     },
                     {
                         _key: "last_month_start",
                         name: "上月初",
                         numbers: [0],
-                        dateTypes: ["month", "date", "datetime", "daterange", "datetimerange"]
+                        dateTypes: ["month", "date", "datetime"]
                     },
                     {
                         _key: "dyn_month_start",
                         name: "月初",
                         numbers: [0, 1],
-                        dateTypes: ["month", "date", "datetime", "daterange", "datetimerange"]
+                        dateTypes: ["month", "date", "datetime"]
                     },
                     {
                         _key: "dyn_month_end",
                         name: "月末",
                         numbers: [1],
-                        dateTypes: ["month", "date", "datetime", "daterange", "datetimerange"]
+                        dateTypes: ["month", "date", "datetime"]
                     },
                     {
                         _key: "dyn_quarter_start",
                         name: "本季初",
                         numbers: [0],
-                        dateTypes: ["month", "date", "datetime", "daterange", "datetimerange"]
+                        dateTypes: ["month", "date", "datetime"]
                     },
                     {
                         _key: "dyn_quarter_end",
                         name: "本季末",
                         numbers: [1],
-                        dateTypes: ["month", "date", "datetime", "daterange", "datetimerange"]
+                        dateTypes: ["month", "date", "datetime"]
                     },
                     {
                         _key: "dyn_year_start",
                         name: "年初",
                         numbers: [0],
-                        dateTypes: ["year", "date", "datetime", "daterange", "datetimerange"]
+                        dateTypes: ["year", "date", "datetime"]
                     },
                     {
                         _key: "dyn_year_end",
                         name: "年末",
                         numbers: [1],
-                        dateTypes: ["year", "date", "datetime", "daterange", "datetimerange"]
+                        dateTypes: ["year", "date", "datetime"]
                     },
                     {
                         _key: "dyn_nextyear_start",
                         name: "次年初",
                         numbers: [0],
-                        dateTypes: ["year", "date", "datetime", "daterange", "datetimerange"]
+                        dateTypes: ["year", "date", "datetime"]
                     },
                     {
                         _key: "dyn_nextyear_end",
                         name: "次年末",
                         numbers: [1],
-                        dateTypes: ["year", "date", "datetime", "daterange", "datetimerange"]
+                        dateTypes: ["year", "date", "datetime"]
                     }
                 ]
             };
@@ -309,7 +309,7 @@
                         return compareDateStr
                             ? this.isDynDateKey(compareDateStr)
                                 ? true
-                                : !this.$isComparedAccord(curDateStr, compareDateStr, compareOperator, "date", this.subType, this.subType).bool
+                                : !this.$isComparedAccord(curDateStr, compareDateStr, compareOperator, "date", this.subType, this.subType)
                             : false;
                     }
                 };

package/src/components/controls/controlMap.js

@@ -17,11 +17,8 @@ const componentNameMap = {
     url: "DshInput",
     password: "DshInput",
     serialNumber: "DshInput",
-    texts: "DshInput",
     number: "DshNumber",
-    numberange: "DshNumber",
     date: "DshDate",
-    daterange: "DshDate",
     switch: "DshSwitch",
     select: "DshSelect",
     checkbox: "DshCheckbox",

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

@@ -132,7 +132,7 @@ export default {
         multipleMode () {
             return this.isOnDftSearch || this.isOnSearch
                 ? true
-                : ["texts", "numberange", "daterange", "checkbox", "regions", "cascaders", "file"].includes(this.controlType) || !!this.propsObj._multiple;
+                : ["checkbox", "regions", "cascaders"].includes(this.controlType) || !!this.selfPropsObj._multiple;
         },
         // 是否为tag显示
         tagShow () {

package/src/components/form/DshForm.vue

@@ -355,59 +355,21 @@
 
                 // 必填校验
                 if (formItem._required) {
-                    // 其他配置
-                    const subFieldsMap = {
-                        coordinates: {
-                            fields: {
-                                lnglat: {
-                                    required: true,
-                                    message: `${formItem._name}为必填项!`,
-                                    type: "array"
-                                }
-                            }
-                        },
-                        flatTable: {
-                            fields: {
-                                list: {
-                                    required: true,
-                                    message: `${formItem._name}不能为空行!`,
-                                    type: "array"
-                                }
-                            }
-                        },
-                        cascaderTable: {
-                            fields: {
-                                tree: {
-                                    required: true,
-                                    message: `${formItem._name}不能为空行!`,
-                                    type: "array"
-                                }
-                            }
-                        },
-                        referenceBy: {
-                            fields: {
-                                count: {
-                                    message: `${formItem._name}必须关联数据!`,
-                                    type: "number",
-                                    transform: (val) => {
-                                        if (val && val > 0) {
-                                            return val;
-                                        } else {
-                                            return false;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    };
-
                     rules.push({
                         required: true,
                         message: `${formItem._name}为必填项!`,
                         trigger: "blur, change",
                         type: "string",
-                        ...(subFieldsMap[formItem._type] || {}),
-                        ...ruleConfig
+                        ...ruleConfig,
+                        fields: ruleConfig.fields && Object.entries(ruleConfig.fields).reduce((obj, arr) => {
+                            return {
+                                ...obj,
+                                [arr[0]]: {
+                                    ...arr[1],
+                                    message: `${formItem._name}${arr[1].message || ""}`
+                                }
+                            };
+                        }, ruleConfig.fields)
                     });
                 }
 
@@ -416,32 +378,34 @@
                     rules.push({
                         message: formItem._regMessage || `${formItem._name}格式不正确!`,
                         trigger: "blur",
+                        type: "string",
                         transform: (val) => {
-                            if (this.$isEmptyData(val)) {
-                                return val;
-                            } else {
-                                return ruleConfig.regs.every(regItem => regItem.test(val)) && val;
-                            }
+                            return this.$isEmptyData(val)
+                                ? val
+                                : 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);
+                // 对比校验（横向对比和层级对比）-虽然暂时只number和date对比校验，但为了扩展到其他类型时，不修改此处。用type判断：大量使用DshForm的地方有复合类型，type参数(数据类型)没有定义，会出现校验文字
+                // if (ruleConfig.type) {
+                if (["number", "date"].includes(formItem._type)) {
+                    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)
+                                ? val
+                                : false;
+                        },
+                        ...ruleConfig
+                    };
+
+                    rules.push(ruleObj);
+                }
 
                 return rules;
             },

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

@@ -112,7 +112,7 @@ export default {
         },
 
         allTreeData () {
-            console.log("allTreeData");
+            // console.log("allTreeData");
             return this.getCalcuedTree(this.data, this.treeColumns, this.columns);
         },
         allListData () {
@@ -593,8 +593,10 @@ export default {
                 ]);
             };
         },
-        // 表头单元格渲染函数
+        // 表头单元格渲染函数 （无法共用contentColumns的renderHeaderCell，因为级联表头的无renderHeaderCell）
         getThRender (column, colIndex) {
+            column = this.$transformDynamicProperty(column, undefined, this.parentObj);
+
             return (h) => {
                 return h("div", [
                     this.$getHeadRender(h, column, {

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

@@ -269,16 +269,18 @@ export default {
                 list.forEach((row) => {
                     // 递归到叶子节点前 从上往下执行 要处理的
                     columns.reduce((newRow, column) => {
-                        if (
-                            ["number", "date"].includes(column._type) &&
-                            ["upToDown"].includes(column._writeSort)
-                        ) {
-                            // 第一级的和父级有值的，否则置空
-                            const val = parentRow && this.$isEmptyData(parentRow[column._key])
-                                ? this.$deepCopy(this.initDftValMap[column._type])
-                                : newRow[column._key];
+                        if (["number", "date"].includes(column._type)) {
+                            if (![undefined, null, "", "no"].includes(column._summaryType)) {
+                                // 不做处理，_summaryType和_writeSort互反，更安全的判断
+                            }
+                            else if (["upToDown"].includes(column._writeSort) && column._noLimitWrite !== true) {
+                                // 有父级且值为空的 值置空
+                                const val = parentRow && this.$isEmptyData(parentRow[column._key])
+                                    ? this.$deepCopy(this.initDftValMap[column._type])
+                                    : newRow[column._key];
 
-                            this.$set(newRow, column._key, val);
+                                this.$set(newRow, column._key, val);
+                            }
                         }
 
                         return newRow;
@@ -290,34 +292,31 @@ export default {
 
                         // 递归到叶子节点后到 从下往上执行 要处理的（非叶子节点）
                         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 (["number", "date"].includes(column._type)) {
+                                if (![undefined, null, "", "no"].includes(column._summaryType)) {
+                                    const val = ["number"].includes(column._type)
+                                        ? this.$calNumList(
+                                            newRow.children.map(subRow => subRow[column._key]),
+                                            column._summaryType,
+                                            { ...column, _defaultDigit: 2 },
+                                            false
+                                        )
+                                        : this.$calDateList(
+                                            newRow.children.map(subRow => subRow[column._key]),
+                                            column._summaryType,
+                                            column._dateType
+                                        );
 
-                            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[column._key]),
-                                        column._summaryType,
-                                        { ...column, _defaultDigit: 2 },
-                                        false
-                                    )
-                                    : this.$calDateList(
-                                        newRow.children.map(subRow => subRow[column._key]),
-                                        column._summaryType,
-                                        column._dateType
-                                    );
+                                    this.$set(newRow, column._key, val);
+                                }
+                                else if (["downToUp"].includes(column._writeSort) && column._noLimitWrite !== true) {
+                                    // 子行有空值的 值置空
+                                    const val = newRow.children.some(sonRow => this.$isEmptyData(sonRow[column._key]))
+                                        ? this.$deepCopy(this.initDftValMap[column._type])
+                                        : newRow[column._key];
 
-                                this.$set(newRow, column._key, val);
+                                    this.$set(newRow, column._key, val);
+                                }
                             }
 
                             return newRow;
@@ -325,13 +324,16 @@ export default {
                     } 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]);
+                            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) {
+                                    this.$set(newRow, column._key, newRow[column._key]);
+                                }
                             }
 
                             return newRow;

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

@@ -207,7 +207,7 @@ export default {
                 _isImport: false, // 导入
                 _isExport: false, // 导出
                 _isQuote: false, // 引用
-                _quoteDataCanEdit: false, // 引用的数据是否能编辑
+                _quoteDisabledColKeys: [], // 引用数据行不可编辑咧
                 _quoteListFields: [], // 引用列表的显示字段
                 _quoteAdvSearch: {
                     logic: "and",
@@ -274,8 +274,8 @@ export default {
         isQuote () {
             return this.selfPropsObj._isQuote;
         },
-        quoteDataCanEdit () {
-            return this.selfPropsObj._quoteDataCanEdit;
+        quoteDisabledColKeys () {
+            return this.selfPropsObj._quoteDisabledColKeys;
         },
         quoteListFields () {
             return this.selfPropsObj._quoteListFields;
@@ -1010,20 +1010,17 @@ export default {
             // 未触发校验时 不显示错误
             if ((this.ruleRecordMap[`${row._id}dsh${col._key}`] || {}).showRuleMessage || this.showRuleMessage) {
                 // 校验必填不通过 => 校验对比
-                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)
-                );
+                const resultObj = {};
+                this.$getFieldRuleResult(col, row, resultObj) &&
+                    this.$normalComparedFunc(col, row, this.columns, this.parentObj, this.allFormList, this.inTableType, resultObj) &&
+                    this.$levelComparedFunc(col, row, this.allListData, this.inTableType, resultObj);
 
+                return resultObj;
+            }
+            else {
                 return {
-                    bool: comparedBool,
-                    message: tipObj.message
-                };
-            } else {
-                return {
-                    bool: true
+                    bool: true,
+                    message: "未触发校验，通过!"
                 };
             }
         },
@@ -1043,15 +1040,17 @@ export default {
                 ["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.$isEmptyData(this.getParentNode(row, this.allTreeData)[col._key])
+                        : ["downToUp", "upToDown"].includes(col._writeSort)
+                            ? col._noLimitWrite === true
+                                ? true
+                                : ["downToUp"].includes(col._writeSort)
+                                    ? !(row.children && row.children.length) || row.children.every(sonRow => !this.$isEmptyData(sonRow[col._key]))
+                                    : row.level === 1 || !this.$isEmptyData(this.getParentNode(row, this.allTreeData)[col._key])
                             : true
                     : true
             ) &&
                 (col._oldReadonly ? row.__old__ !== true : true) && // 老数据行里某些列不可编辑
-                (row.__isQuote__ ? this.quoteDataCanEdit === true : true) && // 引用过来的数据是否可编辑
+                (row.__isQuote__ ? !this.quoteDisabledColKeys.includes(col._key) : true) && // 引用过来的数据是否可编辑
                 col._enterType !== "calculate" && // 计算的不可编辑
                 col._readonly !== true && // 不能为只读
                 col.canEdit !== false; // 字段本身编辑权限 考虑为undefined时候