vxe-table 4.11.20 → 4.11.22

package/es/table/src/table.js

@@ -1174,7 +1174,7 @@ export default defineComponent({
                 }
                 else {
                     if ((storage && !type) || (columnOpts.drag && (isCrossDrag || isSelfToChildDrag))) {
-                        errLog('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field`]);
+                        errLog('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field=?`]);
                     }
                 }
                 if (!hasFixed && fixed) {
@@ -5758,7 +5758,13 @@ export default defineComponent({
                 const { id } = props;
                 const customOpts = computeCustomOpts.value;
                 const { collectColumn } = internalData;
-                const { checkMethod } = customOpts;
+                const { storage, checkMethod } = customOpts;
+                const isAllCustom = storage === true;
+                const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {});
+                const isCustomResizable = isAllCustom || storageOpts.resizable;
+                const isCustomVisible = isAllCustom || storageOpts.visible;
+                const isCustomFixed = isAllCustom || storageOpts.fixed;
+                const isCustomSort = isAllCustom || storageOpts.sort;
                 const resizableData = {};
                 const sortData = {};
                 const visibleData = {};
@@ -5778,44 +5784,34 @@ export default defineComponent({
                 let hasFixed = 0;
                 let hasVisible = 0;
                 XEUtils.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
+                    const colKey = column.getKey();
+                    if (!colKey) {
+                        errLog('vxe.error.reqProp', [`${column.getTitle() || column.type || ''} -> column.field=?`]);
+                        return;
+                    }
                     // 只支持一级
                     if (!parentColumn) {
-                        collectColumn.forEach((column) => {
-                            const colKey = column.getKey();
-                            if (colKey) {
-                                hasSort = 1;
-                                sortData[colKey] = column.renderSortNumber;
-                            }
-                        });
-                        if (column.fixed !== column.defaultFixed) {
-                            const colKey = column.getKey();
-                            if (colKey) {
-                                hasFixed = 1;
-                                fixedData[colKey] = column.fixed;
-                            }
+                        if (isCustomSort) {
+                            hasSort = 1;
+                            sortData[colKey] = column.renderSortNumber;
                         }
-                    }
-                    if (column.resizeWidth) {
-                        const colKey = column.getKey();
-                        if (colKey) {
-                            hasResizable = 1;
-                            resizableData[colKey] = column.renderWidth;
+                        if (isCustomFixed && column.fixed !== column.defaultFixed) {
+                            hasFixed = 1;
+                            fixedData[colKey] = column.fixed;
                         }
                     }
-                    if (!checkMethod || checkMethod({ column })) {
+                    if (isCustomResizable && column.resizeWidth) {
+                        hasResizable = 1;
+                        resizableData[colKey] = column.renderWidth;
+                    }
+                    if (isCustomVisible && (!checkMethod || checkMethod({ column }))) {
                         if (!column.visible && column.defaultVisible) {
-                            const colKey = column.getKey();
-                            if (colKey) {
-                                hasVisible = 1;
-                                visibleData[colKey] = false;
-                            }
+                            hasVisible = 1;
+                            visibleData[colKey] = false;
                         }
                         else if (column.visible && !column.defaultVisible) {
-                            const colKey = column.getKey();
-                            if (colKey) {
-                                hasVisible = 1;
-                                visibleData[colKey] = true;
-                            }
+                            hasVisible = 1;
+                            visibleData[colKey] = true;
                         }
                     }
                 });

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.11.20";
+export const version = "4.11.22";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

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

package/lib/index.umd.js

@@ -3051,7 +3051,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.11.20";
+const version = "4.11.22";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3499,7 +3499,7 @@ var es_iterator_some = __webpack_require__(3579);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.11.20"}`;
+const log_version = `table v${"4.11.22"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -9319,11 +9319,17 @@ const {
       const rtFilter = compConf ? compConf.renderTableFilter || compConf.renderFilter : null;
       if (filterSlot) {
         return [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
-          class: 'vxe-table--filter-template'
+          class: 'vxe-table--filter-template',
+          style: maxHeight ? {
+            maxHeight: `${maxHeight}px`
+          } : {}
         }, $xeTable.callSlot(filterSlot, params))];
       } else if (rtFilter) {
         return [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
-          class: 'vxe-table--filter-template'
+          class: 'vxe-table--filter-template',
+          style: maxHeight ? {
+            maxHeight: `${maxHeight}px`
+          } : {}
         }, getSlotVNs(rtFilter(filterRender, params)))];
       }
       const isAllChecked = multiple ? filterStore.isAllSelected : !filterStore.options.some(item => item._checked);
@@ -11585,7 +11591,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           fullColumnFieldData[field] = rest;
         } else {
           if (storage && !type || columnOpts.drag && (isCrossDrag || isSelfToChildDrag)) {
-            errLog('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field`]);
+            errLog('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field=?`]);
           }
         }
         if (!hasFixed && fixed) {
@@ -16936,8 +16942,15 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           collectColumn
         } = internalData;
         const {
+          storage,
           checkMethod
         } = customOpts;
+        const isAllCustom = storage === true;
+        const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {});
+        const isCustomResizable = isAllCustom || storageOpts.resizable;
+        const isCustomVisible = isAllCustom || storageOpts.visible;
+        const isCustomFixed = isAllCustom || storageOpts.fixed;
+        const isCustomSort = isAllCustom || storageOpts.sort;
         const resizableData = {};
         const sortData = {};
         const visibleData = {};
@@ -16957,45 +16970,35 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         let hasFixed = 0;
         let hasVisible = 0;
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, (column, index, items, path, parentColumn) => {
+          const colKey = column.getKey();
+          if (!colKey) {
+            errLog('vxe.error.reqProp', [`${column.getTitle() || column.type || ''} -> column.field=?`]);
+            return;
+          }
           // 只支持一级
           if (!parentColumn) {
-            collectColumn.forEach(column => {
-              const colKey = column.getKey();
-              if (colKey) {
-                hasSort = 1;
-                sortData[colKey] = column.renderSortNumber;
-              }
-            });
-            if (column.fixed !== column.defaultFixed) {
-              const colKey = column.getKey();
-              if (colKey) {
-                hasFixed = 1;
-                fixedData[colKey] = column.fixed;
-              }
+            if (isCustomSort) {
+              hasSort = 1;
+              sortData[colKey] = column.renderSortNumber;
             }
-          }
-          if (column.resizeWidth) {
-            const colKey = column.getKey();
-            if (colKey) {
-              hasResizable = 1;
-              resizableData[colKey] = column.renderWidth;
+            if (isCustomFixed && column.fixed !== column.defaultFixed) {
+              hasFixed = 1;
+              fixedData[colKey] = column.fixed;
             }
           }
-          if (!checkMethod || checkMethod({
+          if (isCustomResizable && column.resizeWidth) {
+            hasResizable = 1;
+            resizableData[colKey] = column.renderWidth;
+          }
+          if (isCustomVisible && (!checkMethod || checkMethod({
             column
-          })) {
+          }))) {
             if (!column.visible && column.defaultVisible) {
-              const colKey = column.getKey();
-              if (colKey) {
-                hasVisible = 1;
-                visibleData[colKey] = false;
-              }
+              hasVisible = 1;
+              visibleData[colKey] = false;
             } else if (column.visible && !column.defaultVisible) {
-              const colKey = column.getKey();
-              if (colKey) {
-                hasVisible = 1;
-                visibleData[colKey] = true;
-              }
+              hasVisible = 1;
+              visibleData[colKey] = true;
             }
           }
         });