vxe-table 4.20.7 → 4.20.9

package/es/table/module/export/hook.js

@@ -1285,7 +1285,7 @@ hooks.add('tableExportModule', {
                 const isColGroup = column.children && column.children.length > 0;
                 let isChecked = false;
                 const isExtraChecked = extraFdMaps[column.field];
-                if (columns && columns.length) {
+                if (columns) {
                     isChecked = handleFilterColumns(defOpts, column, columns);
                 }
                 else if (excludeFields || includeFields) {
@@ -1438,7 +1438,7 @@ hooks.add('tableExportModule', {
                 }
                 let isCustomCol = false;
                 let customCols = [];
-                if (columns && columns.length) {
+                if (columns) {
                     isCustomCol = true;
                     customCols = XEUtils.searchTree(columns, () => true, { children: 'children', mapChildren: 'childNodes', original: true });
                 }
@@ -1447,7 +1447,7 @@ hooks.add('tableExportModule', {
                         const isColGroup = column.children && column.children.length > 0;
                         let isChecked = false;
                         const isExtraChecked = extraFdMaps[column.field];
-                        if (columns && columns.length) {
+                        if (columns) {
                             isChecked = handleFilterColumns(opts, column, columns);
                         }
                         else if (excludeFields || includeFields) {

package/es/table/src/body.js

@@ -137,9 +137,9 @@ export default defineVxeComponent({
             let fixedHiddenColumn = overflowX && (fixedType ? column.fixed !== fixedType : !!column.fixed);
             const isCellPadding = XEUtils.eqNull(padding) ? (allPadding === null ? cellOpts.padding : allPadding) : padding;
             const cellOverflow = XEUtils.eqNull(showOverflow) ? allShowOverflow : showOverflow;
-            const showEllipsis = cellOverflow === 'ellipsis';
-            const showTitle = cellOverflow === 'title';
-            const showTooltip = cellOverflow === true ? tooltipOpts.mode === 'tooltip' : cellOverflow === 'tooltip';
+            const showEllipsis = (cellOverflow === true ? tooltipOpts.mode : cellOverflow) === 'ellipsis';
+            const showTitle = (cellOverflow === true ? tooltipOpts.mode : cellOverflow) === 'title';
+            const showTooltip = (cellOverflow === true ? tooltipOpts.mode : cellOverflow) === 'tooltip';
             const hasEllipsis = isAllOverflow || showTitle || showTooltip || showEllipsis;
             const showResizable = (XEUtils.isBoolean(column.resizable) ? column.resizable : (columnOpts.resizable || allResizable));
             const isCsHeight = !!customCellHeight;

package/es/table/src/cell.js

@@ -169,8 +169,8 @@ function renderTitleContent(params, content) {
     const headerTooltipOpts = computeHeaderTooltipOpts.value;
     const showAllTip = headerTooltipOpts.showAll;
     const headOverflow = XEUtils.eqNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
-    const showTitle = headOverflow === 'title';
-    const showTooltip = headOverflow === true || headOverflow === 'tooltip';
+    const showTitle = (headOverflow === true ? headerTooltipOpts.mode : headOverflow) === 'title';
+    const showTooltip = (headOverflow === true ? headerTooltipOpts.mode : headOverflow) === 'tooltip';
     const ons = {};
     if (showTitle || showTooltip || showAllTip) {
         ons.onMouseenter = (evnt) => {

package/es/table/src/footer.js

@@ -64,9 +64,9 @@ export default defineVxeComponent({
                 const isPadding = XEUtils.isBoolean(footerCellOpts.padding) ? footerCellOpts.padding : cellOpts.padding;
                 const footOverflow = XEUtils.eqNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow;
                 const footAlign = footerAlign || (compConf ? compConf.tableFooterCellAlign : '') || allFooterAlign || align || (compConf ? compConf.tableCellAlign : '') || allAlign;
-                const showEllipsis = footOverflow === 'ellipsis';
-                const showTitle = footOverflow === 'title';
-                const showTooltip = footOverflow === true ? footerTooltipOpts.mode === 'tooltip' : footOverflow === 'tooltip';
+                const showEllipsis = (footOverflow === true ? footerTooltipOpts.mode : footOverflow) === 'ellipsis';
+                const showTitle = (footOverflow === true ? footerTooltipOpts.mode : footOverflow) === 'title';
+                const showTooltip = (footOverflow === true ? footerTooltipOpts.mode : footOverflow) === 'tooltip';
                 const hasEllipsis = showTitle || showTooltip || showEllipsis;
                 const showResizable = (XEUtils.isBoolean(column.resizable) ? column.resizable : (columnOpts.resizable || allResizable));
                 const attrs = { colid };

package/es/table/src/header.js

@@ -76,9 +76,9 @@ export default defineVxeComponent({
                 const isPadding = XEUtils.isBoolean(headerCellOpts.padding) ? headerCellOpts.padding : cellOpts.padding;
                 const headOverflow = XEUtils.eqNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
                 const headAlign = headerAlign || (compConf ? compConf.tableHeaderCellAlign : '') || allHeaderAlign || align || (compConf ? compConf.tableCellAlign : '') || allAlign;
-                const showEllipsis = headOverflow === 'ellipsis';
-                const showTitle = headOverflow === 'title';
-                const showTooltip = headOverflow === true ? headerTooltipOpts.mode === 'tooltip' : headOverflow === 'tooltip';
+                const showEllipsis = (headOverflow === true ? headerTooltipOpts.mode : headOverflow) === 'ellipsis';
+                const showTitle = (headOverflow === true ? headerTooltipOpts.mode : headOverflow) === 'title';
+                const showTooltip = (headOverflow === true ? headerTooltipOpts.mode : headOverflow) === 'tooltip';
                 const hasEllipsis = showTitle || showTooltip || showEllipsis;
                 let hasFilter = false;
                 let firstFilterOption = null;

package/es/table/src/table.js

@@ -1488,8 +1488,8 @@ export default defineVxeComponent({
         const handleCustomRestore = (storeData) => {
             const { aggregateConfig, rowGroupConfig } = props;
             const { collectColumn } = internalData;
-            const { isCustomAlign, isCustomHeaderAlign, isCustomFooterAlign, isCustomResizable, isCustomVisible, isCustomFixed, isCustomSort, isCustomAggGroup, isCustomAggFunc } = handleCustomStoreConfig($xeTable);
-            let { alignData, headerAlignData, footerAlignData, resizableData, sortData, visibleData, fixedData, aggGroupData, aggFuncData } = storeData;
+            const { isCustomAlign, isCustomHeaderAlign, isCustomFooterAlign, isCustomResizable, isCustomVisible, isCustomFixed, isCustomSort, isCustomAggGroup, isCustomAggFunc, isCustomPager } = handleCustomStoreConfig($xeTable);
+            let { alignData, headerAlignData, footerAlignData, resizableData, sortData, visibleData, fixedData, aggGroupData, aggFuncData, pagerData } = storeData;
             // 处理还原
             if ((isCustomAlign && alignData) ||
                 (isCustomHeaderAlign && headerAlignData) ||
@@ -1499,7 +1499,8 @@ export default defineVxeComponent({
                 (isCustomVisible && visibleData) ||
                 (isCustomFixed && fixedData) ||
                 (isCustomAggGroup && aggGroupData) ||
-                (isCustomAggFunc && aggFuncData)) {
+                (isCustomAggFunc && aggFuncData) ||
+                (isCustomPager && pagerData && $xeGGWrapper)) {
                 const sortColMaps = {};
                 if (isCustomSort && sortData) {
                     // 转换兼容老版本数据，即将废弃兼容
@@ -1820,7 +1821,7 @@ export default defineVxeComponent({
             const autoWidthColumnList = computeAutoWidthColumnList.value;
             const { fullColumnIdData } = internalData;
             const el = refElem.value;
-            if (el) {
+            if (el && autoWidthColumnList.length) {
                 el.setAttribute('data-calc-col', 'Y');
                 autoWidthColumnList.forEach(column => {
                     const colid = column.id;
@@ -2105,7 +2106,7 @@ export default defineVxeComponent({
             const fullMaps = {};
             let rowNum = 0;
             const { handleGetRowId } = createHandleGetRowId($xeTable);
-            XEUtils.eachTree(afterTreeFullData, (row, index, items, path) => {
+            XEUtils.eachTree(afterTreeFullData, (row, index, items, path, parentRow) => {
                 const rowid = handleGetRowId(row);
                 const rowRest = fullAllDataRowIdData[rowid];
                 const seq = path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('');
@@ -2113,10 +2114,11 @@ export default defineVxeComponent({
                     rowRest.seq = seq;
                     rowRest._seq = rowNum;
                     rowRest.treeIndex = index;
+                    rowRest._index = rowNum;
                     rowRest._tIndex = rowNum;
                 }
                 else {
-                    const rest = { row, rowid, _seq: rowNum, seq, index: -1, $index: -1, _index: -1, treeIndex: -1, _tIndex: rowNum, items: [], parent: null, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
+                    const rest = { row, rowid, _seq: rowNum, seq, index, $index: -1, _index: rowNum, treeIndex: index, _tIndex: rowNum, items, parent: parentRow, level: 0, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 };
                     fullAllDataRowIdData[rowid] = rest;
                     fullDataRowIdData[rowid] = rest;
                 }
@@ -3329,7 +3331,7 @@ export default defineVxeComponent({
             if (reWidth) {
                 calcCellWidth();
             }
-            if (reFull) {
+            if (reWidth || reFull) {
                 autoCellWidth();
             }
             calcScrollbar();
@@ -3344,7 +3346,7 @@ export default defineVxeComponent({
                 if (reWidth) {
                     calcCellWidth();
                 }
-                if (reFull) {
+                if (reWidth || reFull) {
                     autoCellWidth();
                 }
                 if (reHeight) {
@@ -3436,7 +3438,7 @@ export default defineVxeComponent({
                 return;
             }
             internalData.rsePending = true;
-            handleLazyRecalculate(true, true, true, {
+            handleLazyRecalculate(false, true, true, {
                 minRunDelay: 200
             }).then(() => {
                 internalData.rsePending = false;
@@ -4686,12 +4688,12 @@ export default defineVxeComponent({
                 return;
             }
             const expandOpts = computeExpandOpts.value;
-            const rowOpts = computeRowOpts.value;
-            const cellOpts = computeCellOpts.value;
-            const defaultRowHeight = computeDefaultRowHeight.value;
             const { mode } = expandOpts;
             if (expandColumn && mode === 'fixed') {
                 const { elemStore, fullAllDataRowIdData } = internalData;
+                const rowOpts = computeRowOpts.value;
+                const cellOpts = computeCellOpts.value;
+                const defaultRowHeight = computeDefaultRowHeight.value;
                 const rowExpandEl = refRowExpandElem.value;
                 const bodyScrollElem = getRefElem(elemStore['main-body-scroll']);
                 if (rowExpandEl && bodyScrollElem) {
@@ -8058,7 +8060,7 @@ export default defineVxeComponent({
                 const { isRowGroupStatus, rowGroupList } = reactData;
                 const { fullColumnFieldData, collectColumn } = internalData;
                 const { storage, checkMethod } = customOpts;
-                const { isCustomAlign, isCustomHeaderAlign, isCustomFooterAlign, isCustomResizable, isCustomVisible, isCustomFixed, isCustomSort, isCustomAggGroup, isCustomAggFunc } = handleCustomStoreConfig($xeTable);
+                const { isCustomAlign, isCustomHeaderAlign, isCustomFooterAlign, isCustomResizable, isCustomVisible, isCustomFixed, isCustomSort, isCustomAggGroup, isCustomAggFunc, isCustomPager } = handleCustomStoreConfig($xeTable);
                 const alignData = {};
                 const headerAlignData = {};
                 const footerAlignData = {};
@@ -8069,6 +8071,7 @@ export default defineVxeComponent({
                 const aggGroupData = {};
                 const aggFuncData = {};
                 const storeData = {
+                    pagerData: isCustomPager && $xeGGWrapper && $xeGGWrapper.getCustomPagerData ? $xeGGWrapper.getCustomPagerData() : undefined,
                     alignData: undefined,
                     headerAlignData: undefined,
                     footerAlignData: undefined,
@@ -8929,8 +8932,10 @@ export default defineVxeComponent({
             if (!el || !el.clientWidth) {
                 return;
             }
+            if (internalData.rsePending) {
+                return;
+            }
             handleResizeEvent();
-            $xeTable.updateCellAreas();
         };
         const handleTargetEnterEvent = (isClear) => {
             const $tooltip = refTooltip.value;
@@ -10058,7 +10063,7 @@ export default defineVxeComponent({
                 const tableId = computeTableId.value;
                 const customOpts = computeCustomOpts.value;
                 const { updateStore, storage } = customOpts;
-                const { isCustomAlign, isCustomHeaderAlign, isCustomFooterAlign, isCustomResizable, isCustomVisible, isCustomFixed, isCustomSort, isCustomAggGroup, isCustomAggFunc } = handleCustomStoreConfig($xeTable);
+                const { isCustomAlign, isCustomHeaderAlign, isCustomFooterAlign, isCustomResizable, isCustomVisible, isCustomFixed, isCustomSort, isCustomAggGroup, isCustomAggFunc, isCustomPager } = handleCustomStoreConfig($xeTable);
                 if (type !== 'reset') {
                     // fix：修复拖动列宽，重置按钮无法点击的问题
                     reactData.isCustomStatus = true;
@@ -10073,13 +10078,15 @@ export default defineVxeComponent({
                         isCustomFixed ||
                         isCustomSort ||
                         isCustomAggGroup ||
-                        isCustomAggFunc)) {
+                        isCustomAggFunc ||
+                        isCustomPager)) {
                     if (!tableId) {
                         errLog('vxe.error.reqProp', ['id']);
                         return nextTick();
                     }
                     const storeData = type === 'reset'
                         ? {
+                            pagerData: {},
                             alignData: {},
                             headerAlignData: {},
                             footerAlignData: {},
@@ -11422,6 +11429,7 @@ export default defineVxeComponent({
                     status: false
                 };
                 if (!(el && prevDragRow && dragRow)) {
+                    handleRowDragEndClearStatus();
                     return Promise.resolve(errRest);
                 }
                 // 判断是否有拖动
@@ -11525,6 +11533,9 @@ export default defineVxeComponent({
                         }
                     }
                     const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
+                    if (dEndMethod) {
+                        handleRowDragEndClearStatus();
+                    }
                     return Promise.resolve(dEndMethod ? dEndMethod(dragParams) : true).then((status) => {
                         if (!status) {
                             return errRest;
@@ -11819,6 +11830,9 @@ export default defineVxeComponent({
                         const errRest = {
                             status: false
                         };
+                        if (dragEndMethod) {
+                            handleRowDragEndClearStatus();
+                        }
                         Promise.resolve(dragEndMethod ? dragEndMethod(dragParams) : true).then((status) => {
                             if (!status) {
                                 if ($oldTable) {
@@ -14417,9 +14431,9 @@ export default defineVxeComponent({
             // if (treeConfig && (treeOpts.showLine || treeOpts.line) && !showOverflow) {
             //   warnLog('vxe.error.reqProp', ['show-overflow'])
             // }
-            if (treeConfig && !treeOpts.transform && props.stripe) {
-                warnLog('vxe.error.noTree', ['stripe']);
-            }
+            // if (treeConfig && !treeOpts.transform && props.stripe) {
+            //   warnLog('vxe.error.noTree', ['stripe'])
+            // }
             if (treeConfig && !treeOpts.transform) {
                 if (sortOpts.isDeep) {
                     warnLog('vxe.error.reqSupportProp', ['transform=false', 'sort-config.isDeep=false']);

package/es/table/src/util.js

@@ -146,6 +146,8 @@ export function createInternalData() {
         tooltipTimeout: null,
         initStatus: false,
         isActivated: false,
+        // rceTimeout: undefined,
+        // rceRunTime: undefined,
         rceDelay: 0
         // _sToTime: null
     };
@@ -1039,6 +1041,7 @@ export function handleCustomStoreConfig($xeTable) {
     const isCustomSort = hangleBolleanDefaultValue(storageOpts.sort, isAllCustom);
     const isCustomAggGroup = hangleBolleanDefaultValue(storageOpts.aggGroup, isAllCustom);
     const isCustomAggFunc = hangleBolleanDefaultValue(storageOpts.aggFunc, isAllCustom);
+    const isCustomPager = hangleBolleanDefaultValue(storageOpts.pager, isAllCustom);
     return {
         isCustomAlign,
         isCustomHeaderAlign,
@@ -1048,6 +1051,7 @@ export function handleCustomStoreConfig($xeTable) {
         isCustomFixed,
         isCustomSort,
         isCustomAggGroup,
-        isCustomAggFunc
+        isCustomAggFunc,
+        isCustomPager
     };
 }

package/es/table/style.css

@@ -1832,6 +1832,25 @@
   display: block;
 }
 
+.vxe-table {
+  --vxe-ui-table-current-font-size: var(--vxe-ui-font-size-default);
+}
+.vxe-table.size--xlarge {
+  --vxe-ui-table-current-font-size: var(--vxe-ui-font-size-xlarge);
+}
+.vxe-table.size--large {
+  --vxe-ui-table-current-font-size: var(--vxe-ui-font-size-large);
+}
+.vxe-table.size--medium {
+  --vxe-ui-table-current-font-size: var(--vxe-ui-font-size-medium);
+}
+.vxe-table.size--small {
+  --vxe-ui-table-current-font-size: var(--vxe-ui-font-size-small);
+}
+.vxe-table.size--mini {
+  --vxe-ui-table-current-font-size: var(--vxe-ui-font-size-mini);
+}
+
 .vxe-table-slots,
 .vxe-table--file-form {
   display: none;
@@ -2961,7 +2980,7 @@
 /*table*/
 .vxe-table--render-default {
   position: relative;
-  font-size: var(--vxe-ui-font-size-default);
+  font-size: var(--vxe-ui-table-current-font-size);
   color: var(--vxe-ui-font-color);
   font-family: var(--vxe-ui-font-family);
   direction: ltr;
@@ -3247,9 +3266,6 @@
 .vxe-table--render-default.border--none .vxe-table--border-line {
   display: none;
 }
-.vxe-table--render-default.size--medium {
-  font-size: var(--vxe-ui-font-size-medium);
-}
 .vxe-table--render-default.size--medium .vxe-table--empty-placeholder,
 .vxe-table--render-default.size--medium .vxe-table--empty-block {
   min-height: var(--vxe-ui-table-row-height-medium);
@@ -3275,9 +3291,6 @@
 .vxe-table--render-default.size--medium .vxe-cell--valid-error-tip {
   padding: 0 var(--vxe-ui-table-cell-padding-medium);
 }
-.vxe-table--render-default.size--small {
-  font-size: var(--vxe-ui-font-size-small);
-}
 .vxe-table--render-default.size--small .vxe-table--empty-placeholder,
 .vxe-table--render-default.size--small .vxe-table--empty-block {
   min-height: var(--vxe-ui-table-row-height-small);
@@ -3303,9 +3316,6 @@
 .vxe-table--render-default.size--small .vxe-cell--valid-error-tip {
   padding: 0 var(--vxe-ui-table-cell-padding-small);
 }
-.vxe-table--render-default.size--mini {
-  font-size: var(--vxe-ui-font-size-mini);
-}
 .vxe-table--render-default.size--mini .vxe-table--empty-placeholder,
 .vxe-table--render-default.size--mini .vxe-table--empty-block {
   min-height: var(--vxe-ui-table-row-height-mini);
@@ -3847,7 +3857,7 @@
   width: 100%;
   position: absolute;
   left: 50%;
-  font-size: var(--vxe-ui-table-validate-error-font-size);
+  font-size: var(--vxe-ui-table-validate-error-font-size, var(--vxe-ui-table-current-font-size));
   line-height: 1em;
   transform: translate(-50%, -2px);
   text-align: left;
@@ -3862,7 +3872,7 @@
   pointer-events: auto;
 }
 .vxe-table--render-default .vxe-body--column .vxe-cell--valid-error-theme-beautify {
-  padding: 0.2em 0.6em 0.25em 0.6em;
+  padding: var(--vxe-ui-table-validate-error-padding, 0.2em 0.6em);
   color: #fff;
   background-color: var(--vxe-ui-table-validate-error-color);
 }