vxe-table 3.13.23 → 3.13.25

package/es/table/src/cell.js

@@ -551,7 +551,8 @@ export const Cell = {
         const headerSlot = slots ? slots.header : null;
         const titleSlot = slots ? slots.title : null;
         const checkboxOpts = $table.computeCheckboxOpts;
-        const headerTitle = column.getTitle();
+        const { checkStrictly, showHeader, headerTitle } = checkboxOpts;
+        const colTitle = column.getTitle();
         const ons = {};
         if (!isHidden) {
             ons.click = (evnt) => {
@@ -564,11 +565,11 @@ export const Cell = {
         if (headerSlot) {
             return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, checkboxParams, $table.callSlot(headerSlot, checkboxParams, h)));
         }
-        if (checkboxOpts.checkStrictly ? !checkboxOpts.showHeader : checkboxOpts.showHeader === false) {
+        if (checkStrictly ? !showHeader : showHeader === false) {
             return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, checkboxParams, [
                 h('span', {
                     class: 'vxe-checkbox--label'
-                }, titleSlot ? $table.callSlot(titleSlot, checkboxParams, h) : headerTitle)
+                }, titleSlot ? $table.callSlot(titleSlot, checkboxParams, h) : colTitle)
             ]));
         }
         return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, checkboxParams, [
@@ -579,18 +580,18 @@ export const Cell = {
                         'is--indeterminate': isAllCheckboxIndeterminate
                     }],
                 attrs: {
-                    title: getI18n('vxe.table.allTitle')
+                    title: XEUtils.eqNull(headerTitle) ? getI18n('vxe.table.allTitle') : `${headerTitle || ''}`
                 },
                 on: ons
             }, [
                 h('span', {
                     class: ['vxe-checkbox--icon', isAllCheckboxIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : (isAllCheckboxSelected ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED)]
                 })
-            ].concat(titleSlot || headerTitle
+            ].concat(titleSlot || colTitle
                 ? [
                     h('span', {
                         class: 'vxe-checkbox--label'
-                    }, titleSlot ? $table.callSlot(titleSlot, checkboxParams, h) : headerTitle)
+                    }, titleSlot ? $table.callSlot(titleSlot, checkboxParams, h) : colTitle)
                 ]
                 : []))
         ]));
@@ -820,7 +821,7 @@ export const Cell = {
     renderSortIcon(h, params) {
         const { $table, column } = params;
         const sortOpts = $table.computeSortOpts;
-        const { showIcon, allowBtn, iconLayout, iconAsc, iconDesc, iconVisibleMethod } = sortOpts;
+        const { showIcon, allowBtn, ascTitle, descTitle, iconLayout, iconAsc, iconDesc, iconVisibleMethod } = sortOpts;
         if (showIcon && (!iconVisibleMethod || iconVisibleMethod(params))) {
             return [
                 h('span', {
@@ -831,7 +832,7 @@ export const Cell = {
                                 'sort--active': column.order === 'asc'
                             }],
                         attrs: {
-                            title: getI18n('vxe.table.sortAsc')
+                            title: XEUtils.eqNull(ascTitle) ? getI18n('vxe.table.sortAsc') : `${ascTitle || ''}`
                         },
                         on: allowBtn
                             ? {
@@ -847,7 +848,7 @@ export const Cell = {
                                 'sort--active': column.order === 'desc'
                             }],
                         attrs: {
-                            title: getI18n('vxe.table.sortDesc')
+                            title: XEUtils.eqNull(descTitle) ? getI18n('vxe.table.sortDesc') : `${descTitle || ''}`
                         },
                         on: allowBtn
                             ? {

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.25";
 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.25"}`;
 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.25";
 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.25"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -5276,7 +5276,12 @@ const Cell = {
     const headerSlot = slots ? slots.header : null;
     const titleSlot = slots ? slots.title : null;
     const checkboxOpts = $table.computeCheckboxOpts;
-    const headerTitle = column.getTitle();
+    const {
+      checkStrictly,
+      showHeader,
+      headerTitle
+    } = checkboxOpts;
+    const colTitle = column.getTitle();
     const ons = {};
     if (!isHidden) {
       ons.click = evnt => {
@@ -5294,10 +5299,10 @@ const Cell = {
     if (headerSlot) {
       return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, checkboxParams, $table.callSlot(headerSlot, checkboxParams, h)));
     }
-    if (checkboxOpts.checkStrictly ? !checkboxOpts.showHeader : checkboxOpts.showHeader === false) {
+    if (checkStrictly ? !showHeader : showHeader === false) {
       return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, checkboxParams, [h('span', {
         class: 'vxe-checkbox--label'
-      }, titleSlot ? $table.callSlot(titleSlot, checkboxParams, h) : headerTitle)]));
+      }, titleSlot ? $table.callSlot(titleSlot, checkboxParams, h) : colTitle)]));
     }
     return renderHeaderCellBaseVNs(h, params, renderTitleContent(h, checkboxParams, [h('span', {
       class: ['vxe-cell--checkbox', {
@@ -5306,14 +5311,14 @@ const Cell = {
         'is--indeterminate': isAllCheckboxIndeterminate
       }],
       attrs: {
-        title: cell_getI18n('vxe.table.allTitle')
+        title: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(headerTitle) ? cell_getI18n('vxe.table.allTitle') : `${headerTitle || ''}`
       },
       on: ons
     }, [h('span', {
       class: ['vxe-checkbox--icon', isAllCheckboxIndeterminate ? cell_getIcon().TABLE_CHECKBOX_INDETERMINATE : isAllCheckboxSelected ? cell_getIcon().TABLE_CHECKBOX_CHECKED : cell_getIcon().TABLE_CHECKBOX_UNCHECKED]
-    })].concat(titleSlot || headerTitle ? [h('span', {
+    })].concat(titleSlot || colTitle ? [h('span', {
       class: 'vxe-checkbox--label'
-    }, titleSlot ? $table.callSlot(titleSlot, checkboxParams, h) : headerTitle)] : []))]));
+    }, titleSlot ? $table.callSlot(titleSlot, checkboxParams, h) : colTitle)] : []))]));
   },
   renderCheckboxCell(h, params) {
     const {
@@ -5612,6 +5617,8 @@ const Cell = {
     const {
       showIcon,
       allowBtn,
+      ascTitle,
+      descTitle,
       iconLayout,
       iconAsc,
       iconDesc,
@@ -5625,7 +5632,7 @@ const Cell = {
           'sort--active': column.order === 'asc'
         }],
         attrs: {
-          title: cell_getI18n('vxe.table.sortAsc')
+          title: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(ascTitle) ? cell_getI18n('vxe.table.sortAsc') : `${ascTitle || ''}`
         },
         on: allowBtn ? {
           click(evnt) {
@@ -5638,7 +5645,7 @@ const Cell = {
           'sort--active': column.order === 'desc'
         }],
         attrs: {
-          title: cell_getI18n('vxe.table.sortDesc')
+          title: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(descTitle) ? cell_getI18n('vxe.table.sortDesc') : `${descTitle || ''}`
         },
         on: allowBtn ? {
           click(evnt) {
@@ -6358,7 +6365,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 +10719,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 +10755,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 +10796,7 @@ const Methods = {
     if (hasSort) {
       storeData.sortData = sortData;
     }
-    if (hasFixedt) {
+    if (hasFixed) {
       storeData.fixedData = fixedData;
     }
     if (hasVisible) {