bri-components 1.4.10 → 1.4.12

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

@@ -102,7 +102,7 @@ export default {
             showImportModal: false,
             exportTimer: null,
             isEnlarge: false,
-            isEnlargeFlag: true, // 为重渲染膜态框内容而用
+            isEnlargeFlag: false, // 为重渲染膜态框内容而用
 
             baseOperationMap: {
                 canCreate: {
@@ -565,6 +565,12 @@ export default {
                 }
             };
         },
+        tableInModalPropsObj () {
+            return {
+                ...this.tablePropsObj,
+                maxHeight: undefined
+            };
+        },
 
         hideColKeys () {
             return this.selfPropsObj._hideColKeys;
@@ -712,6 +718,7 @@ export default {
         isEnlarge (bool) {
             setTimeout(() => {
                 this.isEnlargeFlag = bool;
+                this.dealingOpenModal && this.dealingOpenModal();
             }, 0);
         }
     },
@@ -1050,7 +1057,7 @@ export default {
                             e.stopPropagation();
                         }
                     }
-                });
+            });
         },
         topSearchRender (h) {
             return this.searchFormList.length
@@ -1340,7 +1347,7 @@ export default {
         getRowDelBtnCanEdit (row, rowIndex) {
             return row.__readonly__ !== true && // 不能为只读数据
                 (this.disabledDeleteDftRow ? row.__isDefault__ !== true : true) && // 默认数据可删除
-                (this.disabledDeleteOldRow ? row.__old__ !== true : true); // 老数据可删除
+            (this.disabledDeleteOldRow ? row.__old__ !== true : true); // 老数据可删除
         },
         // 行内容是否可编辑
         getRowCanEdit (row, rowIndex) {
@@ -1592,11 +1599,9 @@ export default {
                     ? compareRow[curColKey].length === row[curColKey].length && compareRow[curColKey].every((item, index) => item._key === row[curColKey][index]._key)
                     : compareRow[curColKey] === row[curColKey];
         },
-        // 行id+列key组成键
-        getMixKey (row, column, useDsh = true) {
-            return useDsh
-                ? `${row._id}dsh${column._key}`
-                : `${row._id}${column._key}`;
+        // 行id + 分隔符 + 列key 组成键
+        getMixKey (row, column, splitStr = "--") {
+            return `${row._id}${splitStr}${column._key}`;
         }
     }
 };