vxe-table 4.21.10 → 4.22.0-beta.1

package/README.md

@@ -31,6 +31,7 @@
     * [ ] v4.? 重构虚拟渲染v7，优化百万级渲染量
     * [ ] v4.? 重构虚拟渲染v6，同时支持原生滚动条和虚拟滚动条
     * [ ] v4.? 功能需求收集中...
+    * [x] v4.22 编辑表格的渲染器支持 edit-render 和 edit-render 组合使用
     * [x] v4.21 重构全键盘操作，修复按键编辑为拼音输入法时首字母丢失问题；筛选支持自适应屏幕上下位置显示；优化虚拟渲染，解决滚动错位场景
     * [x] v4.20 内部重构优化，内部结构调整
     * [x] v4.19 增加对增删改操作撤销回退的支持；优化虚拟渲染，优化提升 Window/Mac 触摸板滚动流畅度
@@ -49,6 +50,7 @@
     * [ ] v3.? 重构虚拟渲染v7，优化百万级渲染量
     * [ ] v3.? 重构虚拟渲染v6，同时支持原生滚动条和虚拟滚动条
     * [ ] v3.? 功能需求收集中...
+    * [x] v3.24 编辑表格的渲染器支持 edit-render 和 edit-render 组合使用
     * [x] v3.23 重构全键盘操作，修复按键编辑为拼音输入法时首字母丢失问题；筛选支持自适应屏幕上下位置显示；优化虚拟渲染，解决滚动错位场景
     * [x] v3.22 内部重构优化，内部结构调整
     * [x] v3.21 增加对增删改操作撤销回退的支持；优化虚拟渲染，优化提升 Window/Mac 触摸板滚动流畅度

package/dist/all.esm.js

@@ -47,7 +47,7 @@ function getDefaultConfig(val1, def1) {
     return XEUtils.eqNull(val1) ? def1 : val1;
 }
 
-const version = "4.21.10";
+const version = "4.22.0-beta.1";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -931,7 +931,7 @@ function getPopupWrapperElement(panelElem) {
 }
 
 const { log } = VxeUI;
-const tableVersion = `table v${"4.21.10"}`;
+const tableVersion = `table v${"4.22.0-beta.1"}`;
 function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
@@ -954,11 +954,13 @@ class ColumnInfo {
         const $xeGrid = $xeTable.xeGrid;
         const $xeGantt = $xeTable.xeGantt;
         const $xeGGWrapper = $xeGrid || $xeGantt;
+        const { computeRendererOpts, computeTreeOpts } = $xeTable.getComputeMaps();
         const { type, field, width, visible, fixed, align, headerAlign, footerAlign, aggFunc, formatter, filterMultiple, cellRender, editRender, filterRender } = colConfs;
         const colId = colConfs.colId || XEUtils.uniqueId('col_');
         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$b.get(filterRender.name) : null;
+        const rendererOpts = computeRendererOpts.value;
+        const flCompConf = filterRender && isEnableConf(filterRender) && filterRender.name ? (rendererOpts[filterRender.name] || renderer$b.get(filterRender.name)) : null;
         const ctFilterOptions = flCompConf ? flCompConf.createTableFilterOptions : null;
         const filters = toFilters(colConfs.filters, colId);
         const types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
@@ -973,7 +975,6 @@ class ColumnInfo {
         }
         if (type === 'expand') {
             const { treeConfig } = tableProps;
-            const { computeTreeOpts } = $xeTable.getComputeMaps();
             const treeOpts = computeTreeOpts.value;
             if (treeConfig && (treeOpts.showLine || treeOpts.line)) {
                 errLog$a('vxe.error.errConflicts', ['tree-config.showLine', 'column.type=expand']);
@@ -2469,7 +2470,9 @@ function getFooterContent(params) {
     const renderOpts = editRenderOpts || cellRenderOpts;
     const itemValue = $table.getFooterCellLabel(row, column);
     if (renderOpts) {
-        const compConf = renderer$a.get(renderOpts.name);
+        const { computeRendererOpts } = $table.getComputeMaps();
+        const rendererOpts = computeRendererOpts.value;
+        const compConf = renderOpts.name ? (rendererOpts[renderOpts.name] || renderer$a.get(renderOpts.name)) : null;
         if (compConf) {
             const rtFooter = compConf.renderTableFooter || compConf.renderFooter;
             if (rtFooter) {
@@ -2606,7 +2609,9 @@ const Cell = {
             }
         }
         if (renderOpts) {
-            const compConf = renderer$a.get(renderOpts.name);
+            const { computeRendererOpts } = $table.getComputeMaps();
+            const rendererOpts = computeRendererOpts.value;
+            const compConf = renderOpts.name ? (rendererOpts[renderOpts.name] || renderer$a.get(renderOpts.name)) : null;
             if (compConf) {
                 const rtHeader = compConf.renderTableHeader || compConf.renderHeader;
                 if (rtHeader) {
@@ -2701,18 +2706,29 @@ const Cell = {
             if (defaultSlot) {
                 return renderCellBaseVNs(params, $table.callSlot(defaultSlot, params));
             }
-            const renderOpts = editRenderOpts || cellRenderOpts;
-            // 如果是编辑表格：renderTableCell > formatter
-            // 如果是查看表格：renderTableDefault > formatter
-            if (renderOpts) {
-                const compConf = renderer$a.get(renderOpts.name);
-                if (compConf) {
-                    const renderFn = editRenderOpts ? (compConf.renderTableCell || compConf.renderCell) : (compConf.renderTableDefault || compConf.renderDefault);
-                    if (renderFn) {
-                        return renderCellBaseVNs(params, getSlotVNs(renderFn(renderOpts, Object.assign({ $type: editRenderOpts ? 'edit' : 'cell' }, params))));
-                    }
-                }
-            }
+            const { computeRendererOpts } = $table.getComputeMaps();
+            const rendererOpts = computeRendererOpts.value;
+            // 如果是编辑模式-查看：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$a.get(cellRenderOpts.name)) : null;
+            if (cellRenderOpts) {
+                const cellDefaultRenderFn = cellCompConf ? (cellCompConf.renderTableDefault || cellCompConf.renderDefault) : null;
+                if (cellDefaultRenderFn && cellRenderOpts) {
+                    return renderCellBaseVNs(params, getSlotVNs(cellDefaultRenderFn(cellRenderOpts, Object.assign({ $type: editRenderOpts ? 'edit' : 'cell' }, params))));
+                }
+            }
+            if (editRenderOpts) {
+                const editCompConf = editRenderOpts && editRenderOpts.name ? (rendererOpts[editRenderOpts.name] || renderer$a.get(editRenderOpts.name)) : null;
+                const editCellRenderFn = editCompConf
+                    ? ((editCompConf.renderTableCell || editCompConf.renderCell) ||
+                        (editCompConf.renderTableDefault || editCompConf.renderDefault))
+                    : null;
+                if (editCellRenderFn) {
+                    return renderCellBaseVNs(params, getSlotVNs(editCellRenderFn(editRenderOpts, Object.assign({ $type: editRenderOpts ? 'edit' : 'cell' }, params))));
+                }
+            }
+            // 如果是编辑模式-查看：cellRender.tableCellFormatter > editRender.tableCellFormatter > field
+            // 如果是查看表格：cellRender.tableCellFormatter > field
             cellValue = $table.getCellLabel(row, column);
         }
         const cellPlaceholder = editRenderOpts ? editRenderOpts.placeholder : '';
@@ -3240,7 +3256,9 @@ const Cell = {
             return $table.callSlot(contentSlot, params);
         }
         if (contentRender) {
-            const compConf = renderer$a.get(contentRender.name);
+            const { computeRendererOpts } = $table.getComputeMaps();
+            const rendererOpts = computeRendererOpts.value;
+            const compConf = contentRender.name ? (rendererOpts[contentRender.name] || renderer$a.get(contentRender.name)) : null;
             if (compConf) {
                 const rtExpand = compConf.renderTableExpand || compConf.renderExpand;
                 if (rtExpand) {
@@ -3456,7 +3474,9 @@ const Cell = {
             if (editSlot) {
                 return $table.callSlot(editSlot, cellParams);
             }
-            const compConf = renderer$a.get(editRenderOpts.name);
+            const { computeRendererOpts } = $table.getComputeMaps();
+            const rendererOpts = computeRendererOpts.value;
+            const compConf = editRenderOpts.name ? (rendererOpts[editRenderOpts.name] || renderer$a.get(editRenderOpts.name)) : null;
             const rtEdit = compConf ? (compConf.renderTableEdit || compConf.renderEdit) : null;
             if (rtEdit) {
                 return getSlotVNs(rtEdit(editRenderOpts, cellParams));
@@ -3481,6 +3501,7 @@ const Cell = {
                 return renderCellBaseVNs(params, $table.callSlot(defaultSlot, cellParams));
             }
         }
+        // slot default > formatter
         if (formatter) {
             return renderCellBaseVNs(params, [
                 h('span', {
@@ -4055,6 +4076,10 @@ const tableProps = {
         type: Number,
         default: () => getConfig$7().table.delayHover
     },
+    /**
+     * 渲染器配置项
+     */
+    rendererConfig: Object,
     // 额外的参数
     params: Object
 };
@@ -4272,7 +4297,7 @@ var TableBodyComponent = defineVxeComponent({
     setup(props) {
         const $xeTable = inject('$xeTable', {});
         const { xID, props: tableProps, context: tableContext, reactData: tableReactData, internalData: tableInternalData } = $xeTable;
-        const { computeEditOpts, computeMouseOpts, computeCellOffsetWidth, computeAreaOpts, computeDefaultRowHeight, computeEmptyOpts, computeTooltipOpts, computeRadioOpts, computeExpandOpts, computeTreeOpts, computeCheckboxOpts, computeCellOpts, computeValidOpts, computeRowOpts, computeColumnOpts, computeRowDragOpts, computeResizableOpts, computeVirtualXOpts, computeVirtualYOpts, computeIsBodyRenderOptimize } = $xeTable.getComputeMaps();
+        const { computeEditOpts, computeMouseOpts, computeCellOffsetWidth, computeAreaOpts, computeDefaultRowHeight, computeEmptyOpts, computeTooltipOpts, computeRadioOpts, computeExpandOpts, computeTreeOpts, computeCheckboxOpts, computeCellOpts, computeValidOpts, computeRowOpts, computeColumnOpts, computeRowDragOpts, computeResizableOpts, computeVirtualXOpts, computeVirtualYOpts, computeIsBodyRenderOptimize, computeRendererOpts } = $xeTable.getComputeMaps();
         const refElem = ref();
         const refBodyScroll = ref();
         const refBodyTable = ref();
@@ -4357,6 +4382,7 @@ var TableBodyComponent = defineVxeComponent({
             const resizableOpts = computeResizableOpts.value;
             const virtualXOpts = computeVirtualXOpts.value;
             const virtualYOpts = computeVirtualYOpts.value;
+            const rendererOpts = computeRendererOpts.value;
             const { isAllColumnDrag, isAllRowDrag } = resizableOpts;
             const rowOpts = computeRowOpts.value;
             const rowDragOpts = computeRowDragOpts.value;
@@ -4375,7 +4401,7 @@ var TableBodyComponent = defineVxeComponent({
             const colid = column.id;
             const colRest = fullColumnIdData[colid] || {};
             const renderOpts = editRender || cellRender;
-            const compConf = renderOpts ? renderer$9.get(renderOpts.name) : null;
+            const compConf = renderOpts && renderOpts.name ? (rendererOpts[renderOpts.name] || renderer$9.get(renderOpts.name)) : null;
             const compCellClassName = compConf ? (compConf.tableCellClassName || compConf.cellClassName) : null;
             const compCellStyle = compConf ? (compConf.tableCellStyle || compConf.cellStyle) : '';
             const showAllTip = tooltipOpts.showAll;
@@ -5012,7 +5038,8 @@ var TableBodyComponent = defineVxeComponent({
                 emptyContent = $xeTable.callSlot(emptySlot, emptyParams);
             }
             else {
-                const compConf = emptyOpts.name ? renderer$9.get(emptyOpts.name) : null;
+                const rendererOpts = computeRendererOpts.value;
+                const compConf = emptyOpts.name ? (rendererOpts[emptyOpts.name] || renderer$9.get(emptyOpts.name)) : null;
                 const rtEmptyView = compConf ? (compConf.renderTableEmpty || compConf.renderTableEmptyView || compConf.renderEmpty) : null;
                 if (rtEmptyView) {
                     emptyContent = getSlotVNs(rtEmptyView(emptyOpts, emptyParams));
@@ -5147,7 +5174,7 @@ var TableHeaderComponent = defineVxeComponent({
     setup(props) {
         const $xeTable = inject('$xeTable', {});
         const { xID, props: tableProps, reactData: tableReactData, internalData: tableInternalData } = $xeTable;
-        const { computeColumnOpts, computeColumnDragOpts, computeCellOpts, computeMouseOpts, computeHeaderCellOpts, computeDefaultRowHeight, computeVirtualXOpts, computeFloatingFilterOpts, computeIsHeaderRenderOptimize, computeHeaderTooltipOpts } = $xeTable.getComputeMaps();
+        const { computeColumnOpts, computeColumnDragOpts, computeCellOpts, computeMouseOpts, computeHeaderCellOpts, computeDefaultRowHeight, computeVirtualXOpts, computeFloatingFilterOpts, computeIsHeaderRenderOptimize, computeHeaderTooltipOpts, computeRendererOpts } = $xeTable.getComputeMaps();
         const headerColumn = ref([]);
         const refElem = ref();
         const refHeaderScroll = ref();
@@ -5186,6 +5213,7 @@ var TableHeaderComponent = defineVxeComponent({
             const cellOpts = computeCellOpts.value;
             const defaultRowHeight = computeDefaultRowHeight.value;
             const headerCellOpts = computeHeaderCellOpts.value;
+            const rendererOpts = computeRendererOpts.value;
             const currCellHeight = getCalcHeight(headerCellOpts.height) || defaultRowHeight;
             const { disabledMethod: dragDisabledMethod, isCrossDrag, isPeerDrag } = columnDragOpts;
             const isLastRow = _rowIndex === headerGroups.length - 1;
@@ -5194,7 +5222,7 @@ var TableHeaderComponent = defineVxeComponent({
                 const colid = column.id;
                 const colRest = fullColumnIdData[colid] || {};
                 const renderOpts = editRender || cellRender;
-                const compConf = renderOpts ? renderer$8.get(renderOpts.name) : null;
+                const compConf = renderOpts && renderOpts.name ? (rendererOpts[renderOpts.name] || renderer$8.get(renderOpts.name)) : null;
                 const isColGroup = column.children && column.children.length;
                 const fixedHiddenColumn = overflowX && !isColGroup && (fixedType ? column.fixed !== fixedType : !!column.fixed);
                 const cellPadding = getDefaultConfig(headerCellOpts.padding, cellOpts.padding);
@@ -5373,6 +5401,7 @@ var TableHeaderComponent = defineVxeComponent({
             const defaultRowHeight = computeDefaultRowHeight.value;
             const headerCellOpts = computeHeaderCellOpts.value;
             const floatingFilterOpts = computeFloatingFilterOpts.value;
+            const rendererOpts = computeRendererOpts.value;
             const { cellClassName } = floatingFilterOpts;
             const currCellHeight = getCalcHeight(headerCellOpts.height) || defaultRowHeight;
             return cols.map((column, $columnIndex) => {
@@ -5381,8 +5410,8 @@ var TableHeaderComponent = defineVxeComponent({
                 const colRest = fullColumnIdData[colid] || {};
                 const renderOpts = editRender || cellRender;
                 const flSlot = slots ? (slots.floatingFilter || slots['floating-filter']) : null;
-                const compConf = renderOpts ? renderer$8.get(renderOpts.name) : null;
-                const flCompConf = isEnableConf(filterRender) ? renderer$8.get(filterRender.name) : null;
+                const compConf = renderOpts && renderOpts.name ? (rendererOpts[renderOpts.name] || renderer$8.get(renderOpts.name)) : null;
+                const flCompConf = isEnableConf(filterRender) && filterRender.name ? (rendererOpts[filterRender.name] || renderer$8.get(filterRender.name)) : null;
                 const rtFloatingFilter = flCompConf ? flCompConf.renderTableFloatingFilter : null;
                 const fixedHiddenColumn = overflowX && (fixedType ? column.fixed !== fixedType : !!column.fixed);
                 const isPadding = XEUtils.isBoolean(headerCellOpts.padding) ? headerCellOpts.padding : cellOpts.padding;
@@ -5675,7 +5704,7 @@ var TableFooterComponent = defineVxeComponent({
     setup(props) {
         const $xeTable = inject('$xeTable', {});
         const { xID, props: tableProps, reactData: tableReactData, internalData: tableInternalData } = $xeTable;
-        const { computeFooterTooltipOpts, computeColumnOpts, computeCellOpts, computeFooterCellOpts, computeDefaultRowHeight, computeResizableOpts, computeVirtualXOpts, computeIsFooterRenderOptimize } = $xeTable.getComputeMaps();
+        const { computeFooterTooltipOpts, computeColumnOpts, computeCellOpts, computeFooterCellOpts, computeDefaultRowHeight, computeResizableOpts, computeVirtualXOpts, computeIsFooterRenderOptimize, computeRendererOpts } = $xeTable.getComputeMaps();
         const refElem = ref();
         const refFooterScroll = ref();
         const refFooterTable = ref();
@@ -5698,12 +5727,13 @@ var TableFooterComponent = defineVxeComponent({
             const cellOpts = computeCellOpts.value;
             const footerCellOpts = computeFooterCellOpts.value;
             const currCellHeight = getCalcHeight(footerCellOpts.height) || defaultRowHeight;
+            const rendererOpts = computeRendererOpts.value;
             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$7.get(renderOpts.name) : null;
+                const compConf = renderOpts && renderOpts.name ? (rendererOpts[renderOpts.name] || renderer$7.get(renderOpts.name)) : null;
                 const showAllTip = footerTooltipOpts.showAll;
                 const fixedHiddenColumn = overflowX && (fixedType ? column.fixed !== fixedType : !!column.fixed);
                 const cellPadding = getDefaultConfig(footerCellOpts.padding, cellOpts.padding);
@@ -7599,7 +7629,7 @@ var TableFilterPanelComponent = defineVxeComponent({
         const xID = XEUtils.uniqueId();
         const $xeTable = inject('$xeTable', {});
         const { reactData: tableReactData, internalData: tableInternalData, getComputeMaps } = $xeTable;
-        const { computeFilterOpts } = getComputeMaps();
+        const { computeFilterOpts, computeRendererOpts } = getComputeMaps();
         const refElem = ref();
         const refMaps = {
             refElem
@@ -7782,10 +7812,11 @@ var TableFilterPanelComponent = defineVxeComponent({
                 return [];
             }
             const filterOpts = computeFilterOpts.value;
+            const rendererOpts = computeRendererOpts.value;
             const hasCheckOption = computeHasCheckOption.value;
             const { filterRender, filterMultiple } = column;
             const { confirmButtonText, resetButtonText, showFooter } = filterOpts;
-            const compConf = isEnableConf(filterRender) ? renderer$6.get(filterRender.name) : null;
+            const compConf = filterRender && isEnableConf(filterRender) && filterRender.name ? (rendererOpts[filterRender.name] || renderer$6.get(filterRender.name)) : null;
             const isDisabled = !hasCheckOption && !filterStore.isAllSelected && !filterStore.isIndeterminate;
             let showFlFoot = !!filterMultiple;
             if (XEUtils.isBoolean(showFooter)) {
@@ -7820,8 +7851,9 @@ var TableFilterPanelComponent = defineVxeComponent({
             if (!column) {
                 return renderEmptyElement$5($xeFilterPanel);
             }
+            const rendererOpts = computeRendererOpts.value;
             const filterRender = column ? column.filterRender : null;
-            const compConf = filterRender && isEnableConf(filterRender) ? renderer$6.get(filterRender.name) : null;
+            const compConf = filterRender && isEnableConf(filterRender) && filterRender.name ? (rendererOpts[filterRender.name] || renderer$6.get(filterRender.name)) : null;
             const filterClassName = compConf ? (compConf.tableFilterClassName || compConf.filterClassName) : '';
             const params = Object.assign({}, tableInternalData._currFilterParams, { $panel: $xeFilterPanel, $table: $xeTable });
             const tableProps = $xeTable.props;
@@ -8878,7 +8910,7 @@ hooks$7.add('tableFilterModule', {
         const $xeGGWrapper = $xeGrid || $xeGantt;
         const { props, reactData, internalData } = $xeTable;
         const { refElem, refTableFilter } = $xeTable.getRefMaps();
-        const { computeFilterOpts, computeMouseOpts } = $xeTable.getComputeMaps();
+        const { computeFilterOpts, computeMouseOpts, computeRendererOpts } = $xeTable.getComputeMaps();
         const updatePopupStyle = () => {
             const { filterStore } = reactData;
             const { elemStore } = internalData;
@@ -8888,9 +8920,10 @@ hooks$7.add('tableFilterModule', {
             }
             const tableEl = refElem.value;
             const filterOpts = computeFilterOpts.value;
+            const rendererOpts = computeRendererOpts.value;
             const { maxHeight: customMaxHeight, transfer, zIndex } = filterOpts;
             const filterRender = column ? column.filterRender : null;
-            const compConf = filterRender && isEnableConf(filterRender) ? renderer$5.get(filterRender.name) : null;
+            const compConf = filterRender && isEnableConf(filterRender) && filterRender.name ? (rendererOpts[filterRender.name] || renderer$5.get(filterRender.name)) : null;
             const headerScrollElem = getRefElem(elemStore['main-header-scroll']);
             if (!headerScrollElem) {
                 return nextTick();
@@ -9026,7 +9059,8 @@ hooks$7.add('tableFilterModule', {
                 if (column) {
                     const { filters, filterRender } = column;
                     if (filters) {
-                        const compConf = isEnableConf(filterRender) ? renderer$5.get(filterRender.name) : null;
+                        const rendererOpts = computeRendererOpts.value;
+                        const compConf = isEnableConf(filterRender) && filterRender.name ? (rendererOpts[filterRender.name] || renderer$5.get(filterRender.name)) : null;
                         const frMethod = column.filterResetMethod || (compConf ? (compConf.tableFilterResetMethod || compConf.filterResetMethod) : null);
                         filters.forEach((item) => {
                             item._checked = false;
@@ -9686,7 +9720,7 @@ hooks$5.add('tableEditModule', {
     setupTable($xeTable) {
         const { props, reactData, internalData } = $xeTable;
         const { refElem } = $xeTable.getRefMaps();
-        const { computeMouseOpts, computeEditOpts, computeCheckboxOpts, computeTreeOpts, computeValidOpts } = $xeTable.getComputeMaps();
+        const { computeMouseOpts, computeEditOpts, computeCheckboxOpts, computeTreeOpts, computeValidOpts, computeRendererOpts } = $xeTable.getComputeMaps();
         const browseObj = XEUtils.browse();
         let editMethods = {};
         let editPrivateMethods = {};
@@ -10619,7 +10653,9 @@ hooks$5.add('tableEditModule', {
             const { editRender } = column;
             const editOpts = computeEditOpts.value;
             if (editConfig && isEnableConf(editRender)) {
-                const compRender = renderer$4.get(editRender.name);
+                const rendererOpts = computeRendererOpts.value;
+                const renderName = editRender.name;
+                const compRender = renderName ? (rendererOpts[renderName] || renderer$4.get(renderName)) : null;
                 let autoFocus = editRender.autofocus || editRender.autoFocus;
                 let autoSelect = editRender.autoSelect || editRender.autoselect;
                 let inputElem = null;
@@ -11052,7 +11088,7 @@ const tableExportMethodKeys = ['exportData', 'importByFile', 'importData', 'save
 hooks$4.add('tableExportModule', {
     setupTable($xeTable) {
         const { props, reactData, internalData } = $xeTable;
-        const { computeTreeOpts, computePrintOpts, computeExportOpts, computeImportOpts, computeSeqOpts, computeRadioOpts, computeCheckboxOpts, computeColumnOpts, computeAggregateOpts } = $xeTable.getComputeMaps();
+        const { computeTreeOpts, computePrintOpts, computeExportOpts, computeImportOpts, computeSeqOpts, computeRadioOpts, computeCheckboxOpts, computeColumnOpts, computeAggregateOpts, computeRendererOpts } = $xeTable.getComputeMaps();
         const getSeq = (cellValue, row, $rowIndex, column, $columnIndex) => {
             const seqOpts = computeSeqOpts.value;
             const seqMd = seqOpts.seqMethod || column.seqMethod;
@@ -11086,12 +11122,13 @@ hooks$4.add('tableExportModule', {
             const { isTreeAllExpanded, isRowGroupAllExpanded, mode: expMode } = opts;
             const { treeConfig } = props;
             const { isRowGroupStatus } = reactData;
-            const { fullColumnFieldData } = internalData;
+            const { fullColumnFieldData, fullAllDataRowIdData } = internalData;
             const radioOpts = computeRadioOpts.value;
             const checkboxOpts = computeCheckboxOpts.value;
             const treeOpts = computeTreeOpts.value;
             const columnOpts = computeColumnOpts.value;
             const aggregateOpts = computeAggregateOpts.value;
+            const rendererOpts = computeRendererOpts.value;
             if (!htmlCellElem) {
                 htmlCellElem = document.createElement('div');
             }
@@ -11124,7 +11161,7 @@ hooks$4.add('tableExportModule', {
                             const renderOpts = editRender || cellRender;
                             let bodyExportMethod = column.exportMethod || columnOpts.exportMethod;
                             if (!bodyExportMethod && renderOpts && renderOpts.name) {
-                                const compConf = renderer$3.get(renderOpts.name);
+                                const compConf = rendererOpts[renderOpts.name] || renderer$3.get(renderOpts.name);
                                 if (compConf) {
                                     bodyExportMethod = compConf.tableExportMethod || compConf.exportMethod;
                                 }
@@ -11242,6 +11279,7 @@ hooks$4.add('tableExportModule', {
             }
             if (treeConfig) {
                 // 如果是树结构
+                const { seqMode } = treeOpts;
                 const childrenField = treeOpts.children || treeOpts.childrenField;
                 const rest = [];
                 const expandMaps = {};
@@ -11262,12 +11300,13 @@ hooks$4.add('tableExportModule', {
                             _hasChild: hasRowChild,
                             _expand: hasRowChild && $xeTable.isTreeExpandByRow(row)
                         };
+                        const rowRest = fullAllDataRowIdData[rowid] || {};
                         columns.forEach((column, $columnIndex) => {
                             let cellValue = '';
                             const renderOpts = column.editRender || column.cellRender;
                             let bodyExportMethod = column.exportMethod || columnOpts.exportMethod;
                             if (!bodyExportMethod && renderOpts && renderOpts.name) {
-                                const compConf = renderer$3.get(renderOpts.name);
+                                const compConf = rendererOpts[renderOpts.name] || renderer$3.get(renderOpts.name);
                                 if (compConf) {
                                     bodyExportMethod = compConf.tableExportMethod || compConf.exportMethod;
                                 }
@@ -11281,7 +11320,10 @@ hooks$4.add('tableExportModule', {
                             else {
                                 switch (column.type) {
                                     case 'seq': {
-                                        const seqVal = path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('');
+                                        let seqVal = 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(seqVal, row, $rowIndex, column, $columnIndex);
                                         break;
                                     }
@@ -11334,7 +11376,7 @@ hooks$4.add('tableExportModule', {
                     const renderOpts = column.editRender || column.cellRender;
                     let bodyExportMethod = column.exportMethod || columnOpts.exportMethod;
                     if (!bodyExportMethod && renderOpts && renderOpts.name) {
-                        const compConf = renderer$3.get(renderOpts.name);
+                        const compConf = rendererOpts[renderOpts.name] || renderer$3.get(renderOpts.name);
                         if (compConf) {
                             bodyExportMethod = compConf.tableExportMethod || compConf.exportMethod;
                         }
@@ -11395,10 +11437,11 @@ hooks$4.add('tableExportModule', {
         };
         const getFooterCellValue = (opts, row, column) => {
             const columnOpts = computeColumnOpts.value;
+            const rendererOpts = computeRendererOpts.value;
             const renderOpts = column.editRender || column.cellRender;
             let footLabelMethod = column.footerExportMethod;
             if (!footLabelMethod && renderOpts && renderOpts.name) {
-                const compConf = renderer$3.get(renderOpts.name);
+                const compConf = rendererOpts[renderOpts.name] || renderer$3.get(renderOpts.name);
                 if (compConf) {
                     footLabelMethod = compConf.tableFooterExportMethod || compConf.footerExportMethod;
                 }
@@ -16568,6 +16611,9 @@ var VxeTableComponent = defineVxeComponent({
         const combineSplitterResizeFlag = computed(() => {
             return $xeSplitter ? $xeSplitter.reactData.resizeFlag : null;
         });
+        const computeRendererOpts = computed(() => {
+            return Object.assign({}, getConfig$2().table.rendererConfig, props.rendererConfig);
+        });
         const refMaps = {
             refElem,
             refTooltip,
@@ -16674,6 +16720,7 @@ var VxeTableComponent = defineVxeComponent({
             computeRowGroupColumns,
             computeAggFuncColumns,
             computeUndoRedoHistoryOpts,
+            computeRendererOpts,
             computeFNROpts,
             computeSXOpts,
             computeSYOpts
@@ -18109,6 +18156,7 @@ var VxeTableComponent = defineVxeComponent({
             const filterOpts = computeFilterOpts.value;
             const sortOpts = computeSortOpts.value;
             const aggregateOpts = computeAggregateOpts.value;
+            const rendererOpts = computeRendererOpts.value;
             const treeOpts = computeTreeOpts.value;
             const childrenField = treeOpts.children || treeOpts.childrenField;
             const { transform, rowField, parentField, mapChildrenField } = treeOpts;
@@ -18148,7 +18196,7 @@ var VxeTableComponent = defineVxeComponent({
                     const handleFilter = (row) => {
                         return filterColumns.every(({ column, valueList, itemList }) => {
                             const { filterMethod, filterRender } = column;
-                            const compConf = isEnableConf(filterRender) ? renderer$1.get(filterRender.name) : null;
+                            const compConf = isEnableConf(filterRender) && filterRender.name ? (rendererOpts[filterRender.name] || renderer$1.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);
@@ -21259,6 +21307,7 @@ var VxeTableComponent = defineVxeComponent({
                 }
                 const { editConfig } = props;
                 const { formatter, editRender, cellRender } = column;
+                const rendererOpts = computeRendererOpts.value;
                 let etOpSize = null;
                 let etOgSize = null;
                 let clOpSize = null;
@@ -21271,13 +21320,17 @@ var VxeTableComponent = defineVxeComponent({
                     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$1.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$1.get(cellRenderOpts.name)) : null;
+                const editCompConf = editRenderOpts && editRenderOpts.name ? (rendererOpts[editRenderOpts.name] || renderer$1.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;
                     const { fullAllDataRowIdData } = internalData;
                     const rowid = getRowid($xeTable, row);
@@ -21318,8 +21371,11 @@ var VxeTableComponent = defineVxeComponent({
                             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];
@@ -26041,8 +26097,9 @@ var VxeTableComponent = defineVxeComponent({
                 if (column) {
                     const { filterStore } = reactData;
                     const { filterRender, filters } = column;
+                    const rendererOpts = computeRendererOpts.value;
                     const filterOptions = filters || [];
-                    const compConf = isEnableConf(filterRender) ? renderer$1.get(filterRender.name) : null;
+                    const compConf = isEnableConf(filterRender) && filterRender.name ? (rendererOpts[filterRender.name] || renderer$1.get(filterRender.name)) : null;
                     const frMethod = column.filterRecoverMethod || (compConf ? (compConf.tableFilterRecoverMethod || compConf.filterRecoverMethod) : null);
                     filterStore.column = column;
                     // 复原状态
@@ -29335,7 +29392,8 @@ var VxeTableComponent = defineVxeComponent({
                 return emptySlot(emptyParams);
             }
             else {
-                const compConf = emptyOpts.name ? renderer$1.get(emptyOpts.name) : null;
+                const rendererOpts = computeRendererOpts.value;
+                const compConf = emptyOpts.name ? (rendererOpts[emptyOpts.name] || renderer$1.get(emptyOpts.name)) : null;
                 const rtEmptyView = compConf ? (compConf.renderTableEmpty || compConf.renderTableEmptyView || compConf.renderEmpty) : null;
                 if (rtEmptyView) {
                     return getSlotVNs(rtEmptyView(emptyOpts, emptyParams));
@@ -31021,10 +31079,12 @@ var VxeToolbarComponent = defineVxeComponent({
             const buttonSuffixSlot = slots.buttonSuffix || slots['button-suffix'];
             const btnVNs = [];
             if (buttons) {
+                const { computeRendererOpts } = $table ? $table.getComputeMaps() : {};
+                const rendererOpts = (computeRendererOpts ? computeRendererOpts.value : null) || {};
                 buttons.forEach((item, index) => {
                     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 };
@@ -31072,16 +31132,17 @@ var VxeToolbarComponent = defineVxeComponent({
             const toolSuffixSlot = slots.toolSuffix || slots['tool-suffix'];
             const btnVNs = [];
             if (tools) {
+                const { computeRendererOpts } = $table ? $table.getComputeMaps() : {};
+                const rendererOpts = (computeRendererOpts ? computeRendererOpts.value : 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,
+                                key: tIndex,
                                 class: ['vxe-tool--item', toolbarToolClassName ? (XEUtils.isFunction(toolbarToolClassName) ? toolbarToolClassName(params) : toolbarToolClassName) : '']
                             }, getSlotVNs(compConf.renderToolbarTool(toolRender, params))));
                         }
@@ -32696,6 +32757,10 @@ var VxeGridComponent = defineVxeComponent({
                 return handleZoom();
             },
             getFormData,
+            /**
+             * 已废弃，被 getFormFlatItems 替换
+             * @deprecated
+             */
             getFormItems(itemIndex) {
                 const formOpts = computeFormOpts.value;
                 const { formConfig } = props;
@@ -32704,8 +32769,30 @@ var VxeGridComponent = 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 $form = refForm.value;
+                if ($form) {
+                    return $form.getFlatItems();
+                }
+                return [];
+            },
+            getFormNestedItems() {
+                const $form = refForm.value;
+                if ($form) {
+                    return $form.getNestedItems();
+                }
+                return [];
+            },
+            getFormItemByField(field) {
+                const $form = refForm.value;
+                if ($form) {
+                    return $form.getItemByField(field);
+                }
+                return null;
+            },
             resetForm() {
                 const $form = refForm.value;
                 if ($form) {