vxe-table 3.23.10 → 3.24.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.23.10",
+  "version": "3.24.0-beta.1",
   "description": "A PC-end table component based on Vxe UI, supporting copy-paste, data pivot table, and high-performance virtual list table solution.",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -65,7 +65,7 @@
     "vue-i18n": "^8.15.1",
     "vue-router": "^3.5.1",
     "vue-template-compiler": "2.6.14",
-    "vxe-pc-ui": "3.18.9"
+    "vxe-pc-ui": "3.18.12"
   },
   "vetur": {
     "tags": "helper/vetur/tags.json",

package/packages/grid/src/grid.ts

@@ -1161,6 +1161,10 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const formOpts = $xeGrid.computeFormOpts
       return proxyConfig && isEnableConf(proxyOpts) && proxyOpts.form ? formData : formOpts.data
     },
+    /**
+     * 已废弃，被 getFormFlatItems 替换
+     * @deprecated
+     */
     getFormItems (itemIndex?: number): any {
       const $xeGrid = this
       const props = $xeGrid
@@ -1172,8 +1176,36 @@ export default /* define-vxe-component start */ defineVxeComponent({
       XEUtils.eachTree(formConfig && isEnableConf(formOpts) && items ? items : [], item => {
         itemList.push(item)
       }, { children: 'children' })
+      // errLog('vxe.error.delFunc', ['getFormItems', 'getFormFlatItems'])
       return XEUtils.isUndefined(itemIndex) ? itemList : itemList[itemIndex]
     },
+    getFormFlatItems () {
+      const $xeGrid = this
+
+      const $form = $xeGrid.$refs.refForm as VxeFormInstance
+      if ($form) {
+        return $form.getFlatItems()
+      }
+      return []
+    },
+    getFormNestedItems () {
+      const $xeGrid = this
+
+      const $form = $xeGrid.$refs.refForm as VxeFormInstance
+      if ($form) {
+        return $form.getNestedItems()
+      }
+      return []
+    },
+    getFormItemByField (field: string) {
+      const $xeGrid = this
+
+      const $form = $xeGrid.$refs.refForm as VxeFormInstance
+      if ($form) {
+        return $form.getItemByField(field)
+      }
+      return null
+    },
     resetForm () {
       const $xeGrid = this
 

package/packages/table/module/edit/mixin.ts

@@ -977,7 +977,9 @@ export default {
       const { editRender } = column
       const editOpts = $xeTable.computeEditOpts
       if (editConfig && isEnableConf(editRender)) {
-        const compRender = renderer.get(editRender.name)
+        const rendererOpts = $xeTable.computeRendererOpts
+        const renderName = editRender.name
+        const compRender = renderName ? (rendererOpts[renderName] || renderer.get(renderName)) : null
         let autoFocus: boolean | string | ((params: VxeGlobalRendererHandles.TableAutoFocusParams) => HTMLElement | null) | null | undefined = editRender.autofocus || editRender.autoFocus
         let autoSelect = editRender.autoSelect || editRender.autoselect
         let inputElem: HTMLElement | null = null

package/packages/table/module/export/mixin.ts

@@ -66,12 +66,13 @@ function getBodyLabelData ($xeTable: VxeTableConstructor & VxeTablePrivateMethod
   const { isTreeAllExpanded, isRowGroupAllExpanded, mode: expMode } = opts
   const { treeConfig } = props
   const { isRowGroupStatus } = reactData
-  const { fullColumnFieldData } = internalData
+  const { fullColumnFieldData, fullAllDataRowIdData } = internalData
   const radioOpts = $xeTable.computeRadioOpts
   const checkboxOpts = $xeTable.computeCheckboxOpts
   const treeOpts = $xeTable.computeTreeOpts
   const columnOpts = $xeTable.computeColumnOpts
   const aggregateOpts = $xeTable.computeAggregateOpts
+  const rendererOpts = $xeTable.computeRendererOpts
   if (!htmlCellElem) {
     htmlCellElem = document.createElement('div')
   }
@@ -104,7 +105,7 @@ function getBodyLabelData ($xeTable: VxeTableConstructor & VxeTablePrivateMethod
           const renderOpts = editRender || cellRender
           let bodyExportMethod: VxeColumnPropTypes.ExportMethod | undefined = column.exportMethod || columnOpts.exportMethod
           if (!bodyExportMethod && renderOpts && renderOpts.name) {
-            const compConf = renderer.get(renderOpts.name)
+            const compConf = rendererOpts[renderOpts.name] || renderer.get(renderOpts.name)
             if (compConf) {
               bodyExportMethod = compConf.tableExportMethod || compConf.exportMethod
             }
@@ -216,8 +217,9 @@ function getBodyLabelData ($xeTable: VxeTableConstructor & VxeTablePrivateMethod
     return rest
   }
   if (treeConfig) {
-    const childrenField = treeOpts.children || treeOpts.childrenField
     // 如果是树结构
+    const { seqMode } = treeOpts
+    const childrenField = treeOpts.children || treeOpts.childrenField
     const rest: any[] = []
     const expandMaps: Record<string, boolean> = {}
     const useMaps: Record<string, boolean> = {}
@@ -237,12 +239,13 @@ function getBodyLabelData ($xeTable: VxeTableConstructor & VxeTablePrivateMethod
           _hasChild: hasRowChild,
           _expand: hasRowChild && $xeTable.isTreeExpandByRow(row)
         }
+        const rowRest = fullAllDataRowIdData[rowid] || {}
         columns.forEach((column, $columnIndex) => {
           let cellValue: string | number | boolean | null = ''
           const renderOpts = column.editRender || column.cellRender
           let bodyExportMethod: VxeColumnPropTypes.ExportMethod | undefined = column.exportMethod || columnOpts.exportMethod
           if (!bodyExportMethod && renderOpts && renderOpts.name) {
-            const compConf = renderer.get(renderOpts.name)
+            const compConf = rendererOpts[renderOpts.name] || renderer.get(renderOpts.name)
             if (compConf) {
               bodyExportMethod = compConf.tableExportMethod || compConf.exportMethod
             }
@@ -255,7 +258,10 @@ function getBodyLabelData ($xeTable: VxeTableConstructor & VxeTablePrivateMethod
           } else {
             switch (column.type) {
               case 'seq': {
-                const seqVal = path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('')
+                let seqVal: number | string = path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('')
+                if (seqMode === 'increasing') {
+                  seqVal = rowRest ? (rowRest._index + 1) : -1
+                }
                 cellValue = expMode === 'all' ? seqVal : getSeq($xeTable, seqVal, row, $rowIndex, column, $columnIndex)
                 break
               }
@@ -306,7 +312,7 @@ function getBodyLabelData ($xeTable: VxeTableConstructor & VxeTablePrivateMethod
       const renderOpts = column.editRender || column.cellRender
       let bodyExportMethod: VxeColumnPropTypes.ExportMethod | undefined = column.exportMethod || columnOpts.exportMethod
       if (!bodyExportMethod && renderOpts && renderOpts.name) {
-        const compConf = renderer.get(renderOpts.name)
+        const compConf = rendererOpts[renderOpts.name] || renderer.get(renderOpts.name)
         if (compConf) {
           bodyExportMethod = compConf.tableExportMethod || compConf.exportMethod
         }
@@ -377,10 +383,11 @@ function getHeaderTitle ($xeTable: VxeTableConstructor & VxeTablePrivateMethods,
 
 function getFooterCellValue ($xeTable: any, opts: VxeTablePropTypes.ExportHandleOptions, row: any, column: VxeTableDefines.ColumnInfo) {
   const columnOpts = $xeTable.computeColumnOpts
+  const rendererOpts = $xeTable.computeRendererOpts
   const renderOpts = column.editRender || column.cellRender
   let footLabelMethod: VxeColumnPropTypes.FooterExportMethod | undefined = column.footerExportMethod
   if (!footLabelMethod && renderOpts && renderOpts.name) {
-    const compConf = renderer.get(renderOpts.name)
+    const compConf = rendererOpts[renderOpts.name] || renderer.get(renderOpts.name)
     if (compConf) {
       footLabelMethod = compConf.tableFooterExportMethod || compConf.footerExportMethod || (compConf as any).footerCellExportMethod
     }

package/packages/table/module/filter/mixin.ts

@@ -25,9 +25,10 @@ function updatePopupStyle ($xeTable: VxeTableConstructor & VxeTablePrivateMethod
   }
   const tableEl = $xeTable.$refs.refElem as HTMLDivElement
   const filterOpts = $xeTable.computeFilterOpts
+  const rendererOpts = $xeTable.computeRendererOpts
   const { maxHeight: customMaxHeight, transfer, zIndex } = filterOpts
   const filterRender = column ? column.filterRender : null
-  const compConf = filterRender && isEnableConf(filterRender) ? renderer.get(filterRender.name) : null
+  const compConf = filterRender && isEnableConf(filterRender) && filterRender.name ? (rendererOpts[filterRender.name] || renderer.get(filterRender.name)) : null
 
   const headerScrollElem = getRefElem(elemStore['main-header-scroll'])
   if (!headerScrollElem) {
@@ -464,13 +465,14 @@ export default {
         $xeTable.handleColumnConfirmFilter(column, evnt)
       }
     },
-    handleClearFilter (column: any) {
+    handleClearFilter (column: VxeTableDefines.ColumnInfo) {
       const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
 
       if (column) {
         const { filters, filterRender } = column
         if (filters) {
-          const compConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null
+          const rendererOpts = $xeTable.computeRendererOpts
+          const compConf = isEnableConf(filterRender) && filterRender.name ? (rendererOpts[filterRender.name] || renderer.get(filterRender.name)) : null
           const filterResetMethod = column.filterResetMethod || (compConf ? (compConf.tableFilterResetMethod || compConf.filterResetMethod) : null)
           filters.forEach((item: any) => {
             item._checked = false
@@ -480,7 +482,7 @@ export default {
             }
           })
           if (filterResetMethod) {
-            filterResetMethod({ options: filters, column, $table: $xeTable })
+            filterResetMethod({ options: filters as VxeTableDefines.FilterOption[], column, $table: $xeTable })
           }
         }
       }

package/packages/table/module/filter/panel.ts

@@ -258,9 +258,10 @@ export default /* define-vxe-component start */ defineVxeComponent({
         return []
       }
       const filterOpts = $xeTable.computeFilterOpts
+      const rendererOpts = $xeTable.computeRendererOpts
       const hasCheckOption = $xeFilterPanel.computeHasCheckOption
       const { filterRender, filterMultiple } = column
-      const compConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null
+      const compConf = filterRender && isEnableConf(filterRender) && filterRender.name ? (rendererOpts[filterRender.name] || renderer.get(filterRender.name)) : null
       const isDisabled = !hasCheckOption && !filterStore.isAllSelected && !filterStore.isIndeterminate
       return filterMultiple && (compConf ? !(compConf.showTableFilterFooter === false || compConf.showFilterFooter === false || compConf.isFooter === false) : true)
         ? [
@@ -298,8 +299,9 @@ export default /* define-vxe-component start */ defineVxeComponent({
       if (!column) {
         return renderEmptyElement($xeFilterPanel)
       }
+      const rendererOpts = $xeTable.computeRendererOpts
       const filterRender = column ? column.filterRender : null
-      const compConf = filterRender && isEnableConf(filterRender) ? renderer.get(filterRender.name) : null
+      const compConf = filterRender && isEnableConf(filterRender) && filterRender.name ? (rendererOpts[filterRender.name] || renderer.get(filterRender.name)) : null
       const filterClassName = compConf ? (compConf.tableFilterClassName || compConf.filterClassName) : ''
       const params = Object.assign({}, tableInternalData._currFilterParams, { $panel: $xeFilterPanel, $table: $xeTable })
       const tableProps = $xeTable

package/packages/table/src/body.ts

@@ -117,6 +117,7 @@ function renderTdColumn (
   const tooltipOpts = $xeTable.computeTooltipOpts
   const virtualXOpts = $xeTable.computeVirtualXOpts
   const virtualYOpts = $xeTable.computeVirtualYOpts
+  const rendererOpts = $xeTable.computeRendererOpts
   const { isAllColumnDrag, isAllRowDrag } = $xeTable.resizableOpts
   const rowOpts = $xeTable.computeRowOpts
   const rowDragOpts = $xeTable.computeRowDragOpts
@@ -135,7 +136,7 @@ function renderTdColumn (
   const colid = column.id
   const colRest = fullColumnIdData[colid] || {}
   const renderOpts = editRender || cellRender
-  const compConf = renderOpts ? renderer.get(renderOpts.name) : null
+  const compConf = renderOpts && renderOpts.name ? (rendererOpts[renderOpts.name] || renderer.get(renderOpts.name)) : null
   const compCellClassName = compConf ? (compConf.tableCellClassName || compConf.cellClassName) : null
   const compCellStyle = compConf ? (compConf.tableCellStyle || compConf.cellStyle) : ''
   const showAllTip = tooltipOpts.showAll
@@ -862,7 +863,8 @@ export default /* define-vxe-component start */ defineVxeComponent({
     if (emptySlot) {
       emptyContent = emptySlot.call($xeTable, emptyParams)
     } else {
-      const compConf = emptyOpts.name ? renderer.get(emptyOpts.name) : null
+      const rendererOpts = $xeTable.computeRendererOpts
+      const compConf = emptyOpts.name ? (rendererOpts[emptyOpts.name] || renderer.get(emptyOpts.name)) : null
       const rtEmptyView = compConf ? (compConf.renderTableEmpty || compConf.renderTableEmptyView || compConf.renderEmpty) : null
       if (rtEmptyView) {
         emptyContent = getSlotVNs(rtEmptyView.call($xeTable, h, emptyOpts, emptyParams))

package/packages/table/src/cell.ts

@@ -245,7 +245,8 @@ function getFooterContent (h: CreateElement, params: VxeTableDefines.CellRenderF
   const renderOpts = editRenderOpts || cellRenderOpts
   const itemValue = $table.getFooterCellLabel(row, column)
   if (renderOpts) {
-    const compConf = renderer.get(renderOpts.name)
+    const rendererOpts = $table.computeRendererOpts
+    const compConf = renderOpts.name ? (rendererOpts[renderOpts.name] || renderer.get(renderOpts.name)) : null
     const rtFooter = compConf ? (compConf.renderTableFooter || compConf.renderFooter) : null
     if (rtFooter) {
       const footParams = Object.assign(params, {
@@ -387,7 +388,8 @@ export const Cell = {
     }
 
     if (renderOpts) {
-      const compConf = renderer.get(renderOpts.name)
+      const rendererOpts = $table.computeRendererOpts
+      const compConf = renderOpts.name ? (rendererOpts[renderOpts.name] || renderer.get(renderOpts.name)) : null
       const rtHeader = compConf ? (compConf.renderTableHeader || compConf.renderHeader) : null
       if (rtHeader) {
         return getSlotVNs(renderTitleContent(h, params, rtHeader.call($table, h, renderOpts, params))) as VNode[]
@@ -477,16 +479,25 @@ export const Cell = {
       if (defaultSlot) {
         return renderCellBaseVNs(h, params, $table.callSlot(defaultSlot, params, h))
       }
-      const renderOpts = editRenderOpts || cellRenderOpts
-      // 如果是编辑表格：renderTableCell > formatter
-      // 如果是查看表格：renderTableDefault > formatter
-      if (renderOpts) {
-        const compConf = renderer.get(renderOpts.name)
-        if (compConf) {
-          const renderFn = editRenderOpts ? (compConf.renderTableCell || compConf.renderCell) : (compConf.renderTableDefault || compConf.renderDefault)
-          if (renderFn) {
-            return renderCellBaseVNs(h, params, getSlotVNs(renderFn.call($table, h, renderOpts, Object.assign({ $type: editRenderOpts ? 'edit' : 'cell' }, params))))
-          }
+      const rendererOpts = $table.computeRendererOpts
+      // 如果是编辑模式-查看：slot default > formatter > cellRender.renderTableDefault > editRender.renderTableCell > editRender.renderTableDefault > cellRender.tableCellFormatter > editRender.tableCellFormatter > field
+      // 如果是查看表格：slot default > formatter > cellRender。renderTableDefault > cellRender.tableCellFormatter > field
+      const cellCompConf = cellRenderOpts && cellRenderOpts.name ? (rendererOpts[cellRenderOpts.name] || renderer.get(cellRenderOpts.name)) : null
+      if (cellRenderOpts) {
+        const cellDefaultRenderFn = cellCompConf ? (cellCompConf.renderTableDefault || cellCompConf.renderDefault) : null
+        if (cellDefaultRenderFn && cellRenderOpts) {
+          return renderCellBaseVNs(h, params, getSlotVNs(cellDefaultRenderFn(h, cellRenderOpts, Object.assign({ $type: editRenderOpts ? 'edit' : 'cell' }, params))))
+        }
+      }
+      if (editRenderOpts) {
+        const editCompConf = editRenderOpts && editRenderOpts.name ? (rendererOpts[editRenderOpts.name] || renderer.get(editRenderOpts.name)) : null
+        const editCellRenderFn = editCompConf
+          ? (
+              (editCompConf.renderTableCell || editCompConf.renderCell) ||
+              (editCompConf.renderTableDefault || editCompConf.renderDefault))
+          : null
+        if (editCellRenderFn) {
+          return renderCellBaseVNs(h, params, getSlotVNs(editCellRenderFn(h, editRenderOpts, Object.assign({ $type: editRenderOpts ? 'edit' : 'cell' }, params))))
         }
       }
       cellValue = $table.getCellLabel(row, column)
@@ -1055,7 +1066,8 @@ export const Cell = {
       return $table.callSlot(slots.content, params, h)
     }
     if (contentRender) {
-      const compConf = renderer.get(contentRender.name)
+      const rendererOpts = $table.computeRendererOpts
+      const compConf = contentRender.name ? (rendererOpts[contentRender.name] || renderer.get(contentRender.name)) : null
       const rtExpand = compConf ? (compConf.renderTableExpand || compConf.renderExpand) : null
       if (rtExpand) {
         return getSlotVNs(rtExpand.call($table, h, contentRender, params))
@@ -1294,7 +1306,8 @@ export const Cell = {
       if (slots && slots.edit) {
         return $table.callSlot(slots.edit, cellParams, h)
       }
-      const compConf = renderer.get(editRender.name)
+      const rendererOpts = $table.computeRendererOpts
+      const compConf = editRenderOpts.name ? (rendererOpts[editRenderOpts.name] || renderer.get(editRenderOpts.name)) : null
       const rtEdit = compConf ? (compConf.renderTableEdit || compConf.renderEdit) : null
       if (rtEdit) {
         return getSlotVNs(rtEdit.call($table, h, editRender, cellParams))
@@ -1319,6 +1332,7 @@ export const Cell = {
       }
     }
 
+    // slot default > formatter
     if (formatter) {
       return renderCellBaseVNs(h, params, [
         h('span', {

package/packages/table/src/columnInfo.ts

@@ -27,7 +27,8 @@ export class ColumnInfo {
     const defaultVisible = XEUtils.isBoolean(visible) ? visible : true
     const defaultRenderWidth = width && isPx(width) && width !== 'auto' ? Math.max(0, XEUtils.toInteger(width)) : 0
 
-    const flCompConf = filterRender && isEnableConf(filterRender) ? renderer.get(filterRender.name) : null
+    const rendererOpts = $xeTable.computeRendererOpts
+    const flCompConf = filterRender && isEnableConf(filterRender) && filterRender.name ? (rendererOpts[filterRender.name] || renderer.get(filterRender.name)) : null
     const ctFilterOptions = flCompConf ? flCompConf.createTableFilterOptions : null
 
     const filters = toFilters(colConfs.filters, colId)

package/packages/table/src/footer.ts

@@ -35,13 +35,14 @@ function renderRows (h: CreateElement, _vm: any, isOptimizeMode: boolean, tableC
   const cellOpts = $xeTable.computeCellOpts
   const footerCellOpts = $xeTable.computeFooterCellOpts
   const currCellHeight = getCalcHeight(footerCellOpts.height) || defaultRowHeight
+  const rendererOpts = $xeTable.computeRendererOpts
 
   return tableColumn.map((column, $columnIndex) => {
     const { type, showFooterOverflow, footerAlign, align, footerClassName, editRender, cellRender } = column
     const colid = column.id
     const colRest = fullColumnIdData[colid] || {}
     const renderOpts = editRender || cellRender
-    const compConf = renderOpts ? renderer.get(renderOpts.name) : null
+    const compConf = renderOpts && renderOpts.name ? (rendererOpts[renderOpts.name] || renderer.get(renderOpts.name)) : null
     const showAllTip = footerTooltipOpts.showAll
     const fixedHiddenColumn = overflowX && (fixedType ? column.fixed !== fixedType : !!column.fixed)
 

package/packages/table/src/header.ts

@@ -33,6 +33,7 @@ function renderRows (h: CreateElement, _vm: any, isGroup: boolean, isOptimizeMod
   const cellOpts = $xeTable.computeCellOpts
   const defaultRowHeight = $xeTable.computeDefaultRowHeight
   const headerCellOpts = $xeTable.computeHeaderCellOpts
+  const rendererOpts = $xeTable.computeRendererOpts
   const currCellHeight = getCalcHeight(headerCellOpts.height) || defaultRowHeight
   const { disabledMethod: dragDisabledMethod, isCrossDrag, isPeerDrag } = columnDragOpts
   const isLastRow = _rowIndex === headerGroups.length - 1
@@ -43,7 +44,7 @@ function renderRows (h: CreateElement, _vm: any, isGroup: boolean, isOptimizeMod
     const colid = column.id
     const colRest = fullColumnIdData[colid] || {}
     const renderOpts = editRender || cellRender
-    const compConf = renderOpts ? renderer.get(renderOpts.name) : null
+    const compConf = renderOpts && renderOpts.name ? (rendererOpts[renderOpts.name] || renderer.get(renderOpts.name)) : null
     const isColGroup = column.children && column.children.length
     const fixedHiddenColumn = overflowX && !isColGroup && (fixedType ? column.fixed !== fixedType : !!column.fixed)
 
@@ -244,6 +245,7 @@ function renderFilterRows (h: CreateElement, _vm: any, isOptimizeMode: boolean,
   const defaultRowHeight = $xeTable.computeDefaultRowHeight
   const headerCellOpts = $xeTable.computeHeaderCellOpts
   const floatingFilterOpts = $xeTable.computeFloatingFilterOpts
+  const rendererOpts = $xeTable.computeRendererOpts
   const { cellClassName } = floatingFilterOpts
   const currCellHeight = getCalcHeight(headerCellOpts.height) || defaultRowHeight
 
@@ -252,8 +254,8 @@ function renderFilterRows (h: CreateElement, _vm: any, isOptimizeMode: boolean,
     const colid = column.id
     const colRest = fullColumnIdData[colid] || {}
     const renderOpts = editRender || cellRender
-    const compConf = renderOpts ? renderer.get(renderOpts.name) : null
-    const flCompConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null
+    const compConf = renderOpts && renderOpts.name ? (rendererOpts[renderOpts.name] || renderer.get(renderOpts.name)) : null
+    const flCompConf = isEnableConf(filterRender) && filterRender.name ? (rendererOpts[filterRender.name] || renderer.get(filterRender.name)) : null
     const rtFloatingFilter = flCompConf ? flCompConf.renderTableFloatingFilter : null
     const flSlot = slots ? (slots.floatingFilter || slots['floating-filter']) : null
     const fixedHiddenColumn = overflowX && (fixedType ? column.fixed !== fixedType : !!column.fixed)

package/packages/table/src/methods.ts

@@ -817,6 +817,7 @@ function updateAfterFullData ($xeTable: VxeTableConstructor & VxeTablePrivateMet
   const filterOpts = $xeTable.computeFilterOpts
   const sortOpts = $xeTable.computeSortOpts
   const aggregateOpts = $xeTable.computeAggregateOpts
+  const rendererOpts = $xeTable.computeRendererOpts
   const treeOpts = $xeTable.computeTreeOpts
   const childrenField = treeOpts.children || treeOpts.childrenField
   const { transform, rowField, parentField, mapChildrenField } = treeOpts
@@ -862,7 +863,7 @@ function updateAfterFullData ($xeTable: VxeTableConstructor & VxeTablePrivateMet
       const handleFilter = (row: any) => {
         return filterColumns.every(({ column, valueList, itemList }) => {
           const { filterMethod, filterRender } = column
-          const compConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null
+          const compConf = isEnableConf(filterRender) && filterRender.name ? (rendererOpts[filterRender.name] || renderer.get(filterRender.name)) : null
           const compFilterMethod = compConf ? (compConf.tableFilterMethod || compConf.filterMethod) : null
           const tdFilterMethod = compConf ? (compConf.tableFilterDefaultMethod || compConf.defaultTableFilterMethod || compConf.defaultFilterMethod) : null
           const cellValue = getCellValue(row, column)
@@ -5762,6 +5763,7 @@ const tableMethods: any = {
     }
     const { editConfig } = props
     const { formatter, editRender, cellRender } = column
+    const rendererOpts = $xeTable.computeRendererOpts
     let etOpSize = null
     let etOgSize = null
     let clOpSize = null
@@ -5774,13 +5776,17 @@ const tableMethods: any = {
       clOpSize = cellRender.options ? cellRender.options.length : 0
       clOgSize = cellRender.optionGroups ? cellRender.optionGroups.length : 0
     }
-    // formatter > tableCellFormatter
-    const renderOpts = formatter ? null : (editConfig && isEnableConf(editRender) ? editRender : (isEnableConf(cellRender) ? cellRender : null))
-    const compConf = renderOpts ? renderer.get(renderOpts.name) : null
-    const tcFormatter = compConf ? compConf.tableCellFormatter : null
+    const isEnableEdit = editConfig && isEnableConf(editConfig)
+    const editRenderOpts = formatter ? null : (isEnableEdit && isEnableConf(editRender) ? editRender : null)
+    const cellRenderOpts = formatter ? null : (isEnableConf(cellRender) ? cellRender : null)
+    // formatter > cellRender.tableCellFormatter > editRender.tableCellFormatter
+    const cellCompConf = cellRenderOpts && cellRenderOpts.name ? (rendererOpts[cellRenderOpts.name] || renderer.get(cellRenderOpts.name)) : null
+    const editCompConf = editRenderOpts && editRenderOpts.name ? (rendererOpts[editRenderOpts.name] || renderer.get(editRenderOpts.name)) : null
+    const cellDfFormatter = cellCompConf ? cellCompConf.tableCellFormatter : null
+    const editDfFormatter = editCompConf ? editCompConf.tableCellFormatter : null
     const cellValue = getCellValue(row, column)
     let cellLabel = cellValue
-    if (formatter || tcFormatter) {
+    if (formatter || cellDfFormatter || editDfFormatter) {
       let formatData: Record<string, VxeTableDefines.RowCacheFormatObj> | undefined
       const { fullAllDataRowIdData } = internalData
       const rowid = getRowid($xeTable, row)
@@ -5818,8 +5824,10 @@ const tableMethods: any = {
         } else {
           cellLabel = formatter(formatParams)
         }
-      } else if (renderOpts && tcFormatter) {
-        cellLabel = tcFormatter(renderOpts, formatParams)
+      } else if (cellRenderOpts && cellDfFormatter) {
+        cellLabel = cellDfFormatter(cellRenderOpts, formatParams)
+      } else if (editRenderOpts && editDfFormatter) {
+        cellLabel = editDfFormatter(editRenderOpts, formatParams)
       }
       if (formatData) {
         const ftValue = [cellValue, etOpSize, etOgSize, clOpSize, clOgSize]
@@ -7067,8 +7075,9 @@ const tableMethods: any = {
     if (column) {
       const { filterStore } = reactData
       const { filterRender, filters } = column
+      const rendererOpts = $xeTable.computeRendererOpts
       const filterOptions = filters || []
-      const compConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null
+      const compConf = isEnableConf(filterRender) && filterRender.name ? (rendererOpts[filterRender.name] || renderer.get(filterRender.name)) : null
       const frMethod = column.filterRecoverMethod || (compConf ? (compConf.tableFilterRecoverMethod || compConf.filterRecoverMethod) : null)
       filterStore.column = column
       // 复原状态

package/packages/table/src/props.ts

@@ -306,6 +306,10 @@ export const tableProps = {
   animat: { type: Boolean, default: () => getConfig().table.animat },
   // （可能会被废弃的参数，不要使用）
   delayHover: { type: Number, default: () => getConfig().table.delayHover },
+  /**
+   * 渲染器配置项
+   */
+  rendererConfig: Object as PropType<VxeTablePropTypes.RendererConfig>,
   // 额外的参数
   params: Object as PropType<VxeTablePropTypes.Params>
 }

package/packages/table/src/table.ts

@@ -173,7 +173,8 @@ function renderEmptyBody (h: CreateElement, $xeTable: VxeTableConstructor & VxeT
   if (emptySlot) {
     emptyContent = emptySlot.call($xeTable, emptyParams)
   } else {
-    const compConf = emptyOpts.name ? renderer.get(emptyOpts.name) : null
+    const rendererOpts = $xeTable.computeRendererOpts
+    const compConf = emptyOpts.name ? (rendererOpts[emptyOpts.name] || renderer.get(emptyOpts.name)) : null
     const rtEmptyView = compConf ? (compConf.renderTableEmpty || compConf.renderTableEmptyView || compConf.renderEmpty) : null
     if (rtEmptyView) {
       emptyContent = getSlotVNs(rtEmptyView.call($xeTable, h, emptyOpts, emptyParams))
@@ -1489,6 +1490,12 @@ export default {
 
       return Object.assign({}, getConfig().table.undoRedoHistoryConfig, props.undoRedoHistoryConfig)
     },
+    computeRendererOpts () {
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+      const props = $xeTable
+
+      return Object.assign({}, getConfig().table.rendererConfig, props.rendererConfig)
+    },
     combineTabsResizeFlag () {
       const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
       const $xeTabs = $xeTable.$xeTabs

package/packages/toolbar/src/toolbar.ts

@@ -486,10 +486,11 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const buttonSuffixSlot = slots.buttonSuffix || slots['button-suffix']
       const btnVNs: VxeComponentSlotType[] = []
       if (buttons) {
+        const rendererOpts = ($table ? $table.computeRendererOpts : null) || {}
         buttons.forEach((item) => {
           const { dropdowns, buttonRender } = item
           if (item.visible !== false) {
-            const compConf = buttonRender ? renderer.get(buttonRender.name) : null
+            const compConf = buttonRender && buttonRender.name ? (rendererOpts[buttonRender.name] || renderer.get(buttonRender.name)) : null
             if (buttonRender && compConf && compConf.renderToolbarButton) {
               const toolbarButtonClassName = compConf.toolbarButtonClassName
               const params = { $grid: $xeGrid, $gantt: $xeGantt, $table: $table!, button: item }
@@ -555,17 +556,17 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const toolSuffixSlot = slots.toolSuffix || slots['tool-suffix']
       const btnVNs: VxeComponentSlotType[] = []
       if (tools) {
+        const rendererOpts = ($table ? $table.computeRendererOpts : null) || {}
         tools.forEach((item, tIndex) => {
           const { dropdowns, toolRender } = item
           if (item.visible !== false) {
-            const rdName = toolRender ? toolRender.name : null
-            const compConf = toolRender ? renderer.get(rdName) : null
+            const compConf = toolRender && toolRender.name ? (rendererOpts[toolRender.name] || renderer.get(toolRender.name)) : null
             if (toolRender && compConf && compConf.renderToolbarTool) {
               const toolbarToolClassName = compConf.toolbarToolClassName
               const params = { $grid: $xeGrid, $gantt: $xeGantt, $table: $table!, tool: item }
               btnVNs.push(
                 h('span', {
-                  key: rdName as string,
+                  key: tIndex,
                   class: ['vxe-tool--item', toolbarToolClassName ? (XEUtils.isFunction(toolbarToolClassName) ? toolbarToolClassName(params) : toolbarToolClassName) : '']
                 }, getSlotVNs(compConf.renderToolbarTool(h, toolRender, params)))
               )

package/styles/components/icon.scss

@@ -4,7 +4,7 @@
 
 @font-face {
   font-family: "vxetableiconfont";
-  src: url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2');
+  src: url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2');
 }
 
 @keyframes rollCircle {
@@ -47,7 +47,7 @@ $btnThemeList: (
   font-family: "vxetableiconfont" !important;
   font-style: normal;
   font-weight: 400;
-  font-size: 1.1em;
+  font-size: 1em;
   line-height: 1em;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;

package/styles/components/table.scss

@@ -1065,7 +1065,7 @@ $btnThemeList: (
     vertical-align: middle;
     .vxe-sort--asc-btn,
     .vxe-sort--desc-btn {
-      height: 0.6em;
+      height: 0.68em;
     }
   }
   .vxe-cell--sort-horizontal-layout {