bri-components 1.3.21 → 1.3.23

package/package.json

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

package/src/components/list/DshCascaderTable.vue

@@ -167,10 +167,10 @@
                                                 ></dsh-list-unit>
 
                                                 <span
-                                                    v-if="!getRuleResult(col, row[col.nodeKey], rowIndex).bool"
+                                                    v-if="!getColRuleResult(col, row[col.nodeKey], rowIndex).bool"
                                                     class="bri-table-td-tip"
                                                 >
-                                                    {{ getRuleResult(col, row[col.nodeKey], rowIndex).message }}
+                                                    {{ getColRuleResult(col, row[col.nodeKey], rowIndex).message }}
                                                 </span>
                                             </td>
                                         </template>
@@ -447,7 +447,7 @@
 
                 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)
+                    subColumns.every(col => this.getColRuleResult(col, row[col.nodeKey], rowIndex, true).bool)
                 );
             },
 
@@ -572,7 +572,7 @@
                 this.$set(this.ruleRecordMap, `${row._id}dsh${col._key}`, { showRuleMessage: true });
             },
             // 是否显示 单元格校验提示文字
-            getRuleResult (col, row, rowIndex, showRuleMessage = this.showRuleMessage) {
+            getColRuleResult (col, row, rowIndex, showRuleMessage = this.showRuleMessage) {
                 if ((this.ruleRecordMap[`${row._id}dsh${col._key}`] || {}).showRuleMessage || showRuleMessage) {
                     return this.$getFieldRuleResult({
                         ...col,

package/src/components/list/DshFlatTable.vue

@@ -60,7 +60,7 @@
                 return {
                     maxHeight: this.contentHeight,
                     cellStyleOption: {
-                        bodyCellClass: ({rowIndex}) => {
+                        bodyCellClass: ({row, column, rowIndex}) => {
                             return `bri-table-td ${this.canEdit ? "bri-table-td-edit" : "bri-table-td-show"}`;
                         }
                     }
@@ -124,7 +124,7 @@
                             filter: undefined,
                             sortBy: undefined,
                             renderBodyCell: ({ row, column, rowIndex }, h) => {
-                                column = this.transformCol(column, row);
+                                column = this.$transformFieldProperty(column, row, this.parentObj);
                                 column = this.resetCol(column, row);
                                 const unitCanEdit = this.getUnitCanEdit(column, row);
 
@@ -174,15 +174,15 @@
                                             }
                                         }),
 
-                                    !this.getRuleResult(column, row).bool
+                                    !this.getColRuleResult(column, row).bool
                                         ? h("span", {
                                             class: "bri-table-td-tip"
-                                        }, this.getRuleResult(column, row).message)
+                                        }, this.getColRuleResult(column, row).message)
                                         : undefined
                                 ];
                             },
                             renderHeaderCell: ({ column }, h) => {
-                                column = this.transformCol(column);
+                                column = this.$transformFieldProperty(column, undefined, this.parentObj);
 
                                 return this.$getHeadRender(h, column, {
                                     showRequired: this.showRequired,
@@ -302,6 +302,11 @@
                     // isShare: this.isShare,
                     _heightAuto: this.heightAuto
                 };
+            },
+            getUnitCanEdit (col, row) {
+                return this.getRowCanEdit(row) &&
+                    this.getColCanEdit(col, row) &&
+                    this.$isAdvRelyShow(col, row, this.parentObj, true);
             }
         }
     };

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

@@ -115,11 +115,7 @@ export default {
         },
 
         filterColumns () {
-            return this.columns.filter(col =>
-                col._isRelyByParent
-                    ? this.$isAdvRelyShow(col, this.parentObj, true, true, this.listData)
-                    : !["hide"].includes(col._displayType)
-            );
+            return this.columns.filter(col => this.$isAdvRelyShow(col, this.listData, this.parentObj, true));
         },
         selfRowDefault () {
             return this.$filterObj(this.filterColumns, this.rowDefault);
@@ -141,15 +137,15 @@ export default {
         validate () {
             this.showRuleMessage = true;
 
-            return this.listData.every(row =>
-                this.filterColumns.every(col => {
-                    col = this.transformCol(col, row);
-                    return this.getRuleResult(col, row).bool;
-                })
-            );
-        },
-        // 是否显示 单元格校验提示文字
-        getRuleResult (col, row) {
+            return this.listData.every(row => this.getRowRuleResult(row));
+        },
+        // 整行校验结果
+        getRowRuleResult (row) {
+            return this.filterColumns.every(column => this.getColRuleResult(column, row).bool);
+        },
+        // 单元格校验结果
+        getColRuleResult (col, row) {
+            col = this.$transformFieldProperty(col, row, this.parentObj);
             if ((this.ruleRecordMap[`${row._id}dsh${col._key}`] || {}).showRuleMessage || this.showRuleMessage) {
                 return this.$getFieldRuleResult(col, row);
             } else {
@@ -176,20 +172,12 @@ export default {
         },
 
         /* --------------- 工具方法 ------------- */
-        transformCol (col, row) {
-            return this.$transformFieldProperty(col, col._isRuleByParent ? this.parentObj : row);
-        },
-        getUnitCanEdit (col, row) {
-            return this.getRowCanEdit(row) && this.getColCanEdit(col, row);
-        },
         getRowCanEdit (row) {
             return this.canEdit && // 是否是编辑状态
-            // (!this.disabledOldDataRow || !!this.createRowMap[row._id]) && // 是否让老数据行置灰
             (!this.disabledOldDataRow || !!row.__isCreate__); // 是否让老数据行置灰
         },
         getColCanEdit (col, row) {
-            return (!col.dependRowCanEdit || row.canEdit !== false) &&
-            (col._isRelyByParent ? true : this.$isAdvRelyShow(col, row, true)); // 在老数据行里某些列不可编辑; // 在老数据行里某些列不可编辑
+            return (!col.dependRowCanEdit || row.canEdit !== false);// 在老数据行里某些列不可编辑
         },
         isShowCompare (col, row, oldRow = {}) {
             return this.useCampare && ["number"].includes(col._type) &&

package/src/styles/global/text.less

@@ -1,11 +1,3 @@
-.dsh-title {
-    padding: 10px;
-    text-align: center;
-    font-size: 16px;
-    font-weight: 600;
-    color: @textColor;
-}
-
 #dsh-nodata {
     width: 100%;
     margin: auto;
@@ -34,6 +26,16 @@
     color: @placeholderColor;
 }
 
+.dsh-title {
+    padding: 10px;
+    text-align: center;
+    font-size: 16px;
+    font-weight: 600;
+    color: @textColor;
+}
+.dsh-hide {
+    display: none;;
+}
 .dsh-subtip {
     width: 100%;
     text-align: center;