vxe-table 3.13.23 → 3.13.24

package/es/table/src/methods.js

@@ -200,7 +200,7 @@ function cacheColumnMap($xeTable) {
         }
         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) {
@@ -3960,8 +3960,19 @@ const Methods = {
         }
     },
     getCustomStoreData() {
-        const { id, customOpts, collectColumn } = this;
-        const { checkMethod } = customOpts;
+        const $xeTable = this;
+        const props = $xeTable;
+        const internalData = $xeTable;
+        const { id } = props;
+        const customOpts = $xeTable.computeCustomOpts;
+        const { 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 = {};
@@ -3978,47 +3989,37 @@ const Methods = {
         }
         let hasResizable = 0;
         let hasSort = 0;
-        let hasFixedt = 0;
+        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) {
-                        hasFixedt = 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;
                 }
             }
         });
@@ -4028,7 +4029,7 @@ const Methods = {
         if (hasSort) {
             storeData.sortData = sortData;
         }
-        if (hasFixedt) {
+        if (hasFixed) {
             storeData.fixedData = fixedData;
         }
         if (hasVisible) {

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.13.23";
+export const version = "3.13.24";
 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${"3.13.23"}`;
+const version = `table v${"3.13.24"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -3201,7 +3201,7 @@ function getClass(property, params) {
 ;// ./packages/ui/index.ts
 
 
-const version = "3.13.23";
+const version = "3.13.24";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3828,7 +3828,7 @@ var es_iterator_map = __webpack_require__(1701);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.13.23"}`;
+const log_version = `table v${"3.13.24"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -6358,7 +6358,7 @@ function cacheColumnMap($xeTable) {
       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) {
@@ -10712,14 +10712,26 @@ const Methods = {
     }
   },
   getCustomStoreData() {
+    const $xeTable = this;
+    const props = $xeTable;
+    const internalData = $xeTable;
+    const {
+      id
+    } = props;
+    const customOpts = $xeTable.computeCustomOpts;
     const {
-      id,
-      customOpts,
       collectColumn
-    } = this;
+    } = 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 = {};
@@ -10736,48 +10748,38 @@ const Methods = {
     }
     let hasResizable = 0;
     let hasSort = 0;
-    let hasFixedt = 0;
+    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) {
-            hasFixedt = 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;
         }
       }
     });
@@ -10787,7 +10789,7 @@ const Methods = {
     if (hasSort) {
       storeData.sortData = sortData;
     }
-    if (hasFixedt) {
+    if (hasFixed) {
       storeData.fixedData = fixedData;
     }
     if (hasVisible) {