vxe-table 3.19.5 → 3.19.7

package/lib/index.umd.js

@@ -2005,7 +2005,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.19.5";
+const version = "3.19.7";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2017,7 +2017,7 @@ core_.VxeUI.setConfig({
     delayHover: 250,
     autoResize: true,
     padding: true,
-    minHeight: 144,
+    // minHeight: null,
     // keepSource: false,
     // showOverflow: null,
     // showHeaderOverflow: null,
@@ -2713,7 +2713,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.19.5"}`;
+const log_version = `table v${"3.19.7"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3938,8 +3938,10 @@ function renderTitleContent(h, params, content) {
     isRowGroupStatus
   } = tableReactData;
   const {
-    showHeaderOverflow
+    showHeaderOverflow,
+    slots
   } = column;
+  const titleSlot = slots ? slots.title : null;
   const headerTooltipOpts = $table.computeHeaderTooltipOpts;
   const showAllTip = headerTooltipOpts.showAll;
   const headOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
@@ -3972,7 +3974,7 @@ function renderTitleContent(h, params, content) {
   return [h('span', {
     class: 'vxe-cell--title',
     on: ons
-  }, isRowGroupStatus && column.aggFunc && $table.getPivotTableAggregateRenderColTitles ? $table.getPivotTableAggregateRenderColTitles(h, column, titleVN) : [titleVN])];
+  }, isRowGroupStatus && column.aggFunc && $table.getPivotTableAggregateRenderColTitles ? $table.getPivotTableAggregateRenderColTitles(h, column, titleVN) : titleSlot ? $table.callSlot(titleSlot, params, h) : [titleVN])];
 }
 function getFooterContent(h, params) {
   const {
@@ -4479,8 +4481,8 @@ const Cell = {
     const {
       seq
     } = params;
-    const seqMethod = seqOpts.seqMethod;
-    return renderCellBaseVNs(h, params, [h('span', `${formatText(seqMethod ? seqMethod(params) : treeConfig ? seq : (seqOpts.startIndex || 0) + seq, 1)}`)]);
+    const seqMd = seqOpts.seqMethod;
+    return renderCellBaseVNs(h, params, [h('span', `${formatText(seqMd ? seqMd(params) : treeConfig ? seq : (seqOpts.startIndex || 0) + seq, 1)}`)]);
   },
   renderDeepIndexCell(h, params) {
     return Cell.renderDeepNodeBtn(h, params, Cell.renderSeqCell(h, params));
@@ -4995,12 +4997,17 @@ const Cell = {
       iconDesc,
       iconVisibleMethod
     } = sortOpts;
+    const {
+      order,
+      slots
+    } = column;
     if (showIcon && (!iconVisibleMethod || iconVisibleMethod(params))) {
-      return [h('span', {
+      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 || cell_getIcon().TABLE_SORT_ASC, {
-          'sort--active': column.order === 'asc'
+          'sort--active': order === 'asc'
         }],
         attrs: {
           title: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(ascTitle) ? cell_getI18n('vxe.table.sortAsc') : `${ascTitle || ''}`
@@ -5013,7 +5020,7 @@ const Cell = {
         } : undefined
       }), h('i', {
         class: ['vxe-sort--desc-btn', iconDesc || cell_getIcon().TABLE_SORT_DESC, {
-          'sort--active': column.order === 'desc'
+          'sort--active': order === 'desc'
         }],
         attrs: {
           title: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(descTitle) ? cell_getI18n('vxe.table.sortDesc') : `${descTitle || ''}`
@@ -6489,8 +6496,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(() => {
@@ -7112,18 +7118,12 @@ function updateStyle($xeTable) {
   const reactData = $xeTable;
   const internalData = $xeTable;
   const {
-    showHeaderOverflow: allColumnHeaderOverflow,
-    showFooterOverflow: allColumnFooterOverflow,
-    mouseConfig,
-    spanMethod,
-    footerSpanMethod
+    mouseConfig
   } = props;
   const {
     isGroup,
     currentRow,
     tableColumn,
-    scrollXLoad,
-    scrollYLoad,
     overflowX,
     scrollbarWidth,
     overflowY,
@@ -7131,8 +7131,6 @@ function updateStyle($xeTable) {
     scrollXWidth,
     columnStore,
     editStore,
-    isAllOverflow,
-    expandColumn,
     isColLoading
   } = reactData;
   const {
@@ -7151,12 +7149,18 @@ 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) {
@@ -7269,7 +7273,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 => {
@@ -7280,18 +7284,10 @@ 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;
           }
@@ -7341,15 +7337,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) {
@@ -7379,15 +7367,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;
         }
@@ -19039,7 +19019,9 @@ const Methods = {
     const internalData = $xeTable;
     const {
       isAllOverflow,
+      overflowY,
       scrollYLoad,
+      scrollYHeight,
       expandColumn
     } = reactData;
     const {
@@ -19065,13 +19047,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);
@@ -19083,18 +19065,21 @@ 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;
@@ -19102,7 +19087,7 @@ const Methods = {
       clientHeight = bodyScrollElem.clientHeight;
     }
     // 虚拟渲染
-    let ySpaceHeight = scrollYHeight;
+    let ySpaceHeight = sYHeight;
     let scrollYTop = ySpaceTop;
     if (isScrollYBig) {
       // 触底
@@ -19113,6 +19098,9 @@ const Methods = {
       }
       ySpaceHeight = maxYHeight;
     }
+    if (!(scrollYLoad && overflowY)) {
+      scrollYTop = 0;
+    }
     if (leftBodyTableElem) {
       leftBodyTableElem.style.transform = `translate(0px, ${scrollYTop}px)`;
     }
@@ -19140,7 +19128,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) {
@@ -20509,8 +20497,6 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
       tableColumn
     } = props;
     const {
-      spanMethod,
-      footerSpanMethod,
       mouseConfig
     } = tableProps;
     const {
@@ -20520,8 +20506,6 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
       overflowX,
       scrollXLoad,
       scrollYLoad,
-      isAllOverflow,
-      expandColumn,
       dragRow,
       dragCol
     } = tableReactData;
@@ -20532,18 +20516,10 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
     } = 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;
     }
@@ -20616,11 +20592,6 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
         emptyContent = tableProps.emptyText || body_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'],
@@ -20630,7 +20601,11 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
     }, [h('div', {
       ref: 'refBodyScroll',
       class: 'vxe-table--body-inner-wrapper',
-      on: ons
+      on: {
+        scroll(evnt) {
+          $xeTable.triggerBodyScrollEvent(evnt, fixedType);
+        }
+      }
     }, [fixedType ? body_renderEmptyElement($xeTable) : h('div', {
       ref: 'refBodyXSpace',
       class: 'vxe-body--x-space'
@@ -21214,10 +21189,7 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
       headerColumn
     } = _vm;
     const {
-      mouseConfig,
-      showHeaderOverflow: allColumnHeaderOverflow,
-      spanMethod,
-      footerSpanMethod
+      mouseConfig
     } = tableProps;
     const {
       isGroup,
@@ -21231,20 +21203,13 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
       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;
       }
@@ -21704,7 +21669,6 @@ function footer_renderHeads(h, _vm, isOptimizeMode, renderColumnList) {
     const _vm = this;
     const props = _vm;
     const $xeTable = _vm.$parent;
-    const tableProps = $xeTable;
     const tableReactData = $xeTable;
     const tableInternalData = $xeTable;
     const {
@@ -21715,11 +21679,6 @@ function footer_renderHeads(h, _vm, isOptimizeMode, renderColumnList) {
       fixedColumn,
       tableColumn
     } = props;
-    const {
-      spanMethod,
-      footerSpanMethod,
-      showFooterOverflow: allColumnFooterOverflow
-    } = tableProps;
     const {
       visibleColumn,
       fullColumnIdData
@@ -21731,16 +21690,9 @@ function footer_renderHeads(h, _vm, isOptimizeMode, renderColumnList) {
       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;
     }
@@ -26676,15 +26628,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
     });
   }
@@ -31459,6 +31413,118 @@ function renderBody(h, $xeTable) {
       }
       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;
     },
@@ -31902,12 +31968,12 @@ function renderBody(h, $xeTable) {
     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']);
     }
@@ -33117,7 +33183,7 @@ function toolbar_createInternalData() {
           return VxeUIButtonComponent ? h(VxeUIButtonComponent, {
             key: index,
             props: Object.assign({}, child, {
-              content: child.name,
+              content: child.content || child.name,
               options: undefined
             }),
             on: {
@@ -33181,7 +33247,7 @@ function toolbar_createInternalData() {
               if (VxeUIButtonComponent) {
                 btnVNs.push(h(VxeUIButtonComponent, {
                   props: Object.assign({}, item, {
-                    content: item.name,
+                    content: item.content || item.name,
                     options: undefined
                   }),
                   on: {
@@ -33262,7 +33328,7 @@ function toolbar_createInternalData() {
                 btnVNs.push(h(VxeUIButtonComponent, {
                   key: tIndex,
                   props: Object.assign({}, item, {
-                    content: item.name,
+                    content: item.content || item.name,
                     options: undefined
                   }),
                   on: {