vxe-table 4.19.15 → 4.19.17

package/dist/all.esm.js

@@ -44,9 +44,9 @@ function eqEmptyValue(cellValue) {
     return cellValue === '' || XEUtils.eqNull(cellValue);
 }
 
-const version$1 = "4.19.15";
-VxeUI.version = version$1;
-VxeUI.tableVersion = version$1;
+const version = "4.19.17";
+VxeUI.version = version;
+VxeUI.tableVersion = version;
 VxeUI.setConfig({
     emptyCell: '　',
     table: {
@@ -743,10 +743,20 @@ function wheelScrollTopTo(diffNum, cb) {
 }
 
 const { log } = VxeUI;
-const version = `table v${"4.19.15"}`;
-const warnLog = log.create('warn', version);
-const errLog = log.create('error', version);
+const tableVersion = `table v${"4.19.17"}`;
+function createComponentLog(name) {
+    const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
+    const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
+    const designVersion = VxeUI.designVersion ? `design v${VxeUI.designVersion}` : '';
+    return {
+        warnLog: log.create('warn', uiVersion + tableVersion + ganttVersion + designVersion + '] [' + name),
+        errLog: log.create('error', uiVersion + tableVersion + ganttVersion + designVersion + '] [' + name)
+    };
+}
+log.create('warn', tableVersion);
+log.create('error', tableVersion);
 
+const { warnLog: warnLog$7, errLog: errLog$a } = createComponentLog('table');
 const { getI18n: getI18n$d, formats: formats$1, renderer: renderer$b } = VxeUI;
 class ColumnInfo {
     /* eslint-disable @typescript-eslint/no-use-before-define */
@@ -764,47 +774,47 @@ class ColumnInfo {
         const filters = toFilters(colConfs.filters, colId);
         const types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
         if (type && types.indexOf(type) === -1) {
-            warnLog('vxe.error.errProp', [`type=${type}`, types.join(', ')]);
+            warnLog$7('vxe.error.errProp', [`type=${type}`, types.join(', ')]);
         }
         if (XEUtils.isBoolean(cellRender) || (cellRender && !XEUtils.isObject(cellRender))) {
-            warnLog('vxe.error.errProp', [`column.cell-render=${cellRender}`, 'column.cell-render={}']);
+            warnLog$7('vxe.error.errProp', [`column.cell-render=${cellRender}`, 'column.cell-render={}']);
         }
         if (XEUtils.isBoolean(editRender) || (editRender && !XEUtils.isObject(editRender))) {
-            warnLog('vxe.error.errProp', [`column.edit-render=${editRender}`, 'column.edit-render={}']);
+            warnLog$7('vxe.error.errProp', [`column.edit-render=${editRender}`, 'column.edit-render={}']);
         }
         if (type === 'expand') {
             const { treeConfig } = tableProps;
             const { computeTreeOpts } = $xeTable.getComputeMaps();
             const treeOpts = computeTreeOpts.value;
             if (treeConfig && (treeOpts.showLine || treeOpts.line)) {
-                errLog('vxe.error.errConflicts', ['tree-config.showLine', 'column.type=expand']);
+                errLog$a('vxe.error.errConflicts', ['tree-config.showLine', 'column.type=expand']);
             }
         }
         if (formatter) {
             if (XEUtils.isString(formatter)) {
                 const gFormatOpts = formats$1.get(formatter) || XEUtils[formatter];
                 if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
-                    errLog('vxe.error.notFormats', [formatter]);
+                    errLog$a('vxe.error.notFormats', [formatter]);
                 }
             }
             else if (XEUtils.isArray(formatter)) {
                 const gFormatOpts = formats$1.get(formatter[0]) || XEUtils[formatter[0]];
                 if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
-                    errLog('vxe.error.notFormats', [formatter[0]]);
+                    errLog$a('vxe.error.notFormats', [formatter[0]]);
                 }
             }
         }
         if (aggFunc) {
             if (!$xeTable.handlePivotTableAggData && aggFunc !== true) {
-                errLog('vxe.error.errProp', [`column.agg-func=${aggFunc}`, 'column.agg-func=true']);
+                errLog$a('vxe.error.errProp', [`column.agg-func=${aggFunc}`, 'column.agg-func=true']);
             }
         }
         if (field && editRender) {
             if (editRender.startField && `${editRender.startField}`.indexOf(field) >= 0) {
-                errLog('vxe.error.modelConflicts', [`field=${field}`, `edit-render.startField=${editRender.startField}`]);
+                errLog$a('vxe.error.modelConflicts', [`field=${field}`, `edit-render.startField=${editRender.startField}`]);
             }
             if (editRender.endField && `${editRender.endField}`.indexOf(field) >= 0) {
-                errLog('vxe.error.modelConflicts', [`field=${field}`, `edit-render.endField=${editRender.endField}`]);
+                errLog$a('vxe.error.modelConflicts', [`field=${field}`, `edit-render.endField=${editRender.endField}`]);
             }
         }
         Object.assign(this, {
@@ -5061,6 +5071,8 @@ var TableHeaderComponent = defineVxeComponent({
             const cellOpts = computeCellOpts.value;
             const defaultRowHeight = computeDefaultRowHeight.value;
             const headerCellOpts = computeHeaderCellOpts.value;
+            const floatingFilterOpts = computeFloatingFilterOpts.value;
+            const { cellClassName } = floatingFilterOpts;
             const currCellHeight = getCalcHeight(headerCellOpts.height) || defaultRowHeight;
             return cols.map((column, $columnIndex) => {
                 const { type, showHeaderOverflow, headerAlign, align, filters, editRender, cellRender, floatingFilters, filterRender, slots } = column;
@@ -5114,7 +5126,7 @@ var TableHeaderComponent = defineVxeComponent({
                 else {
                     tcStyle.minHeight = `${currCellHeight}px`;
                 }
-                return h('th', Object.assign({ class: ['vxe-table--column vxe-header--column', colid, fixedHiddenColumn ? 'fixed--hidden' : 'fixed--visible', {
+                return h('th', Object.assign({ class: ['vxe-table--column vxe-header--column is--floating-filters', colid, fixedHiddenColumn ? 'fixed--hidden' : 'fixed--visible', {
                             [`col--${headAlign}`]: headAlign,
                             [`col--${type}`]: type,
                             'col--last': isLastColumn,
@@ -5127,7 +5139,7 @@ var TableHeaderComponent = defineVxeComponent({
                         }
                     ], key: colid }, thAttrs), [
                     h('div', {
-                        class: ['vxe-cell', {
+                        class: ['vxe-cell', '' + (cellClassName || ''), {
                                 'c--title': showTitle,
                                 'c--tooltip': showTooltip,
                                 'c--ellipsis': showEllipsis
@@ -5167,7 +5179,8 @@ var TableHeaderComponent = defineVxeComponent({
                 rowVNs.push(h('tr', {
                     key: 'ff',
                     class: [
-                        'vxe-header--row'
+                        'vxe-header--row is--floating-filters',
+                        '' + (floatingFilterOpts.rowClassName || '')
                     ]
                 }, renderFilterRows(isOptimizeMode, renderColumnList)));
             }
@@ -5669,6 +5682,7 @@ var TableFooterComponent = defineVxeComponent({
     }
 });
 
+const { errLog: errLog$9 } = createComponentLog('table');
 const { getI18n: getI18n$a, getIcon: getIcon$6, renderEmptyElement: renderEmptyElement$6 } = VxeUI;
 function createInternalData$2() {
     return {
@@ -7074,19 +7088,19 @@ var TableCustomPanelComponent = defineVxeComponent({
             const customOpts = computeCustomOpts.value;
             const { mode } = customOpts;
             if (!VxeUIModalComponent && (mode === 'modal')) {
-                errLog('vxe.error.reqComp', ['vxe-modal']);
+                errLog$9('vxe.error.reqComp', ['vxe-modal']);
             }
             if (!VxeUIDrawerComponent && (mode === 'drawer')) {
-                errLog('vxe.error.reqComp', ['vxe-drawer']);
+                errLog$9('vxe.error.reqComp', ['vxe-drawer']);
             }
             if (!VxeUIButtonComponent) {
-                errLog('vxe.error.reqComp', ['vxe-button']);
+                errLog$9('vxe.error.reqComp', ['vxe-button']);
             }
             if (!VxeUINumberInputComponent) {
-                errLog('vxe.error.reqComp', ['vxe-number-input']);
+                errLog$9('vxe.error.reqComp', ['vxe-number-input']);
             }
             if (!VxeUIRadioGroupComponent) {
-                errLog('vxe.error.reqComp', ['vxe-radio-group']);
+                errLog$9('vxe.error.reqComp', ['vxe-radio-group']);
             }
         });
         const $xeTableCustomPanel = {
@@ -7111,6 +7125,7 @@ var TableCustomPanelComponent = defineVxeComponent({
     }
 });
 
+const { warnLog: warnLog$6 } = createComponentLog('table');
 const { getI18n: getI18n$9, getIcon: getIcon$5, renderer: renderer$6, renderEmptyElement: renderEmptyElement$5 } = VxeUI;
 var TableFilterPanelComponent = defineVxeComponent({
     name: 'VxeTableFilterPanel',
@@ -7160,7 +7175,7 @@ var TableFilterPanelComponent = defineVxeComponent({
         const confirmFilter = (evnt) => {
             const { filterStore } = props;
             if (!evnt) {
-                warnLog('vxe.error.delFunc', ['confirmFilter', 'saveFilterPanelByEvent']);
+                warnLog$6('vxe.error.delFunc', ['confirmFilter', 'saveFilterPanelByEvent']);
             }
             $xeTable.handleFilterConfirmFilter(evnt || new Event('click'), filterStore.column || null);
         };
@@ -7384,6 +7399,7 @@ var TableFilterPanelComponent = defineVxeComponent({
     }
 });
 
+const { errLog: errLog$8 } = createComponentLog('table');
 const { getI18n: getI18n$8, getIcon: getIcon$4, renderEmptyElement: renderEmptyElement$4 } = VxeUI;
 var TableImportPanelComponent = defineVxeComponent({
     name: 'VxeTableImportPanel',
@@ -7611,19 +7627,20 @@ var TableImportPanelComponent = defineVxeComponent({
         };
         nextTick(() => {
             if (!VxeUIModalComponent) {
-                errLog('vxe.error.reqComp', ['vxe-modal']);
+                errLog$8('vxe.error.reqComp', ['vxe-modal']);
             }
             if (!VxeUIButtonComponent) {
-                errLog('vxe.error.reqComp', ['vxe-button']);
+                errLog$8('vxe.error.reqComp', ['vxe-button']);
             }
             if (!VxeUISelectComponent) {
-                errLog('vxe.error.reqComp', ['vxe-select']);
+                errLog$8('vxe.error.reqComp', ['vxe-select']);
             }
         });
         return renderVN;
     }
 });
 
+const { errLog: errLog$7 } = createComponentLog('table');
 const { getI18n: getI18n$7, getIcon: getIcon$3, renderEmptyElement: renderEmptyElement$3 } = VxeUI;
 var TableExportPanelComponent = defineVxeComponent({
     name: 'VxeTableExportPanel',
@@ -8149,19 +8166,19 @@ var TableExportPanelComponent = defineVxeComponent({
         };
         nextTick(() => {
             if (!VxeUIModalComponent) {
-                errLog('vxe.error.reqComp', ['vxe-modal']);
+                errLog$7('vxe.error.reqComp', ['vxe-modal']);
             }
             if (!VxeUIButtonComponent) {
-                errLog('vxe.error.reqComp', ['vxe-button']);
+                errLog$7('vxe.error.reqComp', ['vxe-button']);
             }
             if (!VxeUISelectComponent) {
-                errLog('vxe.error.reqComp', ['vxe-select']);
+                errLog$7('vxe.error.reqComp', ['vxe-select']);
             }
             if (!VxeUIInputComponent) {
-                errLog('vxe.error.reqComp', ['vxe-input']);
+                errLog$7('vxe.error.reqComp', ['vxe-input']);
             }
             if (!VxeUICheckboxComponent) {
-                errLog('vxe.error.reqComp', ['vxe-checkbox']);
+                errLog$7('vxe.error.reqComp', ['vxe-checkbox']);
             }
         });
         return renderVN;
@@ -9129,6 +9146,7 @@ hooks$6.add('tableMenuModule', {
     }
 });
 
+const { warnLog: warnLog$5, errLog: errLog$6 } = createComponentLog('table');
 const { getConfig: getConfig$5, renderer: renderer$4, hooks: hooks$5, getI18n: getI18n$5 } = VxeUI;
 const tableEditMethodKeys = ['insert', 'insertAt', 'insertNextAt', 'insertChild', 'insertChildAt', 'insertChildNextAt', 'remove', 'removeCheckboxRow', 'removeRadioRow', 'removeCurrentRow', 'getRecordset', 'getInsertRecords', 'getRemoveRecords', 'getUpdateRecords', 'getEditRecord', 'getActiveRecord', 'getEditCell', 'getSelectedCell', 'clearEdit', 'clearActived', 'clearSelected', 'isEditByRow', 'isActiveByRow', 'setEditRow', 'setActiveRow', 'setEditCell', 'setActiveCell', 'setSelectCell'];
 hooks$5.add('tableEditModule', {
@@ -9207,7 +9225,7 @@ hooks$5.add('tableEditModule', {
                 }
                 else {
                     if (parentRowId) {
-                        warnLog('vxe.error.unableInsert');
+                        warnLog$5('vxe.error.unableInsert');
                     }
                     afterFullData[funcName](item);
                     tableFullTreeData[funcName](item);
@@ -9255,7 +9273,7 @@ hooks$5.add('tableEditModule', {
                     if (treeConfig) {
                         throw new Error(getI18n$5('vxe.error.noTree', ['insert']));
                     }
-                    errLog(getI18n$5('vxe.error.noGroup', ['insert']));
+                    errLog$6(getI18n$5('vxe.error.noGroup', ['insert']));
                     // insertGroupRow(newRecords, false)
                 }
                 else {
@@ -9287,7 +9305,7 @@ hooks$5.add('tableEditModule', {
                         if (treeConfig) {
                             throw new Error(getI18n$5('vxe.error.noTree', ['insert']));
                         }
-                        errLog(getI18n$5('vxe.error.noGroup', ['insert']));
+                        errLog$6(getI18n$5('vxe.error.noGroup', ['insert']));
                         // insertGroupRow(newRecords, true)
                     }
                     else {
@@ -9313,14 +9331,14 @@ hooks$5.add('tableEditModule', {
                             treeRecords.forEach((row, i) => {
                                 if (parentRow) {
                                     if (row[parentField] !== parentRow[rowField]) {
-                                        errLog('vxe.error.errProp', [`${parentField}=${row[parentField]}`, `${parentField}=${parentRow[rowField]}`]);
+                                        errLog$6('vxe.error.errProp', [`${parentField}=${row[parentField]}`, `${parentField}=${parentRow[rowField]}`]);
                                         row[parentField] = parentRow[rowField];
                                     }
                                 }
                                 else {
                                     if (row[parentField] !== null) {
                                         if (!XEUtils.eqNull(row[parentField])) {
-                                            errLog('vxe.error.errProp', [`${parentField}=${row[parentField]}`, 'null']);
+                                            errLog$6('vxe.error.errProp', [`${parentField}=${row[parentField]}`, 'null']);
                                         }
                                         row[parentField] = null;
                                     }
@@ -9354,7 +9372,7 @@ hooks$5.add('tableEditModule', {
                             }
                         }
                         else {
-                            warnLog('vxe.error.unableInsert');
+                            warnLog$5('vxe.error.unableInsert');
                             insertTreeRow(newRecords, true);
                         }
                     }
@@ -9363,7 +9381,7 @@ hooks$5.add('tableEditModule', {
                         if (treeConfig) {
                             throw new Error(getI18n$5('vxe.error.noTree', ['insert']));
                         }
-                        errLog(getI18n$5('vxe.error.noGroup', ['insert']));
+                        errLog$6(getI18n$5('vxe.error.noGroup', ['insert']));
                     }
                     else {
                         if (treeConfig) {
@@ -9470,7 +9488,7 @@ hooks$5.add('tableEditModule', {
                 return handleInsertRowAt(records.map((item) => Object.assign({}, item, { [parentField]: parentRow[rowField] })), targetRow, isInsertNextRow);
             }
             else {
-                errLog('vxe.error.errProp', ['tree-config.transform=false', 'tree-config.transform=true']);
+                errLog$6('vxe.error.errProp', ['tree-config.transform=false', 'tree-config.transform=true']);
             }
             return Promise.resolve({ row: null, rows: [] });
         };
@@ -9749,7 +9767,7 @@ hooks$5.add('tableEditModule', {
                     }
                     else if (isRowGroupStatus) {
                         // 如果分组
-                        warnLog(getI18n$5('vxe.error.noGroup', ['remove']));
+                        warnLog$5(getI18n$5('vxe.error.noGroup', ['remove']));
                     }
                     else {
                         rows.forEach((row) => {
@@ -9900,7 +9918,7 @@ hooks$5.add('tableEditModule', {
                 return [];
             },
             getActiveRecord() {
-                warnLog('vxe.error.delFunc', ['getActiveRecord', 'getEditCell']);
+                warnLog$5('vxe.error.delFunc', ['getActiveRecord', 'getEditCell']);
                 const { editStore } = reactData;
                 const { fullAllDataRowIdData } = internalData;
                 const { args, row } = editStore.actived;
@@ -9910,7 +9928,7 @@ hooks$5.add('tableEditModule', {
                 return null;
             },
             getEditRecord() {
-                warnLog('vxe.error.delFunc', ['getEditRecord', 'getEditCell']);
+                warnLog$5('vxe.error.delFunc', ['getEditRecord', 'getEditCell']);
                 const { editStore } = reactData;
                 const { fullAllDataRowIdData } = internalData;
                 const { args, row } = editStore.actived;
@@ -9948,7 +9966,7 @@ hooks$5.add('tableEditModule', {
             },
             clearActived(row) {
                 // 即将废弃
-                warnLog('vxe.error.delFunc', ['clearActived', 'clearEdit']);
+                warnLog$5('vxe.error.delFunc', ['clearActived', 'clearEdit']);
                 return $xeTable.clearEdit(row);
             },
             /**
@@ -9969,7 +9987,7 @@ hooks$5.add('tableEditModule', {
                 return nextTick();
             },
             isActiveByRow(row) {
-                warnLog('vxe.error.delFunc', ['isActiveByRow', 'isEditByRow']);
+                warnLog$5('vxe.error.delFunc', ['isActiveByRow', 'isEditByRow']);
                 // 即将废弃
                 return $xeTable.isEditByRow(row);
             },
@@ -9982,7 +10000,7 @@ hooks$5.add('tableEditModule', {
                 return editStore.actived.row === row;
             },
             setActiveRow(row) {
-                warnLog('vxe.error.delFunc', ['setActiveRow', 'setEditRow']);
+                warnLog$5('vxe.error.delFunc', ['setActiveRow', 'setEditRow']);
                 // 即将废弃
                 return editMethods.setEditRow(row);
             },
@@ -10005,7 +10023,7 @@ hooks$5.add('tableEditModule', {
                 }, options));
             },
             setActiveCell(row, fieldOrColumn) {
-                warnLog('vxe.error.delFunc', ['setActiveCell', 'setEditCell']);
+                warnLog$5('vxe.error.delFunc', ['setActiveCell', 'setEditCell']);
                 // 即将废弃
                 return editMethods.setEditCell(row, fieldOrColumn);
             },
@@ -10205,6 +10223,7 @@ function createHtmlPage(opts, content) {
     ].join('');
 }
 
+const { warnLog: warnLog$4, errLog: errLog$5 } = createComponentLog('table');
 const { getI18n: getI18n$4, hooks: hooks$4, renderer: renderer$3 } = VxeUI;
 let htmlCellElem;
 const csvBOM = '\ufeff';
@@ -10867,7 +10886,7 @@ hooks$4.add('tableExportModule', {
         const toHtml = (opts, columns, datas) => {
             const { id, border, treeConfig, headerAlign: allHeaderAlign, align: allAlign, footerAlign: allFooterAlign, showOverflow: allColumnOverflow, showHeaderOverflow: allColumnHeaderOverflow } = props;
             const { isAllSelected, isIndeterminate } = reactData;
-            const { mergeBodyCellMaps } = internalData;
+            const { mergeBodyCellMaps, mergeFooterCellMaps } = internalData;
             const treeOpts = computeTreeOpts.value;
             const { print: isPrint, isHeader, isFooter, isColgroup, isMerge, colgroups, original } = opts;
             const allCls = 'check-all';
@@ -11005,15 +11024,34 @@ hooks$4.add('tableExportModule', {
                 const footers = getFooterData($xeTable, opts, footerTableData);
                 if (footers.length) {
                     tables.push('<tfoot>');
-                    footers.forEach((row) => {
+                    footers.forEach((row, rIndex) => {
                         tables.push(`<tr>${columns.map((column) => {
                             const footAlign = column.footerAlign || column.align || allFooterAlign || allAlign;
                             const classNames = hasEllipsis(column, 'showOverflow', allColumnOverflow) ? ['col--ellipsis'] : [];
                             const cellValue = getFooterCellValue(opts, row, column);
+                            let rowSpan = 1;
+                            let colSpan = 1;
+                            if (isMerge) {
+                                const _rowIndex = rIndex;
+                                const _columnIndex = $xeTable.getVTColumnIndex(column);
+                                const spanRest = mergeFooterCellMaps[`${_rowIndex}:${_columnIndex}`];
+                                if (spanRest) {
+                                    const { rowspan, colspan } = spanRest;
+                                    if (!rowspan || !colspan) {
+                                        return '';
+                                    }
+                                    if (rowspan > 1) {
+                                        rowSpan = rowspan;
+                                    }
+                                    if (colspan > 1) {
+                                        colSpan = colspan;
+                                    }
+                                }
+                            }
                             if (footAlign) {
                                 classNames.push(`col--${footAlign}`);
                             }
-                            return `<td class="${classNames.join(' ')}" title="${cellValue}"><div ${isPrint ? '' : `style="width: ${column.renderWidth}px"`}>${formatText(cellValue, true)}</div></td>`;
+                            return `<td class="${classNames.join(' ')}" rowspan="${rowSpan}" colspan="${colSpan}" title="${cellValue}"><div ${isPrint ? '' : `style="width: ${column.renderWidth}px"`}>${formatText(cellValue, true)}</div></td>`;
                         }).join('')}</tr>`);
                     });
                     tables.push('</tfoot>');
@@ -11239,7 +11277,7 @@ hooks$4.add('tableExportModule', {
                         $xeTable.preventEvent(null, 'event.import', { file, options, columns: tableFullColumn }, () => {
                             const reader = new FileReader();
                             reader.onerror = () => {
-                                errLog('vxe.error.notType', [type]);
+                                errLog$5('vxe.error.notType', [type]);
                                 _importReject({ status: false });
                             };
                             reader.onload = (e) => {
@@ -11251,7 +11289,7 @@ hooks$4.add('tableExportModule', {
                 }
                 else {
                     // 不支持的浏览器
-                    errLog('vxe.error.notExp');
+                    errLog$5('vxe.error.notExp');
                     _importResolve({ status: true });
                 }
             });
@@ -11336,7 +11374,7 @@ hooks$4.add('tableExportModule', {
             }, options);
             // 已废弃，参数 isAllExpand
             if (XEUtils.isBoolean(defOpts.isAllExpand)) {
-                warnLog('vxe.error.delProp', ['isAllExpand', 'isTreeAllExpanded']);
+                warnLog$4('vxe.error.delProp', ['isAllExpand', 'isTreeAllExpanded']);
                 defOpts.isTreeAllExpanded = defOpts.isAllExpand;
             }
             const types = defOpts.types || XEUtils.keys(exportOpts._typeMaps);
@@ -11483,7 +11521,7 @@ hooks$4.add('tableExportModule', {
                 }, exportOpts, options);
                 // 已废弃，参数 isAllExpand
                 if (XEUtils.isBoolean(opts.isAllExpand)) {
-                    warnLog('vxe.error.delProp', ['isAllExpand', 'isTreeAllExpanded']);
+                    warnLog$4('vxe.error.delProp', ['isAllExpand', 'isTreeAllExpanded']);
                     opts.isTreeAllExpanded = opts.isAllExpand;
                 }
                 let { filename, sheetName, type, mode, columns, original, columnFilterMethod, beforeExportMethod, includeFields, excludeFields } = opts;
@@ -11620,9 +11658,9 @@ hooks$4.add('tableExportModule', {
                 }
                 // 检查类型，如果为自定义导出，则不需要校验类型
                 if (!handleOptions.exportMethod && !XEUtils.includes(XEUtils.keys(exportOpts._typeMaps), type)) {
-                    errLog('vxe.error.notType', [type]);
+                    errLog$5('vxe.error.notType', [type]);
                     if (['xlsx', 'pdf'].includes(type)) {
-                        warnLog('vxe.error.reqPlugin', [4, 'plugin-export-xlsx']);
+                        warnLog$4('vxe.error.reqPlugin', [4, 'plugin-export-xlsx']);
                     }
                     const params = { status: false };
                     return Promise.reject(params);
@@ -11644,7 +11682,7 @@ hooks$4.add('tableExportModule', {
                     }
                     else if (mode === 'all') {
                         if (!$xeGGWrapper) {
-                            errLog('vxe.error.errProp', ['all', 'mode=current,selected']);
+                            errLog$5('vxe.error.errProp', ['all', 'mode=current,selected']);
                         }
                         if ($xeGGWrapper && !handleOptions.remote) {
                             const gridReactData = $xeGGWrapper.reactData;
@@ -11657,7 +11695,7 @@ hooks$4.add('tableExportModule', {
                             const queryAllSuccessMethods = ajax.queryAllSuccess;
                             const queryAllErrorMethods = ajax.queryAllError;
                             if (!ajaxMethods) {
-                                errLog('vxe.error.notFunc', ['proxy-config.ajax.queryAll']);
+                                errLog$5('vxe.error.notFunc', ['proxy-config.ajax.queryAll']);
                             }
                             if (ajaxMethods) {
                                 const params = {
@@ -11875,7 +11913,7 @@ hooks$4.add('tableExportModule', {
                     return;
                 }
                 if (!importConfig) {
-                    errLog('vxe.error.reqProp', ['import-config']);
+                    errLog$5('vxe.error.reqProp', ['import-config']);
                 }
                 // 处理类型
                 const typeList = types.map((value) => {
@@ -11918,7 +11956,7 @@ hooks$4.add('tableExportModule', {
                     types: XEUtils.keys(exportOpts._typeMaps)
                 }, exportOpts, options);
                 if (!props.exportConfig) {
-                    errLog('vxe.error.reqProp', ['export-config']);
+                    errLog$5('vxe.error.reqProp', ['export-config']);
                 }
                 return handleExportAndPrint(defOpts);
             },
@@ -11929,7 +11967,7 @@ hooks$4.add('tableExportModule', {
                     message: true
                 }, printOpts, options);
                 if (!props.printConfig) {
-                    errLog('vxe.error.reqProp', ['print-config']);
+                    errLog$5('vxe.error.reqProp', ['print-config']);
                 }
                 return handleExportAndPrint(defOpts, true);
             }
@@ -12457,6 +12495,7 @@ hooks$3.add('tableKeyboardModule', {
     }
 });
 
+const { warnLog: warnLog$3, errLog: errLog$4 } = createComponentLog('table');
 const { getConfig: getConfig$4, validators, hooks: hooks$2 } = VxeUI;
 /**
  * 校验规则
@@ -12793,7 +12832,7 @@ hooks$2.add('tableValidatorModule', {
              */
             fullValidate(rows, cb) {
                 if (XEUtils.isFunction(cb)) {
-                    warnLog('vxe.error.notValidators', ['fullValidate(rows, callback)', 'fullValidate(rows)']);
+                    warnLog$3('vxe.error.notValidators', ['fullValidate(rows, callback)', 'fullValidate(rows)']);
                 }
                 return beginValidate(rows, null, cb, true);
             },
@@ -12921,11 +12960,11 @@ hooks$2.add('tableValidatorModule', {
                                                 customValid = tcvMethod(validParams);
                                             }
                                             else {
-                                                errLog('vxe.error.notValidators', [validator]);
+                                                errLog$4('vxe.error.notValidators', [validator]);
                                             }
                                         }
                                         else {
-                                            errLog('vxe.error.notValidators', [validator]);
+                                            errLog$4('vxe.error.notValidators', [validator]);
                                         }
                                     }
                                     else {
@@ -13460,6 +13499,7 @@ VxeUI.hooks.add('tableCustomModule', {
     }
 });
 
+const { errLog: errLog$3 } = createComponentLog('table');
 const { getConfig: getConfig$3, renderer: renderer$2, getI18n: getI18n$3, getComponent } = VxeUI;
 const componentDefaultModelProp = 'modelValue';
 const defaultCompProps = {};
@@ -13613,7 +13653,7 @@ function getComponentOns(renderOpts, params, eFns, eventOns) {
     XEUtils.objectEach(events, (func, key) => {
         ons[getOnName(key)] = function (...args) {
             if (!XEUtils.isFunction(func)) {
-                errLog('vxe.error.errFunc', [func]);
+                errLog$3('vxe.error.errFunc', [func]);
             }
             func(params, ...args);
         };
@@ -14893,6 +14933,7 @@ renderer$2.mixin({
     // 以上已废弃
 });
 
+const { warnLog: warnLog$2, errLog: errLog$2 } = createComponentLog('table');
 const { getConfig: getConfig$2, getIcon: getIcon$1, getI18n: getI18n$2, renderer: renderer$1, formats, createEvent: createEvent$2, globalResize, interceptor, hooks: hooks$1, globalEvents: globalEvents$1, GLOBAL_EVENT_KEYS: GLOBAL_EVENT_KEYS$1, useFns: useFns$2, renderEmptyElement: renderEmptyElement$1 } = VxeUI;
 const supportMaxRow = 5e6;
 const customStorageKey = 'VXE_CUSTOM_STORE';
@@ -14911,8 +14952,10 @@ var VxeTableComponent = defineVxeComponent({
         // 使用已安装的组件，如果未安装则不渲染
         const VxeUILoadingComponent = VxeUI.getComponent('VxeLoading');
         const VxeUITooltipComponent = VxeUI.getComponent('VxeTooltip');
+        const $xeModal = inject('$xeModal', null);
         const $xeTabs = inject('$xeTabs', null);
         const $xeParentTable = inject('$xeTable', null);
+        const $xeSplitter = inject('$xeSplitter', null);
         const $xeGrid = inject('$xeGrid', null);
         const $xeGantt = inject('$xeGantt', null);
         const $xeGGWrapper = $xeGrid || $xeGantt;
@@ -15531,6 +15574,15 @@ var VxeTableComponent = defineVxeComponent({
             }
             return [];
         });
+        const combineTabsResizeFlag = computed(() => {
+            return $xeTabs ? $xeTabs.reactData.resizeFlag : null;
+        });
+        const combineModalResizeFlag = computed(() => {
+            return $xeModal ? $xeModal.reactData.resizeFlag : null;
+        });
+        const combineSplitterResizeFlag = computed(() => {
+            return $xeSplitter ? $xeSplitter.reactData.resizeFlag : null;
+        });
         const refMaps = {
             refElem,
             refTooltip,
@@ -16051,7 +16103,7 @@ var VxeTableComponent = defineVxeComponent({
                         rowspan = XEUtils.toNumber(rowspan) || 1;
                         colspan = XEUtils.toNumber(colspan) || 1;
                         if (!showCustomHeader && rowspan > 1) {
-                            errLog('vxe.error.notSupportProp', ['[table] show-custom-header=false', `rowspan=${rowspan}`, 'rowspan=1']);
+                            errLog$2('vxe.error.notSupportProp', ['[table] show-custom-header=false', `rowspan=${rowspan}`, 'rowspan=1']);
                             return;
                         }
                         if (rowspan > 1 || colspan > 1) {
@@ -16434,7 +16486,7 @@ var VxeTableComponent = defineVxeComponent({
             const isCustomAggFunc = hangleStorageDefaultValue(storageOpts.aggFunc, isAllCustom);
             if (storage && (customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort || isCustomAggGroup || isCustomAggFunc)) {
                 if (!tableId) {
-                    errLog('vxe.error.reqProp', ['id']);
+                    errLog$2('vxe.error.reqProp', ['id']);
                     return;
                 }
                 const storeData = getCustomStorageMap(tableId);
@@ -16504,16 +16556,16 @@ var VxeTableComponent = defineVxeComponent({
                 const rest = { $index: -1, _index: -1, column, colid, index, items, parent: parentColumn || null, width: 0, oLeft: 0 };
                 if (field) {
                     if (fullColFieldData[field]) {
-                        errLog('vxe.error.colRepet', ['field', field]);
+                        errLog$2('vxe.error.colRepet', ['field', field]);
                     }
                     fullColFieldData[field] = rest;
                 }
                 else {
                     if (storage && !type) {
-                        errLog('vxe.error.reqSupportProp', ['storage', `[${type ? `type=${type}` : `title=${column.getTitle()}`}]field=?`]);
+                        errLog$2('vxe.error.reqSupportProp', ['storage', `[${type ? `type=${type}` : `title=${column.getTitle()}`}]field=?`]);
                     }
                     if (columnOpts.drag && (isCrossDrag || isSelfToChildDrag)) {
-                        errLog('vxe.error.reqSupportProp', ['column-drag-config.isCrossDrag | column-drag-config.isSelfToChildDrag', `${column.getTitle() || type || ''} -> field=?`]);
+                        errLog$2('vxe.error.reqSupportProp', ['column-drag-config.isCrossDrag | column-drag-config.isSelfToChildDrag', `${column.getTitle() || type || ''} -> field=?`]);
                     }
                 }
                 if (!htmlColumn && type === 'html') {
@@ -16521,7 +16573,7 @@ var VxeTableComponent = defineVxeComponent({
                 }
                 if (treeNode) {
                     if (treeNodeColumn) {
-                        warnLog('vxe.error.colRepet', ['tree-node', treeNode]);
+                        warnLog$2('vxe.error.colRepet', ['tree-node', treeNode]);
                     }
                     if (!treeNodeColumn) {
                         treeNodeColumn = column;
@@ -16529,7 +16581,7 @@ var VxeTableComponent = defineVxeComponent({
                 }
                 if (rowGroupNode) {
                     if (treeNodeColumn) {
-                        warnLog('vxe.error.colRepet', ['row-group-node', rowGroupNode]);
+                        warnLog$2('vxe.error.colRepet', ['row-group-node', rowGroupNode]);
                     }
                     if (!rowGroupColumn) {
                         rowGroupColumn = column;
@@ -16537,7 +16589,7 @@ var VxeTableComponent = defineVxeComponent({
                 }
                 if (type === 'expand') {
                     if (expandColumn) {
-                        warnLog('vxe.error.colRepet', ['type', type]);
+                        warnLog$2('vxe.error.colRepet', ['type', type]);
                     }
                     if (!expandColumn) {
                         expandColumn = column;
@@ -16545,7 +16597,7 @@ var VxeTableComponent = defineVxeComponent({
                 }
                 if (type === 'checkbox') {
                     if (checkboxColumn) {
-                        warnLog('vxe.error.colRepet', ['type', type]);
+                        warnLog$2('vxe.error.colRepet', ['type', type]);
                     }
                     if (!checkboxColumn) {
                         checkboxColumn = column;
@@ -16553,7 +16605,7 @@ var VxeTableComponent = defineVxeComponent({
                 }
                 else if (type === 'radio') {
                     if (radioColumn) {
-                        warnLog('vxe.error.colRepet', ['type', type]);
+                        warnLog$2('vxe.error.colRepet', ['type', type]);
                     }
                     if (!radioColumn) {
                         radioColumn = column;
@@ -16563,7 +16615,7 @@ var VxeTableComponent = defineVxeComponent({
                     isAllOverflow = false;
                 }
                 if (fullColIdData[colid]) {
-                    errLog('vxe.error.colRepet', ['colId', colid]);
+                    errLog$2('vxe.error.colRepet', ['colId', colid]);
                 }
                 fullColIdData[colid] = rest;
             };
@@ -16578,13 +16630,13 @@ var VxeTableComponent = defineVxeComponent({
             }
             if (expandColumn) {
                 if (expandOpts.mode !== 'fixed' && virtualYOpts.enabled) {
-                    warnLog('vxe.error.notConflictProp', ['column.type="expand', 'virtual-y-config.enabled=false']);
+                    warnLog$2('vxe.error.notConflictProp', ['column.type="expand', 'virtual-y-config.enabled=false']);
                 }
                 if ((expandOpts.mode !== 'fixed') && mouseOpts.area) {
-                    errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
+                    errLog$2('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
                 }
                 if (expandOpts.mode !== 'inside' && (treeConfig && !treeOpts.transform)) {
-                    errLog('vxe.error.notConflictProp', ['tree-config.transform=false', 'expand-config.mode=inside']);
+                    errLog$2('vxe.error.notConflictProp', ['tree-config.transform=false', 'expand-config.mode=inside']);
                 }
                 // if (props.spanMethod) {
                 //   warnLog('vxe.error.notSupportProp', ['column.type=expand', 'span-method', 'span-method=null'])
@@ -16592,10 +16644,10 @@ var VxeTableComponent = defineVxeComponent({
             }
             if (htmlColumn) {
                 if (!columnOpts.useKey) {
-                    errLog('vxe.error.notSupportProp', ['column.type=html', 'column-config.useKey=false', 'column-config.useKey=true']);
+                    errLog$2('vxe.error.notSupportProp', ['column.type=html', 'column-config.useKey=false', 'column-config.useKey=true']);
                 }
                 if (!rowOpts.useKey) {
-                    errLog('vxe.error.notSupportProp', ['column.type=html', 'row-config.useKey=false', 'row-config.useKey=true']);
+                    errLog$2('vxe.error.notSupportProp', ['column.type=html', 'row-config.useKey=false', 'row-config.useKey=true']);
                 }
             }
             reactData.isGroup = isGroup;
@@ -18538,14 +18590,14 @@ var VxeTableComponent = defineVxeComponent({
             let treeData = [];
             let fullData = reactive(datas ? datas.slice(0) : []); // 转为响应式数据
             if (fullData.length > supportMaxRow) {
-                errLog('vxe.error.errMaxRow', [supportMaxRow]);
+                errLog$2('vxe.error.errMaxRow', [supportMaxRow]);
             }
             if (treeConfig && rowGroupList.length) {
-                errLog('vxe.error.noTree', ['aggregate-config']);
+                errLog$2('vxe.error.noTree', ['aggregate-config']);
                 return nextTick();
             }
             if (rowOpts.drag && rowGroupList.length) {
-                errLog('vxe.error.errConflicts', ['row-config.drag', 'aggregate-config']);
+                errLog$2('vxe.error.errConflicts', ['row-config.drag', 'aggregate-config']);
                 return nextTick();
             }
             let isRGroup = false;
@@ -18553,19 +18605,19 @@ var VxeTableComponent = defineVxeComponent({
                 if (transform) {
                     // 树结构自动转换
                     if (!treeOpts.rowField) {
-                        errLog('vxe.error.reqProp', ['tree-config.rowField']);
+                        errLog$2('vxe.error.reqProp', ['tree-config.rowField']);
                     }
                     if (!treeOpts.parentField) {
-                        errLog('vxe.error.reqProp', ['tree-config.parentField']);
+                        errLog$2('vxe.error.reqProp', ['tree-config.parentField']);
                     }
                     if (!childrenField) {
-                        errLog('vxe.error.reqProp', ['tree-config.childrenField']);
+                        errLog$2('vxe.error.reqProp', ['tree-config.childrenField']);
                     }
                     if (!treeOpts.mapChildrenField) {
-                        errLog('vxe.error.reqProp', ['tree-config.mapChildrenField']);
+                        errLog$2('vxe.error.reqProp', ['tree-config.mapChildrenField']);
                     }
                     if (childrenField === treeOpts.mapChildrenField) {
-                        errLog('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField']);
+                        errLog$2('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField']);
                     }
                     // fullData.forEach(row => {
                     //   if (row[treeOpts.children] && row[treeOpts.children].length) {
@@ -18646,10 +18698,10 @@ var VxeTableComponent = defineVxeComponent({
                 }
                 if (sYLoad) {
                     if (reactData.expandColumn && expandOpts.mode !== 'fixed') {
-                        errLog('vxe.error.notConflictProp', ['column.type="expand', 'expand-config.mode="fixed"']);
+                        errLog$2('vxe.error.notConflictProp', ['column.type="expand', 'expand-config.mode="fixed"']);
                     }
                     if (virtualYOpts.mode === 'scroll' && reactData.expandColumn && expandOpts.mode === 'fixed') {
-                        warnLog('vxe.error.notConflictProp', ['virtual-y-config.mode=scroll', 'expand-config.mode=inside']);
+                        warnLog$2('vxe.error.notConflictProp', ['virtual-y-config.mode=scroll', 'expand-config.mode=inside']);
                     }
                     // if (showOverflow) {
                     //   if (!rowOpts.height) {
@@ -18660,7 +18712,7 @@ var VxeTableComponent = defineVxeComponent({
                     //   }
                     // }
                     if (!(props.height || props.maxHeight)) {
-                        errLog('vxe.error.reqSupportProp', ['virtual-y-config.enabled = true', 'height | max-height']);
+                        errLog$2('vxe.error.reqSupportProp', ['virtual-y-config.enabled = true', 'height | max-height']);
                     }
                     // if (!props.showOverflow) {
                     //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
@@ -18831,7 +18883,7 @@ var VxeTableComponent = defineVxeComponent({
                         column.fixed = parentColumn.fixed;
                     }
                     if (parentColumn && (column.fixed || '') !== (parentColumn.fixed || '')) {
-                        errLog('vxe.error.groupFixed');
+                        errLog$2('vxe.error.groupFixed');
                     }
                     if (isColGroup) {
                         column.visible = !!XEUtils.findTree(column.children, (subColumn) => hasChildrenList(subColumn) ? false : subColumn.visible);
@@ -18901,10 +18953,10 @@ var VxeTableComponent = defineVxeComponent({
                 //   warnLog('vxe.error.reqProp', ['show-footer-overflow'])
                 // }
                 if (props.spanMethod) {
-                    warnLog('vxe.error.scrollErrProp', ['span-method']);
+                    warnLog$2('vxe.error.scrollErrProp', ['span-method']);
                 }
                 if (props.footerSpanMethod) {
-                    warnLog('vxe.error.scrollErrProp', ['footer-span-method']);
+                    warnLog$2('vxe.error.scrollErrProp', ['footer-span-method']);
                 }
                 if (isReset) {
                     const { visibleSize } = handleVirtualXVisible();
@@ -18957,7 +19009,7 @@ var VxeTableComponent = defineVxeComponent({
                 sortIndex++;
                 if (field) {
                     if (fullColFieldData[field]) {
-                        errLog('vxe.error.colRepet', ['field', field]);
+                        errLog$2('vxe.error.colRepet', ['field', field]);
                     }
                     fullColFieldData[field] = rest;
                 }
@@ -18981,7 +19033,7 @@ var VxeTableComponent = defineVxeComponent({
             $xeTable.handleTableData(true);
             $xeTable.handleAggregateSummaryData();
             if ((scrollXLoad || scrollYLoad) && (expandColumn && expandOpts.mode !== 'fixed')) {
-                warnLog('vxe.error.scrollErrProp', ['column.type=expand']);
+                warnLog$2('vxe.error.scrollErrProp', ['column.type=expand']);
             }
             return nextTick().then(() => {
                 if ($xeToolbar) {
@@ -18995,7 +19047,7 @@ var VxeTableComponent = defineVxeComponent({
                 }
                 const columnOpts = computeColumnOpts.value;
                 if (props.showCustomHeader && reactData.isGroup && (columnOpts.resizable || props.resizable)) {
-                    warnLog('vxe.error.notConflictProp', ['show-custom-header & colgroup', 'column-config.resizable=false']);
+                    warnLog$2('vxe.error.notConflictProp', ['show-custom-header & colgroup', 'column-config.resizable=false']);
                 }
                 reactData.isColLoading = false;
                 return handleLazyRecalculate(false, true, true);
@@ -19035,7 +19087,7 @@ var VxeTableComponent = defineVxeComponent({
             // 如果gt为0，则总是启用
             let scrollYLoad = !!virtualYOpts.enabled && virtualYOpts.gt > -1 && (virtualYOpts.gt === 0 || virtualYOpts.gt < allList.length);
             if (scrollYLoad && (treeConfig && !transform)) {
-                errLog('vxe.error.notSupportProp', ['[table] virtual-y-config.enabled=true', 'tree-config.transform=false', 'tree-config.transform=true']);
+                errLog$2('vxe.error.notSupportProp', ['[table] virtual-y-config.enabled=true', 'tree-config.transform=false', 'tree-config.transform=true']);
                 scrollYLoad = false;
             }
             reactData.scrollYLoad = scrollYLoad;
@@ -19700,7 +19752,7 @@ var VxeTableComponent = defineVxeComponent({
              * 对于某些特殊的场景，比如深层树节点元素发生变动时可能会用到
              */
             syncData() {
-                errLog('vxe.error.delFunc', ['syncData', 'getData']);
+                errLog$2('vxe.error.delFunc', ['syncData', 'getData']);
                 return nextTick().then(() => {
                     reactData.tableData = [];
                     emit('update:data', internalData.tableFullData);
@@ -19814,7 +19866,7 @@ var VxeTableComponent = defineVxeComponent({
                     reactData.tableData = tableData.slice(0);
                 }
                 else {
-                    errLog('vxe.error.reqProp', ['keep-source']);
+                    errLog$2('vxe.error.reqProp', ['keep-source']);
                 }
                 return nextTick();
             },
@@ -20009,7 +20061,7 @@ var VxeTableComponent = defineVxeComponent({
                 const { transform } = treeOpts;
                 const { handleGetRowId } = createHandleGetRowId($xeTable);
                 if (!keepSource) {
-                    errLog('vxe.error.reqProp', ['keep-source']);
+                    errLog$2('vxe.error.reqProp', ['keep-source']);
                     return nextTick();
                 }
                 let targetRows = rows;
@@ -20766,7 +20818,7 @@ var VxeTableComponent = defineVxeComponent({
                 return null;
             },
             getParentRow(rowOrRowid) {
-                warnLog('vxe.error.delFunc', ['getParentRow', 'getTreeParentRow']);
+                warnLog$2('vxe.error.delFunc', ['getParentRow', 'getTreeParentRow']);
                 return $xeTable.getTreeParentRow(rowOrRowid);
             },
             /**
@@ -20925,7 +20977,7 @@ var VxeTableComponent = defineVxeComponent({
              * 如果已关联工具栏，则会同步更新
              */
             resetColumn(options) {
-                warnLog('vxe.error.delFunc', ['resetColumn', 'resetCustom']);
+                warnLog$2('vxe.error.delFunc', ['resetColumn', 'resetCustom']);
                 return $xeTable.resetCustom(options);
             },
             /**
@@ -21871,7 +21923,7 @@ var VxeTableComponent = defineVxeComponent({
                 return nextTick();
             },
             reloadExpandContent(row) {
-                warnLog('vxe.error.delFunc', ['reloadExpandContent', 'reloadRowExpand']);
+                warnLog$2('vxe.error.delFunc', ['reloadExpandContent', 'reloadRowExpand']);
                 // 即将废弃
                 return $xeTable.reloadRowExpand(row);
             },
@@ -21977,7 +22029,7 @@ var VxeTableComponent = defineVxeComponent({
             },
             isExpandByRow(row) {
                 // 已废弃
-                warnLog('vxe.error.delFunc', ['isExpandByRow', 'isRowExpandByRow']);
+                warnLog$2('vxe.error.delFunc', ['isExpandByRow', 'isRowExpandByRow']);
                 return $xeTable.isRowExpandByRow(row);
             },
             /**
@@ -22024,7 +22076,7 @@ var VxeTableComponent = defineVxeComponent({
                 const aggregateOpts = computeAggregateOpts.value;
                 const { maxGroupSize } = aggregateOpts;
                 if (!(aggregateConfig || rowGroupConfig)) {
-                    errLog('vxe.error.reqProp', ['aggregate-config']);
+                    errLog$2('vxe.error.reqProp', ['aggregate-config']);
                     return nextTick();
                 }
                 const confList = fieldOrColumns ? (XEUtils.isArray(fieldOrColumns) ? fieldOrColumns : [fieldOrColumns]) : [];
@@ -22066,18 +22118,18 @@ var VxeTableComponent = defineVxeComponent({
             clearRowGroups() {
                 const { aggregateConfig, rowGroupConfig } = props;
                 if (!(aggregateConfig || rowGroupConfig)) {
-                    errLog('vxe.error.reqProp', ['aggregate-config']);
+                    errLog$2('vxe.error.reqProp', ['aggregate-config']);
                     return nextTick();
                 }
                 handleUpdateRowGroup([]);
                 return loadTableData(internalData.tableSynchData, false, true);
             },
             isRowGroupRecord(row) {
-                warnLog('vxe.error.delFunc', ['isRowGroupRecord', 'isAggregateRecord']);
+                warnLog$2('vxe.error.delFunc', ['isRowGroupRecord', 'isAggregateRecord']);
                 return $xeTable.isAggregateRecord(row);
             },
             isRowGroupExpandByRow(row) {
-                warnLog('vxe.error.delFunc', ['isRowGroupExpandByRow', 'isAggregateExpandByRow']);
+                warnLog$2('vxe.error.delFunc', ['isRowGroupExpandByRow', 'isAggregateExpandByRow']);
                 return $xeTable.isAggregateExpandByRow(row);
             },
             isAggregateRecord(row) {
@@ -22241,7 +22293,7 @@ var VxeTableComponent = defineVxeComponent({
                 return nextTick();
             },
             reloadTreeChilds(row) {
-                warnLog('vxe.error.delFunc', ['reloadTreeChilds', 'reloadTreeExpand']);
+                warnLog$2('vxe.error.delFunc', ['reloadTreeChilds', 'reloadTreeExpand']);
                 // 即将废弃
                 return $xeTable.reloadTreeExpand(row);
             },
@@ -22593,7 +22645,7 @@ var VxeTableComponent = defineVxeComponent({
              */
             setMergeCells(merges) {
                 if (props.spanMethod) {
-                    errLog('vxe.error.errConflicts', ['merge-cells', 'span-method']);
+                    errLog$2('vxe.error.errConflicts', ['merge-cells', 'span-method']);
                 }
                 handleBodyMerge(merges);
                 $xeTable.handleUpdateBodyMerge();
@@ -22601,7 +22653,7 @@ var VxeTableComponent = defineVxeComponent({
                     const { expandColumn } = reactData;
                     const { mergeBodyList } = internalData;
                     if (expandColumn && mergeBodyList.length) {
-                        warnLog('vxe.error.errConflicts', ['type=expand', 'merge-cells | span-method']);
+                        warnLog$2('vxe.error.errConflicts', ['type=expand', 'merge-cells | span-method']);
                     }
                     $xeTable.updateCellAreas();
                     return updateStyle();
@@ -22612,7 +22664,7 @@ var VxeTableComponent = defineVxeComponent({
              */
             removeMergeCells(merges) {
                 if (props.spanMethod) {
-                    errLog('vxe.error.errConflicts', ['merge-cells', 'span-method']);
+                    errLog$2('vxe.error.errConflicts', ['merge-cells', 'span-method']);
                 }
                 const rest = removeBodyMerges(merges);
                 $xeTable.handleUpdateBodyMerge();
@@ -22682,7 +22734,7 @@ var VxeTableComponent = defineVxeComponent({
             },
             setMergeFooterCells(merges) {
                 if (props.footerSpanMethod) {
-                    errLog('vxe.error.errConflicts', ['merge-footer-cells | merge-footer-items', 'footer-span-method']);
+                    errLog$2('vxe.error.errConflicts', ['merge-footer-cells | merge-footer-items', 'footer-span-method']);
                 }
                 handleFooterMerge(merges);
                 $xeTable.handleUpdateFooterMerge();
@@ -22696,7 +22748,7 @@ var VxeTableComponent = defineVxeComponent({
             },
             removeMergeFooterCells(merges) {
                 if (props.footerSpanMethod) {
-                    errLog('vxe.error.errConflicts', ['merge-footer-cells | merge-footer-items', 'footer-span-method']);
+                    errLog$2('vxe.error.errConflicts', ['merge-footer-cells | merge-footer-items', 'footer-span-method']);
                 }
                 const rest = removeFooterMerges(merges);
                 $xeTable.handleUpdateFooterMerge();
@@ -22843,7 +22895,7 @@ var VxeTableComponent = defineVxeComponent({
                 };
                 if (!id) {
                     if (storage) {
-                        errLog('vxe.error.reqProp', ['id']);
+                        errLog$2('vxe.error.reqProp', ['id']);
                     }
                     return storeData;
                 }
@@ -22856,7 +22908,7 @@ var VxeTableComponent = defineVxeComponent({
                 XEUtils.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
                     const colKey = column.getKey();
                     if (!colKey) {
-                        errLog('vxe.error.reqProp', [`${column.getTitle() || column.type || ''} -> column.field=?`]);
+                        errLog$2('vxe.error.reqProp', [`${column.getTitle() || column.type || ''} -> column.field=?`]);
                         return;
                     }
                     if (parentColumn) {
@@ -22957,7 +23009,7 @@ var VxeTableComponent = defineVxeComponent({
                     $xeToolbar.syncUpdate({ collectColumn: internalData.collectColumn, $table: $xeTable });
                 }
                 else {
-                    errLog('vxe.error.barUnableLink');
+                    errLog$2('vxe.error.barUnableLink');
                 }
                 return nextTick();
             }
@@ -23922,11 +23974,39 @@ var VxeTableComponent = defineVxeComponent({
             const { tooltipStore } = reactData;
             const { column, row } = params;
             const { showAll, contentMethod } = tipOpts;
-            const customContent = contentMethod ? contentMethod(params) : null;
-            const useCustom = contentMethod && !XEUtils.eqNull(customContent);
-            const content = useCustom ? customContent : XEUtils.toString(column.type === 'html' ? tipOverEl.innerText : tipOverEl.textContent).trim();
+            const cellText = XEUtils.toString(column.type === 'html' ? tipOverEl.innerText : tipOverEl.textContent).trim();
             const isOver = tipOverEl.scrollWidth > tipOverEl.clientWidth;
-            if (content && (showAll || useCustom || isOver)) {
+            let isShow = false;
+            let customContent = null;
+            let content = '';
+            if (contentMethod) {
+                customContent = contentMethod(params);
+            }
+            // 是否全部展示
+            if (showAll) {
+                // 如果为 null 默认显示
+                if (XEUtils.eqNull(customContent)) {
+                    isShow = true;
+                    content = cellText;
+                }
+                else if (customContent !== '' && customContent !== false) {
+                    // 如果为 '' | false 则不显示
+                    isShow = true;
+                    content = '' + customContent;
+                }
+            }
+            else {
+                // 如果为 null 使用默认逻辑
+                if (XEUtils.eqNull(customContent)) {
+                    isShow = isOver;
+                }
+                else if (customContent !== '' && customContent !== false) {
+                    // 如果为 '' | false 则不显示
+                    isShow = true;
+                }
+                content = cellText;
+            }
+            if (isShow && content) {
                 const tipContent = formatText(content);
                 Object.assign(tooltipStore, {
                     row,
@@ -24251,7 +24331,7 @@ var VxeTableComponent = defineVxeComponent({
                 const handleRowCache = (row, index, items, currIndex, parentRow, rowid, level, seq) => {
                     let rowRest = fullAllDataRowIdMaps[rowid];
                     if (idMaps[rowid]) {
-                        errLog('vxe.error.repeatKey', [currKeyField, rowid]);
+                        errLog$2('vxe.error.repeatKey', [currKeyField, rowid]);
                     }
                     if (!rowRest) {
                         rowRest = { row, rowid, _seq: -1, seq, index: -1, _index: -1, $index: -1, treeIndex: index, _tIndex: -1, items, parent: parentRow, level, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
@@ -24768,7 +24848,7 @@ var VxeTableComponent = defineVxeComponent({
                 }
                 if (storage && (customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort || isCustomAggGroup || isCustomAggFunc)) {
                     if (!tableId) {
-                        errLog('vxe.error.reqProp', ['id']);
+                        errLog$2('vxe.error.reqProp', ['id']);
                         return nextTick();
                     }
                     const storeData = type === 'reset'
@@ -24845,7 +24925,7 @@ var VxeTableComponent = defineVxeComponent({
                 if (!evntList.length && type === 'event.clearEdit') {
                     evntList = interceptor.get('event.clearActived');
                     if (evntList.length) {
-                        warnLog('vxe.error.delEvent', ['event.clearActived', 'event.clearEdit']);
+                        warnLog$2('vxe.error.delEvent', ['event.clearActived', 'event.clearEdit']);
                     }
                 }
                 // 兼容老版本
@@ -27716,7 +27796,7 @@ var VxeTableComponent = defineVxeComponent({
                     }
                     calcScrollbar();
                     if (isScrollXBig && mouseOpts.area) {
-                        errLog('vxe.error.notProp', ['mouse-config.area']);
+                        errLog$2('vxe.error.notProp', ['mouse-config.area']);
                     }
                     if ($xeGanttView && $xeGanttView.handleUpdateSXSpace) {
                         $xeGanttView.handleUpdateSXSpace();
@@ -27852,7 +27932,7 @@ var VxeTableComponent = defineVxeComponent({
                 reactData.isScrollYBig = isScrollYBig;
                 calcScrollbar();
                 if (isScrollYBig && mouseOpts.area) {
-                    errLog('vxe.error.notProp', ['mouse-config.area']);
+                    errLog$2('vxe.error.notProp', ['mouse-config.area']);
                 }
                 if ($xeGanttView && $xeGanttView.handleUpdateSYSpace) {
                     $xeGanttView.handleUpdateSYSpace();
@@ -28792,7 +28872,7 @@ var VxeTableComponent = defineVxeComponent({
             const { initStatus } = internalData;
             const value = props.data || [];
             if (value && value.length >= 20000) {
-                warnLog('vxe.error.errLargeData', ['loadData(data), reloadData(data)']);
+                warnLog$2('vxe.error.errLargeData', ['loadData(data), reloadData(data)']);
             }
             loadTableData(value, false, true).then(() => {
                 const { scrollXLoad, scrollYLoad, expandColumn } = reactData;
@@ -28808,7 +28888,7 @@ var VxeTableComponent = defineVxeComponent({
                 //   warnLog('vxe.error.checkProp', ['checkbox-config.checkField'])
                 // }
                 if ((scrollXLoad || scrollYLoad) && (expandColumn && expandOpts.mode !== 'fixed')) {
-                    warnLog('vxe.error.scrollErrProp', ['column.type=expand']);
+                    warnLog$2('vxe.error.scrollErrProp', ['column.type=expand']);
                 }
                 return $xeTable.recalculate();
             });
@@ -28990,11 +29070,19 @@ var VxeTableComponent = defineVxeComponent({
                 loadTableData(internalData.tableSynchData, false, true);
             }
         });
-        if ($xeTabs) {
-            watch(() => $xeTabs ? $xeTabs.reactData.resizeFlag : null, () => {
-                handleGlobalResizeEvent();
-            });
-        }
+        const layoutReFlag = ref(0);
+        watch(combineTabsResizeFlag, () => {
+            layoutReFlag.value++;
+        });
+        watch(combineModalResizeFlag, () => {
+            layoutReFlag.value++;
+        });
+        watch(combineSplitterResizeFlag, () => {
+            layoutReFlag.value++;
+        });
+        watch(layoutReFlag, () => {
+            handleGlobalResizeEvent();
+        });
         handleKeyField();
         hooks$1.forEach((options) => {
             const { setupTable } = options;
@@ -29063,21 +29151,21 @@ var VxeTableComponent = defineVxeComponent({
                 initTpImg();
             }
             if (props.rowId) {
-                warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField']);
+                warnLog$2('vxe.error.delProp', ['row-id', 'row-config.keyField']);
             }
             if (props.rowKey) {
-                warnLog('vxe.error.delProp', ['row-key', 'row-config.useKey']);
+                warnLog$2('vxe.error.delProp', ['row-key', 'row-config.useKey']);
             }
             if (props.columnKey) {
-                warnLog('vxe.error.delProp', ['column-id', 'column-config.useKey']);
+                warnLog$2('vxe.error.delProp', ['column-id', 'column-config.useKey']);
             }
             if (!(props.rowId || rowOpts.keyField) && (checkboxOpts.reserve || checkboxOpts.checkRowKeys || radioOpts.reserve || radioOpts.checkRowKey || expandOpts.expandRowKeys || treeOpts.expandRowKeys)) {
-                warnLog('vxe.error.reqProp', ['row-config.keyField']);
+                warnLog$2('vxe.error.reqProp', ['row-config.keyField']);
             }
             if (editConfig) {
                 if (!keepSource) {
                     if (editOpts.showStatus || editOpts.showUpdateStatus || editOpts.showInsertStatus) {
-                        warnLog('vxe.error.reqSupportProp', ['edit-config.showStatus | showUpdateStatus | showInsertStatus', 'keep-source']);
+                        warnLog$2('vxe.error.reqSupportProp', ['edit-config.showStatus | showUpdateStatus | showInsertStatus', 'keep-source']);
                     }
                     // if (keyboardOpts.isUndoRedo) {
                     //   warnLog('vxe.error.reqSupportProp', ['keyboard-config.isUndoRedo', 'keep-source'])
@@ -29088,36 +29176,36 @@ var VxeTableComponent = defineVxeComponent({
             //   warnLog('vxe.error.reqProp', ['show-overflow'])
             // }
             if (treeConfig && !treeOpts.transform && props.stripe) {
-                warnLog('vxe.error.noTree', ['stripe']);
+                warnLog$2('vxe.error.noTree', ['stripe']);
             }
             if (treeConfig && !treeOpts.transform) {
                 if (sortOpts.isDeep) {
-                    warnLog('vxe.error.reqSupportProp', ['transform=false', 'sort-config.isDeep=false']);
+                    warnLog$2('vxe.error.reqSupportProp', ['transform=false', 'sort-config.isDeep=false']);
                 }
                 if (filterOpts.isDeep) {
-                    warnLog('vxe.error.reqSupportProp', ['transform=false', 'filter-config.isDeep=false']);
+                    warnLog$2('vxe.error.reqSupportProp', ['transform=false', 'filter-config.isDeep=false']);
                 }
             }
             if (props.showFooter && !(props.footerMethod || props.footerData)) {
-                warnLog('vxe.error.reqProp', ['footer-data | footer-method']);
+                warnLog$2('vxe.error.reqProp', ['footer-data | footer-method']);
             }
             if (rowOpts.height) {
-                warnLog('vxe.error.delProp', ['row-config.height', 'cell-config.height']);
+                warnLog$2('vxe.error.delProp', ['row-config.height', 'cell-config.height']);
             }
             if (props.highlightCurrentRow) {
-                warnLog('vxe.error.delProp', ['highlight-current-row', 'row-config.isCurrent']);
+                warnLog$2('vxe.error.delProp', ['highlight-current-row', 'row-config.isCurrent']);
             }
             if (props.highlightHoverRow) {
-                warnLog('vxe.error.delProp', ['highlight-hover-row', 'row-config.isHover']);
+                warnLog$2('vxe.error.delProp', ['highlight-hover-row', 'row-config.isHover']);
             }
             if (props.highlightCurrentColumn) {
-                warnLog('vxe.error.delProp', ['highlight-current-column', 'column-config.isCurrent']);
+                warnLog$2('vxe.error.delProp', ['highlight-current-column', 'column-config.isCurrent']);
             }
             if (props.highlightHoverColumn) {
-                warnLog('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover']);
+                warnLog$2('vxe.error.delProp', ['highlight-hover-column', 'column-config.isHover']);
             }
             if (props.resizable) {
-                warnLog('vxe.error.delProp', ['resizable', 'column-config.resizable']);
+                warnLog$2('vxe.error.delProp', ['resizable', 'column-config.resizable']);
             }
             // if (props.virtualXConfig && props.scrollX) {
             //   warnLog('vxe.error.notSupportProp', ['virtual-x-config', 'scroll-x', 'scroll-x=null'])
@@ -29126,7 +29214,7 @@ var VxeTableComponent = defineVxeComponent({
             //   warnLog('vxe.error.notSupportProp', ['virtual-y-config', 'scroll-y', 'scroll-y=null'])
             // }
             if (props.aggregateConfig && props.rowGroupConfig) {
-                warnLog('vxe.error.notSupportProp', ['aggregate-config', 'row-group-config', 'row-group-config=null']);
+                warnLog$2('vxe.error.notSupportProp', ['aggregate-config', 'row-group-config', 'row-group-config=null']);
             }
             // if (props.scrollY) {
             //   warnLog('vxe.error.delProp', ['scroll-y', 'virtual-y-config'])
@@ -29136,108 +29224,108 @@ var VxeTableComponent = defineVxeComponent({
             // }
             // 检查导入导出类型，如果自定义导入导出方法，则不校验类型
             if (importConfig && importOpts.types && !importOpts.importMethod && !XEUtils.includeArrays(XEUtils.keys(importOpts._typeMaps), importOpts.types)) {
-                warnLog('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter((type) => XEUtils.includes(XEUtils.keys(importOpts._typeMaps), type)).join(',') || XEUtils.keys(importOpts._typeMaps).join(',')]);
+                warnLog$2('vxe.error.errProp', [`export-config.types=${importOpts.types.join(',')}`, importOpts.types.filter((type) => XEUtils.includes(XEUtils.keys(importOpts._typeMaps), type)).join(',') || XEUtils.keys(importOpts._typeMaps).join(',')]);
             }
             if (exportConfig && exportOpts.types && !exportOpts.exportMethod && !XEUtils.includeArrays(XEUtils.keys(exportOpts._typeMaps), exportOpts.types)) {
-                warnLog('vxe.error.errProp', [`export-config.types=${exportOpts.types.join(',')}`, exportOpts.types.filter((type) => XEUtils.includes(XEUtils.keys(exportOpts._typeMaps), type)).join(',') || XEUtils.keys(exportOpts._typeMaps).join(',')]);
+                warnLog$2('vxe.error.errProp', [`export-config.types=${exportOpts.types.join(',')}`, exportOpts.types.filter((type) => XEUtils.includes(XEUtils.keys(exportOpts._typeMaps), type)).join(',') || XEUtils.keys(exportOpts._typeMaps).join(',')]);
             }
             if (exportConfig && XEUtils.isBoolean(exportOpts.isAllExpand)) {
-                warnLog('vxe.error.delProp', ['isAllExpand', 'isTreeAllExpanded']);
+                warnLog$2('vxe.error.delProp', ['isAllExpand', 'isTreeAllExpanded']);
             }
             if (!props.id) {
                 if ((props.customConfig ? isEnableConf(customOpts) : customOpts.enabled) && customOpts.storage) {
-                    errLog('vxe.error.reqProp', ['id']);
+                    errLog$2('vxe.error.reqProp', ['id']);
                 }
             }
             if (props.treeConfig && checkboxOpts.range) {
-                errLog('vxe.error.noTree', ['checkbox-config.range']);
+                errLog$2('vxe.error.noTree', ['checkbox-config.range']);
             }
             if (rowOpts.height && !props.showOverflow) {
-                warnLog('vxe.error.notProp', ['table.show-overflow']);
+                warnLog$2('vxe.error.notProp', ['table.show-overflow']);
             }
             if (!$xeTable.triggerCelllAreaMnEvent) {
                 if (props.areaConfig) {
-                    warnLog('vxe.error.notProp', ['area-config']);
+                    warnLog$2('vxe.error.notProp', ['area-config']);
                 }
                 if (props.clipConfig) {
-                    warnLog('vxe.error.notProp', ['clip-config']);
+                    warnLog$2('vxe.error.notProp', ['clip-config']);
                 }
                 if (props.fnrConfig) {
-                    warnLog('vxe.error.notProp', ['fnr-config']);
+                    warnLog$2('vxe.error.notProp', ['fnr-config']);
                 }
                 if (mouseOpts.area) {
-                    errLog('vxe.error.notProp', ['mouse-config.area']);
+                    errLog$2('vxe.error.notProp', ['mouse-config.area']);
                     return;
                 }
                 if (mouseOpts.area && areaOpts.selectCellByHeader && columnOpts.drag && columnDragOpts.trigger === 'cell') {
-                    errLog('vxe.error.notSupportProp', ['area-config.selectCellByHeader & column-config.drag', 'column-drag-config.trigger=cell', 'column-drag-config.trigger=default | area-config.selectCellByHeader=false']);
+                    errLog$2('vxe.error.notSupportProp', ['area-config.selectCellByHeader & column-config.drag', 'column-drag-config.trigger=cell', 'column-drag-config.trigger=default | area-config.selectCellByHeader=false']);
                 }
             }
             if (!$xeTable.handlePivotTableAggData) {
                 if (customOpts.allowGroup) {
-                    errLog('vxe.error.notProp', ['custom-config.allowGroup']);
+                    errLog$2('vxe.error.notProp', ['custom-config.allowGroup']);
                     return;
                 }
                 if (customOpts.allowValues) {
-                    errLog('vxe.error.notProp', ['custom-config.allowValues']);
+                    errLog$2('vxe.error.notProp', ['custom-config.allowValues']);
                     return;
                 }
             }
             if (treeConfig && rowOpts.drag && !treeOpts.transform) {
-                errLog('vxe.error.notSupportProp', ['row-config.drag', 'tree-config.transform=false', 'tree-config.transform=true']);
+                errLog$2('vxe.error.notSupportProp', ['row-config.drag', 'tree-config.transform=false', 'tree-config.transform=true']);
             }
             if (treeConfig && rowDragOpts.isCrossTableDrag && !rowDragOpts.isCrossDrag) {
-                errLog('vxe.error.reqSupportProp', ['tree-config & row-drag-config.isCrossTableDrag', 'row-drag-config.isCrossDrag']);
+                errLog$2('vxe.error.reqSupportProp', ['tree-config & row-drag-config.isCrossTableDrag', 'row-drag-config.isCrossDrag']);
             }
             if (props.dragConfig) {
-                warnLog('vxe.error.delProp', ['drag-config', 'row-drag-config']);
+                warnLog$2('vxe.error.delProp', ['drag-config', 'row-drag-config']);
             }
             if (props.rowGroupConfig) {
-                warnLog('vxe.error.delProp', ['row-group-config', 'aggregate-config']);
+                warnLog$2('vxe.error.delProp', ['row-group-config', 'aggregate-config']);
             }
             if (aggregateOpts.countFields) {
-                warnLog('vxe.error.delProp', ['row-group-config.countFields', 'column.agg-func']);
+                warnLog$2('vxe.error.delProp', ['row-group-config.countFields', 'column.agg-func']);
             }
             if (aggregateOpts.aggregateMethod) {
-                warnLog('vxe.error.delProp', ['row-group-config.aggregateMethod', 'aggregate-config.calcValuesMethod']);
+                warnLog$2('vxe.error.delProp', ['row-group-config.aggregateMethod', 'aggregate-config.calcValuesMethod']);
             }
             if (aggregateOpts.countMethod) {
-                warnLog('vxe.error.delProp', ['aggregate-config.countMethod', 'aggregate-config.calcValuesMethod']);
+                warnLog$2('vxe.error.delProp', ['aggregate-config.countMethod', 'aggregate-config.calcValuesMethod']);
             }
             if (props.treeConfig && treeOpts.children) {
-                warnLog('vxe.error.delProp', ['tree-config.children', 'tree-config.childrenField']);
+                warnLog$2('vxe.error.delProp', ['tree-config.children', 'tree-config.childrenField']);
             }
             if (props.treeConfig && treeOpts.line) {
-                warnLog('vxe.error.delProp', ['tree-config.line', 'tree-config.showLine']);
+                warnLog$2('vxe.error.delProp', ['tree-config.line', 'tree-config.showLine']);
             }
             if (mouseOpts.area && mouseOpts.selected) {
-                warnLog('vxe.error.errConflicts', ['mouse-config.area', 'mouse-config.selected']);
+                warnLog$2('vxe.error.errConflicts', ['mouse-config.area', 'mouse-config.selected']);
             }
             if (mouseOpts.area && (props.treeConfig && !treeOpts.transform)) {
-                errLog('vxe.error.notSupportProp', ['mouse-config.area', 'tree-config.transform=false', 'tree-config.transform=true']);
+                errLog$2('vxe.error.notSupportProp', ['mouse-config.area', 'tree-config.transform=false', 'tree-config.transform=true']);
             }
             if (props.editConfig && editOpts.activeMethod) {
-                warnLog('vxe.error.delProp', ['edit-config.activeMethod', 'edit-config.beforeEditMethod']);
+                warnLog$2('vxe.error.delProp', ['edit-config.activeMethod', 'edit-config.beforeEditMethod']);
             }
             if (checkboxOpts.halfField) {
-                warnLog('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField']);
+                warnLog$2('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField']);
             }
             if (props.editConfig && isEnableConf(editOpts) && props.editRules && (minHeight === 0 || minHeight === '0')) {
-                warnLog('vxe.error.reqSupportProp', ['edit-config & edit-rules', 'min-height']);
+                warnLog$2('vxe.error.reqSupportProp', ['edit-config & edit-rules', 'min-height']);
             }
             if (treeConfig) {
                 XEUtils.arrayEach(['rowField', 'parentField', 'childrenField', 'hasChildField', 'mapChildrenField'], key => {
                     const val = treeOpts[key];
                     if (val && val.indexOf('.') > -1) {
-                        errLog('vxe.error.errProp', [`${key}=${val}`, `${key}=${val.split('.')[0]}`]);
+                        errLog$2('vxe.error.errProp', [`${key}=${val}`, `${key}=${val.split('.')[0]}`]);
                     }
                 });
             }
             if (rowOpts.currentMethod) {
-                warnLog('vxe.error.delProp', ['row-config.currentMethod', 'current-row-config.beforeSelectMethod']);
+                warnLog$2('vxe.error.delProp', ['row-config.currentMethod', 'current-row-config.beforeSelectMethod']);
             }
             if (columnOpts.currentMethod) {
-                warnLog('vxe.error.delProp', ['row-config.currentMethod', 'current-column-config.beforeSelectMethod']);
+                warnLog$2('vxe.error.delProp', ['row-config.currentMethod', 'current-column-config.beforeSelectMethod']);
             }
             // if ((rowOpts.isCurrent || highlightCurrentRow) && props.keyboardConfig && keyboardOpts.isArrow && !XEUtils.isBoolean(currentRowOpts.isFollowSelected)) {
             //   warnLog('vxe.error.notConflictProp', ['row-config.isCurrent & keyboard-config.isArrow', 'current-row-config.isFollowSelected'])
@@ -29359,8 +29447,8 @@ var VxeTableComponent = defineVxeComponent({
         nextTick(() => {
             if (props.loading) {
                 if (!VxeUILoadingComponent && !slots.loading) {
-                    errLog('vxe.error.errProp', ['loading=true', 'loading=false | <template #loading>...</template>']);
-                    errLog('vxe.error.reqComp', ['vxe-loading']);
+                    errLog$2('vxe.error.errProp', ['loading=true', 'loading=false | <template #loading>...</template>']);
+                    errLog$2('vxe.error.reqComp', ['vxe-loading']);
                 }
             }
             if ((props.showOverflow === true || props.showOverflow === 'tooltip') ||
@@ -29369,24 +29457,24 @@ var VxeTableComponent = defineVxeComponent({
                 props.tooltipConfig || props.editRules) {
                 if (!VxeUITooltipComponent) {
                     if (props.showOverflow === true) {
-                        errLog('vxe.error.errProp', ['show-overflow=true', 'show-overflow=title']);
+                        errLog$2('vxe.error.errProp', ['show-overflow=true', 'show-overflow=title']);
                     }
                     if (props.showOverflow === 'tooltip') {
-                        errLog('vxe.error.errProp', ['show-overflow=tooltip', 'show-overflow=title']);
+                        errLog$2('vxe.error.errProp', ['show-overflow=tooltip', 'show-overflow=title']);
                     }
                     if (props.showHeaderOverflow === true) {
-                        errLog('vxe.error.errProp', ['show-header-overflow=true', 'show-header-overflow=title']);
+                        errLog$2('vxe.error.errProp', ['show-header-overflow=true', 'show-header-overflow=title']);
                     }
                     if (props.showHeaderOverflow === 'tooltip') {
-                        errLog('vxe.error.errProp', ['show-header-overflow=tooltip', 'show-header-overflow=title']);
+                        errLog$2('vxe.error.errProp', ['show-header-overflow=tooltip', 'show-header-overflow=title']);
                     }
                     if (props.showFooterOverflow === true) {
-                        errLog('vxe.error.errProp', ['show-footer-overflow=true', 'show-footer-overflow=title']);
+                        errLog$2('vxe.error.errProp', ['show-footer-overflow=true', 'show-footer-overflow=title']);
                     }
                     if (props.showFooterOverflow === 'tooltip') {
-                        errLog('vxe.error.errProp', ['show-footer-overflow=tooltip', 'show-footer-overflow=title']);
+                        errLog$2('vxe.error.errProp', ['show-footer-overflow=tooltip', 'show-footer-overflow=title']);
                     }
-                    errLog('vxe.error.reqComp', ['vxe-tooltip']);
+                    errLog$2('vxe.error.reqComp', ['vxe-tooltip']);
                 }
             }
         });
@@ -29400,6 +29488,7 @@ var VxeTableComponent = defineVxeComponent({
     }
 });
 
+const { warnLog: warnLog$1, errLog: errLog$1 } = createComponentLog('toolbar');
 const { getConfig: getConfig$1, getIcon, getI18n: getI18n$1, renderer, commands: commands$1, createEvent: createEvent$1, useFns: useFns$1 } = VxeUI;
 function createReactData$1() {
     return {
@@ -29514,7 +29603,7 @@ var VxeToolbarComponent = defineVxeComponent({
             if ($table) {
                 return true;
             }
-            errLog('vxe.error.barUnableLink');
+            errLog$1('vxe.error.barUnableLink');
         };
         const handleClickSettingEvent = ({ $event }) => {
             const { connectTable } = internalData;
@@ -29574,7 +29663,7 @@ var VxeToolbarComponent = defineVxeComponent({
                 $xeGGWrapper.triggerZoomEvent($event);
             }
             else {
-                warnLog('vxe.error.notProp', ['[toolbar] zoom']);
+                warnLog$1('vxe.error.notProp', ['zoom']);
             }
         };
         const importEvent = () => {
@@ -29684,7 +29773,7 @@ var VxeToolbarComponent = defineVxeComponent({
                                 tCommandMethod(params);
                             }
                             else {
-                                errLog('vxe.error.notCommands', [`[toolbar] ${code}`]);
+                                errLog$1('vxe.error.notCommands', [code]);
                             }
                         }
                         $xeToolbar.dispatchEvent('button-click', params, $event);
@@ -29711,7 +29800,7 @@ var VxeToolbarComponent = defineVxeComponent({
                                 tCommandMethod(params);
                             }
                             else {
-                                errLog('vxe.error.notCommands', [`[toolbar] ${code}`]);
+                                errLog$1('vxe.error.notCommands', [code]);
                             }
                         }
                         $xeToolbar.dispatchEvent('tool-click', params, $event);
@@ -29964,42 +30053,42 @@ var VxeToolbarComponent = defineVxeComponent({
             const refreshOpts = computeRefreshOpts.value;
             const queryMethod = refreshOpts.queryMethod || refreshOpts.query;
             if (props.refresh && !$xeGGWrapper && !queryMethod) {
-                warnLog('vxe.error.notFunc', ['[toolbar] queryMethod']);
+                warnLog$1('vxe.error.notFunc', ['queryMethod']);
             }
             if (XEUtils.isPlainObject(props.custom)) {
-                warnLog('vxe.error.delProp', ['[toolbar] custom={...}', 'custom=boolean & custom-options={...}']);
+                warnLog$1('vxe.error.delProp', ['custom={...}', 'custom=boolean & custom-options={...}']);
             }
             if (XEUtils.isPlainObject(props.print)) {
-                warnLog('vxe.error.delProp', ['[toolbar] print={...}', 'print=boolean & print-options={...}']);
+                warnLog$1('vxe.error.delProp', ['print={...}', 'print=boolean & print-options={...}']);
             }
             if (XEUtils.isPlainObject(props.export)) {
-                warnLog('vxe.error.delProp', ['[toolbar] export={...}', 'export=boolean & export-options={...}']);
+                warnLog$1('vxe.error.delProp', ['export={...}', 'export=boolean & export-options={...}']);
             }
             if (XEUtils.isPlainObject(props.import)) {
-                warnLog('vxe.error.delProp', ['[toolbar] import={...}', 'import=boolean & import-options={...}']);
+                warnLog$1('vxe.error.delProp', ['import={...}', 'import=boolean & import-options={...}']);
             }
             if (XEUtils.isPlainObject(props.refresh)) {
-                warnLog('vxe.error.delProp', ['[toolbar] refresh={...}', 'refresh=boolean & refresh-options={...}']);
+                warnLog$1('vxe.error.delProp', ['refresh={...}', 'refresh=boolean & refresh-options={...}']);
             }
             if (XEUtils.isPlainObject(props.refresh)) {
-                warnLog('vxe.error.delProp', ['[toolbar] zoom={...}', 'zoom=boolean & zoom-options={...}']);
+                warnLog$1('vxe.error.delProp', ['zoom={...}', 'zoom=boolean & zoom-options={...}']);
             }
             const customOpts = computeCustomOpts.value;
             if (customOpts.isFooter) {
-                warnLog('vxe.error.delProp', ['[toolbar] toolbar.custom.isFooter', 'table.custom-config.showFooter']);
+                warnLog$1('vxe.error.delProp', ['toolbar.custom.isFooter', 'table.custom-config.showFooter']);
             }
             if (customOpts.showFooter) {
-                warnLog('vxe.error.delProp', ['[toolbar] toolbar.custom.showFooter', 'table.custom-config.showFooter']);
+                warnLog$1('vxe.error.delProp', ['toolbar.custom.showFooter', 'table.custom-config.showFooter']);
             }
             if (customOpts.immediate) {
-                warnLog('vxe.error.delProp', ['[toolbar] toolbar.custom.immediate', 'table.custom-config.immediate']);
+                warnLog$1('vxe.error.delProp', ['toolbar.custom.immediate', 'table.custom-config.immediate']);
             }
             if (customOpts.trigger) {
-                warnLog('vxe.error.delProp', ['[toolbar] toolbar.custom.trigger', 'table.custom-config.trigger']);
+                warnLog$1('vxe.error.delProp', ['toolbar.custom.trigger', 'table.custom-config.trigger']);
             }
             if (props.refresh || props.import || props.export || props.print || props.zoom) {
                 if (!VxeUIButtonComponent) {
-                    errLog('vxe.error.reqComp', ['vxe-button']);
+                    errLog$1('vxe.error.reqComp', ['vxe-button']);
                 }
             }
         });
@@ -30014,6 +30103,7 @@ var VxeToolbarComponent = defineVxeComponent({
     }
 });
 
+const { warnLog, errLog } = createComponentLog('grid');
 const { getConfig, getI18n, commands, hooks, useFns, createEvent, globalEvents, GLOBAL_EVENT_KEYS, renderEmptyElement } = VxeUI;
 const tableComponentPropKeys = Object.keys(tableProps);
 const tableComponentMethodKeys = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'setRow', 'createData', 'createRow', 'revertData', 'clearData', 'isRemoveByRow', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getFullColumns', 'getData', 'getCheckboxRecords', 'getParentRow', 'getTreeRowChildren', 'getTreeRowLevel', 'getTreeParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'getFullData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'recalcRowHeight', 'setRowHeightConf', 'getRowHeightConf', 'setRowHeight', 'getRowHeight', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'setCheckboxRowKey', 'isCheckedByCheckboxRow', 'isCheckedByCheckboxRowKey', 'isIndeterminateByCheckboxRow', 'isIndeterminateByCheckboxRowKey', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'isCheckedByRadioRowKey', 'setRadioRow', 'setRadioRowKey', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'setPendingRow', 'togglePendingRow', 'hasPendingByRow', 'isPendingByRow', 'getPendingRecords', 'clearPendingRow', 'setFilterByEvent', 'sort', 'setSort', 'setSortByEvent', 'clearSort', 'clearSortByEvent', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'clearFilterByEvent', 'isActiveFilterByColumn', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'isRowExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'getScrollData', 'scrollTo', 'scrollToStartRow', 'scrollToEndRow', 'scrollToRow', 'scrollToStartColumn', 'scrollToEndColumn', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'setMergeHeaderCells', 'removeMergeHeaderCells', 'getMergeHeaderCells', 'clearMergeHeaderCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'setCustomStoreData', 'getCustomStoreData', 'setRowGroupExpand', 'setRowGroupExpandByField', 'setAllRowGroupExpand', 'clearRowGroupExpand', 'isRowGroupExpandByRow', 'isRowGroupRecord', 'isAggregateRecord', 'isAggregateExpandByRow', 'getAggregateContentByRow', 'getAggregateRowChildren', 'setRowGroups', 'clearRowGroups', 'openTooltip', 'moveColumnTo', 'moveRowTo', 'getCellLabel', 'updateCellLabel', 'clearFormatterCache', 'getFooterCellLabel', 'updateFooterCellLabel', 'clearFooterFormatterCache', 'undo', 'redo', 'effectCellData', 'getCellElement', 'focus', 'blur', 'connect', 'connectToolbar'];
@@ -30488,7 +30578,7 @@ var VxeGridComponent = defineVxeComponent({
                         return slots[funcSlot];
                     }
                     else {
-                        errLog('vxe.error.notSlot', [`[grid] ${funcSlot}`]);
+                        errLog('vxe.error.notSlot', [funcSlot]);
                     }
                 }
                 else {
@@ -30506,7 +30596,7 @@ var VxeGridComponent = defineVxeComponent({
                             slotConf[slotKey] = slots[slotFunc];
                         }
                         else {
-                            errLog('vxe.error.notSlot', [`[grid] ${slotFunc}`]);
+                            errLog('vxe.error.notSlot', [slotFunc]);
                         }
                     }
                     else {
@@ -30768,7 +30858,7 @@ var VxeGridComponent = defineVxeComponent({
                         childVNs.push(renderPager());
                         break;
                     default:
-                        errLog('vxe.error.notProp', [`[grid] layouts -> ${key}`]);
+                        errLog('vxe.error.notProp', [`layouts -> ${key}`]);
                         break;
                 }
             });
@@ -31105,7 +31195,7 @@ var VxeGridComponent = defineVxeComponent({
                             });
                         }
                         else {
-                            errLog('vxe.error.notFunc', ['[grid] proxy-config.ajax.query']);
+                            errLog('vxe.error.notFunc', ['proxy-config.ajax.query']);
                         }
                         break;
                     }
@@ -31145,7 +31235,7 @@ var VxeGridComponent = defineVxeComponent({
                             });
                         }
                         else {
-                            errLog('vxe.error.notFunc', ['[grid] proxy-config.ajax.queryFooter']);
+                            errLog('vxe.error.notFunc', ['proxy-config.ajax.queryFooter']);
                         }
                         break;
                     }
@@ -31219,7 +31309,7 @@ var VxeGridComponent = defineVxeComponent({
                             }
                         }
                         else {
-                            errLog('vxe.error.notFunc', ['[grid] proxy-config.ajax.delete']);
+                            errLog('vxe.error.notFunc', ['proxy-config.ajax.delete']);
                         }
                         break;
                     }
@@ -31306,7 +31396,7 @@ var VxeGridComponent = defineVxeComponent({
                             });
                         }
                         else {
-                            errLog('vxe.error.notFunc', ['[grid] proxy-config.ajax.save']);
+                            errLog('vxe.error.notFunc', ['proxy-config.ajax.save']);
                         }
                         break;
                     }
@@ -31318,7 +31408,7 @@ var VxeGridComponent = defineVxeComponent({
                                 tCommandMethod({ code, button, $grid: $xeGrid, $table: $xeTable, $gantt: null }, ...args);
                             }
                             else {
-                                errLog('vxe.error.notCommands', [`[grid] ${code}`]);
+                                errLog('vxe.error.notCommands', [code]);
                             }
                         }
                     }
@@ -31556,7 +31646,7 @@ var VxeGridComponent = defineVxeComponent({
                         XEUtils.each(column.slots, (func) => {
                             if (!XEUtils.isFunction(func)) {
                                 if (!slots[func]) {
-                                    errLog('vxe.error.notSlot', [`[grid] ${func}`]);
+                                    errLog('vxe.error.notSlot', [func]);
                                 }
                             }
                         });
@@ -31643,7 +31733,7 @@ var VxeGridComponent = defineVxeComponent({
                 //   errLog('vxe.error.errConflicts', ['[grid] data', 'proxy-config'])
                 // }
                 if (proxyOpts.props) {
-                    warnLog('vxe.error.delProp', ['[grid] proxy-config.props', 'proxy-config.response']);
+                    warnLog('vxe.error.delProp', ['proxy-config.props', 'proxy-config.response']);
                 }
                 if (columns && columns.length) {
                     $xeGrid.loadColumn(columns);
@@ -32660,7 +32750,7 @@ var VxeUITableExport = /*#__PURE__*/Object.freeze({
     t: t,
     use: use,
     validators: validators$1,
-    version: version$1
+    version: version
 });
 
-export { Colgroup, Column, Grid, Table, Toolbar, VXETable, VxeColgroup, VxeColumn, VxeGrid, VxeTable, VxeToolbar, _t, clipboard, commands$2 as commands, config, VxeUITableExport as default, formats$2 as formats, getConfig$8 as getConfig, getI18n$e as getI18n, getIcon$8 as getIcon, getTheme, globalEvents$3 as globalEvents, globalResize$1 as globalResize, hooks$8 as hooks, install, interceptor$1 as interceptor, log$1 as log, menus$1 as menus, modal, print, readFile, renderer$c as renderer, saveFile, setConfig, setI18n, setIcon, setLanguage, setTheme, setup, t, use, validators$1 as validators, version$1 as version };
+export { Colgroup, Column, Grid, Table, Toolbar, VXETable, VxeColgroup, VxeColumn, VxeGrid, VxeTable, VxeToolbar, _t, clipboard, commands$2 as commands, config, VxeUITableExport as default, formats$2 as formats, getConfig$8 as getConfig, getI18n$e as getI18n, getIcon$8 as getIcon, getTheme, globalEvents$3 as globalEvents, globalResize$1 as globalResize, hooks$8 as hooks, install, interceptor$1 as interceptor, log$1 as log, menus$1 as menus, modal, print, readFile, renderer$c as renderer, saveFile, setConfig, setI18n, setIcon, setLanguage, setTheme, setup, t, use, validators$1 as validators, version };