vxe-table 4.7.41 → 4.7.42

package/es/table/src/table.js

@@ -483,7 +483,7 @@ export default defineComponent({
             let fixedSize = 0;
             // 只判断第一层
             collectColumn.forEach((column) => {
-                if (column.fixed) {
+                if (column.renderFixed) {
                     fixedSize++;
                 }
             });
@@ -822,27 +822,29 @@ export default defineComponent({
             return num;
         };
         const handleCustomRestore = (storeData) => {
-            const { tableFullColumn } = internalData;
             let { collectColumn } = internalData;
             const { resizableData, sortData, visibleData, fixedData } = storeData;
             let hasCustomSort = false;
             // 处理还原
             if (resizableData || sortData || visibleData || fixedData) {
-                tableFullColumn.forEach(column => {
+                XEUtils.eachTree(collectColumn, (column, index, items, path, parent) => {
                     const colKey = column.getKey();
+                    // 支持一级
+                    if (!parent) {
+                        if (fixedData && fixedData[colKey]) {
+                            column.fixed = fixedData[colKey];
+                        }
+                        if (sortData && XEUtils.isNumber(sortData[colKey])) {
+                            hasCustomSort = true;
+                            column.renderSortNumber = sortData[colKey];
+                        }
+                    }
                     if (resizableData && XEUtils.isNumber(resizableData[colKey])) {
                         column.resizeWidth = resizableData[colKey];
                     }
                     if (visibleData && XEUtils.isBoolean(visibleData[colKey])) {
                         column.visible = visibleData[colKey];
                     }
-                    if (fixedData && fixedData[colKey]) {
-                        column.fixed = fixedData[colKey];
-                    }
-                    if (sortData && XEUtils.isNumber(sortData[colKey])) {
-                        hasCustomSort = true;
-                        column.renderSortNumber = sortData[colKey];
-                    }
                 });
                 // 如果自定义了顺序
                 if (hasCustomSort) {
@@ -3241,14 +3243,13 @@ export default defineComponent({
                 const targetColumn = getRootColumn($xeTable, column);
                 const isMaxFixedColumn = computeIsMaxFixedColumn.value;
                 const columnOpts = computeColumnOpts.value;
-                const { maxFixedSize } = columnOpts;
                 if (targetColumn && targetColumn.fixed !== fixed) {
                     // 是否超过最大固定列数量
                     if (!targetColumn.fixed && isMaxFixedColumn) {
                         if (VxeUI.modal) {
                             VxeUI.modal.message({
                                 status: 'error',
-                                content: getI18n('vxe.table.maxFixedCol', [maxFixedSize])
+                                content: getI18n('vxe.table.maxFixedCol', [columnOpts.maxFixedSize])
                             });
                         }
                         return nextTick();
@@ -4533,7 +4534,7 @@ export default defineComponent({
                 let hasFixedt = 0;
                 let hasVisible = 0;
                 XEUtils.eachTree(collectColumn, (column, index, items, path, parent) => {
-                    // 排序只支持一级
+                    // 只支持一级
                     if (!parent) {
                         collectColumn.forEach((column) => {
                             const colKey = column.getKey();
@@ -4542,6 +4543,13 @@ export default defineComponent({
                                 sortData[colKey] = column.renderSortNumber;
                             }
                         });
+                        if (column.fixed && column.fixed !== column.defaultFixed) {
+                            const colKey = column.getKey();
+                            if (colKey) {
+                                hasFixedt = 1;
+                                fixedData[colKey] = column.fixed;
+                            }
+                        }
                     }
                     if (column.resizeWidth) {
                         const colKey = column.getKey();
@@ -4550,13 +4558,6 @@ export default defineComponent({
                             resizableData[colKey] = column.renderWidth;
                         }
                     }
-                    if (column.fixed && column.fixed !== column.defaultFixed) {
-                        const colKey = column.getKey();
-                        if (colKey) {
-                            hasFixedt = 1;
-                            fixedData[colKey] = column.fixed;
-                        }
-                    }
                     if (!checkMethod || checkMethod({ column })) {
                         if (!column.visible && column.defaultVisible) {
                             const colKey = column.getKey();

package/es/ui/index.js

@@ -1,8 +1,8 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.7.41";
+export const version = "4.7.42";
 VxeUI.version = version;
-VxeUI.tableVersion = "4.7.41";
+VxeUI.tableVersion = "4.7.42";
 VxeUI.setConfig({
     emptyCell: '　',
     table: {
@@ -62,9 +62,16 @@ VxeUI.setConfig({
             allowFixed: true,
             allowSort: true,
             showFooter: true,
-            placement: 'top-right'
+            placement: 'top-right',
             //  storage: false,
-            //  checkMethod () {}
+            //  checkMethod () {},
+            modalOptions: {
+                showMaximize: true,
+                mask: true,
+                lockView: true,
+                resize: true,
+                escClosable: true
+            }
         },
         sortConfig: {
             // remote: false,

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"4.7.41"}`;
+const version = `table v${"4.7.42"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -1951,9 +1951,9 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.7.41";
+const version = "4.7.42";
 core_.VxeUI.version = version;
-core_.VxeUI.tableVersion = "4.7.41";
+core_.VxeUI.tableVersion = "4.7.42";
 core_.VxeUI.setConfig({
   emptyCell: '　',
   table: {
@@ -2013,9 +2013,16 @@ core_.VxeUI.setConfig({
       allowFixed: true,
       allowSort: true,
       showFooter: true,
-      placement: 'top-right'
+      placement: 'top-right',
       //  storage: false,
-      //  checkMethod () {}
+      //  checkMethod () {},
+      modalOptions: {
+        showMaximize: true,
+        mask: true,
+        lockView: true,
+        resize: true,
+        escClosable: true
+      }
     },
     sortConfig: {
       // remote: false,
@@ -2324,7 +2331,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.7.41"}`;
+const log_version = `table v${"4.7.42"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -6988,6 +6995,9 @@ const {
         visibleMethod
       } = customOpts;
       const columnOpts = computeColumnOpts.value;
+      const {
+        maxFixedSize
+      } = columnOpts;
       const modalOpts = Object.assign({}, modalOptions);
       const isMaxFixedColumn = computeIsMaxFixedColumn.value;
       const trVNs = [];
@@ -7089,12 +7099,15 @@ const {
         minWidth: modalOpts.minWidth || 700,
         height: modalOpts.height || '50vh',
         minHeight: modalOpts.minHeight || 400,
-        mask: true,
-        lockView: true,
-        showFooter: true,
-        resize: true,
-        escClosable: true,
+        showZoom: modalOpts.showZoom,
+        showMaximize: modalOpts.showMaximize,
+        showMinimize: modalOpts.showMinimize,
+        mask: modalOpts.mask,
+        lockView: modalOpts.lockView,
+        resize: modalOpts.resize,
+        escClosable: !!modalOpts.escClosable,
         destroyOnClose: true,
+        showFooter: true,
         'onUpdate:modelValue'(value) {
           customStore.visible = value;
         }
@@ -7147,7 +7160,7 @@ const {
                 class: 'vxe-table-custom-popup--table-sort-help-icon vxe-icon-question-circle-fill'
               });
             }
-          }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {}, panel_getI18n('vxe.custom.setting.colTitle')), allowResizable ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {}, panel_getI18n('vxe.custom.setting.colResizable')) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), allowFixed ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {}, panel_getI18n('vxe.custom.setting.colFixed', [columnOpts.maxFixedSize || 0])) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()])]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(external_commonjs_vue_commonjs2_vue_root_Vue_.TransitionGroup, {
+          }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()]) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {}, panel_getI18n('vxe.custom.setting.colTitle')), allowResizable ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {}, panel_getI18n('vxe.custom.setting.colResizable')) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(), allowFixed ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('th', {}, panel_getI18n(`vxe.custom.setting.${maxFixedSize ? 'colFixedMax' : 'colFixed'}`, [maxFixedSize])) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)()])]), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(external_commonjs_vue_commonjs2_vue_root_Vue_.TransitionGroup, {
             class: 'vxe-table-custom--body',
             tag: 'tbody',
             name: 'vxe-table-custom--list'
@@ -8644,7 +8657,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       let fixedSize = 0;
       // 只判断第一层
       collectColumn.forEach(column => {
-        if (column.fixed) {
+        if (column.renderFixed) {
           fixedSize++;
         }
       });
@@ -9043,9 +9056,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       return num;
     };
     const handleCustomRestore = storeData => {
-      const {
-        tableFullColumn
-      } = internalData;
       let {
         collectColumn
       } = internalData;
@@ -9058,21 +9068,24 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       let hasCustomSort = false;
       // 处理还原
       if (resizableData || sortData || visibleData || fixedData) {
-        tableFullColumn.forEach(column => {
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, (column, index, items, path, parent) => {
           const colKey = column.getKey();
+          // 支持一级
+          if (!parent) {
+            if (fixedData && fixedData[colKey]) {
+              column.fixed = fixedData[colKey];
+            }
+            if (sortData && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(sortData[colKey])) {
+              hasCustomSort = true;
+              column.renderSortNumber = sortData[colKey];
+            }
+          }
           if (resizableData && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(resizableData[colKey])) {
             column.resizeWidth = resizableData[colKey];
           }
           if (visibleData && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(visibleData[colKey])) {
             column.visible = visibleData[colKey];
           }
-          if (fixedData && fixedData[colKey]) {
-            column.fixed = fixedData[colKey];
-          }
-          if (sortData && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(sortData[colKey])) {
-            hasCustomSort = true;
-            column.renderSortNumber = sortData[colKey];
-          }
         });
         // 如果自定义了顺序
         if (hasCustomSort) {
@@ -11953,16 +11966,13 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const targetColumn = getRootColumn($xeTable, column);
         const isMaxFixedColumn = computeIsMaxFixedColumn.value;
         const columnOpts = computeColumnOpts.value;
-        const {
-          maxFixedSize
-        } = columnOpts;
         if (targetColumn && targetColumn.fixed !== fixed) {
           // 是否超过最大固定列数量
           if (!targetColumn.fixed && isMaxFixedColumn) {
             if (core_.VxeUI.modal) {
               core_.VxeUI.modal.message({
                 status: 'error',
-                content: table_getI18n('vxe.table.maxFixedCol', [maxFixedSize])
+                content: table_getI18n('vxe.table.maxFixedCol', [columnOpts.maxFixedSize])
               });
             }
             return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
@@ -13448,7 +13458,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         let hasFixedt = 0;
         let hasVisible = 0;
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, (column, index, items, path, parent) => {
-          // 排序只支持一级
+          // 只支持一级
           if (!parent) {
             collectColumn.forEach(column => {
               const colKey = column.getKey();
@@ -13457,6 +13467,13 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                 sortData[colKey] = column.renderSortNumber;
               }
             });
+            if (column.fixed && column.fixed !== column.defaultFixed) {
+              const colKey = column.getKey();
+              if (colKey) {
+                hasFixedt = 1;
+                fixedData[colKey] = column.fixed;
+              }
+            }
           }
           if (column.resizeWidth) {
             const colKey = column.getKey();
@@ -13465,13 +13482,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               resizableData[colKey] = column.renderWidth;
             }
           }
-          if (column.fixed && column.fixed !== column.defaultFixed) {
-            const colKey = column.getKey();
-            if (colKey) {
-              hasFixedt = 1;
-              fixedData[colKey] = column.fixed;
-            }
-          }
           if (!checkMethod || checkMethod({
             column
           })) {
@@ -23814,10 +23824,6 @@ core_.VxeUI.component(grid);
 const Grid = VxeGrid;
 /* harmony default export */ var packages_grid = ((/* unused pure expression or super */ null && (VxeGrid)));
 ;// CONCATENATED MODULE: ./packages/locale/lang/zh-CN.ts
-/**
- * v4保留兼容，已废弃，即将删除文件
- * @deprecated
- */
 /* harmony default export */ var zh_CN = ({
   vxe: {
     base: {
@@ -23942,7 +23948,8 @@ const Grid = VxeGrid;
         colTitle: '标题',
         colResizable: '列宽（像素）',
         colVisible: '是否显示',
-        colFixed: '冻结列（最多 {0} 列）',
+        colFixed: '冻结列',
+        colFixedMax: '冻结列（最多 {0} 列）',
         fixedLeft: '左侧',
         fixedUnset: '不设置',
         fixedRight: '右侧'