bri-components 1.3.18 → 1.3.19

package/package.json

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

package/src/components/controls/controlMap.js

@@ -70,7 +70,7 @@ const pathMap = {
         selectDepartments: "./senior/selectDepartments.vue",
         BriLabels: "./senior/BriLabels.vue",
         DshPackage: "./senior/DshPackage.vue",
-        flatTable: "./senior/flatTable.vue",
+        flatTable: "./senior/flatTable/flatTable.vue",
         cascaderTable: "./senior/cascaderTable"
     },
     special: {

package/src/components/controls/senior/{flatTable.vue → flatTable/flatTable.vue}

@@ -88,9 +88,9 @@
 </template>
 
 <script>
-    import controlMixin from "../mixins/controlMixin.js";
-    import DshBtnModal from "../../small/DshBtnModal.vue";
-    import BriFlatTable from "../../list/BriFlatTable.vue";
+    import controlMixin from "../../mixins/controlMixin.js";
+    import DshBtnModal from "../../../small/DshBtnModal.vue";
+    import BriFlatTable from "../../../list/BriFlatTable.vue";
     import flatTableImportModal from "./flatTableImportModal.vue";
 
     export default {

package/src/components/list/BriFlatTable.vue

@@ -181,11 +181,11 @@
                 return !!this.oldListData.length;
             },
             filterColumns () {
-                return this.columns.filter(column => {
-                    return column._isRelyParent
-                        ? this.$isFormItemShow(column, this.parentObj, true)
-                        : !["hide"].includes(column._displayType);
-                });
+                return this.columns.filter(column =>
+                    column._isRelyByParent
+                        ? this.$isAdvRelyShow(column, this.parentObj, true, true, this.listData)
+                        : !["hide"].includes(column._displayType)
+                );
             },
             showColumns () {
                 const operationList = this.$getOperationList(["delete"]);
@@ -226,7 +226,7 @@
                             filter: undefined,
                             sortBy: undefined,
                             renderBodyCell: ({ row, column, rowIndex }, h) => {
-                                column = this.$transformFieldProperty(column, row);
+                                column = this.$transformFieldProperty(column, column._isRuleByParent ? this.parentObj : row);
 
                                 return [
                                     this.isShowCompare(column, row, this.oldListData[rowIndex])
@@ -371,7 +371,7 @@
 
                 return this.listData.every(row =>
                     this.filterColumns.every(column => {
-                        column = this.$transformFieldProperty(column, row);
+                        column = this.$transformFieldProperty(column, column._isRuleByParent ? this.parentObj : row);
                         return this.getRuleResult(column, row).bool;
                     })
                 );
@@ -432,7 +432,7 @@
                     ...(resetMap[col._type] || {}),
                     isShare: this.isShare,
                     _heightAuto: this.heightAuto
-                    // canEdit: this.$isAdvRelyShow(col, row, true)
+                    // canEdit: col._isRelyByParent ? true : this.$isAdvRelyShow(col, row, true)
                 };
             },
             getUnitCanEdit (col, row) {
@@ -440,7 +440,7 @@
                     // (!this.disabledOldDataRow || !!this.createRowMap[row._id]) && // 是否让老数据行置灰
                     (!this.disabledOldDataRow || !!row.__isCreate__) && // 是否让老数据行置灰
                     (!col.dependRowCanEdit || row.canEdit !== false) &&
-                    this.$isAdvRelyShow(col, row, true); // 在老数据行里某些列不可编辑; // 在老数据行里某些列不可编辑
+                (col._isRelyByParent ? true : this.$isAdvRelyShow(col, row, true)); // 在老数据行里某些列不可编辑; // 在老数据行里某些列不可编辑
             },
             isShowCompare (col, row, oldRow = {}) {
                 return this.useCampare && ["number"].includes(col._type) &&