vxe-table 4.20.6 → 4.20.8

package/dist/all.esm.js

@@ -44,7 +44,7 @@ function eqEmptyValue(cellValue) {
     return cellValue === '' || XEUtils.eqNull(cellValue);
 }
 
-const version = "4.20.6";
+const version = "4.20.8";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -115,9 +115,11 @@ VxeUI.setConfig({
             defaultPlacement: 'top'
         },
         headerTooltipConfig: {
+            mode: 'tooltip',
             enterable: true
         },
         footerTooltipConfig: {
+            mode: 'tooltip',
             enterable: true
         },
         validConfig: {
@@ -425,7 +427,7 @@ VxeUI.setIcon({
     TOOLBAR_TOOLS_PRINT: iconPrefix + 'print',
     TOOLBAR_TOOLS_FULLSCREEN: iconPrefix + 'fullscreen',
     TOOLBAR_TOOLS_MINIMIZE: iconPrefix + 'minimize',
-    TOOLBAR_TOOLS_CUSTOM: iconPrefix + 'custom-column',
+    TOOLBAR_TOOLS_CUSTOM: iconPrefix + 'setting',
     TOOLBAR_TOOLS_FIXED_LEFT: iconPrefix + 'fixed-left',
     TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE: iconPrefix + 'fixed-left-fill',
     TOOLBAR_TOOLS_FIXED_RIGHT: iconPrefix + 'fixed-right',
@@ -756,7 +758,7 @@ function wheelScrollTopTo(diffNum, cb) {
 }
 
 const { log } = VxeUI;
-const tableVersion = `table v${"4.20.6"}`;
+const tableVersion = `table v${"4.20.8"}`;
 function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
@@ -1111,6 +1113,8 @@ function createInternalData$3() {
         tooltipTimeout: null,
         initStatus: false,
         isActivated: false,
+        // rceTimeout: undefined,
+        // rceRunTime: undefined,
         rceDelay: 0
         // _sToTime: null
     };
@@ -2004,6 +2008,7 @@ function handleCustomStoreConfig($xeTable) {
     const isCustomSort = hangleBolleanDefaultValue(storageOpts.sort, isAllCustom);
     const isCustomAggGroup = hangleBolleanDefaultValue(storageOpts.aggGroup, isAllCustom);
     const isCustomAggFunc = hangleBolleanDefaultValue(storageOpts.aggFunc, isAllCustom);
+    const isCustomPager = hangleBolleanDefaultValue(storageOpts.pager, isAllCustom);
     return {
         isCustomAlign,
         isCustomHeaderAlign,
@@ -2013,7 +2018,8 @@ function handleCustomStoreConfig($xeTable) {
         isCustomFixed,
         isCustomSort,
         isCustomAggGroup,
-        isCustomAggFunc
+        isCustomAggFunc,
+        isCustomPager
     };
 }
 
@@ -2228,8 +2234,8 @@ function renderTitleContent(params, content) {
     const headerTooltipOpts = computeHeaderTooltipOpts.value;
     const showAllTip = headerTooltipOpts.showAll;
     const headOverflow = XEUtils.eqNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
-    const showTitle = headOverflow === 'title';
-    const showTooltip = headOverflow === true || headOverflow === 'tooltip';
+    const showTitle = (headOverflow === true ? headerTooltipOpts.mode : headOverflow) === 'title';
+    const showTooltip = (headOverflow === true ? headerTooltipOpts.mode : headOverflow) === 'tooltip';
     const ons = {};
     if (showTitle || showTooltip || showAllTip) {
         ons.onMouseenter = (evnt) => {
@@ -4172,9 +4178,9 @@ var TableBodyComponent = defineVxeComponent({
             let fixedHiddenColumn = overflowX && (fixedType ? column.fixed !== fixedType : !!column.fixed);
             const isCellPadding = XEUtils.eqNull(padding) ? (allPadding === null ? cellOpts.padding : allPadding) : padding;
             const cellOverflow = XEUtils.eqNull(showOverflow) ? allShowOverflow : showOverflow;
-            const showEllipsis = cellOverflow === 'ellipsis';
-            const showTitle = cellOverflow === 'title';
-            const showTooltip = cellOverflow === true ? tooltipOpts.mode === 'tooltip' : cellOverflow === 'tooltip';
+            const showEllipsis = (cellOverflow === true ? tooltipOpts.mode : cellOverflow) === 'ellipsis';
+            const showTitle = (cellOverflow === true ? tooltipOpts.mode : cellOverflow) === 'title';
+            const showTooltip = (cellOverflow === true ? tooltipOpts.mode : cellOverflow) === 'tooltip';
             const hasEllipsis = isAllOverflow || showTitle || showTooltip || showEllipsis;
             const showResizable = (XEUtils.isBoolean(column.resizable) ? column.resizable : (columnOpts.resizable || allResizable));
             const isCsHeight = !!customCellHeight;
@@ -4971,9 +4977,9 @@ var TableHeaderComponent = defineVxeComponent({
                 const isPadding = XEUtils.isBoolean(headerCellOpts.padding) ? headerCellOpts.padding : cellOpts.padding;
                 const headOverflow = XEUtils.eqNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
                 const headAlign = headerAlign || (compConf ? compConf.tableHeaderCellAlign : '') || allHeaderAlign || align || (compConf ? compConf.tableCellAlign : '') || allAlign;
-                const showEllipsis = headOverflow === 'ellipsis';
-                const showTitle = headOverflow === 'title';
-                const showTooltip = headOverflow === true ? headerTooltipOpts.mode === 'tooltip' : headOverflow === 'tooltip';
+                const showEllipsis = (headOverflow === true ? headerTooltipOpts.mode : headOverflow) === 'ellipsis';
+                const showTitle = (headOverflow === true ? headerTooltipOpts.mode : headOverflow) === 'title';
+                const showTooltip = (headOverflow === true ? headerTooltipOpts.mode : headOverflow) === 'tooltip';
                 const hasEllipsis = showTitle || showTooltip || showEllipsis;
                 let hasFilter = false;
                 let firstFilterOption = null;
@@ -5472,9 +5478,9 @@ var TableFooterComponent = defineVxeComponent({
                 const isPadding = XEUtils.isBoolean(footerCellOpts.padding) ? footerCellOpts.padding : cellOpts.padding;
                 const footOverflow = XEUtils.eqNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow;
                 const footAlign = footerAlign || (compConf ? compConf.tableFooterCellAlign : '') || allFooterAlign || align || (compConf ? compConf.tableCellAlign : '') || allAlign;
-                const showEllipsis = footOverflow === 'ellipsis';
-                const showTitle = footOverflow === 'title';
-                const showTooltip = footOverflow === true ? footerTooltipOpts.mode === 'tooltip' : footOverflow === 'tooltip';
+                const showEllipsis = (footOverflow === true ? footerTooltipOpts.mode : footOverflow) === 'ellipsis';
+                const showTitle = (footOverflow === true ? footerTooltipOpts.mode : footOverflow) === 'title';
+                const showTooltip = (footOverflow === true ? footerTooltipOpts.mode : footOverflow) === 'tooltip';
                 const hasEllipsis = showTitle || showTooltip || showEllipsis;
                 const showResizable = (XEUtils.isBoolean(column.resizable) ? column.resizable : (columnOpts.resizable || allResizable));
                 const attrs = { colid };
@@ -6909,8 +6915,8 @@ var TableCustomPanelComponent = defineVxeComponent({
                                         immediate: false,
                                         disabled: isHidden,
                                         modelValue: column.renderResizeWidth,
-                                        min: customMinWidth || undefined,
-                                        max: customMaxWidth || undefined,
+                                        min: customMinWidth || 0,
+                                        max: customMaxWidth || 9999,
                                         'onUpdate:modelValue'(value) {
                                             const width = Math.max(0, Number(value));
                                             column.renderResizeWidth = width;
@@ -10447,7 +10453,7 @@ hooks$5.add('tableEditModule', {
 });
 
 // 默认导出或打印的 HTML 样式
-const defaultHtmlStyle = 'body{padding:0;color:rgba(0,0,0,0.7);font-family:"Microsoft YaHei",微软雅黑,"MicrosoftJhengHei",华文细黑,STHeiti,MingLiu;}body *{-webkit-box-sizing:border-box;box-sizing:border-box;}.vxe-table{border-collapse:collapse;text-align:left;border-spacing:0;}.vxe-table.is--default-width,.vxe-table.is--auto-width{width:100%;}.vxe-table.is--scale-width{table-layout:fixed;}.vxe-table,.vxe-table th,.vxe-table td,.vxe-table td{word-break:break-all;border-color:#D0D0D0;border-style:solid;border-width:0;}.border--default,.border--full,.border--outer{border-top-width:1px;}.border--default,.border--full,.border--outer{border-left-width:1px}.border--outer,.border--default th,.border--default td,.border--full th,.border--full td,.border--outer th,.border--inner th,.border--inner td{border-bottom-width:1px;}.border--default,.border--outer,.border--full th,.border--full td{border-right-width:1px;}.border--default th,.border--full th,.border--outer th{background-color:#f8f8f9;}.vxe-table td>div,.vxe-table th>div{padding:0.5em 0.4em;}.col--center{text-align:center;}.col--right{text-align:right;}.vxe-table .col--ellipsis>div{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-break:break-all;}.vxe-table--tree-node{text-align:left;}.vxe-table--tree-node-wrapper{position:relative;}.vxe-table--tree-icon-wrapper{position:absolute;top:50%;width:1em;height:1em;text-align:center;-webkit-transform:translateY(-50%);transform:translateY(-50%);-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:pointer;}.vxe-table--tree-unfold-icon,.vxe-table--tree-fold-icon{position:absolute;width:0;height:0;border-style:solid;border-width:0.5em;border-right-color:transparent;border-bottom-color:transparent;}.vxe-table--tree-unfold-icon{left:.3em;top:0;border-left-color:#939599;border-top-color:transparent;}.vxe-table--tree-fold-icon{left:0;top:.3em;border-left-color:transparent;border-top-color:#939599;}.vxe-table--tree-cell{display:block;padding-left:1.5em;}.vxe-table input[type="checkbox"]{margin:0;}.vxe-table input[type="checkbox"],.vxe-table input[type="radio"],.vxe-table input[type="checkbox"]+span,.vxe-table input[type="radio"]+span{vertical-align:middle;padding-left:0.4em}';
+const defaultHtmlStyle = 'body{padding:0;color:rgba(0,0,0,0.7);font-family:"Microsoft YaHei",微软雅黑,"MicrosoftJhengHei",华文细黑,STHeiti,MingLiu}body *{-webkit-box-sizing:border-box;box-sizing:border-box}.vxe-table{border-collapse:collapse;text-align:left;border-spacing:0}.vxe-table.is--default-width,.vxe-table.is--auto-width{width:100%}.vxe-table.is--scale-width{table-layout:fixed}.vxe-table,.vxe-table th,.vxe-table td,.vxe-table td{white-space:pre-line;word-break:break-all;border-color:#D0D0D0;border-style:solid;border-width:0}.border--default,.border--full,.border--outer{border-top-width:1px}.border--default,.border--full,.border--outer{border-left-width:1px}.border--outer,.border--default th,.border--default td,.border--full th,.border--full td,.border--outer th,.border--inner th,.border--inner td{border-bottom-width:1px}.border--default,.border--outer,.border--full th,.border--full td{border-right-width:1px}.border--default th,.border--full th,.border--outer th{background-color:#f8f8f9}.vxe-table td>div,.vxe-table th>div{padding:0.5em 0.4em}.col--center{text-align:center}.col--right{text-align:right}.vxe-table .col--ellipsis>div{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-break:break-all}.vxe-table--tree-node{text-align:left}.vxe-table--tree-node-wrapper{position:relative}.vxe-table--tree-icon-wrapper{position:absolute;top:50%;width:1em;height:1em;text-align:center;-webkit-transform:translateY(-50%);transform:translateY(-50%);-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:pointer}.vxe-table--tree-unfold-icon,.vxe-table--tree-fold-icon{position:absolute;width:0;height:0;border-style:solid;border-width:0.5em;border-right-color:transparent;border-bottom-color:transparent}.vxe-table--tree-unfold-icon{left:.3em;top:0;border-left-color:#939599;border-top-color:transparent}.vxe-table--tree-fold-icon{left:0;top:.3em;border-left-color:transparent;border-top-color:#939599}.vxe-table--tree-cell{display:block;padding-left:1.5em}.vxe-table input[type="checkbox"]{margin:0}.vxe-table input[type="checkbox"],.vxe-table input[type="radio"],.vxe-table input[type="checkbox"]+span,.vxe-table input[type="radio"]+span{vertical-align:middle;padding-left:0.4em}';
 function getExportBlobByContent(content, options) {
     return new Blob([content], { type: `text/${options.type};charset=utf-8;` });
 }
@@ -16813,8 +16819,8 @@ var VxeTableComponent = defineVxeComponent({
         const handleCustomRestore = (storeData) => {
             const { aggregateConfig, rowGroupConfig } = props;
             const { collectColumn } = internalData;
-            const { isCustomAlign, isCustomHeaderAlign, isCustomFooterAlign, isCustomResizable, isCustomVisible, isCustomFixed, isCustomSort, isCustomAggGroup, isCustomAggFunc } = handleCustomStoreConfig($xeTable);
-            let { alignData, headerAlignData, footerAlignData, resizableData, sortData, visibleData, fixedData, aggGroupData, aggFuncData } = storeData;
+            const { isCustomAlign, isCustomHeaderAlign, isCustomFooterAlign, isCustomResizable, isCustomVisible, isCustomFixed, isCustomSort, isCustomAggGroup, isCustomAggFunc, isCustomPager } = handleCustomStoreConfig($xeTable);
+            let { alignData, headerAlignData, footerAlignData, resizableData, sortData, visibleData, fixedData, aggGroupData, aggFuncData, pagerData } = storeData;
             // 处理还原
             if ((isCustomAlign && alignData) ||
                 (isCustomHeaderAlign && headerAlignData) ||
@@ -16824,7 +16830,8 @@ var VxeTableComponent = defineVxeComponent({
                 (isCustomVisible && visibleData) ||
                 (isCustomFixed && fixedData) ||
                 (isCustomAggGroup && aggGroupData) ||
-                (isCustomAggFunc && aggFuncData)) {
+                (isCustomAggFunc && aggFuncData) ||
+                (isCustomPager && pagerData && $xeGGWrapper)) {
                 const sortColMaps = {};
                 if (isCustomSort && sortData) {
                     // 转换兼容老版本数据，即将废弃兼容
@@ -17141,7 +17148,7 @@ var VxeTableComponent = defineVxeComponent({
             const autoWidthColumnList = computeAutoWidthColumnList.value;
             const { fullColumnIdData } = internalData;
             const el = refElem.value;
-            if (el) {
+            if (el && autoWidthColumnList.length) {
                 el.setAttribute('data-calc-col', 'Y');
                 autoWidthColumnList.forEach(column => {
                     const colid = column.id;
@@ -17426,7 +17433,7 @@ var VxeTableComponent = defineVxeComponent({
             const fullMaps = {};
             let rowNum = 0;
             const { handleGetRowId } = createHandleGetRowId($xeTable);
-            XEUtils.eachTree(afterTreeFullData, (row, index, items, path) => {
+            XEUtils.eachTree(afterTreeFullData, (row, index, items, path, parentRow) => {
                 const rowid = handleGetRowId(row);
                 const rowRest = fullAllDataRowIdData[rowid];
                 const seq = path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('');
@@ -17434,10 +17441,11 @@ var VxeTableComponent = defineVxeComponent({
                     rowRest.seq = seq;
                     rowRest._seq = rowNum;
                     rowRest.treeIndex = index;
+                    rowRest._index = rowNum;
                     rowRest._tIndex = rowNum;
                 }
                 else {
-                    const rest = { row, rowid, _seq: rowNum, seq, index: -1, $index: -1, _index: -1, treeIndex: -1, _tIndex: rowNum, items: [], parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+                    const rest = { row, rowid, _seq: rowNum, seq, index, $index: -1, _index: rowNum, treeIndex: index, _tIndex: rowNum, items, parent: parentRow, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
                     fullAllDataRowIdData[rowid] = rest;
                     fullDataRowIdData[rowid] = rest;
                 }
@@ -18650,7 +18658,7 @@ var VxeTableComponent = defineVxeComponent({
             if (reWidth) {
                 calcCellWidth();
             }
-            if (reFull) {
+            if (reWidth || reFull) {
                 autoCellWidth();
             }
             calcScrollbar();
@@ -18665,7 +18673,7 @@ var VxeTableComponent = defineVxeComponent({
                 if (reWidth) {
                     calcCellWidth();
                 }
-                if (reFull) {
+                if (reWidth || reFull) {
                     autoCellWidth();
                 }
                 if (reHeight) {
@@ -18757,7 +18765,7 @@ var VxeTableComponent = defineVxeComponent({
                 return;
             }
             internalData.rsePending = true;
-            handleLazyRecalculate(true, true, true, {
+            handleLazyRecalculate(false, true, true, {
                 minRunDelay: 200
             }).then(() => {
                 internalData.rsePending = false;
@@ -20007,12 +20015,12 @@ var VxeTableComponent = defineVxeComponent({
                 return;
             }
             const expandOpts = computeExpandOpts.value;
-            const rowOpts = computeRowOpts.value;
-            const cellOpts = computeCellOpts.value;
-            const defaultRowHeight = computeDefaultRowHeight.value;
             const { mode } = expandOpts;
             if (expandColumn && mode === 'fixed') {
                 const { elemStore, fullAllDataRowIdData } = internalData;
+                const rowOpts = computeRowOpts.value;
+                const cellOpts = computeCellOpts.value;
+                const defaultRowHeight = computeDefaultRowHeight.value;
                 const rowExpandEl = refRowExpandElem.value;
                 const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
                 if (rowExpandEl && bodyScrollElem) {
@@ -23375,7 +23383,7 @@ var VxeTableComponent = defineVxeComponent({
                 const { isRowGroupStatus, rowGroupList } = reactData;
                 const { fullColumnFieldData, collectColumn } = internalData;
                 const { storage, checkMethod } = customOpts;
-                const { isCustomAlign, isCustomHeaderAlign, isCustomFooterAlign, isCustomResizable, isCustomVisible, isCustomFixed, isCustomSort, isCustomAggGroup, isCustomAggFunc } = handleCustomStoreConfig($xeTable);
+                const { isCustomAlign, isCustomHeaderAlign, isCustomFooterAlign, isCustomResizable, isCustomVisible, isCustomFixed, isCustomSort, isCustomAggGroup, isCustomAggFunc, isCustomPager } = handleCustomStoreConfig($xeTable);
                 const alignData = {};
                 const headerAlignData = {};
                 const footerAlignData = {};
@@ -23386,6 +23394,7 @@ var VxeTableComponent = defineVxeComponent({
                 const aggGroupData = {};
                 const aggFuncData = {};
                 const storeData = {
+                    pagerData: isCustomPager && $xeGGWrapper && $xeGGWrapper.getCustomPagerData ? $xeGGWrapper.getCustomPagerData() : undefined,
                     alignData: undefined,
                     headerAlignData: undefined,
                     footerAlignData: undefined,
@@ -24236,8 +24245,10 @@ var VxeTableComponent = defineVxeComponent({
             if (!el || !el.clientWidth) {
                 return;
             }
+            if (internalData.rsePending) {
+                return;
+            }
             handleResizeEvent();
-            $xeTable.updateCellAreas();
         };
         const handleTargetEnterEvent = (isClear) => {
             const $tooltip = refTooltip.value;
@@ -25365,7 +25376,7 @@ var VxeTableComponent = defineVxeComponent({
                 const tableId = computeTableId.value;
                 const customOpts = computeCustomOpts.value;
                 const { updateStore, storage } = customOpts;
-                const { isCustomAlign, isCustomHeaderAlign, isCustomFooterAlign, isCustomResizable, isCustomVisible, isCustomFixed, isCustomSort, isCustomAggGroup, isCustomAggFunc } = handleCustomStoreConfig($xeTable);
+                const { isCustomAlign, isCustomHeaderAlign, isCustomFooterAlign, isCustomResizable, isCustomVisible, isCustomFixed, isCustomSort, isCustomAggGroup, isCustomAggFunc, isCustomPager } = handleCustomStoreConfig($xeTable);
                 if (type !== 'reset') {
                     // fix：修复拖动列宽，重置按钮无法点击的问题
                     reactData.isCustomStatus = true;
@@ -25380,13 +25391,15 @@ var VxeTableComponent = defineVxeComponent({
                         isCustomFixed ||
                         isCustomSort ||
                         isCustomAggGroup ||
-                        isCustomAggFunc)) {
+                        isCustomAggFunc ||
+                        isCustomPager)) {
                     if (!tableId) {
                         errLog$2('vxe.error.reqProp', ['id']);
                         return nextTick();
                     }
                     const storeData = type === 'reset'
                         ? {
+                            pagerData: {},
                             alignData: {},
                             headerAlignData: {},
                             footerAlignData: {},
@@ -29720,9 +29733,9 @@ var VxeTableComponent = defineVxeComponent({
             // if (treeConfig && (treeOpts.showLine || treeOpts.line) && !showOverflow) {
             //   warnLog('vxe.error.reqProp', ['show-overflow'])
             // }
-            if (treeConfig && !treeOpts.transform && props.stripe) {
-                warnLog$2('vxe.error.noTree', ['stripe']);
-            }
+            // if (treeConfig && !treeOpts.transform && props.stripe) {
+            //   warnLog('vxe.error.noTree', ['stripe'])
+            // }
             if (treeConfig && !treeOpts.transform) {
                 if (sortOpts.isDeep) {
                     warnLog$2('vxe.error.reqSupportProp', ['transform=false', 'sort-config.isDeep=false']);
@@ -32094,6 +32107,17 @@ var VxeGridComponent = defineVxeComponent({
                     };
                 }
                 return null;
+            },
+            getCustomPagerData() {
+                const { pagerConfig } = props;
+                const { tablePage } = reactData;
+                const pagerOpts = computePagerOpts.value;
+                if (pagerConfig && isEnableConf(pagerOpts)) {
+                    return {
+                        pSize: tablePage.pageSize
+                    };
+                }
+                return {};
             }
             // setProxyInfo (options) {
             //   if (props.proxyConfig && options) {