vxe-table 4.11.21 → 4.11.23

package/es/table/src/cell.js

@@ -548,7 +548,8 @@ export const Cell = {
         const headerSlot = slots ? slots.header : null;
         const titleSlot = slots ? slots.title : null;
         const checkboxOpts = computeCheckboxOpts.value;
-        const headerTitle = column.getTitle();
+        const { checkStrictly, showHeader, headerTitle } = checkboxOpts;
+        const colTitle = column.getTitle();
         const ons = {};
         if (!isHidden) {
             ons.onClick = (evnt) => {
@@ -561,11 +562,11 @@ export const Cell = {
         if (headerSlot) {
             return renderHeaderCellBaseVNs(params, renderTitleContent(checkboxParams, $table.callSlot(headerSlot, checkboxParams)));
         }
-        if (checkboxOpts.checkStrictly ? !checkboxOpts.showHeader : checkboxOpts.showHeader === false) {
+        if (checkStrictly ? !showHeader : showHeader === false) {
             return renderHeaderCellBaseVNs(params, renderTitleContent(checkboxParams, [
                 h('span', {
                     class: 'vxe-checkbox--label'
-                }, titleSlot ? $table.callSlot(titleSlot, checkboxParams) : headerTitle)
+                }, titleSlot ? $table.callSlot(titleSlot, checkboxParams) : colTitle)
             ]));
         }
         return renderHeaderCellBaseVNs(params, renderTitleContent(checkboxParams, [
@@ -573,15 +574,15 @@ export const Cell = {
                         'is--checked': isAllCheckboxSelected,
                         'is--disabled': isAllCheckboxDisabled,
                         'is--indeterminate': isAllCheckboxIndeterminate
-                    }], title: getI18n('vxe.table.allTitle') }, ons), [
+                    }], title: XEUtils.eqNull(headerTitle) ? getI18n('vxe.table.allTitle') : `${headerTitle || ''}` }, 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) : headerTitle)
+                    }, titleSlot ? $table.callSlot(titleSlot, checkboxParams) : colTitle)
                 ]
                 : []))
         ]));
@@ -809,7 +810,7 @@ export const Cell = {
         const { $table, column } = params;
         const { computeSortOpts } = $table.getComputeMaps();
         const sortOpts = computeSortOpts.value;
-        const { showIcon, allowBtn, iconLayout, iconAsc, iconDesc, iconVisibleMethod } = sortOpts;
+        const { showIcon, allowBtn, ascTitle, descTitle, iconLayout, iconAsc, iconDesc, iconVisibleMethod } = sortOpts;
         const { order } = column;
         if (showIcon && (!iconVisibleMethod || iconVisibleMethod(params))) {
             return [
@@ -820,7 +821,7 @@ export const Cell = {
                         class: ['vxe-sort--asc-btn', iconAsc || getIcon().TABLE_SORT_ASC, {
                                 'sort--active': order === 'asc'
                             }],
-                        title: getI18n('vxe.table.sortAsc'),
+                        title: XEUtils.eqNull(ascTitle) ? getI18n('vxe.table.sortAsc') : `${ascTitle || ''}`,
                         onClick: allowBtn
                             ? (evnt) => {
                                 evnt.stopPropagation();
@@ -832,7 +833,7 @@ export const Cell = {
                         class: ['vxe-sort--desc-btn', iconDesc || getIcon().TABLE_SORT_DESC, {
                                 'sort--active': order === 'desc'
                             }],
-                        title: getI18n('vxe.table.sortDesc'),
+                        title: XEUtils.eqNull(descTitle) ? getI18n('vxe.table.sortDesc') : `${descTitle || ''}`,
                         onClick: allowBtn
                             ? (evnt) => {
                                 evnt.stopPropagation();

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.21";
+export const version = "4.11.23";
 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.21"}`;
+const version = `table v${"4.11.23"}`;
 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.21";
+const version = "4.11.23";
 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.21"}`;
+const log_version = `table v${"4.11.23"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -5267,7 +5267,12 @@ const Cell = {
     const headerSlot = slots ? slots.header : null;
     const titleSlot = slots ? slots.title : null;
     const checkboxOpts = computeCheckboxOpts.value;
-    const headerTitle = column.getTitle();
+    const {
+      checkStrictly,
+      showHeader,
+      headerTitle
+    } = checkboxOpts;
+    const colTitle = column.getTitle();
     const ons = {};
     if (!isHidden) {
       ons.onClick = evnt => {
@@ -5285,10 +5290,10 @@ const Cell = {
     if (headerSlot) {
       return renderHeaderCellBaseVNs(params, renderTitleContent(checkboxParams, $table.callSlot(headerSlot, checkboxParams)));
     }
-    if (checkboxOpts.checkStrictly ? !checkboxOpts.showHeader : checkboxOpts.showHeader === false) {
+    if (checkStrictly ? !showHeader : showHeader === false) {
       return renderHeaderCellBaseVNs(params, renderTitleContent(checkboxParams, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
         class: 'vxe-checkbox--label'
-      }, titleSlot ? $table.callSlot(titleSlot, checkboxParams) : headerTitle)]));
+      }, titleSlot ? $table.callSlot(titleSlot, checkboxParams) : colTitle)]));
     }
     return renderHeaderCellBaseVNs(params, renderTitleContent(checkboxParams, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
       class: ['vxe-cell--checkbox', {
@@ -5296,13 +5301,13 @@ const Cell = {
         'is--disabled': isAllCheckboxDisabled,
         'is--indeterminate': isAllCheckboxIndeterminate
       }],
-      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 || ''}`,
       ...ons
     }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.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 ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
+    })].concat(titleSlot || colTitle ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
       class: 'vxe-checkbox--label'
-    }, titleSlot ? $table.callSlot(titleSlot, checkboxParams) : headerTitle)] : []))]));
+    }, titleSlot ? $table.callSlot(titleSlot, checkboxParams) : colTitle)] : []))]));
   },
   renderCheckboxCell(params) {
     const {
@@ -5613,6 +5618,8 @@ const Cell = {
     const {
       showIcon,
       allowBtn,
+      ascTitle,
+      descTitle,
       iconLayout,
       iconAsc,
       iconDesc,
@@ -5628,7 +5635,7 @@ const Cell = {
         class: ['vxe-sort--asc-btn', iconAsc || cell_getIcon().TABLE_SORT_ASC, {
           'sort--active': order === 'asc'
         }],
-        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 || ''}`,
         onClick: allowBtn ? evnt => {
           evnt.stopPropagation();
           $table.triggerSortEvent(evnt, column, 'asc');
@@ -5637,7 +5644,7 @@ const Cell = {
         class: ['vxe-sort--desc-btn', iconDesc || cell_getIcon().TABLE_SORT_DESC, {
           'sort--active': order === 'desc'
         }],
-        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 || ''}`,
         onClick: allowBtn ? evnt => {
           evnt.stopPropagation();
           $table.triggerSortEvent(evnt, column, 'desc');
@@ -11591,7 +11598,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) {
@@ -16942,8 +16949,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 = {};
@@ -16963,45 +16977,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;
             }
           }
         });