vxe-table 3.21.22 → 3.21.24

package/es/table/src/cell.js

@@ -533,7 +533,7 @@ export const Cell = {
         const treeOpts = $table.computeTreeOpts;
         const { row, column, level } = params;
         const { slots } = column;
-        const { padding, indent, lazy, trigger, iconLoaded, showIcon, iconOpen, iconClose } = treeOpts;
+        const { padding, indent, lazy, trigger, visibleMethod, iconLoaded, showIcon, iconOpen, iconClose } = treeOpts;
         const childrenField = treeOpts.children || treeOpts.childrenField;
         const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
         const rowChilds = row[childrenField];
@@ -573,7 +573,7 @@ export const Cell = {
                     }
                     : undefined
             }, [
-                showIcon && (lazy ? (isLazyLoaded ? hasChild : (hasChild || hasLazyChilds)) : hasChild)
+                showIcon && (lazy ? (isLazyLoaded ? hasChild : (hasChild || hasLazyChilds)) : hasChild) && (!visibleMethod || visibleMethod(params))
                     ? [
                         h('div', {
                             class: 'vxe-cell--tree-btn',

package/es/table/src/columnInfo.js

@@ -13,7 +13,7 @@ export class ColumnInfo {
         const $xeGrid = $xeTable.$xeGrid;
         const $xeGantt = $xeTable.$xeGantt;
         const $xeGGWrapper = $xeGrid || $xeGantt;
-        const { type, field, width, visible, aggFunc, formatter, filterMultiple, cellRender, editRender, filterRender } = colConfs;
+        const { type, field, width, visible, fixed, align, headerAlign, footerAlign, aggFunc, formatter, filterMultiple, cellRender, editRender, filterRender } = colConfs;
         const colId = colConfs.colId || XEUtils.uniqueId('col_');
         const proxyOpts = $xeGrid ? $xeGrid.computeProxyOpts : null;
         const defaultVisible = XEUtils.isBoolean(visible) ? visible : true;
@@ -82,10 +82,10 @@ export class ColumnInfo {
             minWidth: colConfs.minWidth,
             maxWidth: colConfs.maxWidth,
             resizable: colConfs.resizable,
-            fixed: colConfs.fixed,
-            align: colConfs.align,
-            headerAlign: colConfs.headerAlign,
-            footerAlign: colConfs.footerAlign,
+            fixed,
+            align,
+            headerAlign,
+            footerAlign,
             showOverflow: colConfs.showOverflow,
             showHeaderOverflow: colConfs.showHeaderOverflow,
             showFooterOverflow: colConfs.showFooterOverflow,
@@ -126,7 +126,7 @@ export class ColumnInfo {
             titleHelp: colConfs.titleHelp,
             titlePrefix: colConfs.titlePrefix,
             titleSuffix: colConfs.titleSuffix,
-            aggFunc: colConfs.aggFunc,
+            aggFunc,
             copyMethod: colConfs.copyMethod,
             cutMethod: colConfs.cutMethod,
             pasteMethod: colConfs.pasteMethod,
@@ -140,7 +140,10 @@ export class ColumnInfo {
             defaultParentId: null,
             halfVisible: false,
             defaultVisible: defaultVisible,
-            defaultFixed: colConfs.fixed,
+            defaultFixed: fixed,
+            defaultAlign: align,
+            defaultHeaderAlign: headerAlign,
+            defaultFooterAlign: footerAlign,
             defaultAggFunc: colConfs.aggFunc,
             checked: false,
             halfChecked: false,
@@ -160,6 +163,9 @@ export class ColumnInfo {
             renderAggFn: '',
             renderAggDigits: null,
             renderAggFormat: null,
+            renderAlign: '',
+            renderHeaderAlign: '',
+            renderFooterAlign: '',
             renderFixed: '',
             renderVisible: false,
             renderWidth: defaultRenderWidth,

package/es/table/src/methods.js

@@ -3,7 +3,7 @@ import { getTpImg, isPx, isScale, hasClass, addClass, removeClass, wheelScrollLe
 import { getLastZIndex, nextZIndex, hasChildrenList, getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../ui/src/utils';
 import { VxeUI } from '../../ui';
 import Cell from './cell';
-import { getRowUniqueId, createRowId, clearTableAllStatus, getColumnList, toFilters, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getColReMinWidth, getColReMaxWidth, createHandleUpdateRowId, createHandleGetRowId, getRefElem, getCellRestHeight, getLastChildColumn, getRowMaxHeight } from './util';
+import { getRowUniqueId, createRowId, clearTableAllStatus, getColumnList, toFilters, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleRowidOrRow, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, getRootColumn, getColReMinWidth, getColReMaxWidth, createHandleUpdateRowId, createHandleGetRowId, getRefElem, getCellRestHeight, getLastChildColumn, getRowMaxHeight, handleCustomStoreConfig } from './util';
 import { getSlotVNs } from '../../ui/src/vn';
 import { moveRowAnimateToTb, clearRowAnimate, moveColAnimateToLr, clearColAnimate } from '../../ui/src/anime';
 import { createComponentLog } from '../../ui/src/log';
@@ -31,9 +31,6 @@ function eqCellValue(newRow, oldRow, field) {
     }
     return { newValue: val1, oldValue: val2, result };
 }
-function hangleStorageDefaultValue(value, isAll) {
-    return XEUtils.isBoolean(value) ? value : isAll;
-}
 function getNextSortOrder($xeTable, column) {
     const sortOpts = $xeTable.computeSortOpts;
     const { orders = [] } = sortOpts;
@@ -127,19 +124,18 @@ function handleCustomRestore($xeTable, storeData) {
     const internalData = $xeTable;
     const { aggregateConfig, rowGroupConfig } = props;
     const { collectColumn } = internalData;
-    const customOpts = $xeTable.computeCustomOpts;
-    const { storage, storeOptions } = customOpts;
-    const isAllCustom = storage === true;
-    const storageOpts = Object.assign({}, isAllCustom ? {} : storage || {}, storeOptions);
-    const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
-    const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
-    const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
-    const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
-    const isCustomAggGroup = hangleStorageDefaultValue(storageOpts.aggGroup, isAllCustom);
-    const isCustomAggFunc = hangleStorageDefaultValue(storageOpts.aggFunc, isAllCustom);
-    let { resizableData, sortData, visibleData, fixedData, aggGroupData, aggFuncData } = storeData;
+    const { isCustomAlign, isCustomHeaderAlign, isCustomFooterAlign, isCustomResizable, isCustomVisible, isCustomFixed, isCustomSort, isCustomAggGroup, isCustomAggFunc } = handleCustomStoreConfig($xeTable);
+    let { alignData, headerAlignData, footerAlignData, resizableData, sortData, visibleData, fixedData, aggGroupData, aggFuncData } = storeData;
     // 处理还原
-    if ((isCustomResizable && resizableData) || (isCustomSort && sortData) || (isCustomVisible && visibleData) || (isCustomFixed && fixedData) || (isCustomAggGroup && aggGroupData) || (isCustomAggFunc && aggFuncData)) {
+    if ((isCustomAlign && alignData) ||
+        (isCustomHeaderAlign && headerAlignData) ||
+        (isCustomFooterAlign && footerAlignData) ||
+        (isCustomResizable && resizableData) ||
+        (isCustomSort && sortData) ||
+        (isCustomVisible && visibleData) ||
+        (isCustomFixed && fixedData) ||
+        (isCustomAggGroup && aggGroupData) ||
+        (isCustomAggFunc && aggFuncData)) {
         const sortColMaps = {};
         if (isCustomSort && sortData) {
             // 转换兼容老版本数据，即将废弃兼容
@@ -223,15 +219,19 @@ function restoreCustomStorage($xeTable) {
     const { customConfig } = props;
     const tableId = $xeTable.computeTableId;
     const customOpts = $xeTable.computeCustomOpts;
-    const { storage, restoreStore, storeOptions } = customOpts;
-    const isAllCustom = storage === true;
-    const storageOpts = Object.assign({}, isAllCustom ? {} : storage || {}, storeOptions);
-    const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
-    const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
-    const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
-    const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
-    const isCustomAggFunc = hangleStorageDefaultValue(storageOpts.aggFunc, isAllCustom);
-    if (storage && (customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort || isCustomAggFunc)) {
+    const { storage, restoreStore } = customOpts;
+    const { isCustomAlign, isCustomHeaderAlign, isCustomFooterAlign, isCustomResizable, isCustomVisible, isCustomFixed, isCustomSort, isCustomAggGroup, isCustomAggFunc } = handleCustomStoreConfig($xeTable);
+    if (storage &&
+        (customConfig ? isEnableConf(customOpts) : customOpts.enabled) &&
+        (isCustomAlign ||
+            isCustomHeaderAlign ||
+            isCustomFooterAlign ||
+            isCustomResizable ||
+            isCustomVisible ||
+            isCustomFixed ||
+            isCustomSort ||
+            isCustomAggGroup ||
+            isCustomAggFunc)) {
         if (!tableId) {
             errLog('vxe.error.reqProp', ['id']);
             return;
@@ -446,8 +446,9 @@ function handleBaseTreeExpand($xeTable, rows, expanded) {
     const result = [];
     const columnIndex = $xeTable.getColumnIndex(treeNodeColumn);
     const $columnIndex = $xeTable.getVMColumnIndex(treeNodeColumn);
+    const _columnIndex = $xeTable.getVTColumnIndex(treeNodeColumn);
     const { handleGetRowId } = createHandleGetRowId($xeTable);
-    let validRows = toggleMethod ? rows.filter((row) => toggleMethod({ $table: $xeTable, expanded, column: treeNodeColumn, columnIndex, $columnIndex, row })) : rows;
+    let validRows = toggleMethod ? rows.filter((row) => toggleMethod({ $table: $xeTable, expanded, column: treeNodeColumn, columnIndex, $columnIndex, _columnIndex, row })) : rows;
     if (accordion) {
         validRows = validRows.length ? [validRows[validRows.length - 1]] : [];
         // 同一级只能展开一个
@@ -6397,15 +6398,19 @@ const tableMethods = {
         const { customConfig } = props;
         const tableId = $xeTable.computeTableId;
         const customOpts = $xeTable.computeCustomOpts;
-        const { storage, restoreStore, storeOptions } = customOpts;
-        const isAllCustom = storage === true;
-        const storageOpts = Object.assign({}, isAllCustom ? {} : storage || {}, storeOptions);
-        const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
-        const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
-        const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
-        const isCustomAggGroup = hangleStorageDefaultValue(storageOpts.aggGroup, isAllCustom);
-        const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
-        if (storage && (customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomAggGroup || isCustomSort)) {
+        const { storage, restoreStore } = customOpts;
+        const { isCustomAlign, isCustomHeaderAlign, isCustomFooterAlign, isCustomResizable, isCustomVisible, isCustomFixed, isCustomSort, isCustomAggGroup, isCustomAggFunc } = handleCustomStoreConfig($xeTable);
+        if (storage &&
+            (customConfig ? isEnableConf(customOpts) : customOpts.enabled) &&
+            (isCustomAlign ||
+                isCustomHeaderAlign ||
+                isCustomFooterAlign ||
+                isCustomResizable ||
+                isCustomVisible ||
+                isCustomFixed ||
+                isCustomSort ||
+                isCustomAggGroup ||
+                isCustomAggFunc)) {
             if (!tableId) {
                 errLog('vxe.error.reqProp', ['id']);
                 return;
@@ -6450,6 +6455,9 @@ const tableMethods = {
             if (!checkMethod || checkMethod({ $table: $xeTable, column })) {
                 column.visible = column.defaultVisible;
             }
+            column.align = column.defaultAlign;
+            column.headerAlign = column.defaultHeaderAlign;
+            column.footerAlign = column.defaultFooterAlign;
             column.aggFunc = column.defaultAggFunc;
             column.renderAggFn = column.defaultAggFunc;
             column.renderResizeWidth = column.renderWidth;
@@ -6495,15 +6503,11 @@ const tableMethods = {
         const customOpts = $xeTable.computeCustomOpts;
         const { isRowGroupStatus, rowGroupList } = reactData;
         const { fullColumnFieldData, collectColumn } = internalData;
-        const { storage, checkMethod, storeOptions } = customOpts;
-        const isAllCustom = storage === true;
-        const storageOpts = Object.assign({}, isAllCustom ? {} : storage || {}, storeOptions);
-        const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
-        const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
-        const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
-        const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
-        const isCustomAggGroup = hangleStorageDefaultValue(storageOpts.aggGroup, isAllCustom);
-        const isCustomAggFunc = hangleStorageDefaultValue(storageOpts.aggFunc, isAllCustom);
+        const { storage, checkMethod } = customOpts;
+        const { isCustomAlign, isCustomHeaderAlign, isCustomFooterAlign, isCustomResizable, isCustomVisible, isCustomFixed, isCustomSort, isCustomAggGroup, isCustomAggFunc } = handleCustomStoreConfig($xeTable);
+        const alignData = {};
+        const headerAlignData = {};
+        const footerAlignData = {};
         const resizableData = {};
         const sortData = [];
         const visibleData = {};
@@ -6511,6 +6515,9 @@ const tableMethods = {
         const aggGroupData = {};
         const aggFuncData = {};
         const storeData = {
+            alignData: undefined,
+            headerAlignData: undefined,
+            footerAlignData: undefined,
             resizableData: undefined,
             sortData: undefined,
             visibleData: undefined,
@@ -6524,6 +6531,9 @@ const tableMethods = {
             }
             return storeData;
         }
+        let hasAlign = 0;
+        let hasHeaderAlign = 0;
+        let hasFooterAlign = 0;
         let hasResizable = 0;
         let hasSort = 0;
         let hasFixed = 0;
@@ -6564,6 +6574,18 @@ const tableMethods = {
                     fixedData[colKey] = column.fixed;
                 }
             }
+            if (isCustomAlign && column.align) {
+                hasAlign = 1;
+                alignData[colKey] = column.align;
+            }
+            if (isCustomHeaderAlign && column.headerAlign) {
+                hasHeaderAlign = 1;
+                headerAlignData[colKey] = column.headerAlign;
+            }
+            if (isCustomFooterAlign && column.footerAlign) {
+                hasFooterAlign = 1;
+                footerAlignData[colKey] = column.footerAlign;
+            }
             if (isCustomResizable && column.resizeWidth) {
                 hasResizable = 1;
                 resizableData[colKey] = column.renderWidth;
@@ -6583,6 +6605,15 @@ const tableMethods = {
                 aggFuncData[colKey] = column.aggFunc;
             }
         });
+        if (hasAlign) {
+            storeData.alignData = alignData;
+        }
+        if (hasHeaderAlign) {
+            storeData.headerAlignData = headerAlignData;
+        }
+        if (hasFooterAlign) {
+            storeData.footerAlignData = footerAlignData;
+        }
         if (hasResizable) {
             storeData.resizableData = resizableData;
         }
@@ -6619,33 +6650,40 @@ const tableMethods = {
         const { customConfig } = props;
         const tableId = $xeTable.computeTableId;
         const customOpts = $xeTable.computeCustomOpts;
-        const { updateStore, storage, storeOptions } = customOpts;
-        const isAllCustom = storage === true;
-        const storageOpts = Object.assign({}, isAllCustom ? {} : storage || {}, storeOptions);
-        const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
-        const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
-        const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
-        const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
-        const isCustomAggGroup = hangleStorageDefaultValue(storageOpts.aggGroup, isAllCustom);
-        const isCustomAggFunc = hangleStorageDefaultValue(storageOpts.aggFunc, isAllCustom);
+        const { updateStore, storage } = customOpts;
+        const { isCustomAlign, isCustomHeaderAlign, isCustomFooterAlign, isCustomResizable, isCustomVisible, isCustomFixed, isCustomSort, isCustomAggGroup, isCustomAggFunc } = handleCustomStoreConfig($xeTable);
         if (type !== 'reset') {
+            // fix：修复拖动列宽，重置按钮无法点击的问题
             reactData.isCustomStatus = true;
         }
-        if (storage && (customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort || isCustomAggGroup || isCustomAggFunc)) {
+        if (storage &&
+            (customConfig ? isEnableConf(customOpts) : customOpts.enabled) &&
+            (isCustomAlign ||
+                isCustomHeaderAlign ||
+                isCustomFooterAlign ||
+                isCustomResizable ||
+                isCustomVisible ||
+                isCustomFixed ||
+                isCustomSort ||
+                isCustomAggGroup ||
+                isCustomAggFunc)) {
             if (!tableId) {
                 errLog('vxe.error.reqProp', ['id']);
-                return this.$nextTick();
+                return $xeTable.$nextTick();
             }
             const storeData = type === 'reset'
                 ? {
+                    alignData: {},
+                    headerAlignData: {},
+                    footerAlignData: {},
                     resizableData: {},
-                    sortData: {},
+                    sortData: [],
                     visibleData: {},
                     fixedData: {},
                     aggGroupData: {},
                     aggFuncData: {}
                 }
-                : this.getCustomStoreData();
+                : $xeTable.getCustomStoreData();
             if (updateStore) {
                 return updateStore({
                     $table: $xeTable,
@@ -6658,13 +6696,17 @@ const tableMethods = {
                 setCustomStorageMap(tableId, type === 'reset' ? null : storeData);
             }
         }
-        return this.$nextTick();
+        return $xeTable.$nextTick();
     },
     handleUpdateDataQueue() {
-        this.upDataFlag++;
+        const $xeTable = this;
+        const reactData = $xeTable;
+        reactData.upDataFlag++;
     },
     handleRefreshColumnQueue() {
-        this.reColumnFlag++;
+        const $xeTable = this;
+        const reactData = $xeTable;
+        reactData.reColumnFlag++;
     },
     handleFilterOptions(column) {
         const $xeTable = this;

package/es/table/src/util.js

@@ -219,7 +219,8 @@ export function createReactData() {
             activeWrapper: false,
             visible: false,
             maxHeight: null,
-            popupStyle: {},
+            defPopupStyle: {},
+            panePopupStyle: {},
             oldSortMaps: {},
             oldFixedMaps: {},
             oldVisibleMaps: {}
@@ -1011,3 +1012,32 @@ export function colToVisible($xeTable, isForce, column, row) {
     }
     return Promise.resolve();
 }
+function hangleBolleanDefaultValue(currVal, defVal) {
+    return XEUtils.isBoolean(currVal) ? currVal : defVal;
+}
+export function handleCustomStoreConfig($xeTable) {
+    const customOpts = $xeTable.computeCustomOpts;
+    const { storage, storeOptions } = customOpts;
+    const isAllCustom = storage === true;
+    const storageOpts = Object.assign({}, isAllCustom ? {} : storage || {}, storeOptions);
+    const isCustomAlign = hangleBolleanDefaultValue(storageOpts.align, isAllCustom);
+    const isCustomHeaderAlign = hangleBolleanDefaultValue(storageOpts.headerAlign, isAllCustom);
+    const isCustomFooterAlign = hangleBolleanDefaultValue(storageOpts.footerAlign, isAllCustom);
+    const isCustomResizable = hangleBolleanDefaultValue(storageOpts.resizable, isAllCustom);
+    const isCustomVisible = hangleBolleanDefaultValue(storageOpts.visible, isAllCustom);
+    const isCustomFixed = hangleBolleanDefaultValue(storageOpts.fixed, isAllCustom);
+    const isCustomSort = hangleBolleanDefaultValue(storageOpts.sort, isAllCustom);
+    const isCustomAggGroup = hangleBolleanDefaultValue(storageOpts.aggGroup, isAllCustom);
+    const isCustomAggFunc = hangleBolleanDefaultValue(storageOpts.aggFunc, isAllCustom);
+    return {
+        isCustomAlign,
+        isCustomHeaderAlign,
+        isCustomFooterAlign,
+        isCustomResizable,
+        isCustomVisible,
+        isCustomFixed,
+        isCustomSort,
+        isCustomAggGroup,
+        isCustomAggFunc
+    };
+}