@univerjs/sheets-table 0.24.0 → 0.25.0

package/lib/cjs/index.js

@@ -307,7 +307,7 @@ const tableThemeConfig = tableDefaultThemeStyleArr.map((item, index) => {
 });
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/typeof.js
+//#region \0@oxc-project+runtime@0.133.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -318,7 +318,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/toPrimitive.js
+//#region \0@oxc-project+runtime@0.133.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -331,14 +331,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.133.0/helpers/esm/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/defineProperty.js
+//#region \0@oxc-project+runtime@0.133.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -394,6 +394,28 @@ var TableColumn = class {
 	}
 };
 
+//#endregion
+//#region src/const.ts
+/**
+* Copyright 2023-present DreamNum Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+const PLUGIN_NAME = "SHEET_TABLE_PLUGIN";
+const FEATURE_TABLE_ID = "SHEET_TABLE";
+const SHEET_TABLE_CUSTOM_THEME_PREFIX = "table-custom";
+const TABLE_FILTER_EMPTY_VALUE = "__UNIVER_TABLE_FILTER_EMPTY__";
+
 //#endregion
 //#region src/model/filter-util/date-filter-util.ts
 /**
@@ -601,7 +623,7 @@ const nextWeek = (date, anchorTime = /* @__PURE__ */ new Date()) => {
 */
 const lastWeek = (date, anchorTime = /* @__PURE__ */ new Date()) => {
 	const weekStart = getWeekStart(date);
-	const anchorTimeLastWeekStart = new Date(getWeekStart(anchorTime).getTime() - perWeek);
+	const anchorTimeLastWeekStart = /* @__PURE__ */ new Date(getWeekStart(anchorTime).getTime() - perWeek);
 	return weekStart.toDateString() === anchorTimeLastWeekStart.toDateString();
 };
 /**
@@ -1298,7 +1320,8 @@ var TableFilters = class {
 			const executeFunc = this.getExecuteFunc(sheet, range, columnIndex, filter);
 			for (let row = startRow; row <= endRow; row++) {
 				const conditionType = isConditionFilter(filter) ? filter.filterInfo.conditionType : "string";
-				if (getCellValueWithConditionType(sheet, row, column, conditionType) === null) filterOutRows.add(row);
+				const cellValue = getCellValueWithConditionType(sheet, row, column, conditionType);
+				if (cellValue === null && !executeFunc(cellValue)) filterOutRows.add(row);
 				else if (!executeFunc(getCellValueWithConditionType(sheet, row, column, conditionType))) filterOutRows.add(row);
 			}
 		}
@@ -1326,6 +1349,7 @@ var TableFilters = class {
 		if (filter.filterType === "manual") {
 			const valuesSet = new Set(filter.values);
 			return (value) => {
+				if (value == null) return valuesSet.has(TABLE_FILTER_EMPTY_VALUE);
 				return valuesSet.has(value);
 			};
 		} else if (filter.filterType === "condition") return getConditionExecuteFunc(filter, isNumberDynamicFilter(filter.filterInfo.compareType) ? this._getNumberCalculatedOptions(sheet, range, columnIndex) : void 0);
@@ -1577,7 +1601,7 @@ var Table = class {
 };
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/decorateParam.js
+//#region \0@oxc-project+runtime@0.133.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -1585,7 +1609,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/decorate.js
+//#region \0@oxc-project+runtime@0.133.0/helpers/esm/decorate.js
 function __decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -2178,6 +2202,7 @@ const DeleteSheetTableCommand = {
 	id: "sheet.command.delete-table",
 	type: _univerjs_core.CommandType.COMMAND,
 	handler: (accessor, params) => {
+		var _interceptorCommands$, _interceptorCommands$2;
 		if (!params) return false;
 		const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
 		const commandService = accessor.get(_univerjs_core.ICommandService);
@@ -2191,10 +2216,20 @@ const DeleteSheetTableCommand = {
 			logService.error("[TableManager]: Table not found");
 			return false;
 		}
+		const interceptorCommands = accessor.get(_univerjs_sheets.SheetInterceptorService).onCommandExecute({
+			id: DeleteSheetTableCommand.id,
+			params: {
+				...params,
+				tableName: tableConfig.name
+			}
+		});
+		redos.push(...(_interceptorCommands$ = interceptorCommands.preRedos) !== null && _interceptorCommands$ !== void 0 ? _interceptorCommands$ : []);
 		redos.push({
 			id: DeleteSheetTableMutation.id,
 			params: { ...params }
 		});
+		redos.push(...interceptorCommands.redos);
+		undos.push(...(_interceptorCommands$2 = interceptorCommands.preUndos) !== null && _interceptorCommands$2 !== void 0 ? _interceptorCommands$2 : []);
 		undos.push({
 			id: AddSheetTableMutation.id,
 			params: {
@@ -2206,6 +2241,7 @@ const DeleteSheetTableCommand = {
 				options: tableConfig.options
 			}
 		});
+		undos.push(...interceptorCommands.undos);
 		if ((0, _univerjs_core.sequenceExecute)(redos, commandService).result) {
 			undoRedoService.pushUndoRedo({
 				unitID: params.unitId,
@@ -2218,27 +2254,6 @@ const DeleteSheetTableCommand = {
 	}
 };
 
-//#endregion
-//#region src/const.ts
-/**
-* Copyright 2023-present DreamNum Co., Ltd.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-const PLUGIN_NAME = "SHEET_TABLE_PLUGIN";
-const FEATURE_TABLE_ID = "SHEET_TABLE";
-const SHEET_TABLE_CUSTOM_THEME_PREFIX = "table-custom";
-
 //#endregion
 //#region src/commands/commands/remove-table-theme.command.ts
 const RemoveTableThemeCommand = {
@@ -2343,6 +2358,7 @@ const SetSheetTableCommand = {
 	id: "sheet.command.set-table-config",
 	type: _univerjs_core.CommandType.COMMAND,
 	handler: (accessor, params) => {
+		var _interceptorCommands$, _interceptorCommands$2;
 		if (!params) return false;
 		const { unitId, tableId, name, updateRange, rowColOperation, theme } = params;
 		const tableManager = accessor.get(TableManager);
@@ -2387,22 +2403,43 @@ const SetSheetTableCommand = {
 			tableId,
 			config: newTableConfig
 		};
-		accessor.get(_univerjs_core.ICommandService).executeCommand(SetSheetTableMutation.id, redoParams);
-		accessor.get(_univerjs_core.IUndoRedoService).pushUndoRedo({
-			unitID: unitId,
-			undoMutations: [{
-				id: SetSheetTableMutation.id,
-				params: {
-					unitId,
-					subUnitId: table.getSubunitId(),
-					tableId,
-					config: oldTableConfig
-				}
-			}],
-			redoMutations: [{
+		const undoParams = {
+			unitId,
+			subUnitId: table.getSubunitId(),
+			tableId,
+			config: oldTableConfig
+		};
+		const interceptorCommands = accessor.get(_univerjs_sheets.SheetInterceptorService).onCommandExecute({
+			id: SetSheetTableCommand.id,
+			params: {
+				...params,
+				oldTableName: oldTableConfig.name
+			}
+		});
+		const redos = [
+			...(_interceptorCommands$ = interceptorCommands.preRedos) !== null && _interceptorCommands$ !== void 0 ? _interceptorCommands$ : [],
+			{
 				id: SetSheetTableMutation.id,
 				params: redoParams
-			}]
+			},
+			...interceptorCommands.redos
+		];
+		const undos = [
+			...(_interceptorCommands$2 = interceptorCommands.preUndos) !== null && _interceptorCommands$2 !== void 0 ? _interceptorCommands$2 : [],
+			{
+				id: SetSheetTableMutation.id,
+				params: undoParams
+			},
+			...interceptorCommands.undos
+		];
+		const commandService = accessor.get(_univerjs_core.ICommandService);
+		redos.forEach((mutation) => {
+			commandService.executeCommand(mutation.id, mutation.params);
+		});
+		accessor.get(_univerjs_core.IUndoRedoService).pushUndoRedo({
+			unitID: unitId,
+			undoMutations: undos,
+			redoMutations: redos
 		});
 		return true;
 	}
@@ -3103,6 +3140,7 @@ const SheetTableRemoveColumnAtCommand = {
 	id: "sheet.command.table-remove-column-at",
 	type: _univerjs_core.CommandType.COMMAND,
 	handler: (accessor, params) => {
+		var _interceptorCommands$, _interceptorCommands$2;
 		if (!params) return false;
 		const { unitId, subUnitId, tableId, index, count = 1 } = params;
 		if (count <= 0) return false;
@@ -3115,41 +3153,58 @@ const SheetTableRemoveColumnAtCommand = {
 		if (!table || table.getSubunitId() !== subUnitId) return false;
 		const oldRange = table.getRange();
 		if (index < oldRange.startColumn || index + count - 1 > oldRange.endColumn || count >= oldRange.endColumn - oldRange.startColumn + 1) return false;
+		const tableInfo = table.getTableInfo();
 		const columns = [];
 		const gap = index - oldRange.startColumn;
 		for (let i = 0; i < count; i++) {
-			const column = table.getTableInfo().columns[gap + i];
+			const column = tableInfo.columns[gap + i];
 			if (column) columns.push(column);
 		}
-		const redos = [{
-			id: SetSheetTableMutation.id,
-			params: {
-				unitId,
-				subUnitId,
-				tableId,
-				config: { rowColOperation: {
-					operationType: "delete",
-					rowColType: "column",
-					index,
-					count
-				} }
-			}
-		}];
-		const undos = [{
-			id: SetSheetTableMutation.id,
+		const interceptorCommands = accessor.get(_univerjs_sheets.SheetInterceptorService).onCommandExecute({
+			id: SheetTableRemoveColumnAtCommand.id,
 			params: {
-				unitId,
-				subUnitId,
-				tableId,
-				config: { rowColOperation: {
-					operationType: "insert",
-					rowColType: "column",
-					index,
-					count,
-					columnsJson: columns
-				} }
+				...params,
+				tableName: tableInfo.name,
+				removedColumnNames: columns.map((column) => column.displayName)
 			}
-		}];
+		});
+		const redos = [
+			...(_interceptorCommands$ = interceptorCommands.preRedos) !== null && _interceptorCommands$ !== void 0 ? _interceptorCommands$ : [],
+			{
+				id: SetSheetTableMutation.id,
+				params: {
+					unitId,
+					subUnitId,
+					tableId,
+					config: { rowColOperation: {
+						operationType: "delete",
+						rowColType: "column",
+						index,
+						count
+					} }
+				}
+			},
+			...interceptorCommands.redos
+		];
+		const undos = [
+			...(_interceptorCommands$2 = interceptorCommands.preUndos) !== null && _interceptorCommands$2 !== void 0 ? _interceptorCommands$2 : [],
+			{
+				id: SetSheetTableMutation.id,
+				params: {
+					unitId,
+					subUnitId,
+					tableId,
+					config: { rowColOperation: {
+						operationType: "insert",
+						rowColType: "column",
+						index,
+						count,
+						columnsJson: columns
+					} }
+				}
+			},
+			...interceptorCommands.undos
+		];
 		const colContentIndex = target.worksheet.getCellMatrix().getDataRange().endColumn;
 		if (index + count <= colContentIndex) {
 			const moveRangeMutations = (0, _univerjs_sheets.getMoveRangeUndoRedoMutations)(accessor, {
@@ -3256,6 +3311,7 @@ const SheetTableRemoveColCommand = {
 	id: "sheet.command.table-remove-col",
 	type: _univerjs_core.CommandType.COMMAND,
 	handler: (accessor, params) => {
+		var _interceptorCommands$3, _interceptorCommands$4;
 		if (!params) return false;
 		const target = (0, _univerjs_sheets.getSheetCommandTarget)(accessor.get(_univerjs_core.IUniverInstanceService), params);
 		if (!target) return false;
@@ -3284,12 +3340,24 @@ const SheetTableRemoveColCommand = {
 				} }
 			}
 		});
+		const tableInfo = table.getTableInfo();
 		const columns = [];
 		const gap = range.startColumn - oldRange.startColumn;
 		for (let i = 0; i < removeColCount; i++) {
-			const column = table.getTableInfo().columns[gap + i];
+			const column = tableInfo.columns[gap + i];
 			if (column) columns.push(column);
 		}
+		const interceptorCommands = accessor.get(_univerjs_sheets.SheetInterceptorService).onCommandExecute({
+			id: SheetTableRemoveColCommand.id,
+			params: {
+				...params,
+				tableName: tableInfo.name,
+				removedColumnNames: columns.map((column) => column.displayName)
+			}
+		});
+		redos.unshift(...(_interceptorCommands$3 = interceptorCommands.preRedos) !== null && _interceptorCommands$3 !== void 0 ? _interceptorCommands$3 : []);
+		redos.push(...interceptorCommands.redos);
+		undos.unshift(...(_interceptorCommands$4 = interceptorCommands.preUndos) !== null && _interceptorCommands$4 !== void 0 ? _interceptorCommands$4 : []);
 		undos.push({
 			id: SetSheetTableMutation.id,
 			params: {
@@ -3305,6 +3373,7 @@ const SheetTableRemoveColCommand = {
 				} }
 			}
 		});
+		undos.push(...interceptorCommands.undos);
 		const colContentIndex = target.worksheet.getCellMatrix().getDataRange().endColumn;
 		const moveRangeMutations = (0, _univerjs_sheets.getMoveRangeUndoRedoMutations)(accessor, {
 			unitId,
@@ -3344,7 +3413,7 @@ const SheetTableRemoveColCommand = {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-table";
-var version = "0.24.0";
+var version = "0.25.0";
 
 //#endregion
 //#region src/controllers/sheet-table-formula.controller.ts
@@ -3383,10 +3452,10 @@ let SheetTableFormulaController = class SheetTableFormulaController extends _uni
 			});
 			const table = this._tableManager.getTableById(unitId, tableId);
 			if (!table) return;
-			this._updateSuperTable(unitId, table);
+			this._updateSuperTable(unitId, table, oldTableName);
 		}));
 	}
-	_updateSuperTable(unitId, table) {
+	_updateSuperTable(unitId, table, oldTableName) {
 		const tableInfo = table.getTableInfo();
 		const name = tableInfo.name;
 		const columns = tableInfo.columns;
@@ -3397,6 +3466,7 @@ let SheetTableFormulaController = class SheetTableFormulaController extends _uni
 		this._commandService.executeCommand(_univerjs_engine_formula.SetSuperTableMutation.id, {
 			unitId,
 			tableName: name,
+			oldTableName,
 			reference: {
 				range: tableInfo.range,
 				sheetId: tableInfo.subUnitId,
@@ -3457,6 +3527,8 @@ SheetTableRangeController = __decorate([__decorateParam(0, (0, _univerjs_core.In
 
 //#endregion
 //#region src/controllers/sheet-table-ref-range.controller.ts
+const SHEET_TABLE_REMOVE_COL_COMMAND_ID = "sheet.command.table-remove-col";
+const DELETE_SHEET_TABLE_COMMAND_ID = "sheet.command.delete-table";
 let SheetTableRefRangeController = class SheetTableRefRangeController extends _univerjs_core.Disposable {
 	constructor(_commandService, _refRangeService, _univerInstanceService, _injector, _sheetInterceptorService, _tableManager, _localeService) {
 		super();
@@ -3472,20 +3544,23 @@ let SheetTableRefRangeController = class SheetTableRefRangeController extends _u
 	}
 	_initCommandInterceptor() {
 		const self = this;
-		this._sheetInterceptorService.interceptCommand({ getMutations(commandInfo) {
-			const defaultReturn = {
-				redos: [],
-				undos: []
-			};
-			const { id, params } = commandInfo;
-			switch (id) {
-				case _univerjs_sheets.InsertRowCommand.id: return self._generateTableMutationWithInsertRow(params);
-				case _univerjs_sheets.InsertColCommand.id: return self._generateTableMutationWithInsertCol(params);
-				case _univerjs_sheets.RemoveRowCommand.id: return self._generateTableMutationWithRemoveRow(params);
-				case _univerjs_sheets.RemoveColCommand.id: return self._generateTableMutationWithRemoveCol(params);
+		this._sheetInterceptorService.interceptCommand({
+			priority: -1,
+			getMutations(commandInfo) {
+				const defaultReturn = {
+					redos: [],
+					undos: []
+				};
+				const { id, params } = commandInfo;
+				switch (id) {
+					case _univerjs_sheets.InsertRowCommand.id: return self._generateTableMutationWithInsertRow(params);
+					case _univerjs_sheets.InsertColCommand.id: return self._generateTableMutationWithInsertCol(params);
+					case _univerjs_sheets.RemoveRowCommand.id: return self._generateTableMutationWithRemoveRow(params);
+					case _univerjs_sheets.RemoveColCommand.id: return self._generateTableMutationWithRemoveCol(params);
+				}
+				return defaultReturn;
 			}
-			return defaultReturn;
-		} });
+		});
 	}
 	_generateTableMutationWithInsertRow(insertParams) {
 		const undos = [];
@@ -3714,6 +3789,18 @@ let SheetTableRefRangeController = class SheetTableRefRangeController extends _u
 			const tableRange = table.getRange();
 			if (_univerjs_core.Rectangle.intersects(tableRange, range)) {
 				if (range.startColumn <= tableRange.startColumn && range.endColumn >= tableRange.endColumn) {
+					var _formulaMutations$pre, _formulaMutations$pre2;
+					const tableInfo = table.getTableInfo();
+					const formulaMutations = this._sheetInterceptorService.onCommandExecute({
+						id: DELETE_SHEET_TABLE_COMMAND_ID,
+						params: {
+							unitId,
+							subUnitId,
+							tableId: table.getId(),
+							tableName: tableInfo.name
+						}
+					});
+					preRedos.push(...(_formulaMutations$pre = formulaMutations.preRedos) !== null && _formulaMutations$pre !== void 0 ? _formulaMutations$pre : [], ...formulaMutations.redos);
 					preRedos.push({
 						id: DeleteSheetTableMutation.id,
 						params: {
@@ -3746,7 +3833,9 @@ let SheetTableRefRangeController = class SheetTableRefRangeController extends _u
 							options: tableJson.options
 						}
 					});
+					undos.push(...(_formulaMutations$pre2 = formulaMutations.preUndos) !== null && _formulaMutations$pre2 !== void 0 ? _formulaMutations$pre2 : [], ...formulaMutations.undos);
 				} else if (range.startColumn <= tableRange.startColumn && range.endColumn >= tableRange.startColumn) {
+					const tableJson = table.toJSON();
 					const removeColumnCount = range.endColumn - tableRange.startColumn + 1;
 					redos.push({
 						id: SetSheetTableMutation.id,
@@ -3767,22 +3856,18 @@ let SheetTableRefRangeController = class SheetTableRefRangeController extends _u
 						const column = table.getTableColumnByIndex(i);
 						if (column) columns.push(column.toJSON());
 					}
-					undos.push({
-						id: SetSheetTableMutation.id,
-						params: {
-							unitId,
-							subUnitId,
-							tableId: table.getId(),
-							config: { rowColOperation: {
-								operationType: "insert",
-								rowColType: "column",
-								index: tableRange.startColumn,
-								count: removeColumnCount,
-								columnsJson: columns
-							} }
-						}
+					preUndos.push(this._getDeleteTableMutation(unitId, subUnitId, table.getId()));
+					undos.push(this._getAddTableMutation(unitId, subUnitId, tableJson));
+					this._appendTableColumnFormulaMutations(redos, undos, {
+						unitId,
+						subUnitId,
+						tableId: table.getId(),
+						tableName: table.getTableInfo().name,
+						range,
+						columns
 					});
 				} else if (range.startColumn > tableRange.startColumn && range.endColumn > tableRange.endColumn) {
+					const tableJson = table.toJSON();
 					const removeColumnCount = tableRange.endColumn - range.startColumn + 1;
 					redos.push({
 						id: SetSheetTableMutation.id,
@@ -3804,22 +3889,18 @@ let SheetTableRefRangeController = class SheetTableRefRangeController extends _u
 						const column = table.getTableColumnByIndex(i + gap);
 						if (column) columns.push(column.toJSON());
 					}
-					undos.push({
-						id: SetSheetTableMutation.id,
-						params: {
-							unitId,
-							subUnitId,
-							tableId: table.getId(),
-							config: { rowColOperation: {
-								operationType: "insert",
-								rowColType: "column",
-								index: range.startColumn,
-								count: removeColCount,
-								columnsJson: columns
-							} }
-						}
+					preUndos.push(this._getDeleteTableMutation(unitId, subUnitId, table.getId()));
+					undos.push(this._getAddTableMutation(unitId, subUnitId, tableJson));
+					this._appendTableColumnFormulaMutations(redos, undos, {
+						unitId,
+						subUnitId,
+						tableId: table.getId(),
+						tableName: table.getTableInfo().name,
+						range,
+						columns
 					});
 				} else if (range.startColumn > tableRange.startColumn && range.endColumn <= tableRange.endColumn) {
+					const tableJson = table.toJSON();
 					redos.push({
 						id: SetSheetTableMutation.id,
 						params: {
@@ -3840,20 +3921,15 @@ let SheetTableRefRangeController = class SheetTableRefRangeController extends _u
 						const column = table.getTableColumnByIndex(i + gap);
 						if (column) columns.push(column.toJSON());
 					}
-					undos.push({
-						id: SetSheetTableMutation.id,
-						params: {
-							unitId,
-							subUnitId,
-							tableId: table.getId(),
-							config: { rowColOperation: {
-								operationType: "insert",
-								rowColType: "column",
-								index: range.startColumn,
-								count: removeColCount,
-								columnsJson: columns
-							} }
-						}
+					preUndos.push(this._getDeleteTableMutation(unitId, subUnitId, table.getId()));
+					undos.push(this._getAddTableMutation(unitId, subUnitId, tableJson));
+					this._appendTableColumnFormulaMutations(redos, undos, {
+						unitId,
+						subUnitId,
+						tableId: table.getId(),
+						tableName: table.getTableInfo().name,
+						range,
+						columns
 					});
 				}
 			}
@@ -3865,6 +3941,53 @@ let SheetTableRefRangeController = class SheetTableRefRangeController extends _u
 			preUndos
 		};
 	}
+	_getDeleteTableMutation(unitId, subUnitId, tableId) {
+		return {
+			id: DeleteSheetTableMutation.id,
+			params: {
+				unitId,
+				subUnitId,
+				tableId
+			}
+		};
+	}
+	_getAddTableMutation(unitId, subUnitId, tableJson) {
+		const header = tableJson.columns.map((column) => column.displayName);
+		return {
+			id: AddSheetTableMutation.id,
+			params: {
+				unitId,
+				subUnitId,
+				tableId: tableJson.id,
+				name: tableJson.name,
+				header,
+				range: tableJson.range,
+				options: {
+					...tableJson.options,
+					columns: tableJson.columns,
+					filters: tableJson.filters.tableColumnFilterList
+				}
+			}
+		};
+	}
+	_appendTableColumnFormulaMutations(redos, undos, info) {
+		var _formulaMutations$pre3, _formulaMutations$pre4;
+		const removedColumnNames = info.columns.map((column) => column.displayName);
+		if (!removedColumnNames.length) return;
+		const formulaMutations = this._sheetInterceptorService.onCommandExecute({
+			id: SHEET_TABLE_REMOVE_COL_COMMAND_ID,
+			params: {
+				unitId: info.unitId,
+				subUnitId: info.subUnitId,
+				tableId: info.tableId,
+				tableName: info.tableName,
+				range: info.range,
+				removedColumnNames
+			}
+		});
+		redos.splice(Math.max(redos.length - 1, 0), 0, ...(_formulaMutations$pre3 = formulaMutations.preRedos) !== null && _formulaMutations$pre3 !== void 0 ? _formulaMutations$pre3 : [], ...formulaMutations.redos);
+		undos.push(...(_formulaMutations$pre4 = formulaMutations.preUndos) !== null && _formulaMutations$pre4 !== void 0 ? _formulaMutations$pre4 : [], ...formulaMutations.undos);
+	}
 	_initCommandListener() {
 		this._commandService.onCommandExecuted((commandInfo) => {
 			if (commandInfo.id === _univerjs_sheets.InsertRowMutation.id) {
@@ -4030,25 +4153,18 @@ let TableFilterController = class TableFilterController extends _univerjs_core.D
 		this._sheetInterceptorService = _sheetInterceptorService;
 		this._univerInstanceService = _univerInstanceService;
 		this._zebraCrossingCacheController = _zebraCrossingCacheController;
-		_defineProperty(this, "_tableFilteredOutRows$", new rxjs.BehaviorSubject(/* @__PURE__ */ new Set()));
-		_defineProperty(this, "tableFilteredOutRows$", this._tableFilteredOutRows$.asObservable());
+		_defineProperty(this, "_tableFilteredOutRows", /* @__PURE__ */ new Map());
 		_defineProperty(this, "_subscription", null);
 		this.registerFilterChangeEvent();
 		this.initTableHiddenRowIntercept();
 		this._initFilteredOutRows();
 	}
-	get tableFilteredOutRows() {
-		return this._tableFilteredOutRows$.value;
-	}
-	set tableFilteredOutRows(value) {
-		this._tableFilteredOutRows$.next(value);
-	}
 	initTableHiddenRowIntercept() {
 		this.disposeWithMe(this._sheetInterceptorService.intercept(_univerjs_sheets.INTERCEPTOR_POINT.ROW_FILTERED, {
 			priority: 100,
 			handler: (filtered, rowLocation, next) => {
 				if (filtered) return true;
-				const isTableFiltered = this.tableFilteredOutRows.has(rowLocation.row);
+				const isTableFiltered = this._getTableFilteredOutRows(rowLocation.unitId, rowLocation.subUnitId).has(rowLocation.row);
 				return isTableFiltered ? true : next(isTableFiltered);
 			}
 		}));
@@ -4060,12 +4176,7 @@ let TableFilterController = class TableFilterController extends _univerjs_core.D
 			const target = (0, _univerjs_sheets.getSheetCommandTarget)(this._univerInstanceService);
 			if (!target) return;
 			const { unitId, subUnitId } = target;
-			this.tableFilteredOutRows.clear();
-			this._tableManager.getTablesBySubunitId(unitId, subUnitId).forEach((table) => {
-				const tableFilteredRows = table.getTableFilters().getFilterOutRows();
-				if (!tableFilteredRows) return;
-				for (const row of tableFilteredRows) this.tableFilteredOutRows.add(row);
-			});
+			this._refreshTableFilteredOutRows(unitId, subUnitId);
 		});
 	}
 	registerFilterChangeEvent() {
@@ -4075,16 +4186,27 @@ let TableFilterController = class TableFilterController extends _univerjs_core.D
 			const worksheet = (_this$_univerInstance = this._univerInstanceService.getUnit(unitId)) === null || _this$_univerInstance === void 0 ? void 0 : _this$_univerInstance.getSheetBySheetId(subUnitId);
 			const table = this._tableManager.getTable(unitId, tableId);
 			if (!worksheet || !table) return;
-			this.tableFilteredOutRows.clear();
 			table.getTableFilters().doFilter(worksheet, table.getTableFilterRange());
-			this._tableManager.getTablesBySubunitId(unitId, subUnitId).forEach((table) => {
-				const tableFilteredRows = table.getTableFilters().getFilterOutRows();
-				if (!tableFilteredRows) return;
-				for (const row of tableFilteredRows) this.tableFilteredOutRows.add(row);
-			});
+			this._refreshTableFilteredOutRows(unitId, subUnitId);
 			this._zebraCrossingCacheController.updateZebraCrossingCache(unitId, subUnitId);
 		}));
 	}
+	_refreshTableFilteredOutRows(unitId, subUnitId) {
+		const filteredOutRows = /* @__PURE__ */ new Set();
+		this._tableManager.getTablesBySubunitId(unitId, subUnitId).forEach((table) => {
+			const tableFilteredRows = table.getTableFilters().getFilterOutRows();
+			if (!tableFilteredRows) return;
+			for (const row of tableFilteredRows) filteredOutRows.add(row);
+		});
+		this._tableFilteredOutRows.set(this._getSheetKey(unitId, subUnitId), filteredOutRows);
+	}
+	_getTableFilteredOutRows(unitId, subUnitId) {
+		var _this$_tableFilteredO;
+		return (_this$_tableFilteredO = this._tableFilteredOutRows.get(this._getSheetKey(unitId, subUnitId))) !== null && _this$_tableFilteredO !== void 0 ? _this$_tableFilteredO : /* @__PURE__ */ new Set();
+	}
+	_getSheetKey(unitId, subUnitId) {
+		return `${unitId}|${subUnitId}`;
+	}
 	dispose() {
 		var _this$_subscription;
 		super.dispose();
@@ -4200,6 +4322,7 @@ Object.defineProperty(exports, 'SheetsTableController', {
   }
 });
 exports.SheetsTableSortStateEnum = SheetsTableSortStateEnum;
+exports.TABLE_FILTER_EMPTY_VALUE = TABLE_FILTER_EMPTY_VALUE;
 exports.TableColumnDataTypeEnum = TableColumnDataTypeEnum;
 exports.TableColumnFilterTypeEnum = TableColumnFilterTypeEnum;
 exports.TableConditionTypeEnum = TableConditionTypeEnum;