@visactor/vtable 1.8.2 → 1.8.3

package/dist/vtable.js

@@ -27878,6 +27878,7 @@
         MOUSEENTER_TABLE: 'mouseenter_table',
         MOUSELEAVE_TABLE: 'mouseleave_table',
         MOUSEDOWN_TABLE: 'mousedown_table',
+        MOUSEMOVE_TABLE: 'mousemove_table',
         MOUSEMOVE_CELL: 'mousemove_cell',
         MOUSEENTER_CELL: 'mouseenter_cell',
         MOUSELEAVE_CELL: 'mouseleave_cell',
@@ -27886,6 +27887,7 @@
         RESIZE_COLUMN_END: 'resize_column_end',
         RESIZE_ROW: 'resize_row',
         RESIZE_ROW_END: 'resize_row_end',
+        CHANGE_HEADER_POSITION_START: 'change_header_position_start',
         CHANGE_HEADER_POSITION: 'change_header_position',
         SORT_CLICK: 'sort_click',
         FREEZE_CLICK: 'freeze_click',
@@ -30908,8 +30910,12 @@
             this.registerAggregator(AggregationType.NONE, NoneAggregator);
             this.registerAggregator(AggregationType.CUSTOM, CustomAggregator);
         }
+        updateColumns(columns) {
+            this.columns = columns;
+        }
         _generateFieldAggragations() {
             const columnObjs = this.columns;
+            this.fieldAggregators = [];
             for (let i = 0; i < columnObjs?.length; i++) {
                 delete columnObjs[i].vtable_aggregator;
                 const field = columnObjs[i].field;
@@ -32873,6 +32879,15 @@
             }
         }
     }
+    function checkHasAggregationOnColumnDefine(colDefs) {
+        for (let i = 0; i < colDefs.length; i++) {
+            const colDef = colDefs[i];
+            if (colDef.aggregation) {
+                return true;
+            }
+        }
+        return false;
+    }
 
     let Icon$1 = class Icon extends Image$2 {
         role;
@@ -32959,6 +32974,12 @@
                     }
                 }
             }
+            if (table.widthMode === 'autoWidth') {
+                table.scenegraph.recalculateColWidths();
+            }
+            if (table.heightMode === 'autoHeight') {
+                table.scenegraph.recalculateRowHeights();
+            }
             table.scenegraph.renderSceneGraph();
         }
         getCustomLayoutFunc(col, row) {
@@ -33162,8 +33183,8 @@
         }
         if (typeof customLayout === 'function') {
             const arg = {
-                col,
-                row,
+                col: range?.start.col ?? col,
+                row: range?.start.row ?? row,
                 dataValue: table.getCellOriginValue(col, row),
                 value: table.getCellValue(col, row) || '',
                 rect: {
@@ -33174,7 +33195,9 @@
                     width,
                     height
                 },
-                table
+                table,
+                originCol: col,
+                originRow: row
             };
             const customRenderObj = customLayout(arg);
             if (customRenderObj.rootContainer) {
@@ -35617,7 +35640,6 @@
         let value = table.getCellValue(col, row);
         let isMerge;
         let range;
-        let cellTheme;
         let customStyle;
         let customResult;
         let isCustomMerge = false;
@@ -35629,10 +35651,6 @@
                 isMerge = range.start.col !== range.end.col || range.start.row !== range.end.row;
                 value = customMergeText;
                 customStyle = customMergeStyle;
-                if (customStyle) {
-                    cellTheme = getStyleTheme(customStyle, table, range.start.col, range.start.row, getProp).theme;
-                    cellTheme.group.cornerRadius = getCellCornerRadius(col, row, table);
-                }
                 if (customLayout || customRender) {
                     customResult = dealWithCustom(customLayout, customRender, customMergeRange.start.col, customMergeRange.start.row, table.getColsWidth(customMergeRange.start.col, customMergeRange.end.col), table.getRowsHeight(customMergeRange.start.row, customMergeRange.end.row), false, table.isAutoRowHeight(row), [0, 0, 0, 0], range, table);
                 }
@@ -35671,11 +35689,9 @@
                 value = vtableMergeName;
             }
         }
-        const cellStyle = table._getCellStyle(range ? range.start.col : col, range ? range.start.row : row);
+        const cellStyle = customStyle || table._getCellStyle(range ? range.start.col : col, range ? range.start.row : row);
         const autoWrapText = cellStyle.autoWrapText ?? table.internalProps.autoWrapText;
-        if (!cellTheme) {
-            cellTheme = getStyleTheme(cellStyle, table, isMerge ? range.start.col : col, isMerge ? range.start.row : row, getProp).theme;
-        }
+        const cellTheme = getStyleTheme(cellStyle, table, isMerge ? range.start.col : col, isMerge ? range.start.row : row, getProp).theme;
         cellTheme.group.cornerRadius = getCellCornerRadius(col, row, table);
         if (!addNew &&
             !isMerge &&
@@ -35777,7 +35793,25 @@
         }
         if (isPromise(value)) {
             oldCellGroup.removeAllChild();
-            dealPromiseData(value, table, updateCellContent.bind(null, type, value, define, table, col, row, cellWidth, cellHeight, oldCellGroup, padding, textAlign, textBaseline, mayHaveIcon, addNew, cellTheme, range, customResult));
+            dealPromiseData(value, table, callUpdateCellContentForPromiseValue.bind(null, {
+                type,
+                value,
+                define,
+                table,
+                col,
+                row,
+                cellWidth,
+                cellHeight,
+                oldCellGroup,
+                padding,
+                textAlign,
+                textBaseline,
+                mayHaveIcon,
+                addNew,
+                range,
+                customResult,
+                customStyle
+            }));
         }
         else {
             newCellGroup = updateCellContent(type, value, define, table, col, row, cellWidth, cellHeight, oldCellGroup, padding, textAlign, textBaseline, mayHaveIcon, addNew, cellTheme, range, customResult);
@@ -35838,6 +35872,13 @@
         }
         return false;
     }
+    function callUpdateCellContentForPromiseValue(updateCellArgs) {
+        const { type, value, define, table, col, row, cellWidth, cellHeight, oldCellGroup, padding, textAlign, textBaseline, mayHaveIcon, addNew, range, customResult, customStyle } = updateCellArgs;
+        const cellStyle = customStyle || table._getCellStyle(range ? range.start.col : col, range ? range.start.row : row);
+        const cellTheme = getStyleTheme(cellStyle, table, range ? range.start.col : col, range ? range.start.row : row, getProp).theme;
+        cellTheme.group.cornerRadius = getCellCornerRadius(col, row, table);
+        updateCellContent(type, value, define, table, col, row, cellWidth, cellHeight, oldCellGroup, padding, textAlign, textBaseline, mayHaveIcon, addNew, cellTheme, range, customResult);
+    }
     function dealWithMergeCellSize(range, cellWidth, cellHeight, padding, textAlign, textBaseline, table) {
         for (let col = range.start.col; col <= range.end.col; col++) {
             for (let row = range.start.row; row <= range.end.row; row++) {
@@ -36629,7 +36670,7 @@
     }
     function computeCustomRenderHeight(col, row, table) {
         const customRender = table.getCustomRender(col, row);
-        const customLayout = table.getCustomLayout(col, row);
+        let customLayout = table.getCustomLayout(col, row);
         if (customRender || customLayout) {
             let spanRow = 1;
             let height = 0;
@@ -36649,6 +36690,9 @@
                 rect: getCellRect$1(col, row, table),
                 table
             };
+            if (customLayout === 'react-custom-layout') {
+                customLayout = table.reactCustomLayout?.getCustomLayoutFunc(col, row) || emptyCustomLayout;
+            }
             if (isFunction$1(customLayout)) {
                 const customLayoutObj = customLayout(arg);
                 if (customLayoutObj.rootContainer) {
@@ -36968,11 +37012,7 @@
             const customContainer = cell.getChildByName(CUSTOM_CONTAINER_NAME) ||
                 cell.getChildByName(CUSTOM_MERGE_CONTAINER_NAME);
             if (customContainer) {
-                if (scene.table.reactCustomLayout) {
-                    scene.table.reactCustomLayout.removeCustomCell(col, row);
-                }
                 let customElementsGroup;
-                customContainer.removeAllChild();
                 cell.removeChild(customContainer);
                 const customMergeRange = getCustomCellMergeCustom(col, row, cell, scene.table);
                 if (customMergeRange) {
@@ -37324,11 +37364,7 @@
             const customContainer = cell.getChildByName(CUSTOM_CONTAINER_NAME) ||
                 cell.getChildByName(CUSTOM_MERGE_CONTAINER_NAME);
             if (customContainer) {
-                if (scene.table.reactCustomLayout) {
-                    scene.table.reactCustomLayout.removeCustomCell(col, row);
-                }
                 let customElementsGroup;
-                customContainer.removeAllChild();
                 cell.removeChild(customContainer);
                 const customMergeRange = getCustomCellMergeCustom(col, row, cell, scene.table);
                 if (customMergeRange) {
@@ -37380,7 +37416,7 @@
                             width = scene.table.getColsWidth(cellGroup.mergeStartCol, cellGroup.mergeEndCol);
                             height = scene.table.getRowsHeight(cellGroup.mergeStartRow, cellGroup.mergeEndRow);
                         }
-                        const customResult = dealWithCustom(customLayout, customRender, cellGroup.mergeStartCol ?? col, cellGroup.mergeStartRow ?? row, width, height, false, scene.table.isAutoRowHeight(row), padding, isMergeCellGroup(cellGroup)
+                        const customResult = dealWithCustom(customLayout, customRender, col, row, width, height, false, scene.table.isAutoRowHeight(row), padding, isMergeCellGroup(cellGroup)
                             ? {
                                 start: { col: cellGroup.mergeStartCol, row: cellGroup.mergeStartRow },
                                 end: { col: cellGroup.mergeEndCol, row: cellGroup.mergeEndRow }
@@ -41016,7 +41052,7 @@
     }
     function computeCustomRenderWidth(col, row, table) {
         const customRender = table.getCustomRender(col, row);
-        const customLayout = table.getCustomLayout(col, row);
+        let customLayout = table.getCustomLayout(col, row);
         if (customRender || customLayout) {
             let spanCol = 1;
             let width = 0;
@@ -41036,6 +41072,9 @@
                 rect: getCellRect(col, row, table),
                 table
             };
+            if (customLayout === 'react-custom-layout') {
+                customLayout = table.reactCustomLayout?.getCustomLayoutFunc(col, row) || emptyCustomLayout;
+            }
             if (isFunction$1(customLayout)) {
                 const customLayoutObj = customLayout(arg);
                 if (customLayoutObj.rootContainer) {
@@ -41326,7 +41365,9 @@
                 colForDefine = range.start.col;
                 rowForDefine = range.start.row;
             }
-            if ((cellLocation === 'columnHeader' || cellLocation === 'cornerHeader') && row >= table.columnHeaderLevelCount) {
+            if (!table.isPivotTable() &&
+                (cellLocation === 'columnHeader' || cellLocation === 'cornerHeader') &&
+                row >= table.columnHeaderLevelCount) {
                 cellLocation = 'body';
             }
             const define = cellLocation !== 'body'
@@ -41361,23 +41402,6 @@
                     value = vtableMergeName;
                 }
             }
-            const cellStyle = customStyle || table._getCellStyle(range ? range.start.col : col, range ? range.start.row : row);
-            const cellTheme = getStyleTheme(cellStyle, table, range ? range.start.col : col, range ? range.start.row : row, getProp).theme;
-            cellTheme.group.cornerRadius = getCellCornerRadius(col, row, table);
-            cellTheme.group.width = colWidth;
-            cellTheme.group.height = Array.isArray(defaultRowHeight) ? defaultRowHeight[row] : defaultRowHeight;
-            if (cellTheme._vtable.padding) {
-                padding = cellTheme._vtable.padding;
-            }
-            if (cellTheme.text.textAlign) {
-                textAlign = cellTheme.text.textAlign;
-            }
-            if (cellTheme.text.textBaseline) {
-                textBaseline = cellTheme.text.textBaseline;
-            }
-            if (cellLocation !== 'body' && !cellTheme.group.fill) {
-                cellTheme.group.fill = '#fff';
-            }
             const type = isVtableMerge || isCustomMerge
                 ? 'text'
                 : (table.isHeader(col, row)
@@ -41385,13 +41409,48 @@
                     : table.getBodyColumnType(col, row)) || 'text';
             if (isPromise(value)) {
                 createEmptyCellGroup(col, row, 0, y, cellWidth, cellHeight, columnGroup);
-                dealPromiseData(value, table, createCell.bind(null, type, value, define, table, col, row, colWidth, cellWidth, cellHeight, columnGroup, y, padding, textAlign, textBaseline, mayHaveIcon, cellTheme, range, customResult));
+                dealPromiseData(value, table, callCreateCellForPromiseValue.bind(null, {
+                    type,
+                    value,
+                    define,
+                    table,
+                    col,
+                    row,
+                    colWidth,
+                    cellWidth,
+                    cellHeight,
+                    columnGroup,
+                    y,
+                    customStyle,
+                    mayHaveIcon,
+                    cellLocation,
+                    range,
+                    customResult,
+                    defaultRowHeight
+                }));
                 columnGroup.updateColumnRowNumber(row);
                 const height = table.getRowHeight(row);
                 columnGroup.updateColumnHeight(height);
                 y += height;
             }
             else {
+                const cellStyle = customStyle || table._getCellStyle(range ? range.start.col : col, range ? range.start.row : row);
+                const cellTheme = getStyleTheme(cellStyle, table, range ? range.start.col : col, range ? range.start.row : row, getProp).theme;
+                cellTheme.group.cornerRadius = getCellCornerRadius(col, row, table);
+                cellTheme.group.width = colWidth;
+                cellTheme.group.height = Array.isArray(defaultRowHeight) ? defaultRowHeight[row] : defaultRowHeight;
+                if (cellTheme._vtable.padding) {
+                    padding = cellTheme._vtable.padding;
+                }
+                if (cellTheme.text.textAlign) {
+                    textAlign = cellTheme.text.textAlign;
+                }
+                if (cellTheme.text.textBaseline) {
+                    textBaseline = cellTheme.text.textBaseline;
+                }
+                if (cellLocation !== 'body' && !cellTheme.group.fill) {
+                    cellTheme.group.fill = '#fff';
+                }
                 const cellGroup = createCell(type, value, define, table, col, row, colWidth, cellWidth, cellHeight, columnGroup, y, padding, textAlign, textBaseline, mayHaveIcon, cellTheme, range, customResult);
                 columnGroup.updateColumnRowNumber(row);
                 if (isMerge) {
@@ -41420,6 +41479,30 @@
             height: y
         };
     }
+    function callCreateCellForPromiseValue(createCellArgs) {
+        let padding;
+        let textAlign;
+        let textBaseline;
+        const { type, value, define, table, col, row, colWidth, cellWidth, cellHeight, columnGroup, y, cellLocation, mayHaveIcon, customStyle, range, customResult, defaultRowHeight } = createCellArgs;
+        const cellStyle = customStyle || table._getCellStyle(range ? range.start.col : col, range ? range.start.row : row);
+        const cellTheme = getStyleTheme(cellStyle, table, range ? range.start.col : col, range ? range.start.row : row, getProp).theme;
+        cellTheme.group.cornerRadius = getCellCornerRadius(col, row, table);
+        cellTheme.group.width = colWidth;
+        cellTheme.group.height = Array.isArray(defaultRowHeight) ? defaultRowHeight[row] : defaultRowHeight;
+        if (cellTheme._vtable.padding) {
+            padding = cellTheme._vtable.padding;
+        }
+        if (cellTheme.text.textAlign) {
+            textAlign = cellTheme.text.textAlign;
+        }
+        if (cellTheme.text.textBaseline) {
+            textBaseline = cellTheme.text.textBaseline;
+        }
+        if (cellLocation !== 'body' && !cellTheme.group.fill) {
+            cellTheme.group.fill = '#fff';
+        }
+        createCell(type, value, define, table, col, row, colWidth, cellWidth, cellHeight, columnGroup, y, padding, textAlign, textBaseline, mayHaveIcon, cellTheme, range, customResult);
+    }
     function dealMerge(range, mergeMap, table, forceUpdate) {
         let cellWidth = 0;
         let cellHeight = 0;
@@ -44225,15 +44308,17 @@
             return;
         }
         const allColsWidth = table.getAllColsWidth();
+        const tableNoFrameWidth = Math.min(allColsWidth, table.tableNoFrameWidth);
         const frozenColsWidth = table.getFrozenColsWidth();
         const rightFrozenColsWidth = table.getRightFrozenColsWidth();
         const totalFrozenColsWidth = frozenColsWidth + rightFrozenColsWidth;
-        const bodyWidth = Math.min(allColsWidth - totalFrozenColsWidth, table.tableNoFrameWidth - totalFrozenColsWidth);
+        const bodyWidth = Math.min(allColsWidth - totalFrozenColsWidth, tableNoFrameWidth - totalFrozenColsWidth);
         const allRowsHeight = table.getAllRowsHeight();
+        const tableNoFrameHeight = Math.min(allRowsHeight, table.tableNoFrameHeight);
         const frozenRowsHeight = table.getFrozenRowsHeight();
         const bottomFrozenRowsHeight = table.getBottomFrozenRowsHeight();
         const totalFrozenRowsHeight = frozenRowsHeight + bottomFrozenRowsHeight;
-        const bodyHeight = Math.min(allRowsHeight - totalFrozenRowsHeight, table.tableNoFrameHeight - totalFrozenRowsHeight);
+        const bodyHeight = Math.min(allRowsHeight - totalFrozenRowsHeight, tableNoFrameHeight - totalFrozenRowsHeight);
         if (table.frozenColCount > 0) {
             headerDomContainer.style.left = `${table.tableX + frozenColsWidth}px`;
             bodyDomContainer.style.left = `${table.tableX + frozenColsWidth}px`;
@@ -44261,21 +44346,21 @@
         rightFrozenBodyDomContainer.style.width = `${rightFrozenColsWidth}px`;
         rightFrozenBodyDomContainer.style.height = `${bodyHeight}px`;
         rightFrozenBodyDomContainer.style.top = `${table.tableY + frozenRowsHeight}px`;
-        rightFrozenBodyDomContainer.style.left = `${table.tableX + table.tableNoFrameWidth - rightFrozenColsWidth}px`;
+        rightFrozenBodyDomContainer.style.left = `${table.tableX + tableNoFrameWidth - rightFrozenColsWidth}px`;
         rightFrozenHeaderDomContainer.style.width = `${rightFrozenColsWidth}px`;
         rightFrozenHeaderDomContainer.style.height = `${frozenRowsHeight}px`;
         rightFrozenHeaderDomContainer.style.top = `${table.tableY}px`;
-        rightFrozenHeaderDomContainer.style.left = `${table.tableX + table.tableNoFrameWidth - rightFrozenColsWidth}px`;
+        rightFrozenHeaderDomContainer.style.left = `${table.tableX + tableNoFrameWidth - rightFrozenColsWidth}px`;
         bottomDomContainer.style.width = `${bodyWidth}px`;
         bottomDomContainer.style.height = `${bottomFrozenRowsHeight}px`;
-        bottomDomContainer.style.top = `${table.tableY + table.tableNoFrameHeight - bottomFrozenRowsHeight}px`;
+        bottomDomContainer.style.top = `${table.tableY + tableNoFrameHeight - bottomFrozenRowsHeight}px`;
         frozenBottomDomContainer.style.width = `${frozenColsWidth}px`;
         frozenBottomDomContainer.style.height = `${bottomFrozenRowsHeight}px`;
-        frozenBottomDomContainer.style.top = `${table.tableY + table.tableNoFrameHeight - bottomFrozenRowsHeight}px`;
+        frozenBottomDomContainer.style.top = `${table.tableY + tableNoFrameHeight - bottomFrozenRowsHeight}px`;
         rightFrozenBottomDomContainer.style.width = `${rightFrozenColsWidth}px`;
         rightFrozenBottomDomContainer.style.height = `${bottomFrozenRowsHeight}px`;
-        rightFrozenBottomDomContainer.style.top = `${table.tableY + table.tableNoFrameHeight - bottomFrozenRowsHeight}px`;
-        rightFrozenBottomDomContainer.style.left = `${table.tableX + table.tableNoFrameWidth - rightFrozenColsWidth}px`;
+        rightFrozenBottomDomContainer.style.top = `${table.tableY + tableNoFrameHeight - bottomFrozenRowsHeight}px`;
+        rightFrozenBottomDomContainer.style.left = `${table.tableX + tableNoFrameWidth - rightFrozenColsWidth}px`;
     }
     function updateReactComponentContainer(scene) {
         if (!scene.table.reactCustomLayout) {
@@ -47580,6 +47665,19 @@
                             col,
                             row
                         };
+                        const cellRange = skipBodyMerge ? { start: { col, row }, end: { col, row } } : table.getCellRange(col, row);
+                        if (currentRange.start.col < cellRange.end.col) {
+                            currentRange.end.col = cellRange.end.col;
+                        }
+                        else if (currentRange.start.col > cellRange.start.col) {
+                            currentRange.end.col = cellRange.start.col;
+                        }
+                        if (currentRange.start.row < cellRange.end.row) {
+                            currentRange.end.row = cellRange.end.row;
+                        }
+                        else if (currentRange.start.row > cellRange.start.row) {
+                            currentRange.end.row = cellRange.start.row;
+                        }
                         if (skipBodyMerge) {
                             currentRange.skipBodyMerge = true;
                         }
@@ -47876,7 +47974,8 @@
             state.columnMove.colSource >= 0 &&
             state.columnMove.rowSource >= 0 &&
             state.columnMove.colTarget >= 0 &&
-            state.columnMove.rowTarget >= 0) {
+            state.columnMove.rowTarget >= 0 &&
+            state.table.options.customConfig?.notUpdateInColumnRowMove !== true) {
             const oldSourceMergeInfo = state.table.getCellRange(state.columnMove.colSource, state.columnMove.rowSource);
             const oldTargetMergeInfo = state.table.getCellRange(state.columnMove.colTarget, state.columnMove.rowTarget);
             const moveContext = state.table._moveHeaderPosition({ col: state.columnMove.colSource, row: state.columnMove.rowSource }, { col: state.columnMove.colTarget, row: state.columnMove.rowTarget });
@@ -47981,6 +48080,9 @@
             state.table.scenegraph.component.setRightFrozenColumnShadow(state.table.colCount - state.table.rightFrozenColCount);
         }
         state.table.scenegraph.updateNextFrame();
+        if (state.table.options.customConfig?.notUpdateInColumnRowMove === true) {
+            return true;
+        }
         return moveColResult;
     }
     function clearWidthsAndHeightsCache(colMin, colMax, rowMin, rowMax, table) {
@@ -48685,6 +48787,7 @@
     class StateManager {
         table;
         interactionState;
+        interactionStateBeforeScroll;
         select;
         fillHandle;
         hover;
@@ -48708,8 +48811,8 @@
         _checkboxCellTypeFields = [];
         _headerCheckFuncs = {};
         radioState = {};
-        resetInteractionState = debounce(() => {
-            this.updateInteractionState(InteractionState.default);
+        resetInteractionState = debounce((state) => {
+            this.updateInteractionState(state ?? InteractionState.default);
         }, 100);
         constructor(table) {
             this.table = table;
@@ -48978,6 +49081,9 @@
             if (this.interactionState === mode) {
                 return;
             }
+            if (mode === InteractionState.scrolling) {
+                this.interactionStateBeforeScroll = this.interactionState;
+            }
             const oldState = this.interactionState;
             this.interactionState = mode;
             if (oldState === InteractionState.scrolling && mode === InteractionState.default) ;
@@ -49184,8 +49290,9 @@
             this.fillHandle.beforeFillMinCol = undefined;
             this.fillHandle.beforeFillMinRow = undefined;
         }
-        startMoveCol(col, row, x, y) {
+        startMoveCol(col, row, x, y, event) {
             startMoveCol(col, row, x, y, this);
+            this.table.fireListeners(TABLE_EVENT_TYPE.CHANGE_HEADER_POSITION_START, { col, row, x, y, event });
         }
         updateMoveCol(col, row, x, y) {
             updateMoveCol(col, row, x, y, this);
@@ -49926,7 +50033,7 @@
             state.setScrollTop(state.scroll.verticalBarPos + optimizedDeltaY, event);
             state.showVerticalScrollBar(true);
         }
-        isWheelEvent && state.resetInteractionState();
+        isWheelEvent && state.resetInteractionState(state.interactionStateBeforeScroll);
         if (event.nativeEvent?.cancelable &&
             (state.table.internalProps.overscrollBehavior === 'none' ||
                 (Math.abs(deltaY) >= Math.abs(deltaX) && deltaY !== 0 && isVerticalScrollable(deltaY, state)) ||
@@ -50044,6 +50151,17 @@
                 eventManager.touchSetTimeout = undefined;
             }
             const eventArgsSet = getCellEventArgsSet(e);
+            if (eventArgsSet.eventArgs && table.hasListeners(TABLE_EVENT_TYPE.MOUSEMOVE_TABLE)) {
+                table.fireListeners(TABLE_EVENT_TYPE.MOUSEMOVE_TABLE, {
+                    col: eventArgsSet.eventArgs.col,
+                    row: eventArgsSet.eventArgs.row,
+                    x: eventArgsSet.abstractPos.x,
+                    y: eventArgsSet.abstractPos.y,
+                    event: e.nativeEvent,
+                    target: eventArgsSet?.eventArgs?.target,
+                    mergeCellInfo: eventArgsSet.eventArgs?.mergeInfo
+                });
+            }
             if (stateManager.interactionState === InteractionState.grabing &&
                 !table.editorManager?.editingEditor) {
                 if (Math.abs(lastX - e.x) + Math.abs(lastY - e.y) >= 1) {
@@ -50252,7 +50370,8 @@
                             source: {
                                 col: table.stateManager.columnMove.colSource,
                                 row: table.stateManager.columnMove.rowSource
-                            }
+                            },
+                            event: e.nativeEvent
                         });
                     }
                 }
@@ -50287,6 +50406,17 @@
                     }
                     stateManager.updateInteractionState(InteractionState.default);
                     eventManager.dealTableHover();
+                });
+            }
+        };
+        const globalPointerdownCallback = (e) => {
+            const target = e.target;
+            if (!table.getElement().contains(target)) {
+                const isCompleteEdit = table.editorManager?.completeEdit(e);
+                getPromiseValue(isCompleteEdit, isCompleteEdit => {
+                    if (isCompleteEdit === false) {
+                        return;
+                    }
                     if (table.options.select?.outsideClickDeselect) {
                         const isHasSelected = !!stateManager.select.ranges?.length;
                         eventManager.dealTableSelect();
@@ -50300,7 +50430,13 @@
             env: 'document',
             callback: globalPointerupCallback
         });
+        eventManager.globalEventListeners.push({
+            name: 'pointerdown',
+            env: 'document',
+            callback: globalPointerdownCallback
+        });
         vglobal.addEventListener('pointerup', globalPointerupCallback);
+        vglobal.addEventListener('pointerdown', globalPointerdownCallback);
         table.scenegraph.tableGroup.addEventListener('pointerdown', (e) => {
             if (table.hasListeners(TABLE_EVENT_TYPE.MOUSEDOWN_TABLE)) {
                 table.fireListeners(TABLE_EVENT_TYPE.MOUSEDOWN_TABLE, {
@@ -50380,7 +50516,7 @@
                     }
                 }
                 else if (hitIcon.attribute.funcType === IconFuncTypeEnum.dragReorder) {
-                    stateManager.startMoveCol(eventArgsSet.eventArgs.col, eventArgsSet.eventArgs.row, eventArgsSet.abstractPos.x, eventArgsSet.abstractPos.y);
+                    stateManager.startMoveCol(eventArgsSet.eventArgs.col, eventArgsSet.eventArgs.row, eventArgsSet.abstractPos.x, eventArgsSet.abstractPos.y, eventArgsSet.eventArgs?.event?.nativeEvent);
                     stateManager.updateInteractionState(InteractionState.grabing);
                 }
                 if (table.hasListeners(TABLE_EVENT_TYPE.MOUSEDOWN_CELL)) {
@@ -50420,7 +50556,8 @@
                             source: {
                                 col: table.stateManager.columnMove.colSource,
                                 row: table.stateManager.columnMove.rowSource
-                            }
+                            },
+                            event: e.nativeEvent
                         });
                     }
                 }
@@ -51523,7 +51660,7 @@
                     let left = false;
                     if (y > drawRange.bottom - bottomFrozenRowHeight &&
                         canScrollY &&
-                        table.scrollTop + table.tableNoFrameWidth < table.getAllRowsHeight()) {
+                        table.scrollTop + table.tableNoFrameHeight < table.getAllRowsHeight()) {
                         bottom = true;
                         table.eventManager.scrollYSpeed = -(y - drawRange.bottom + bottomFrozenRowHeight) / 50;
                     }
@@ -52154,7 +52291,7 @@
                     this.table.options.select?.disableHeaderSelect ||
                     this.table.options.select?.disableSelect) &&
                 this.table._canDragHeaderPosition(eventArgs.col, eventArgs.row)) {
-                this.table.stateManager.startMoveCol(eventArgs.col, eventArgs.row, eventArgsSet.abstractPos.x, eventArgsSet.abstractPos.y);
+                this.table.stateManager.startMoveCol(eventArgs.col, eventArgs.row, eventArgsSet.abstractPos.x, eventArgsSet.abstractPos.y, eventArgs?.event?.nativeEvent);
                 return true;
             }
             return false;
@@ -56315,7 +56452,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "1.8.2";
+        version = "1.8.3";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -60299,13 +60436,18 @@
             return false;
         }
         isSeriesNumber(col, row) {
-            if (this.leftRowSeriesNumberColumnCount > 0 && col >= 0 && row >= 0 && col < this.leftRowSeriesNumberColumnCount) {
-                return true;
-            }
-            if (this.rightRowSeriesNumberColumnCount > 0 &&
-                row >= 0 &&
-                col >= this.colCount - this.rightRowSeriesNumberColumnCount) {
-                return true;
+            if (isValid$1(col) && isValid$1(row)) {
+                if (this.leftRowSeriesNumberColumnCount > 0 &&
+                    col >= 0 &&
+                    row >= 0 &&
+                    col < this.leftRowSeriesNumberColumnCount) {
+                    return true;
+                }
+                if (this.rightRowSeriesNumberColumnCount > 0 &&
+                    row >= 0 &&
+                    col >= this.colCount - this.rightRowSeriesNumberColumnCount) {
+                    return true;
+                }
             }
             return false;
         }
@@ -62202,6 +62344,10 @@
             this.internalProps.headerHelper.setTableColumnsEditor();
             this._hasAutoImageColumn = undefined;
             this.refreshHeader();
+            this.dataSource.updateColumns?.(this.internalProps.columns);
+            if (this.records && checkHasAggregationOnColumnDefine(columns)) {
+                this.dataSource.processRecords(this.dataSource.dataSourceObj?.records ?? this.dataSource.dataSourceObj);
+            }
             this.internalProps.useOneRowHeightFillAll = false;
             this.scenegraph.clearCells();
             this.headerStyleCache = new Map();
@@ -65197,12 +65343,14 @@
         }
         getLegendAttributes(rect) {
             const layout = this.orient === 'bottom' || this.orient === 'top' ? 'horizontal' : 'vertical';
+            const legendAttrs = getLegendAttributes(this.option, rect);
+            const padding = getQuadProps(legendAttrs.padding ?? this.option.padding ?? 10);
             const attrs = {
                 layout,
                 items: this.getLegendItems(),
-                maxWidth: rect.width,
-                maxHeight: rect.height,
-                ...getLegendAttributes(this.option, rect)
+                maxWidth: rect.width - padding[1] - padding[3],
+                maxHeight: rect.height - padding[0] - padding[2],
+                ...legendAttrs
             };
             return attrs;
         }
@@ -69297,6 +69445,8 @@
                                 dimensionKey: dimensionKey,
                                 id,
                                 value: dimensionKey,
+                                headerCustomRender: this.cornerSetting.customRender,
+                                headerCustomLayout: this.cornerSetting.customLayout,
                                 headerEditor: this.cornerSetting.headerEditor,
                                 disableHeaderHover: !!this.cornerSetting.disableHeaderHover,
                                 disableHeaderSelect: !!this.cornerSetting.disableHeaderSelect
@@ -69342,7 +69492,8 @@
                     define: {
                         dimensionKey: '维度名称',
                         id,
-                        value: '',
+                        headerCustomRender: this.cornerSetting.customRender,
+                        headerCustomLayout: this.cornerSetting.customLayout,
                         disableHeaderHover: !!this.cornerSetting.disableHeaderHover,
                         disableHeaderSelect: !!this.cornerSetting.disableHeaderSelect
                     }
@@ -69428,7 +69579,14 @@
                     });
                 }
                 else {
-                    const rowDimensionKeys = this.rowDimensionTree.dimensionKeysIncludeVirtual.valueArr();
+                    const rowDimensionKeys = this.rowDimensionTree.totalLevel > 0
+                        ? this.rowDimensionTree.dimensionKeysIncludeVirtual.valueArr()
+                        : this.rowsDefine.map(dimension => {
+                            if (typeof dimension === 'string') {
+                                return dimension;
+                            }
+                            return dimension.dimensionKey;
+                        });
                     rowDimensionKeys.forEach((objKey, index) => {
                         const dimension = this.rowsDefine?.find(dimension => typeof dimension === 'string' ? false : dimension.dimensionKey === objKey);
                         dimension &&
@@ -71391,13 +71549,18 @@
             return false;
         }
         isSeriesNumber(col, row) {
-            if (this.leftRowSeriesNumberColumnCount > 0 && col >= 0 && row >= 0 && col < this.leftRowSeriesNumberColumnCount) {
-                return true;
-            }
-            if (this.rightRowSeriesNumberColumnCount > 0 &&
-                row >= 0 &&
-                col >= this.colCount - this.rightRowSeriesNumberColumnCount) {
-                return true;
+            if (isValid$1(col) && isValid$1(row)) {
+                if (this.leftRowSeriesNumberColumnCount > 0 &&
+                    col >= 0 &&
+                    row >= 0 &&
+                    col < this.leftRowSeriesNumberColumnCount) {
+                    return true;
+                }
+                if (this.rightRowSeriesNumberColumnCount > 0 &&
+                    row >= 0 &&
+                    col >= this.colCount - this.rightRowSeriesNumberColumnCount) {
+                    return true;
+                }
             }
             return false;
         }
@@ -76460,7 +76623,7 @@
     }
 
     registerForVrender();
-    const version = "1.8.2";
+    const version = "1.8.3";
     function getIcons() {
         return get$2();
     }