bri-components 1.2.97 → 1.2.99

package/package.json

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

package/src/components/list/DshCascaderTable.vue

@@ -159,10 +159,10 @@
                                                 ></dsh-list-unit>
 
                                                 <span
-                                                    v-if="!getRuleResult(col, row[col.nodeKey]).bool"
+                                                    v-if="!getRuleResult(col, row[col.nodeKey], rowIndex).bool"
                                                     class="table-row-td-tip"
                                                 >
-                                                    {{ getRuleResult(col, row[col.nodeKey]).message }}
+                                                    {{ getRuleResult(col, row[col.nodeKey], rowIndex).message }}
                                                 </span>
                                             </td>
                                         </template>
@@ -411,8 +411,9 @@
             validate () {
                 this.showRuleMessage = true;
 
-                return this.rows.every(dataItem =>
-                    this.subColumns.every(col => this.getRuleResult(col, dataItem, true).bool)
+                const subColumns = this.columns.filter(col => col.colType === "data");
+                return this.rows.every((row, rowIndex) =>
+                    subColumns.every(col => this.getRuleResult(col, row[col.nodeKey], rowIndex, true).bool)
                 );
             },
 
@@ -537,8 +538,19 @@
                 this.$set(this.ruleRecordMap, `${row._id}dsh${col._key}`, { showRuleMessage: true });
             },
             // 是否显示 单元格校验提示文字
-            getRuleResult (col, row, showRuleMessage = this.showRuleMessage) {
+            getRuleResult (col, row, rowIndex, showRuleMessage = this.showRuleMessage) {
                 if ((this.ruleRecordMap[`${row._id}dsh${col._key}`] || {}).showRuleMessage || showRuleMessage) {
+                    if (col._regStr && [";", "；"].some(symbol => col._regStr.includes(symbol))) {
+                        col._regStr = col._regStr
+                            .replace(/\n/g, "")
+                            .split(";")
+                            .reduce((arr, item) => arr.concat(item.split("；")), [])[rowIndex];
+                        col._regMessage = (col._regMessage || "")
+                            .replace(/\n/g, "")
+                            .split(";")
+                            .reduce((arr, item) => arr.concat(item.split("；")), [])[rowIndex];
+                    }
+
                     return this.$getFieldRuleResult(col, row);
                 } else {
                     return {