@univerjs/sheets-table 1.0.3 → 1.1.0

package/lib/cjs/index.js

@@ -317,7 +317,7 @@ const tableThemeConfig = tableDefaultThemeStyleArr.map((item, index) => {
 });
 
 //#endregion
-//#region \0@oxc-project+runtime@0.149.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.153.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -328,7 +328,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.149.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.153.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -341,14 +341,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.149.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.153.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.149.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.153.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -621,7 +621,6 @@ const getWeekStart = (date) => {
 	weekStart.setDate(diff);
 	return weekStart;
 };
-const perWeek = 6048e5;
 /**
 * The provided date is in the current week.
 * @param {Date} date - The date to compare.
@@ -641,7 +640,8 @@ const thisWeek = (date, anchorTime = /* @__PURE__ */ new Date()) => {
 */
 const nextWeek = (date, anchorTime = /* @__PURE__ */ new Date()) => {
 	const weekStart = getWeekStart(date);
-	const anchorTimeNextWeekStart = new Date(getWeekStart(anchorTime).getTime() + perWeek);
+	const anchorTimeNextWeekStart = getWeekStart(anchorTime);
+	anchorTimeNextWeekStart.setDate(anchorTimeNextWeekStart.getDate() + 7);
 	return weekStart.toDateString() === anchorTimeNextWeekStart.toDateString();
 };
 /**
@@ -652,7 +652,8 @@ const nextWeek = (date, anchorTime = /* @__PURE__ */ new Date()) => {
 */
 const lastWeek = (date, anchorTime = /* @__PURE__ */ new Date()) => {
 	const weekStart = getWeekStart(date);
-	const anchorTimeLastWeekStart = /* @__PURE__ */ new Date(getWeekStart(anchorTime).getTime() - perWeek);
+	const anchorTimeLastWeekStart = getWeekStart(anchorTime);
+	anchorTimeLastWeekStart.setDate(anchorTimeLastWeekStart.getDate() - 7);
 	return weekStart.toDateString() === anchorTimeLastWeekStart.toDateString();
 };
 /**
@@ -686,7 +687,7 @@ const nextMonth = (date, anchorTime = /* @__PURE__ */ new Date()) => {
 	nextMonthStart.setHours(0, 0, 0, 0);
 	nextMonthStart.setMonth(nextMonthStart.getMonth() + 1, 1);
 	const monthEnd = new Date(nextMonthStart);
-	monthEnd.setMonth(monthEnd.getMonth() + 1, 0);
+	monthEnd.setMonth(monthEnd.getMonth() + 1);
 	const dateTime = date.getTime();
 	return dateTime >= nextMonthStart.getTime() && dateTime < monthEnd.getTime();
 };
@@ -697,9 +698,9 @@ const nextMonth = (date, anchorTime = /* @__PURE__ */ new Date()) => {
 * @returns {boolean} return the date is match
 */
 const lastMonth = (date, anchorTime = /* @__PURE__ */ new Date()) => {
-	const lastMonthStart = getMonthStart(anchorTime);
-	const monthEnd = new Date(lastMonthStart);
-	monthEnd.setMonth(monthEnd.getMonth() + 1, 0);
+	const monthEnd = getMonthStart(anchorTime);
+	const lastMonthStart = new Date(monthEnd);
+	lastMonthStart.setMonth(lastMonthStart.getMonth() - 1);
 	const dateTime = date.getTime();
 	return dateTime >= lastMonthStart.getTime() && dateTime < monthEnd.getTime();
 };
@@ -740,7 +741,7 @@ const nextQuarter = (date, anchorTime = /* @__PURE__ */ new Date()) => {
 	const nextQuarterStart = new Date(quarterStart);
 	nextQuarterStart.setMonth(nextQuarterStart.getMonth() + 3);
 	const nextQuarterEnd = new Date(nextQuarterStart);
-	nextQuarterEnd.setMonth(nextQuarterEnd.getMonth() + 3, 0);
+	nextQuarterEnd.setMonth(nextQuarterEnd.getMonth() + 3);
 	const dateTime = date.getTime();
 	return dateTime >= nextQuarterStart.getTime() && dateTime < nextQuarterEnd.getTime();
 };
@@ -754,10 +755,8 @@ const lastQuarter = (date, anchorTime = /* @__PURE__ */ new Date()) => {
 	const quarterStart = getQuarterStart(anchorTime);
 	const lastQuarterStart = new Date(quarterStart);
 	lastQuarterStart.setMonth(lastQuarterStart.getMonth() - 3);
-	const lastQuarterEnd = new Date(quarterStart);
-	lastQuarterEnd.setDate(0);
 	const dateTime = date.getTime();
-	return dateTime >= lastQuarterStart.getTime() && dateTime < lastQuarterEnd.getTime();
+	return dateTime >= lastQuarterStart.getTime() && dateTime < quarterStart.getTime();
 };
 /**
 * The provided date is in the current year.
@@ -1496,7 +1495,7 @@ var TableFilters = class {
 	}
 	getExecuteFunc(sheet, range, columnIndex, filter) {
 		if (filter.filterType === "manual") {
-			const valuesSet = new Set(filter.values);
+			const valuesSet = new Set(filter.values.map(String));
 			return (value) => {
 				if (value == null) return valuesSet.has(TABLE_FILTER_EMPTY_VALUE);
 				return valuesSet.has(String(value));
@@ -1725,10 +1724,7 @@ var Table = class {
 		return this._tableFilters.getFilterStates(range);
 	}
 	toJSON() {
-		const columns = [];
-		this._columns.forEach((column) => {
-			columns.push(column.toJSON());
-		});
+		const columns = this._columnOrder.map((columnId) => this._columns.get(columnId).toJSON());
 		return {
 			id: this._id,
 			name: this._name,
@@ -1778,7 +1774,7 @@ var Table = class {
 };
 
 //#endregion
-//#region \0@oxc-project+runtime@0.149.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.153.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -1786,7 +1782,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.149.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.153.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);
@@ -2053,6 +2049,28 @@ let TableManager = class TableManager extends _univerjs_core.Disposable {
 			oldRange
 		});
 	}
+	moveTable(unitId, tableId, subUnitId, range) {
+		const table = this.getTableById(unitId, tableId);
+		if (!table) return;
+		const oldRange = table.getRange();
+		const oldSubUnitId = table.getSubunitId();
+		table.setSubunitId(subUnitId);
+		table.setRange({ ...range });
+		this._tableRangeChanged$.next({
+			unitId,
+			subUnitId,
+			oldSubUnitId,
+			tableId,
+			range: { ...range },
+			oldRange
+		});
+		this._tableFilterChanged$.next({
+			unitId,
+			subUnitId,
+			oldSubUnitId,
+			tableId
+		});
+	}
 	setTableByConfig(unitId, tableId, config) {
 		const unitMap = this._tableMap.get(unitId);
 		const table = unitMap === null || unitMap === void 0 ? void 0 : unitMap.get(tableId);
@@ -2394,12 +2412,35 @@ const AddTableThemeCommand = {
 	}
 };
 
+//#endregion
+//#region src/commands/mutations/set-table-filter.mutation.ts
+const SetSheetTableFilterMutation = {
+	id: "sheet.mutation.set-table-filter",
+	type: _univerjs_core.CommandType.MUTATION,
+	handler: (accessor, params) => {
+		const { tableId, unitId, column, tableFilter } = params;
+		const tableManager = accessor.get(TableManager);
+		const table = tableManager.getTable(unitId, tableId);
+		tableManager.addFilter(unitId, tableId, column, tableFilter);
+		if (table) {
+			var _tableManager$toJSON$;
+			const tableFilters = table.getTableFilters();
+			if (params.filterOutRows) tableFilters.setFilterOutRows(params.filterOutRows);
+			else params.filterOutRows = [...tableFilters.getFilterOutRows()];
+			params.subUnitId = table.getSubunitId();
+			params.tableFilteredOutRows = ((_tableManager$toJSON$ = tableManager.toJSON(unitId)[params.subUnitId]) === null || _tableManager$toJSON$ === void 0 ? void 0 : _tableManager$toJSON$.tableFilteredOutRows) ?? [];
+		}
+		return true;
+	}
+};
+
 //#endregion
 //#region src/commands/commands/delete-sheet-table.command.ts
 const DeleteSheetTableCommand = {
 	id: "sheet.command.delete-table",
 	type: _univerjs_core.CommandType.COMMAND,
 	handler: (accessor, params) => {
+		var _tableConfig$filters$;
 		if (!params) return false;
 		const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
 		const commandService = accessor.get(_univerjs_core.ICommandService);
@@ -2438,6 +2479,17 @@ const DeleteSheetTableCommand = {
 				options: tableConfig.options
 			}
 		});
+		(_tableConfig$filters$ = tableConfig.filters.tableColumnFilterList) === null || _tableConfig$filters$ === void 0 || _tableConfig$filters$.forEach((tableFilter, column) => {
+			if (tableFilter) undos.push({
+				id: SetSheetTableFilterMutation.id,
+				params: {
+					unitId: params.unitId,
+					tableId: params.tableId,
+					column,
+					tableFilter
+				}
+			});
+		});
 		undos.push(...interceptorCommands.undos);
 		if ((0, _univerjs_core.sequenceExecute)(redos, commandService).result) {
 			undoRedoService.pushUndoRedo({
@@ -2780,28 +2832,6 @@ const SetSheetTableCommand = {
 	}
 };
 
-//#endregion
-//#region src/commands/mutations/set-table-filter.mutation.ts
-const SetSheetTableFilterMutation = {
-	id: "sheet.mutation.set-table-filter",
-	type: _univerjs_core.CommandType.MUTATION,
-	handler: (accessor, params) => {
-		const { tableId, unitId, column, tableFilter } = params;
-		const tableManager = accessor.get(TableManager);
-		const table = tableManager.getTable(unitId, tableId);
-		tableManager.addFilter(unitId, tableId, column, tableFilter);
-		if (table) {
-			var _tableManager$toJSON$;
-			const tableFilters = table.getTableFilters();
-			if (params.filterOutRows) tableFilters.setFilterOutRows(params.filterOutRows);
-			else params.filterOutRows = [...tableFilters.getFilterOutRows()];
-			params.subUnitId = table.getSubunitId();
-			params.tableFilteredOutRows = ((_tableManager$toJSON$ = tableManager.toJSON(unitId)[params.subUnitId]) === null || _tableManager$toJSON$ === void 0 ? void 0 : _tableManager$toJSON$.tableFilteredOutRows) ?? [];
-		}
-		return true;
-	}
-};
-
 //#endregion
 //#region src/commands/commands/set-table-filter.command.ts
 const SetSheetTableFilterCommand = {
@@ -2928,11 +2958,11 @@ let SheetsTableController = class SheetsTableController extends _univerjs_core.D
 			});
 		}));
 		this.disposeWithMe(this._tableManager.tableRangeChanged$.subscribe((event) => {
-			const { range, tableId, unitId, subUnitId, oldRange } = event;
+			const { range, tableId, unitId, subUnitId, oldRange, oldSubUnitId = subUnitId } = event;
 			const rTree = this._ensureTableRangeRTree(unitId);
 			rTree.remove({
 				unitId,
-				sheetId: subUnitId,
+				sheetId: oldSubUnitId,
 				id: tableId,
 				range: { ...oldRange }
 			});
@@ -3854,7 +3884,7 @@ let SheetsTableThemeController = class SheetsTableThemeController extends _unive
 			});
 		}));
 		this.disposeWithMe(this._tableManager.tableRangeChanged$.subscribe((event) => {
-			const { range, oldRange, tableId, unitId, subUnitId } = event;
+			const { range, oldRange, tableId, unitId, subUnitId, oldSubUnitId = subUnitId } = event;
 			const table = this._tableManager.getTable(unitId, tableId);
 			let tableStyleId = table.getTableStyleId();
 			if (!tableStyleId) {
@@ -3863,7 +3893,7 @@ let SheetsTableThemeController = class SheetsTableThemeController extends _unive
 			}
 			this._sheetRangeThemeService.removeRangeThemeRule(tableStyleId, {
 				unitId,
-				subUnitId,
+				subUnitId: oldSubUnitId,
 				range: { ...oldRange }
 			});
 			this._sheetRangeThemeService.registerRangeThemeStyle(tableStyleId, {
@@ -3925,7 +3955,43 @@ SheetsTableThemeController = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-table";
-var version = "1.0.3";
+var version = "1.1.0";
+
+//#endregion
+//#region src/commands/mutations/move-sheet-table.mutation.ts
+const MoveSheetTableMutation = {
+	id: "sheet.mutation.move-table",
+	type: _univerjs_core.CommandType.MUTATION,
+	handler: (accessor, params) => {
+		if (!params) return false;
+		const { unitId, tableId, subUnitId, range, calculatedColumns } = params;
+		const manager = accessor.get(TableManager);
+		const table = manager.getTableById(unitId, tableId);
+		const workbook = accessor.get(_univerjs_core.IUniverInstanceService).getUnit(unitId);
+		const worksheet = workbook === null || workbook === void 0 ? void 0 : workbook.getSheetBySheetId(subUnitId);
+		if (!table || !worksheet) return false;
+		const columns = calculatedColumns ?? table.getTableInfo().columns.map((column, columnIndex) => {
+			var _worksheet$getCellRaw;
+			const row = range.startRow + (table.isShowHeader() ? 1 : 0);
+			const endRow = range.endRow - (table.isShowFooter() ? 1 : 0);
+			const formula = column.formula && row <= endRow ? (_worksheet$getCellRaw = worksheet.getCellRaw(row, range.startColumn + columnIndex)) === null || _worksheet$getCellRaw === void 0 ? void 0 : _worksheet$getCellRaw.f : void 0;
+			return {
+				columnId: column.id,
+				formula: formula || column.formula,
+				formulaIsArray: column.formulaIsArray
+			};
+		}).filter((column) => column.formula);
+		for (const config of columns) {
+			const column = table.getColumn(config.columnId);
+			if (column) {
+				column.formula = config.formula;
+				column.formulaIsArray = config.formulaIsArray;
+			}
+		}
+		manager.moveTable(unitId, tableId, subUnitId, range);
+		return true;
+	}
+};
 
 //#endregion
 //#region src/controllers/sheet-table-formula.controller.ts
@@ -4021,6 +4087,114 @@ SheetTableFormulaController = __decorate([
 	__decorateParam(2, _univerjs_engine_formula.IActiveDirtyManagerService)
 ], SheetTableFormulaController);
 
+//#endregion
+//#region src/controllers/sheet-table-move.controller.ts
+let SheetTableMoveController = class SheetTableMoveController extends _univerjs_core.Disposable {
+	constructor(_tableManager, _sheetInterceptorService, _univerInstanceService, _injector, _localeService, _errorService) {
+		super();
+		this._tableManager = _tableManager;
+		this._sheetInterceptorService = _sheetInterceptorService;
+		this._univerInstanceService = _univerInstanceService;
+		this._injector = _injector;
+		this._localeService = _localeService;
+		this._errorService = _errorService;
+		this.disposeWithMe(this._sheetInterceptorService.interceptBeforeCommand({ performCheck: async (command) => command.id !== _univerjs_sheets.MoveRangeCommand.id || this._checkMove(command.params) }));
+		this.disposeWithMe(this._sheetInterceptorService.interceptAfterCommand({ getMutations: (command) => command.id === _univerjs_sheets.MoveRangeCommand.id ? this._getMoveMutations(command.params) : {
+			redos: [],
+			undos: []
+		} }));
+	}
+	_getTargets(params) {
+		const source = (0, _univerjs_sheets.getSheetCommandTarget)(this._univerInstanceService, {
+			unitId: params.fromUnitId ?? params.toUnitId,
+			subUnitId: params.fromSubUnitId
+		});
+		return {
+			source,
+			target: (0, _univerjs_sheets.getSheetCommandTarget)(this._univerInstanceService, {
+				unitId: params.toUnitId ?? (source === null || source === void 0 ? void 0 : source.unitId),
+				subUnitId: params.toSubUnitId ?? (source === null || source === void 0 ? void 0 : source.subUnitId)
+			})
+		};
+	}
+	_checkMove(params) {
+		const { source, target } = this._getTargets(params);
+		if (!source || !target || source.unitId !== target.unitId) return false;
+		const movingTables = this._tableManager.getTablesBySubunitId(source.unitId, source.subUnitId).filter((table) => _univerjs_core.Rectangle.contains(params.fromRange, table.getRange()));
+		if (!movingTables.length) return true;
+		const targetTables = this._tableManager.getTablesBySubunitId(target.unitId, target.subUnitId);
+		for (const table of targetTables) {
+			if (movingTables.includes(table) || !_univerjs_core.Rectangle.intersects(params.toRange, table.getRange())) continue;
+			this._errorService.emit(this._localeService.t("sheets-table.moveTableOverlapError"));
+			return false;
+		}
+		const { fromRange, toRange } = params;
+		if (!this._isValidMoveRange(params, target.worksheet)) return false;
+		return (0, _univerjs_sheets.checkRangesEditablePermission)(this._injector, source.unitId, source.subUnitId, [fromRange]) && (0, _univerjs_sheets.checkRangesEditablePermission)(this._injector, target.unitId, target.subUnitId, [toRange]);
+	}
+	_isValidMoveRange(params, worksheet) {
+		const { fromRange, toRange } = params;
+		if (fromRange.endRow - fromRange.startRow !== toRange.endRow - toRange.startRow || fromRange.endColumn - fromRange.startColumn !== toRange.endColumn - toRange.startColumn || toRange.startRow < 0 || toRange.startColumn < 0 || toRange.endRow >= worksheet.getRowCount() || toRange.endColumn >= worksheet.getColumnCount()) return false;
+		return true;
+	}
+	_getMoveMutations(params) {
+		const redos = [];
+		const undos = [];
+		const { source, target } = this._getTargets(params);
+		if (!source || !target || source.unitId !== target.unitId) return {
+			redos,
+			undos
+		};
+		const rowOffset = params.toRange.startRow - params.fromRange.startRow;
+		const columnOffset = params.toRange.startColumn - params.fromRange.startColumn;
+		const tables = this._tableManager.getTablesBySubunitId(source.unitId, source.subUnitId);
+		for (const table of tables) {
+			const range = table.getRange();
+			if (!_univerjs_core.Rectangle.contains(params.fromRange, range)) continue;
+			redos.push({
+				id: MoveSheetTableMutation.id,
+				params: {
+					unitId: source.unitId,
+					tableId: table.getId(),
+					subUnitId: target.subUnitId,
+					range: {
+						startRow: range.startRow + rowOffset,
+						endRow: range.endRow + rowOffset,
+						startColumn: range.startColumn + columnOffset,
+						endColumn: range.endColumn + columnOffset
+					}
+				}
+			});
+			undos.push({
+				id: MoveSheetTableMutation.id,
+				params: {
+					unitId: source.unitId,
+					tableId: table.getId(),
+					subUnitId: source.subUnitId,
+					range,
+					calculatedColumns: table.getTableInfo().columns.filter((column) => column.formula).map((column) => ({
+						columnId: column.id,
+						formula: column.formula,
+						formulaIsArray: column.formulaIsArray
+					}))
+				}
+			});
+		}
+		return {
+			redos,
+			undos
+		};
+	}
+};
+SheetTableMoveController = __decorate([
+	__decorateParam(0, (0, _univerjs_core.Inject)(TableManager)),
+	__decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_sheets.SheetInterceptorService)),
+	__decorateParam(2, _univerjs_core.IUniverInstanceService),
+	__decorateParam(3, (0, _univerjs_core.Inject)(_univerjs_core.Injector)),
+	__decorateParam(4, (0, _univerjs_core.Inject)(_univerjs_core.LocaleService)),
+	__decorateParam(5, (0, _univerjs_core.Inject)(_univerjs_core.ErrorService))
+], SheetTableMoveController);
+
 //#endregion
 //#region src/controllers/sheet-table-range.controller.ts
 /**
@@ -4047,8 +4221,8 @@ let SheetTableRangeController = class SheetTableRangeController extends _univerj
 	}
 	_initRangeListener() {
 		this.disposeWithMe(this._tableManager.tableRangeChanged$.subscribe((event) => {
-			const { range, tableId, unitId, subUnitId } = event;
-			this._exclusiveRangeService.clearExclusiveRangesByGroupId(unitId, subUnitId, FEATURE_TABLE_ID, tableId);
+			const { range, tableId, unitId, subUnitId, oldSubUnitId = subUnitId } = event;
+			this._exclusiveRangeService.clearExclusiveRangesByGroupId(unitId, oldSubUnitId, FEATURE_TABLE_ID, tableId);
 			this._exclusiveRangeService.addExclusiveRange(unitId, subUnitId, FEATURE_TABLE_ID, [{
 				range: { ...range },
 				groupId: tableId
@@ -4603,7 +4777,6 @@ let TableFilterController = class TableFilterController extends _univerjs_core.D
 		this._sheetRowFilteredService = _sheetRowFilteredService;
 		this._zebraCrossingCacheController = _zebraCrossingCacheController;
 		_defineProperty(this, "_tableFilteredOutRows", /* @__PURE__ */ new Map());
-		_defineProperty(this, "_subscription", null);
 		this.registerFilterChangeEvent();
 		this.initTableHiddenRowIntercept();
 		this._registerFormulaRowFiltered();
@@ -4625,18 +4798,22 @@ let TableFilterController = class TableFilterController extends _univerjs_core.D
 		}));
 	}
 	_initFilteredOutRows() {
-		this._tableManager.tableInitStatus$.pipe((0, rxjs.filter)((initialized) => initialized), (0, rxjs.switchMap)(() => {
+		this.disposeWithMe(this._tableManager.tableInitStatus$.pipe((0, rxjs.filter)((initialized) => initialized), (0, rxjs.switchMap)(() => {
 			return this._univerInstanceService.getCurrentTypeOfUnit$(_univerjs_core.UniverInstanceType.UNIVER_SHEET);
 		}), (0, rxjs.filter)((workbook) => workbook !== null && workbook !== void 0), (0, rxjs.switchMap)((workbook) => workbook.activeSheet$), (0, rxjs.filter)((sheet) => sheet !== null && sheet !== void 0)).subscribe(() => {
 			const target = (0, _univerjs_sheets.getSheetCommandTarget)(this._univerInstanceService);
 			if (!target) return;
 			const { unitId, subUnitId } = target;
 			this._refreshTableFilteredOutRows(unitId, subUnitId);
-		});
+		}));
 	}
 	registerFilterChangeEvent() {
+		this.disposeWithMe(this._tableManager.tableDelete$.subscribe(({ unitId, subUnitId }) => {
+			this._refreshTableFilteredOutRows(unitId, subUnitId);
+			this._zebraCrossingCacheController.updateZebraCrossingCache(unitId, subUnitId);
+		}));
 		this.disposeWithMe(this._tableManager.tableFilterChanged$.subscribe((event) => {
-			const { unitId, subUnitId, tableId } = event;
+			const { unitId, subUnitId, tableId, oldSubUnitId } = event;
 			const workbook = this._univerInstanceService.getUnit(unitId);
 			const worksheet = workbook === null || workbook === void 0 ? void 0 : workbook.getSheetBySheetId(subUnitId);
 			const table = this._tableManager.getTable(unitId, tableId);
@@ -4644,6 +4821,10 @@ let TableFilterController = class TableFilterController extends _univerjs_core.D
 			table.getTableFilters().doFilter(worksheet, table.getTableFilterRange(), workbook === null || workbook === void 0 ? void 0 : workbook.getDateSystem());
 			this._refreshTableFilteredOutRows(unitId, subUnitId);
 			this._zebraCrossingCacheController.updateZebraCrossingCache(unitId, subUnitId);
+			if (oldSubUnitId && oldSubUnitId !== subUnitId) {
+				this._refreshTableFilteredOutRows(unitId, oldSubUnitId);
+				this._zebraCrossingCacheController.updateZebraCrossingCache(unitId, oldSubUnitId);
+			}
 		}));
 	}
 	_refreshTableFilteredOutRows(unitId, subUnitId) {
@@ -4664,9 +4845,8 @@ let TableFilterController = class TableFilterController extends _univerjs_core.D
 		return `${unitId}|${subUnitId}`;
 	}
 	dispose() {
-		var _this$_subscription;
 		super.dispose();
-		(_this$_subscription = this._subscription) === null || _this$_subscription === void 0 || _this$_subscription.unsubscribe();
+		this._tableFilteredOutRows.clear();
 	}
 };
 TableFilterController = __decorate([
@@ -4699,6 +4879,7 @@ let UniverSheetsTablePlugin = class UniverSheetsTablePlugin extends _univerjs_co
 			[TableFilterController],
 			[SheetTableRangeController],
 			[SheetTableRefRangeController],
+			[SheetTableMoveController],
 			[SheetTableFormulaController]
 		]);
 	}
@@ -4707,6 +4888,7 @@ let UniverSheetsTablePlugin = class UniverSheetsTablePlugin extends _univerjs_co
 			[SheetTableFormulaController],
 			[SheetTableRangeController],
 			[SheetTableRefRangeController],
+			[SheetTableMoveController],
 			[SheetsTableThemeController],
 			[SheetsTableController],
 			[SheetTableService],
@@ -4720,6 +4902,7 @@ let UniverSheetsTablePlugin = class UniverSheetsTablePlugin extends _univerjs_co
 			AddSheetTableMutation,
 			DeleteSheetTableCommand,
 			DeleteSheetTableMutation,
+			MoveSheetTableMutation,
 			SetSheetTableFilterMutation,
 			SetSheetTableFilterCommand,
 			SetSheetTableSortStateCommand,
@@ -4768,21 +4951,21 @@ exports.SheetTableInsertRowCommand = SheetTableInsertRowCommand;
 exports.SheetTableRemoveColCommand = SheetTableRemoveColCommand;
 exports.SheetTableRemoveColumnAtCommand = SheetTableRemoveColumnAtCommand;
 exports.SheetTableRemoveRowCommand = SheetTableRemoveRowCommand;
-Object.defineProperty(exports, 'SheetTableService', {
+Object.defineProperty(exports, "SheetTableService", {
   enumerable: true,
   get: function () {
     return SheetTableService;
   }
 });
 exports.SheetsTableButtonStateEnum = SheetsTableButtonStateEnum;
-Object.defineProperty(exports, 'SheetsTableController', {
+Object.defineProperty(exports, "SheetsTableController", {
   enumerable: true,
   get: function () {
     return SheetsTableController;
   }
 });
 exports.SheetsTableSortStateEnum = SheetsTableSortStateEnum;
-Object.defineProperty(exports, 'SheetsTableThemeController', {
+Object.defineProperty(exports, "SheetsTableThemeController", {
   enumerable: true,
   get: function () {
     return SheetsTableThemeController;
@@ -4793,7 +4976,7 @@ exports.TableColumnDataTypeEnum = TableColumnDataTypeEnum;
 exports.TableColumnFilterTypeEnum = TableColumnFilterTypeEnum;
 exports.TableConditionTypeEnum = TableConditionTypeEnum;
 exports.TableDateCompareTypeEnum = TableDateCompareTypeEnum;
-Object.defineProperty(exports, 'TableManager', {
+Object.defineProperty(exports, "TableManager", {
   enumerable: true,
   get: function () {
     return TableManager;
@@ -4801,7 +4984,7 @@ Object.defineProperty(exports, 'TableManager', {
 });
 exports.TableNumberCompareTypeEnum = TableNumberCompareTypeEnum;
 exports.TableStringCompareTypeEnum = TableStringCompareTypeEnum;
-Object.defineProperty(exports, 'UniverSheetsTablePlugin', {
+Object.defineProperty(exports, "UniverSheetsTablePlugin", {
   enumerable: true,
   get: function () {
     return UniverSheetsTablePlugin;

package/lib/cjs/locale/ar-SA.js

@@ -2,6 +2,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "عمود",
 	tablePrefix: "جدول",
+	moveTableOverlapError: "يتداخل نطاق الوجهة مع جدول آخر.",
 	tableNameError: "لا يمكن أن يحتوي اسم الجدول على مسافات، ولا يمكن أن يبدأ برقم، ولا يمكن أن يكون مطابقًا لاسم جدول موجود"
 } };
 

package/lib/cjs/locale/ca-ES.js

@@ -2,6 +2,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "Columna",
 	tablePrefix: "Taula",
+	moveTableOverlapError: "La destinació se superposa amb una altra taula.",
 	tableNameError: "El nom de la taula no pot contenir espais, no pot començar amb un número i no pot ser idèntic a un nom de taula existent"
 } };
 

package/lib/cjs/locale/de-DE.js

@@ -2,6 +2,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "Spalte",
 	tablePrefix: "Tabelle",
+	moveTableOverlapError: "Der Zielbereich überschneidet sich mit einer anderen Tabelle.",
 	tableNameError: "Tabellenname darf keine Leerzeichen enthalten, darf nicht mit einer Zahl beginnen und darf nicht mit einem vorhandenen Tabellennamen identisch sein"
 } };
 

package/lib/cjs/locale/en-US.js

@@ -17,6 +17,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "Column",
 	tablePrefix: "Table",
+	moveTableOverlapError: "The destination overlaps another table.",
 	tableNameError: "Table name cannot contain spaces, cannot start with a number, and cannot be identical to an existing table name"
 } };
 

package/lib/cjs/locale/es-ES.js

@@ -2,6 +2,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "Columna",
 	tablePrefix: "Tabla",
+	moveTableOverlapError: "El destino se superpone con otra tabla.",
 	tableNameError: "El nombre de la tabla no puede contener espacios, no puede comenzar con un número y no puede ser idéntico a un nombre de tabla existente"
 } };
 

package/lib/cjs/locale/fa-IR.js

@@ -2,6 +2,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "ستون",
 	tablePrefix: "جدول",
+	moveTableOverlapError: "محدودهٔ مقصد با جدول دیگری هم‌پوشانی دارد.",
 	tableNameError: "نام جدول نمی‌تواند شامل فاصله باشد، نمی‌تواند با عدد شروع شود و نمی‌تواند با نام جدول‌های موجود تکراری باشد"
 } };
 

package/lib/cjs/locale/fr-FR.js

@@ -2,6 +2,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "Colonne",
 	tablePrefix: "Tableau",
+	moveTableOverlapError: "La destination chevauche un autre tableau.",
 	tableNameError: "Le nom du tableau ne peut pas contenir d'espaces, ne peut pas commencer par un chiffre et ne peut pas être identique à un nom de tableau existant"
 } };
 

package/lib/cjs/locale/id-ID.js

@@ -2,6 +2,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "Kolom",
 	tablePrefix: "Tabel",
+	moveTableOverlapError: "Rentang tujuan tumpang tindih dengan tabel lain.",
 	tableNameError: "Nama tabel tidak boleh mengandung spasi, tidak boleh diawali dengan angka, dan tidak boleh sama dengan nama tabel yang sudah ada"
 } };
 

package/lib/cjs/locale/it-IT.js

@@ -2,6 +2,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "Colonna",
 	tablePrefix: "Tabella",
+	moveTableOverlapError: "La destinazione si sovrappone a un’altra tabella.",
 	tableNameError: "Il nome della tabella non può contenere spazi, non può iniziare con un numero e non può essere identico a un nome di tabella esistente"
 } };
 

package/lib/cjs/locale/ja-JP.js

@@ -2,6 +2,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "列",
 	tablePrefix: "表",
+	moveTableOverlapError: "移動先が他のテーブルと重なっています。",
 	tableNameError: "表の名前は空白を含めることはできず、数字で始めることはできず、既存の表名と重複できません"
 } };
 

package/lib/cjs/locale/ko-KR.js

@@ -2,6 +2,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "열",
 	tablePrefix: "표",
+	moveTableOverlapError: "대상 범위가 다른 표와 겹칩니다.",
 	tableNameError: "표 이름은 공백을 포함할 수 없으며 숫자로 시작할 수 없고 기존 표 이름과 중복될 수 없습니다"
 } };