bri-components 1.3.21 → 1.3.22

package/package.json

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

package/src/components/list/DshFlatTable.vue

@@ -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);
 
@@ -182,7 +182,7 @@
                                 ];
                             },
                             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(column => this.$isAdvRelyShow(column, undefined, this.parentObj, true));
         },
         selfRowDefault () {
             return this.$filterObj(this.filterColumns, this.rowDefault);
@@ -142,9 +138,9 @@ export default {
             this.showRuleMessage = true;
 
             return this.listData.every(row =>
-                this.filterColumns.every(col => {
-                    col = this.transformCol(col, row);
-                    return this.getRuleResult(col, row).bool;
+                this.filterColumns.every(column => {
+                    column = this.$transformFieldProperty(column, row, this.parentObj);
+                    return this.getRuleResult(column, row).bool;
                 })
             );
         },
@@ -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) &&