Merge pull request #5054 from VisActor/fix/groupBy-with-rowSeriesNumber

Fix/group by with row series number

Author: fangsmile

.vscode/settings.json

@@ -2,6 +2,10 @@
   // Eslint
   "eslint.format.enable": true,
   "eslint.validate": ["typescript", "javascript", "javascriptreact", "typescriptreact"],
+  "eslint.workingDirectories": [
+    { "mode": "auto" }
+  ],
+  "eslint.nodePath": "common/autoinstallers/lint/node_modules",
   // Formatter
   "javascript.format.enable": false,
   "typescript.format.enable": false,

common/changes/@visactor/vtable/feat-sheet-undo-redo_2026-03-16-06-37.json

@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "fix: formula has formula case compute result error\n\n",
+      "type": "none",
+      "packageName": "@visactor/vtable"
+    }
+  ],
+  "packageName": "@visactor/vtable",
+  "email": "892739385@qq.com"
+}

common/changes/@visactor/vtable/fix-groupBy-with-rowSeriesNumber_2026-03-17-11-23.json

@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "fix: checkbox cell render error when set groupBy with rowSeriesNumber\n\n",
+      "type": "none",
+      "packageName": "@visactor/vtable"
+    }
+  ],
+  "packageName": "@visactor/vtable",
+  "email": "892739385@qq.com"
+}

docs/assets/api/en/SheetAPI.md

@@ -143,6 +143,46 @@ Get the formula manager
   getFormulaManager: () => FormulaManager
 ```
 
+### getWorkbookHistoryManager(Function)
+
+Get the workbook history manager (workbook-level undo/redo).
+
+```
+  getWorkbookHistoryManager: () => WorkbookHistoryManager
+```
+
+### undo(Function)
+
+Undo the latest workbook transaction.
+
+```
+  undo: () => void
+```
+
+### redo(Function)
+
+Redo the latest workbook transaction.
+
+```
+  redo: () => void
+```
+
+### startHistoryTransaction(Function)
+
+Start a workbook-level transaction. Operations recorded during the transaction are grouped into a single undo/redo step.
+
+```
+  startHistoryTransaction: () => void
+```
+
+### endHistoryTransaction(Function)
+
+End the current workbook-level transaction and push it into the history stack.
+
+```
+  endHistoryTransaction: () => void
+```
+
 
 ## Events
 

docs/assets/api/en/event/event.md

@@ -39,6 +39,8 @@ Supported event types:
   RESIZE_COLUMN_END: 'resize_column_end',
   RESIZE_ROW: 'resize_row',
   RESIZE_ROW_END: 'resize_row_end',
+  MERGE_CELLS: 'merge_cells',
+  UNMERGE_CELLS: 'unmerge_cells',
   CHANGE_HEADER_POSITION: 'change_header_position',
   CHANGE_HEADER_POSITION_START: 'change_header_position_start',
   CHANGING_HEADER_POSITION: 'changing_header_position',
@@ -217,7 +219,6 @@ Column width adjustment end event.
 
 Event callback function parameter types.
 ``
-
 {
 col: number.
 colWidths: number[]
@@ -253,6 +254,34 @@ rowHeight: number
 
 ``
 
+## MERGE_CELLS
+
+Triggered after `mergeCells` succeeds.
+
+Callback parameter:
+```ts
+{
+  startCol: number;
+  startRow: number;
+  endCol: number;
+  endRow: number;
+}
+```
+
+## UNMERGE_CELLS
+
+Triggered after `unmergeCells` is called.
+
+Callback parameter:
+```ts
+{
+  startCol: number;
+  startRow: number;
+  endCol: number;
+  endRow: number;
+}
+```
+
 ## CHANGE_HEADER_POSITION
 
 Events for dragging table headers or rows to move positions

docs/assets/api/en/methods.md

@@ -76,6 +76,44 @@ Corresponding property update interface (see tutorial: https://visactor.io/vtabl
 tableInstance.columns = newColumns;
 ```
 
+## changeHeaderPosition(Function)
+
+Programmatically move header position (drag header behavior), returns whether the move succeeded.
+
+```ts
+  changeHeaderPosition: (args: {
+    source: CellAddress;
+    target: CellAddress;
+    movingColumnOrRow?: 'column' | 'row';
+  }) => boolean
+```
+
+Usage:
+
+```ts
+tableInstance.changeHeaderPosition({
+  source: { col: 1, row: 0 },
+  target: { col: 3, row: 0 },
+  movingColumnOrRow: 'column'
+});
+```
+
+## mergeCells(Function)
+
+Merge cells by creating a custom merge range (ListTable only). After merging, the table will refresh and emit the `merge_cells` event.
+
+```ts
+  mergeCells: (startCol: number, startRow: number, endCol: number, endRow: number) => void
+```
+
+## unmergeCells(Function)
+
+Unmerge cells by removing the corresponding custom merge range (ListTable only). After unmerging, the table will refresh and emit the `unmerge_cells` event.
+
+```ts
+  unmergeCells: (startCol: number, startRow: number, endCol: number, endRow: number) => void
+```
+
 ## updatePagination(Function)
 
 Update pagination configuration information, automatically redraws after calling.

docs/assets/api/zh/SheetAPI.md

@@ -144,6 +144,46 @@ VTableSheet组件支持的方法如下：
   getFormulaManager: () => FormulaManager
 ```
 
+### getWorkbookHistoryManager(Function)
+
+获取工作簿历史管理器（工作簿级别撤销/重做）。
+
+```
+  getWorkbookHistoryManager: () => WorkbookHistoryManager
+```
+
+### undo(Function)
+
+撤销最近一次工作簿事务。
+
+```
+  undo: () => void
+```
+
+### redo(Function)
+
+重做最近一次工作簿事务。
+
+```
+  redo: () => void
+```
+
+### startHistoryTransaction(Function)
+
+开始一个工作簿级别事务。在该事务期间产生的操作会合并为一次撤销/重做步骤。
+
+```
+  startHistoryTransaction: () => void
+```
+
+### endHistoryTransaction(Function)
+
+结束当前工作簿级别事务，并将其推入历史栈。
+
+```
+  endHistoryTransaction: () => void
+```
+
 ## Events
 
 表格事件列表，可以根据实际需要，监听所需事件，实现自定义业务。

docs/assets/api/zh/event/event.md

@@ -41,6 +41,8 @@ TABLE_EVENT_TYPE = {
   RESIZE_COLUMN_END: 'resize_column_end',
   RESIZE_ROW: 'resize_row',
   RESIZE_ROW_END: 'resize_row_end',
+  MERGE_CELLS: 'merge_cells',
+  UNMERGE_CELLS: 'unmerge_cells',
   CHANGE_HEADER_POSITION: 'change_header_position',
   CHANGE_HEADER_POSITION_START: 'change_header_position_start',
   CHANGING_HEADER_POSITION: 'changing_header_position',
@@ -261,6 +263,34 @@ TABLE_EVENT_TYPE = {
 
 ```
 
+## MERGE_CELLS
+
+`mergeCells` 调用成功后触发。
+
+回调参数：
+```ts
+{
+  startCol: number;
+  startRow: number;
+  endCol: number;
+  endRow: number;
+}
+```
+
+## UNMERGE_CELLS
+
+`unmergeCells` 调用后触发。
+
+回调参数：
+```ts
+{
+  startCol: number;
+  startRow: number;
+  endCol: number;
+  endRow: number;
+}
+```
+
 ## CHANGE_HEADER_POSITION
 
 拖拽表头或者行来移动位置的事件

docs/assets/api/zh/methods.md

@@ -76,6 +76,44 @@ tableInstance.updateColumns(newColumns, { clearColWidthCache: true })
 tableInstance.columns = newColumns;
 ```
 
+## changeHeaderPosition(Function)
+
+以编程方式移动表头位置（等价于拖拽表头移动），返回是否移动成功。
+
+```ts
+  changeHeaderPosition: (args: {
+    source: CellAddress;
+    target: CellAddress;
+    movingColumnOrRow?: 'column' | 'row';
+  }) => boolean
+```
+
+使用示例：
+
+```ts
+tableInstance.changeHeaderPosition({
+  source: { col: 1, row: 0 },
+  target: { col: 3, row: 0 },
+  movingColumnOrRow: 'column'
+});
+```
+
+## mergeCells(Function)
+
+合并单元格（仅 ListTable）。调用后会刷新渲染，并触发 `merge_cells` 事件。
+
+```ts
+  mergeCells: (startCol: number, startRow: number, endCol: number, endRow: number) => void
+```
+
+## unmergeCells(Function)
+
+取消合并单元格（仅 ListTable）。调用后会刷新渲染，并触发 `unmerge_cells` 事件。
+
+```ts
+  unmergeCells: (startCol: number, startRow: number, endCol: number, endRow: number) => void
+```
+
 ## updatePagination(Function)
 
 更新页码配置信息 调用后会自动重绘。

docs/assets/demo/en/vtable-sheet/sheet.md

@@ -14,6 +14,7 @@ This example shows how to configure a simple online spreadsheet. The spreadsheet
 ## Key Configurations
 
 - `VTableSheet` Configure the theme name or custom theme style
+- `undoRedo` Enable undo/redo buttons (Ctrl/Cmd+Z, Ctrl/Cmd+Y)
 
 ## Code Demo
 
@@ -23,6 +24,7 @@ This example shows how to configure a simple online spreadsheet. The spreadsheet
 
 const container = document.getElementById(CONTAINER_ID);
 const sheetInstance = new VTableSheet.VTableSheet(container, {
+  undoRedo: { show: true },
   VTablePluginModules: [
     { module: VTablePlugins.TableExportPlugin },
     { module: VTablePlugins.ExcelImportPlugin },
@@ -79,4 +81,4 @@ const sheetInstance = new VTableSheet.VTableSheet(container, {
   }
 });
 window.sheetInstance = sheetInstance;
-```
+```