vxe-table 3.19.5 → 3.19.7

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

@@ -16,15 +16,17 @@ function hasTreeChildren($xeTable, row) {
 }
 function getSeq($xeTable, cellValue, row, $rowIndex, column, $columnIndex) {
     const seqOpts = $xeTable.computeSeqOpts;
-    const seqMethod = seqOpts.seqMethod || column.seqMethod;
-    if (seqMethod) {
-        return seqMethod({
+    const seqMd = seqOpts.seqMethod || column.seqMethod;
+    if (seqMd) {
+        return seqMd({
             $table: $xeTable,
             row,
             rowIndex: $xeTable.getRowIndex(row),
+            _rowIndex: $xeTable.getVTRowIndex(row),
             $rowIndex,
             column,
             columnIndex: $xeTable.getColumnIndex(column),
+            _columnIndex: $xeTable.getVTColumnIndex(column),
             $columnIndex
         });
     }

package/es/table/src/body.js

@@ -702,24 +702,15 @@ export default {
         const slots = $xeTable.$scopedSlots;
         const { xID } = $xeTable;
         const { fixedColumn, fixedType, tableColumn } = props;
-        const { spanMethod, footerSpanMethod, mouseConfig } = tableProps;
-        const { isGroup, tableData, isColLoading, overflowX, scrollXLoad, scrollYLoad, isAllOverflow, expandColumn, dragRow, dragCol } = tableReactData;
+        const { mouseConfig } = tableProps;
+        const { isGroup, tableData, isColLoading, overflowX, scrollXLoad, scrollYLoad, dragRow, dragCol } = tableReactData;
         const { visibleColumn, fullAllDataRowIdData, fullColumnIdData } = tableInternalData;
         const emptyOpts = $xeTable.computeEmptyOpts;
         const mouseOpts = $xeTable.computeMouseOpts;
-        const expandOpts = $xeTable.computeExpandOpts;
+        const isBodyRenderOptimize = $xeTable.computeIsBodyRenderOptimize;
         let renderDataList = tableData;
         let renderColumnList = tableColumn;
-        let isOptimizeMode = false;
-        // 如果是使用优化模式
-        if (scrollXLoad || scrollYLoad || isAllOverflow) {
-            if ((expandColumn && expandOpts.mode !== 'fixed') || spanMethod || footerSpanMethod) {
-                // 如果不支持优化模式
-            }
-            else {
-                isOptimizeMode = true;
-            }
-        }
+        const isOptimizeMode = isBodyRenderOptimize;
         if (!isColLoading && (fixedType || !overflowX)) {
             renderColumnList = visibleColumn;
         }
@@ -792,11 +783,6 @@ export default {
                 emptyContent = tableProps.emptyText || getI18n('vxe.table.emptyText');
             }
         }
-        const ons = {
-            scroll(evnt) {
-                $xeTable.triggerBodyScrollEvent(evnt, fixedType);
-            }
-        };
         return h('div', {
             ref: 'refElem',
             class: ['vxe-table--body-wrapper', fixedType ? `fixed-${fixedType}--wrapper` : 'body--wrapper'],
@@ -807,7 +793,11 @@ export default {
             h('div', {
                 ref: 'refBodyScroll',
                 class: 'vxe-table--body-inner-wrapper',
-                on: ons
+                on: {
+                    scroll(evnt) {
+                        $xeTable.triggerBodyScrollEvent(evnt, fixedType);
+                    }
+                }
             }, [
                 fixedType
                     ? renderEmptyElement($xeTable)

package/es/table/src/cell.js

@@ -170,7 +170,8 @@ function renderTitleContent(h, params, content) {
     const tableReactData = $table;
     const { showHeaderOverflow: allColumnHeaderOverflow } = tableProps;
     const { isRowGroupStatus } = tableReactData;
-    const { showHeaderOverflow } = column;
+    const { showHeaderOverflow, slots } = column;
+    const titleSlot = slots ? slots.title : null;
     const headerTooltipOpts = $table.computeHeaderTooltipOpts;
     const showAllTip = headerTooltipOpts.showAll;
     const headOverflow = XEUtils.eqNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
@@ -207,9 +208,11 @@ function renderTitleContent(h, params, content) {
             on: ons
         }, isRowGroupStatus && column.aggFunc && $table.getPivotTableAggregateRenderColTitles
             ? $table.getPivotTableAggregateRenderColTitles(h, column, titleVN)
-            : [
-                titleVN
-            ])
+            : titleSlot
+                ? $table.callSlot(titleSlot, params, h)
+                : [
+                    titleVN
+                ])
     ];
 }
 function getFooterContent(h, params) {
@@ -613,9 +616,9 @@ export const Cell = {
             return renderCellBaseVNs(h, params, $table.callSlot(slots.default, params, h));
         }
         const { seq } = params;
-        const seqMethod = seqOpts.seqMethod;
+        const seqMd = seqOpts.seqMethod;
         return renderCellBaseVNs(h, params, [
-            h('span', `${formatText(seqMethod ? seqMethod(params) : treeConfig ? seq : (seqOpts.startIndex || 0) + seq, 1)}`)
+            h('span', `${formatText(seqMd ? seqMd(params) : treeConfig ? seq : (seqOpts.startIndex || 0) + seq, 1)}`)
         ]);
     },
     renderDeepIndexCell(h, params) {
@@ -1001,45 +1004,49 @@ export const Cell = {
         const { $table, column } = params;
         const sortOpts = $table.computeSortOpts;
         const { showIcon, allowBtn, ascTitle, descTitle, iconLayout, iconAsc, iconDesc, iconVisibleMethod } = sortOpts;
+        const { order, slots } = column;
         if (showIcon && (!iconVisibleMethod || iconVisibleMethod(params))) {
-            return [
-                h('span', {
-                    class: ['vxe-cell--sort', `vxe-cell--sort-${iconLayout}-layout`]
-                }, [
-                    h('i', {
-                        class: ['vxe-sort--asc-btn', iconAsc || getIcon().TABLE_SORT_ASC, {
-                                'sort--active': column.order === 'asc'
-                            }],
-                        attrs: {
-                            title: XEUtils.eqNull(ascTitle) ? getI18n('vxe.table.sortAsc') : `${ascTitle || ''}`
-                        },
-                        on: allowBtn
-                            ? {
-                                click(evnt) {
-                                    evnt.stopPropagation();
-                                    $table.triggerSortEvent(evnt, column, 'asc');
+            const sortSlot = slots ? slots.sort : null;
+            return sortSlot
+                ? getSlotVNs($table.callSlot(sortSlot, params, h))
+                : [
+                    h('span', {
+                        class: ['vxe-cell--sort', `vxe-cell--sort-${iconLayout}-layout`]
+                    }, [
+                        h('i', {
+                            class: ['vxe-sort--asc-btn', iconAsc || getIcon().TABLE_SORT_ASC, {
+                                    'sort--active': order === 'asc'
+                                }],
+                            attrs: {
+                                title: XEUtils.eqNull(ascTitle) ? getI18n('vxe.table.sortAsc') : `${ascTitle || ''}`
+                            },
+                            on: allowBtn
+                                ? {
+                                    click(evnt) {
+                                        evnt.stopPropagation();
+                                        $table.triggerSortEvent(evnt, column, 'asc');
+                                    }
                                 }
-                            }
-                            : undefined
-                    }),
-                    h('i', {
-                        class: ['vxe-sort--desc-btn', iconDesc || getIcon().TABLE_SORT_DESC, {
-                                'sort--active': column.order === 'desc'
-                            }],
-                        attrs: {
-                            title: XEUtils.eqNull(descTitle) ? getI18n('vxe.table.sortDesc') : `${descTitle || ''}`
-                        },
-                        on: allowBtn
-                            ? {
-                                click(evnt) {
-                                    evnt.stopPropagation();
-                                    $table.triggerSortEvent(evnt, column, 'desc');
+                                : undefined
+                        }),
+                        h('i', {
+                            class: ['vxe-sort--desc-btn', iconDesc || getIcon().TABLE_SORT_DESC, {
+                                    'sort--active': order === 'desc'
+                                }],
+                            attrs: {
+                                title: XEUtils.eqNull(descTitle) ? getI18n('vxe.table.sortDesc') : `${descTitle || ''}`
+                            },
+                            on: allowBtn
+                                ? {
+                                    click(evnt) {
+                                        evnt.stopPropagation();
+                                        $table.triggerSortEvent(evnt, column, 'desc');
+                                    }
                                 }
-                            }
-                            : undefined
-                    })
-                ])
-            ];
+                                : undefined
+                        })
+                    ])
+                ];
         }
         return [];
     },

package/es/table/src/footer.js

@@ -260,25 +260,15 @@ export default {
         const _vm = this;
         const props = _vm;
         const $xeTable = _vm.$parent;
-        const tableProps = $xeTable;
         const tableReactData = $xeTable;
         const tableInternalData = $xeTable;
         const { xID } = $xeTable;
         const { fixedType, fixedColumn, tableColumn } = props;
-        const { spanMethod, footerSpanMethod, showFooterOverflow: allColumnFooterOverflow } = tableProps;
         const { visibleColumn, fullColumnIdData } = tableInternalData;
         const { isGroup, isColLoading, overflowX, scrollXLoad, dragCol } = tableReactData;
+        const isFooterRenderOptimize = $xeTable.computeIsFooterRenderOptimize;
         let renderColumnList = tableColumn;
-        let isOptimizeMode = false;
-        // 如果是使用优化模式
-        if (scrollXLoad && allColumnFooterOverflow) {
-            if (spanMethod || footerSpanMethod) {
-                // 如果不支持优化模式
-            }
-            else {
-                isOptimizeMode = true;
-            }
-        }
+        const isOptimizeMode = isFooterRenderOptimize;
         if (!isOptimizeMode || (!isColLoading && (fixedType || !overflowX))) {
             renderColumnList = visibleColumn;
         }

package/es/table/src/header.js

@@ -428,26 +428,18 @@ export default {
         const { xID } = $xeTable;
         const { fixedType, fixedColumn, tableColumn } = props;
         const { headerColumn } = _vm;
-        const { mouseConfig, showHeaderOverflow: allColumnHeaderOverflow, spanMethod, footerSpanMethod } = tableProps;
+        const { mouseConfig } = tableProps;
         const { isGroup, isColLoading, overflowX, scrollXLoad, dragCol } = tableReactData;
         const { visibleColumn, fullColumnIdData } = tableInternalData;
         const mouseOpts = $xeTable.computeMouseOpts;
+        const isHeaderRenderOptimize = $xeTable.computeIsHeaderRenderOptimize;
         let renderHeaderList = headerColumn;
         let renderColumnList = tableColumn;
-        let isOptimizeMode = false;
+        const isOptimizeMode = isHeaderRenderOptimize;
         if (isGroup) {
             renderColumnList = visibleColumn;
         }
         else {
-            // 如果是使用优化模式
-            if (scrollXLoad && allColumnHeaderOverflow) {
-                if (spanMethod || footerSpanMethod) {
-                    // 如果不支持优化模式
-                }
-                else {
-                    isOptimizeMode = true;
-                }
-            }
             if (!isOptimizeMode || (!isColLoading && (fixedType || !overflowX))) {
                 renderColumnList = visibleColumn;
             }

package/es/table/src/methods.js

@@ -493,8 +493,7 @@ function handleVirtualTreeExpand($xeTable, rows, expanded) {
         updateAfterDataIndex($xeTable);
         return $xeTable.$nextTick();
     }).then(() => {
-        updateTreeLineStyle($xeTable);
-        return handleLazyRecalculate($xeTable, true, true, true);
+        return handleRecalculateStyle($xeTable, true, true, true);
     }).then(() => {
         updateTreeLineStyle($xeTable);
         setTimeout(() => {
@@ -953,8 +952,8 @@ function updateStyle($xeTable) {
     const props = $xeTable;
     const reactData = $xeTable;
     const internalData = $xeTable;
-    const { showHeaderOverflow: allColumnHeaderOverflow, showFooterOverflow: allColumnFooterOverflow, mouseConfig, spanMethod, footerSpanMethod } = props;
-    const { isGroup, currentRow, tableColumn, scrollXLoad, scrollYLoad, overflowX, scrollbarWidth, overflowY, scrollbarHeight, scrollXWidth, columnStore, editStore, isAllOverflow, expandColumn, isColLoading } = reactData;
+    const { mouseConfig } = props;
+    const { isGroup, currentRow, tableColumn, overflowX, scrollbarWidth, overflowY, scrollbarHeight, scrollXWidth, columnStore, editStore, isColLoading } = reactData;
     const { visibleColumn, tableHeight, elemStore, customHeight, customMinHeight, customMaxHeight, tHeaderHeight, tFooterHeight } = internalData;
     const $xeGanttView = internalData.xeGanttView;
     const el = $xeTable.$refs.refElem;
@@ -962,12 +961,15 @@ function updateStyle($xeTable) {
         return;
     }
     const containerList = ['main', 'left', 'right'];
+    const { leftList, rightList } = columnStore;
     let osbWidth = overflowY ? scrollbarWidth : 0;
     let osbHeight = overflowX ? scrollbarHeight : 0;
     const emptyPlaceholderElem = $xeTable.$refs.refEmptyPlaceholder;
+    const isHeaderRenderOptimize = $xeTable.computeIsHeaderRenderOptimize;
+    const isBodyRenderOptimize = $xeTable.computeIsBodyRenderOptimize;
+    const isFooterRenderOptimize = $xeTable.computeIsFooterRenderOptimize;
     const scrollbarOpts = $xeTable.computeScrollbarOpts;
     const mouseOpts = $xeTable.computeMouseOpts;
-    const expandOpts = $xeTable.computeExpandOpts;
     const bodyWrapperElem = getRefElem(elemStore['main-body-wrapper']);
     const bodyTableElem = getRefElem(elemStore['main-body-table']);
     if (emptyPlaceholderElem) {
@@ -1085,7 +1087,7 @@ function updateStyle($xeTable) {
         let fixedColumn = [];
         let fixedWrapperElem;
         if (fixedType) {
-            fixedColumn = isFixedLeft ? columnStore.leftList : columnStore.rightList;
+            fixedColumn = isFixedLeft ? leftList : rightList;
             fixedWrapperElem = (isFixedLeft ? $xeTable.$refs.refLeftContainer : $xeTable.$refs.refRightContainer);
         }
         layoutList.forEach(layout => {
@@ -1096,20 +1098,11 @@ function updateStyle($xeTable) {
                 // 表头体样式处理
                 // 横向滚动渲染
                 let renderColumnList = tableColumn;
-                let isOptimizeMode = false;
+                const isOptimizeMode = isHeaderRenderOptimize;
                 if (isGroup) {
                     renderColumnList = visibleColumn;
                 }
                 else {
-                    // 如果是使用优化模式
-                    if (scrollXLoad && allColumnHeaderOverflow) {
-                        if (spanMethod || footerSpanMethod) {
-                            // 如果不支持优化模式
-                        }
-                        else {
-                            isOptimizeMode = true;
-                        }
-                    }
                     if (!isOptimizeMode || (!isColLoading && (fixedType || !overflowX))) {
                         renderColumnList = visibleColumn;
                     }
@@ -1162,16 +1155,7 @@ function updateStyle($xeTable) {
                     fixedWrapperElem.style.width = `${fixedColumn.reduce((previous, column) => previous + column.renderWidth, 0)}px`;
                 }
                 let renderColumnList = tableColumn;
-                let isOptimizeMode = false;
-                // 如果是使用优化模式
-                if (scrollXLoad || scrollYLoad || isAllOverflow) {
-                    if ((expandColumn && expandOpts.mode !== 'fixed') || spanMethod || footerSpanMethod) {
-                        // 如果不支持优化模式
-                    }
-                    else {
-                        isOptimizeMode = true;
-                    }
-                }
+                const isOptimizeMode = isBodyRenderOptimize;
                 if (fixedType) {
                     renderColumnList = visibleColumn;
                     if (isOptimizeMode) {
@@ -1203,16 +1187,7 @@ function updateStyle($xeTable) {
             }
             else if (layout === 'footer') {
                 let renderColumnList = tableColumn;
-                let isOptimizeMode = false;
-                // 如果是使用优化模式
-                if (scrollXLoad && allColumnFooterOverflow) {
-                    if (spanMethod || footerSpanMethod) {
-                        // 如果不支持优化模式
-                    }
-                    else {
-                        isOptimizeMode = true;
-                    }
-                }
+                const isOptimizeMode = isFooterRenderOptimize;
                 if (!isOptimizeMode || (!isColLoading && (fixedType || !overflowX))) {
                     renderColumnList = visibleColumn;
                 }
@@ -11273,7 +11248,7 @@ const Methods = {
         const $xeTable = this;
         const reactData = $xeTable;
         const internalData = $xeTable;
-        const { isAllOverflow, scrollYLoad, expandColumn } = reactData;
+        const { isAllOverflow, overflowY, scrollYLoad, scrollYHeight, expandColumn } = reactData;
         const { scrollYStore, elemStore, isResizeCellHeight, afterFullData, fullAllDataRowIdData, rowExpandedMaps } = internalData;
         const $xeGanttView = internalData.xeGanttView;
         const { startIndex } = scrollYStore;
@@ -11288,13 +11263,13 @@ const Methods = {
         const rightbodyTableElem = getRefElem(elemStore['right-body-table']);
         const containerList = ['main', 'left', 'right'];
         let ySpaceTop = 0;
-        let scrollYHeight = 0;
+        let sYHeight = scrollYHeight;
         let isScrollYBig = false;
         if (scrollYLoad) {
             const isCustomCellHeight = isResizeCellHeight || cellOpts.height || rowOpts.height;
             if (!isCustomCellHeight && !expandColumn && isAllOverflow) {
-                scrollYHeight = afterFullData.length * defaultRowHeight;
-                if (scrollYHeight > maxYHeight) {
+                sYHeight = afterFullData.length * defaultRowHeight;
+                if (sYHeight > maxYHeight) {
                     isScrollYBig = true;
                 }
                 ySpaceTop = Math.max(0, startIndex * defaultRowHeight);
@@ -11307,19 +11282,22 @@ const Methods = {
                 const lastRow = afterFullData[afterFullData.length - 1];
                 rowid = getRowid($xeTable, lastRow);
                 rowRest = fullAllDataRowIdData[rowid] || {};
-                scrollYHeight = (rowRest.oTop || 0) + (rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight);
-                // 是否展开行
-                if (expandColumn && rowExpandedMaps[rowid]) {
-                    scrollYHeight += rowRest.expandHeight || expandOpts.height || 0;
+                // 如果为空时还没计算完数据，保持原高度不变
+                if (rowRest.oTop) {
+                    sYHeight = (rowRest.oTop || 0) + (rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight);
+                    // 是否展开行
+                    if (expandColumn && rowExpandedMaps[rowid]) {
+                        sYHeight += rowRest.expandHeight || expandOpts.height || 0;
+                    }
                 }
-                if (scrollYHeight > maxYHeight) {
+                if (sYHeight > maxYHeight) {
                     isScrollYBig = true;
                 }
             }
         }
         else {
             if (bodyTableElem) {
-                scrollYHeight = bodyTableElem.clientHeight;
+                sYHeight = bodyTableElem.clientHeight;
             }
         }
         let clientHeight = 0;
@@ -11327,7 +11305,7 @@ const Methods = {
             clientHeight = bodyScrollElem.clientHeight;
         }
         // 虚拟渲染
-        let ySpaceHeight = scrollYHeight;
+        let ySpaceHeight = sYHeight;
         let scrollYTop = ySpaceTop;
         if (isScrollYBig) {
             // 触底
@@ -11339,6 +11317,9 @@ const Methods = {
             }
             ySpaceHeight = maxYHeight;
         }
+        if (!(scrollYLoad && overflowY)) {
+            scrollYTop = 0;
+        }
         if (leftBodyTableElem) {
             leftBodyTableElem.style.transform = `translate(0px, ${scrollYTop}px)`;
         }
@@ -11366,7 +11347,7 @@ const Methods = {
             rowExpandYSpaceEl.style.height = ySpaceHeight ? `${ySpaceHeight}px` : '';
         }
         reactData.scrollYTop = scrollYTop;
-        reactData.scrollYHeight = scrollYHeight;
+        reactData.scrollYHeight = ySpaceHeight;
         reactData.isScrollYBig = isScrollYBig;
         calcScrollbar($xeTable);
         if (isScrollYBig && mouseOpts.area) {

package/es/table/src/table.js

@@ -1197,6 +1197,89 @@ export default {
             }
             return leftWidth;
         },
+        computeBodyMergeCoverFixed() {
+            const $xeTable = this;
+            const reactData = $xeTable;
+            const internalData = $xeTable;
+            const { columnStore, mergeBodyFlag } = reactData;
+            const { mergeBodyList, visibleColumn } = internalData;
+            const { leftList, rightList } = columnStore;
+            const rscIndex = visibleColumn.length - rightList.length;
+            if (mergeBodyFlag && (leftList.length || rightList.length)) {
+                const lecIndex = leftList.length;
+                for (let i = 0; i < mergeBodyList.length; i++) {
+                    const { col, colspan } = mergeBodyList[i];
+                    if (col < lecIndex || (col + colspan) > rscIndex) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        },
+        computeIsHeaderRenderOptimize() {
+            const $xeTable = this;
+            const props = $xeTable;
+            const reactData = $xeTable;
+            const { spanMethod, footerSpanMethod, showHeaderOverflow: allColumnHeaderOverflow } = props;
+            const { isGroup, scrollXLoad } = reactData;
+            let isOptimizeMode = false;
+            if (isGroup) {
+                // 分组表头
+            }
+            else {
+                // 如果是使用优化模式
+                if (scrollXLoad && allColumnHeaderOverflow) {
+                    if (spanMethod || footerSpanMethod) {
+                        // 如果不支持优化模式
+                    }
+                    else {
+                        isOptimizeMode = true;
+                    }
+                }
+            }
+            return isOptimizeMode;
+        },
+        computeIsBodyRenderOptimize() {
+            const $xeTable = this;
+            const props = $xeTable;
+            const reactData = $xeTable;
+            const { spanMethod, footerSpanMethod } = props;
+            const { scrollXLoad, scrollYLoad, isAllOverflow, expandColumn } = reactData;
+            const bodyMergeCoverFixed = $xeTable.computeBodyMergeCoverFixed;
+            const expandOpts = $xeTable.computeExpandOpts;
+            let isOptimizeMode = false;
+            // 如果是使用优化模式
+            if (scrollXLoad || scrollYLoad || isAllOverflow) {
+                // 如果是展开行，内联模式，不支持优化
+                // 如果是方法合并，不支持优化
+                // 如果固定列且配置式合并，不支持优化
+                if ((expandColumn && expandOpts.mode !== 'fixed') || bodyMergeCoverFixed || spanMethod || footerSpanMethod) {
+                    // 如果不支持优化模式
+                }
+                else {
+                    isOptimizeMode = true;
+                }
+            }
+            return isOptimizeMode;
+        },
+        computeIsFooterRenderOptimize() {
+            const $xeTable = this;
+            const props = $xeTable;
+            const reactData = $xeTable;
+            const { spanMethod, footerSpanMethod, showFooterOverflow: allColumnFooterOverflow } = props;
+            const { scrollXLoad } = reactData;
+            let isOptimizeMode = false;
+            // 如果是使用优化模式
+            if (scrollXLoad && allColumnFooterOverflow) {
+                if (spanMethod || footerSpanMethod) {
+                    // 如果不支持优化模式
+                }
+                else {
+                    isOptimizeMode = true;
+                }
+            }
+            return isOptimizeMode;
+        },
         exportOpts() {
             return this.computeExportOpts;
         },
@@ -1579,12 +1662,12 @@ export default {
         if (props.resizable) {
             warnLog('vxe.error.delProp', ['resizable', 'column-config.resizable']);
         }
-        if (props.virtualXConfig && props.scrollX) {
-            warnLog('vxe.error.notSupportProp', ['virtual-x-config', 'scroll-x', 'scroll-x=null']);
-        }
-        if (props.virtualYConfig && props.scrollY) {
-            warnLog('vxe.error.notSupportProp', ['virtual-y-config', 'scroll-y', 'scroll-y=null']);
-        }
+        // if (props.virtualXConfig && props.scrollX) {
+        //   warnLog('vxe.error.notSupportProp', ['virtual-x-config', 'scroll-x', 'scroll-x=null'])
+        // }
+        // if (props.virtualYConfig && props.scrollY) {
+        //   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']);
         }

package/es/toolbar/src/toolbar.js

@@ -406,7 +406,7 @@ export default {
                         ? h(VxeUIButtonComponent, {
                             key: index,
                             props: Object.assign({}, child, {
-                                content: child.name,
+                                content: child.content || child.name,
                                 options: undefined
                             }),
                             on: {
@@ -455,7 +455,7 @@ export default {
                             if (VxeUIButtonComponent) {
                                 btnVNs.push(h(VxeUIButtonComponent, {
                                     props: Object.assign({}, item, {
-                                        content: item.name,
+                                        content: item.content || item.name,
                                         options: undefined
                                     }),
                                     on: {
@@ -517,7 +517,7 @@ export default {
                                 btnVNs.push(h(VxeUIButtonComponent, {
                                     key: tIndex,
                                     props: Object.assign({}, item, {
-                                        content: item.name,
+                                        content: item.content || item.name,
                                         options: undefined
                                     }),
                                     on: {

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.19.5";
+export const version = "3.19.7";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -12,7 +12,7 @@ VxeUI.setConfig({
         delayHover: 250,
         autoResize: true,
         padding: true,
-        minHeight: 144,
+        // minHeight: null,
         // keepSource: false,
         // showOverflow: null,
         // showHeaderOverflow: null,

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.19.5"}`;
+const version = `table v${"3.19.7"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);