vxe-table 4.12.0-beta.1 → 4.12.0-beta.10

package/es/table/module/export/export-panel.js

@@ -493,25 +493,23 @@ export default defineComponent({
                 })
                 : createCommentVNode();
         };
-        if (process.env.NODE_ENV === 'development') {
-            nextTick(() => {
-                if (!VxeUIModalComponent) {
-                    errLog('vxe.error.reqComp', ['vxe-modal']);
-                }
-                if (!VxeUIButtonComponent) {
-                    errLog('vxe.error.reqComp', ['vxe-button']);
-                }
-                if (!VxeUISelectComponent) {
-                    errLog('vxe.error.reqComp', ['vxe-select']);
-                }
-                if (!VxeUIInputComponent) {
-                    errLog('vxe.error.reqComp', ['vxe-input']);
-                }
-                if (!VxeUICheckboxComponent) {
-                    errLog('vxe.error.reqComp', ['vxe-checkbox']);
-                }
-            });
-        }
+        nextTick(() => {
+            if (!VxeUIModalComponent) {
+                errLog('vxe.error.reqComp', ['vxe-modal']);
+            }
+            if (!VxeUIButtonComponent) {
+                errLog('vxe.error.reqComp', ['vxe-button']);
+            }
+            if (!VxeUISelectComponent) {
+                errLog('vxe.error.reqComp', ['vxe-select']);
+            }
+            if (!VxeUIInputComponent) {
+                errLog('vxe.error.reqComp', ['vxe-input']);
+            }
+            if (!VxeUICheckboxComponent) {
+                errLog('vxe.error.reqComp', ['vxe-checkbox']);
+            }
+        });
         return renderVN;
     }
 });

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

@@ -893,9 +893,7 @@ hooks.add('tableExportModule', {
                 }
                 else {
                     // 不支持的浏览器
-                    if (process.env.NODE_ENV === 'development') {
-                        errLog('vxe.error.notExp');
-                    }
+                    errLog('vxe.error.notExp');
                     _importResolve({ status: true });
                 }
             });
@@ -1512,10 +1510,8 @@ hooks.add('tableExportModule', {
                     message: true,
                     types: XEUtils.keys(exportOpts._typeMaps)
                 }, exportOpts, options);
-                if (process.env.NODE_ENV === 'development') {
-                    if (!props.exportConfig) {
-                        errLog('vxe.error.reqProp', ['export-config']);
-                    }
+                if (!props.exportConfig) {
+                    errLog('vxe.error.reqProp', ['export-config']);
                 }
                 handleExportAndPrint(defOpts);
             },
@@ -1525,10 +1521,8 @@ hooks.add('tableExportModule', {
                 const defOpts = Object.assign({
                     message: true
                 }, printOpts, options);
-                if (process.env.NODE_ENV === 'development') {
-                    if (!props.printConfig) {
-                        errLog('vxe.error.reqProp', ['print-config']);
-                    }
+                if (!props.printConfig) {
+                    errLog('vxe.error.reqProp', ['print-config']);
                 }
                 handleExportAndPrint(defOpts, true);
             }

package/es/table/module/export/import-panel.js

@@ -218,19 +218,17 @@ export default defineComponent({
                 })
                 : createCommentVNode();
         };
-        if (process.env.NODE_ENV === 'development') {
-            nextTick(() => {
-                if (!VxeUIModalComponent) {
-                    errLog('vxe.error.reqComp', ['vxe-modal']);
-                }
-                if (!VxeUIButtonComponent) {
-                    errLog('vxe.error.reqComp', ['vxe-button']);
-                }
-                if (!VxeUISelectComponent) {
-                    errLog('vxe.error.reqComp', ['vxe-select']);
-                }
-            });
-        }
+        nextTick(() => {
+            if (!VxeUIModalComponent) {
+                errLog('vxe.error.reqComp', ['vxe-modal']);
+            }
+            if (!VxeUIButtonComponent) {
+                errLog('vxe.error.reqComp', ['vxe-button']);
+            }
+            if (!VxeUISelectComponent) {
+                errLog('vxe.error.reqComp', ['vxe-select']);
+            }
+        });
         return renderVN;
     }
 });

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

@@ -28,7 +28,7 @@ hooks.add('tableKeyboardModule', {
     setupTable($xeTable) {
         const { props, reactData, internalData } = $xeTable;
         const { refElem } = $xeTable.getRefMaps();
-        const { computeEditOpts, computeCheckboxOpts, computeMouseOpts, computeTreeOpts, computeRowOpts, computeCellOpts, computeDefaultRowHeight } = $xeTable.getComputeMaps();
+        const { computeEditOpts, computeCheckboxOpts, computeMouseOpts, computeTreeOpts, computeRowOpts, computeColumnOpts, computeCellOpts, computeDefaultRowHeight, computeCurrentRowOpts, computeCurrentColumnOpts } = $xeTable.getComputeMaps();
         function getCheckboxRangeRows(evnt, params, targetTrElem, trRect, offsetClientTop, moveRange) {
             const { showOverflow } = props;
             const { fullAllDataRowIdData, isResizeCellHeight } = internalData;
@@ -287,6 +287,10 @@ hooks.add('tableKeyboardModule', {
                 const { editConfig } = props;
                 const { afterFullData, visibleColumn } = internalData;
                 const editOpts = computeEditOpts.value;
+                const rowOpts = computeRowOpts.value;
+                const currentRowOpts = computeCurrentRowOpts.value;
+                const columnOpts = computeColumnOpts.value;
+                const currentColumnOpts = computeCurrentColumnOpts.value;
                 let targetRow;
                 let targetRowIndex;
                 let targetColumnIndex;
@@ -333,6 +337,12 @@ hooks.add('tableKeyboardModule', {
                     params.columnIndex = targetColumnIndex;
                     params.column = targetColumn;
                     params.cell = $xeTable.getCellElement(params.row, params.column);
+                    if (rowOpts.isCurrent && currentRowOpts.isFollowSelected) {
+                        $xeTable.triggerCurrentRowEvent(evnt, params);
+                    }
+                    if (columnOpts.isCurrent && currentColumnOpts.isFollowSelected) {
+                        $xeTable.triggerCurrentColumnEvent(evnt, params);
+                    }
                     if (editConfig) {
                         if (editOpts.trigger === 'click' || editOpts.trigger === 'dblclick') {
                             if (editOpts.mode === 'row') {
@@ -340,13 +350,17 @@ hooks.add('tableKeyboardModule', {
                             }
                             else {
                                 $xeTable.scrollToRow(params.row, params.column)
-                                    .then(() => $xeTable.handleSelected(params, evnt));
+                                    .then(() => {
+                                    $xeTable.handleSelected(params, evnt);
+                                });
                             }
                         }
                     }
                     else {
                         $xeTable.scrollToRow(params.row, params.column)
-                            .then(() => $xeTable.handleSelected(params, evnt));
+                            .then(() => {
+                            $xeTable.handleSelected(params, evnt);
+                        });
                     }
                 }
             },
@@ -358,7 +372,6 @@ hooks.add('tableKeyboardModule', {
                 const treeOpts = computeTreeOpts.value;
                 const childrenField = treeOpts.children || treeOpts.childrenField;
                 let targetRow;
-                evnt.preventDefault();
                 if (currentRow) {
                     if (treeConfig) {
                         const { index, items } = XEUtils.findTree(afterFullData, item => item === currentRow, { children: childrenField });
@@ -383,6 +396,7 @@ hooks.add('tableKeyboardModule', {
                     targetRow = afterFullData[0];
                 }
                 if (targetRow) {
+                    evnt.preventDefault();
                     const params = {
                         $table: $xeTable,
                         row: targetRow,
@@ -393,6 +407,35 @@ hooks.add('tableKeyboardModule', {
                         .then(() => $xeTable.triggerCurrentRowEvent(evnt, params));
                 }
             },
+            // 处理当前列方向键移动
+            moveCurrentColumn(isLeftArrow, isRightArrow, evnt) {
+                const { currentColumn } = reactData;
+                const { visibleColumn } = internalData;
+                let targetCol = null;
+                if (currentColumn) {
+                    const _columnIndex = $xeTable.getVTColumnIndex(currentColumn);
+                    if (isLeftArrow && _columnIndex > 0) {
+                        targetCol = visibleColumn[_columnIndex - 1];
+                    }
+                    else if (isRightArrow && _columnIndex < visibleColumn.length - 1) {
+                        targetCol = visibleColumn[_columnIndex + 1];
+                    }
+                }
+                else {
+                    targetCol = visibleColumn[0];
+                }
+                if (targetCol) {
+                    evnt.preventDefault();
+                    const params = {
+                        $table: $xeTable,
+                        column: targetCol,
+                        columnIndex: $xeTable.getColumnIndex(targetCol),
+                        $columnIndex: $xeTable.getVMColumnIndex(targetCol)
+                    };
+                    $xeTable.scrollToColumn(targetCol)
+                        .then(() => $xeTable.triggerCurrentColumnEvent(evnt, params));
+                }
+            },
             // 处理可编辑方向键移动
             moveSelected(args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt) {
                 const { afterFullData, visibleColumn } = internalData;

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

@@ -392,9 +392,7 @@ hooks.add('tableValidatorModule', {
                                             }
                                         }
                                         else {
-                                            if (process.env.NODE_ENV === 'development') {
-                                                errLog('vxe.error.notValidators', [validator]);
-                                            }
+                                            errLog('vxe.error.notValidators', [validator]);
                                         }
                                     }
                                     else {

package/es/table/render/index.js

@@ -152,10 +152,8 @@ function getComponentOns(renderOpts, params, eFns) {
     const ons = {};
     XEUtils.objectEach(events, (func, key) => {
         ons[getOnName(key)] = function (...args) {
-            if (process.env.NODE_ENV === 'development') {
-                if (!XEUtils.isFunction(func)) {
-                    errLog('vxe.error.errFunc', [func]);
-                }
+            if (!XEUtils.isFunction(func)) {
+                errLog('vxe.error.errFunc', [func]);
             }
             func(params, ...args);
         };
@@ -502,6 +500,63 @@ function handleExportTreeSelectMethod(params) {
     const { row, column, options } = params;
     return options.original ? getCellValue(row, column) : getTreeSelectCellValue(column.editRender || column.cellRender, params);
 }
+function handleNumberCell(renderOpts, params) {
+    const { props = {}, showNegativeStatus } = renderOpts;
+    const { row, column } = params;
+    const { type } = props;
+    let cellValue = XEUtils.get(row, column.field);
+    let isNegative = false;
+    if (!isEmptyValue(cellValue)) {
+        const numberInputConfig = getConfig().numberInput || {};
+        if (type === 'float') {
+            const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true);
+            const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 1);
+            cellValue = XEUtils.toFixed(XEUtils.floor(cellValue, digits), digits);
+            if (!autoFill) {
+                cellValue = XEUtils.toNumber(cellValue);
+            }
+            if (showNegativeStatus) {
+                if (cellValue < 0) {
+                    isNegative = true;
+                }
+            }
+        }
+        else if (type === 'amount') {
+            const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true);
+            const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 2);
+            const showCurrency = handleDefaultValue(props.showCurrency, numberInputConfig.showCurrency, false);
+            cellValue = XEUtils.toNumber(cellValue);
+            if (showNegativeStatus) {
+                if (cellValue < 0) {
+                    isNegative = true;
+                }
+            }
+            cellValue = XEUtils.commafy(cellValue, { digits });
+            if (!autoFill) {
+                const [iStr, dStr] = cellValue.split('.');
+                if (dStr) {
+                    const dRest = dStr.replace(/0+$/, '');
+                    cellValue = dRest ? [iStr, '.', dRest].join('') : iStr;
+                }
+            }
+            if (showCurrency) {
+                cellValue = `${props.currencySymbol || numberInputConfig.currencySymbol || getI18n('vxe.numberInput.currencySymbol') || ''}${cellValue}`;
+            }
+        }
+        else {
+            if (showNegativeStatus) {
+                if (XEUtils.toNumber(cellValue) < 0) {
+                    isNegative = true;
+                }
+            }
+        }
+    }
+    return getCellLabelVNs(renderOpts, params, cellValue, isNegative
+        ? {
+            class: 'is--negative'
+        }
+        : {});
+}
 /**
  * 表格 - 渲染器
  */
@@ -561,66 +616,19 @@ renderer.mixin({
         renderTableFilter: defaultFilterRender,
         tableFilterDefaultMethod: handleInputFilterMethod
     },
+    FormatNumberInput: {
+        renderTableDefault: handleNumberCell,
+        tableFilterDefaultMethod: handleInputFilterMethod,
+        tableExportMethod(params) {
+            const { row, column } = params;
+            const cellValue = XEUtils.get(row, column.field);
+            return cellValue;
+        }
+    },
     VxeNumberInput: {
         tableAutoFocus: 'input',
         renderTableEdit: defaultEditRender,
-        renderTableCell(renderOpts, params) {
-            const { props = {}, showNegativeStatus } = renderOpts;
-            const { row, column } = params;
-            const { type } = props;
-            let cellValue = XEUtils.get(row, column.field);
-            let isNegative = false;
-            if (!isEmptyValue(cellValue)) {
-                const numberInputConfig = getConfig().numberInput || {};
-                if (type === 'float') {
-                    const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true);
-                    const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 1);
-                    cellValue = XEUtils.toFixed(XEUtils.floor(cellValue, digits), digits);
-                    if (!autoFill) {
-                        cellValue = XEUtils.toNumber(cellValue);
-                    }
-                    if (showNegativeStatus) {
-                        if (cellValue < 0) {
-                            isNegative = true;
-                        }
-                    }
-                }
-                else if (type === 'amount') {
-                    const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true);
-                    const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 2);
-                    const showCurrency = handleDefaultValue(props.showCurrency, numberInputConfig.showCurrency, false);
-                    cellValue = XEUtils.toNumber(cellValue);
-                    if (showNegativeStatus) {
-                        if (cellValue < 0) {
-                            isNegative = true;
-                        }
-                    }
-                    cellValue = XEUtils.commafy(cellValue, { digits });
-                    if (!autoFill) {
-                        const [iStr, dStr] = cellValue.split('.');
-                        if (dStr) {
-                            const dRest = dStr.replace(/0+$/, '');
-                            cellValue = dRest ? [iStr, '.', dRest].join('') : iStr;
-                        }
-                    }
-                    if (showCurrency) {
-                        cellValue = `${props.currencySymbol || numberInputConfig.currencySymbol || getI18n('vxe.numberInput.currencySymbol') || ''}${cellValue}`;
-                    }
-                }
-                else {
-                    if (showNegativeStatus) {
-                        if (XEUtils.toNumber(cellValue) < 0) {
-                            isNegative = true;
-                        }
-                    }
-                }
-            }
-            return getCellLabelVNs(renderOpts, params, cellValue, isNegative
-                ? {
-                    class: 'is--negative'
-                }
-                : {});
-        },
+        renderTableCell: handleNumberCell,
         renderTableFooter(renderOpts, params) {
             const { props = {} } = renderOpts;
             const { row, column, _columnIndex } = params;
@@ -723,11 +731,22 @@ renderer.mixin({
         tableFilterDefaultMethod: handleFilterMethod,
         tableExportMethod: handleExportSelectMethod
     },
+    /**
+     * 已废弃，被 FormatSelect 替换
+     * @deprecated
+     */
     formatOption: {
         renderTableDefault(renderOpts, params) {
             return getCellLabelVNs(renderOpts, params, getSelectCellValue(renderOpts, params));
         }
     },
+    FormatSelect: {
+        renderTableDefault(renderOpts, params) {
+            return getCellLabelVNs(renderOpts, params, getSelectCellValue(renderOpts, params));
+        },
+        tableFilterDefaultMethod: handleFilterMethod,
+        tableExportMethod: handleExportSelectMethod
+    },
     VxeTreeSelect: {
         tableAutoFocus: 'input',
         renderTableEdit: defaultTableOrTreeSelectEditRender,
@@ -736,11 +755,21 @@ renderer.mixin({
         },
         tableExportMethod: handleExportTreeSelectMethod
     },
+    /**
+     * 已废弃，被 FormatTreeSelect 替换
+     * @deprecated
+     */
     formatTree: {
         renderTableDefault(renderOpts, params) {
             return getCellLabelVNs(renderOpts, params, getTreeSelectCellValue(renderOpts, params));
         }
     },
+    FormatTreeSelect: {
+        renderTableDefault(renderOpts, params) {
+            return getCellLabelVNs(renderOpts, params, getTreeSelectCellValue(renderOpts, params));
+        },
+        tableExportMethod: handleExportTreeSelectMethod
+    },
     VxeTableSelect: {
         tableAutoFocus: 'input',
         renderTableEdit: defaultTableOrTreeSelectEditRender,

package/es/table/src/body.js

@@ -205,6 +205,7 @@ export default defineComponent({
             tdOns.onDblclick = (evnt) => {
                 $xeTable.triggerCellDblclickEvent(evnt, cellParams);
             };
+            let isMergeCell = false;
             // 合并行或列
             if (mergeList.length) {
                 const spanRest = mergeBodyMethod(mergeList, _rowIndex, _columnIndex);
@@ -214,9 +215,11 @@ export default defineComponent({
                         return null;
                     }
                     if (rowspan > 1) {
+                        isMergeCell = true;
                         tdAttrs.rowspan = rowspan;
                     }
                     if (colspan > 1) {
+                        isMergeCell = true;
                         tdAttrs.colspan = colspan;
                     }
                 }
@@ -249,12 +252,14 @@ export default defineComponent({
             const isLastColumn = $columnIndex === columns.length - 1;
             const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
             let isVNPreEmptyStatus = false;
-            if (!dragRow || getRowid($xeTable, dragRow) !== rowid) {
-                if (scrollYLoad && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
-                    isVNPreEmptyStatus = true;
-                }
-                else if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
-                    isVNPreEmptyStatus = true;
+            if (!isMergeCell) {
+                if (!dragRow || getRowid($xeTable, dragRow) !== rowid) {
+                    if (scrollYLoad && (_rowIndex < scrollYStore.visibleStartIndex - scrollYStore.preloadSize || _rowIndex > scrollYStore.visibleEndIndex + scrollYStore.preloadSize)) {
+                        isVNPreEmptyStatus = true;
+                    }
+                    else if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+                        isVNPreEmptyStatus = true;
+                    }
                 }
             }
             const tcStyle = {};

package/es/table/src/columnInfo.js

@@ -11,37 +11,35 @@ export class ColumnInfo {
         const formatter = _vm.formatter;
         const visible = XEUtils.isBoolean(_vm.visible) ? _vm.visible : true;
         const { props: tableProps } = $xeTable;
-        if (process.env.NODE_ENV === 'development') {
-            const types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
-            if (_vm.type && types.indexOf(_vm.type) === -1) {
-                warnLog('vxe.error.errProp', [`type=${_vm.type}`, types.join(', ')]);
-            }
-            if (XEUtils.isBoolean(_vm.cellRender) || (_vm.cellRender && !XEUtils.isObject(_vm.cellRender))) {
-                warnLog('vxe.error.errProp', [`column.cell-render=${_vm.cellRender}`, 'column.cell-render={}']);
-            }
-            if (XEUtils.isBoolean(_vm.editRender) || (_vm.editRender && !XEUtils.isObject(_vm.editRender))) {
-                warnLog('vxe.error.errProp', [`column.edit-render=${_vm.editRender}`, 'column.edit-render={}']);
+        const types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
+        if (_vm.type && types.indexOf(_vm.type) === -1) {
+            warnLog('vxe.error.errProp', [`type=${_vm.type}`, types.join(', ')]);
+        }
+        if (XEUtils.isBoolean(_vm.cellRender) || (_vm.cellRender && !XEUtils.isObject(_vm.cellRender))) {
+            warnLog('vxe.error.errProp', [`column.cell-render=${_vm.cellRender}`, 'column.cell-render={}']);
+        }
+        if (XEUtils.isBoolean(_vm.editRender) || (_vm.editRender && !XEUtils.isObject(_vm.editRender))) {
+            warnLog('vxe.error.errProp', [`column.edit-render=${_vm.editRender}`, 'column.edit-render={}']);
+        }
+        if (_vm.type === 'expand') {
+            const { treeConfig } = tableProps;
+            const { computeTreeOpts } = $xeTable.getComputeMaps();
+            const treeOpts = computeTreeOpts.value;
+            if (treeConfig && (treeOpts.showLine || treeOpts.line)) {
+                errLog('vxe.error.errConflicts', ['tree-config.showLine', 'column.type=expand']);
             }
-            if (_vm.type === 'expand') {
-                const { treeConfig } = tableProps;
-                const { computeTreeOpts } = $xeTable.getComputeMaps();
-                const treeOpts = computeTreeOpts.value;
-                if (treeConfig && (treeOpts.showLine || treeOpts.line)) {
-                    errLog('vxe.error.errConflicts', ['tree-config.showLine', 'column.type=expand']);
+        }
+        if (formatter) {
+            if (XEUtils.isString(formatter)) {
+                const gFormatOpts = formats.get(formatter) || XEUtils[formatter];
+                if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
+                    errLog('vxe.error.notFormats', [formatter]);
                 }
             }
-            if (formatter) {
-                if (XEUtils.isString(formatter)) {
-                    const gFormatOpts = formats.get(formatter) || XEUtils[formatter];
-                    if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
-                        errLog('vxe.error.notFormats', [formatter]);
-                    }
-                }
-                else if (XEUtils.isArray(formatter)) {
-                    const gFormatOpts = formats.get(formatter[0]) || XEUtils[formatter[0]];
-                    if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
-                        errLog('vxe.error.notFormats', [formatter[0]]);
-                    }
+            else if (XEUtils.isArray(formatter)) {
+                const gFormatOpts = formats.get(formatter[0]) || XEUtils[formatter[0]];
+                if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
+                    errLog('vxe.error.notFormats', [formatter[0]]);
                 }
             }
         }

package/es/table/src/footer.js

@@ -126,6 +126,7 @@ export default defineComponent({
                 tfOns.onDblclick = (evnt) => {
                     $xeTable.dispatchEvent('footer-cell-dblclick', Object.assign({ cell: evnt.currentTarget }, cellParams), evnt);
                 };
+                let isMergeCell = false;
                 // 合并行或列
                 if (mergeFooterList.length) {
                     const spanRest = mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex);
@@ -135,9 +136,11 @@ export default defineComponent({
                             return null;
                         }
                         if (rowspan > 1) {
+                            isMergeCell = true;
                             attrs.rowspan = rowspan;
                         }
                         if (colspan > 1) {
+                            isMergeCell = true;
                             attrs.colspan = colspan;
                         }
                     }
@@ -158,8 +161,10 @@ export default defineComponent({
                 const isLastColumn = $columnIndex === tableColumn.length - 1;
                 const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
                 let isVNPreEmptyStatus = false;
-                if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
-                    isVNPreEmptyStatus = true;
+                if (!isMergeCell) {
+                    if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+                        isVNPreEmptyStatus = true;
+                    }
                 }
                 const tcStyle = {};
                 if (hasEllipsis) {

package/es/table/src/props.js

@@ -182,6 +182,8 @@ export default {
     resizeConfig: Object,
     // 列配置信息
     columnConfig: Object,
+    // 当前列配置信息
+    currentColumnConfig: Object,
     // 单元格配置信息
     cellConfig: Object,
     // 表头单元格配置信息
@@ -190,6 +192,8 @@ export default {
     footerCellConfig: Object,
     // 行配置信息
     rowConfig: Object,
+    // 当前行配置信息
+    currentRowConfig: Object,
     // 已废弃，被 rowDragConfig 替换
     dragConfig: Object,
     // 行拖拽排序配置项