bri-components 1.3.72 → 1.3.74

package/package.json

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

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

@@ -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/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 () {
@@ -313,7 +313,7 @@ export default {
                             colType: "data"
                         }
                     ))
-            );
+                );
         },
         // 转化树数据
         getCalcuedTree (nodes = [], treeForm = [], subForm = []) {
@@ -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, {
@@ -783,7 +785,7 @@ export default {
                     }
                     : {
                         textAlign: col._align || "left"
-            };
+                    };
 
             return {
                 width: `${width}px`,

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

@@ -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: "未触发校验，通过!"
                 };
             }
         },