@univerjs/sheets-table 1.0.2 → 1.0.4

package/lib/cjs/index.js

@@ -2053,6 +2053,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);
@@ -2928,11 +2950,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 +3876,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 +3885,7 @@ let SheetsTableThemeController = class SheetsTableThemeController extends _unive
 			}
 			this._sheetRangeThemeService.removeRangeThemeRule(tableStyleId, {
 				unitId,
-				subUnitId,
+				subUnitId: oldSubUnitId,
 				range: { ...oldRange }
 			});
 			this._sheetRangeThemeService.registerRangeThemeStyle(tableStyleId, {
@@ -3925,7 +3947,43 @@ SheetsTableThemeController = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-table";
-var version = "1.0.2";
+var version = "1.0.4";
+
+//#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 +4079,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 +4213,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 +4769,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 +4790,18 @@ 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.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 +4809,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 +4833,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 +4867,7 @@ let UniverSheetsTablePlugin = class UniverSheetsTablePlugin extends _univerjs_co
 			[TableFilterController],
 			[SheetTableRangeController],
 			[SheetTableRefRangeController],
+			[SheetTableMoveController],
 			[SheetTableFormulaController]
 		]);
 	}
@@ -4707,6 +4876,7 @@ let UniverSheetsTablePlugin = class UniverSheetsTablePlugin extends _univerjs_co
 			[SheetTableFormulaController],
 			[SheetTableRangeController],
 			[SheetTableRefRangeController],
+			[SheetTableMoveController],
 			[SheetsTableThemeController],
 			[SheetsTableController],
 			[SheetTableService],
@@ -4720,6 +4890,7 @@ let UniverSheetsTablePlugin = class UniverSheetsTablePlugin extends _univerjs_co
 			AddSheetTableMutation,
 			DeleteSheetTableCommand,
 			DeleteSheetTableMutation,
+			MoveSheetTableMutation,
 			SetSheetTableFilterMutation,
 			SetSheetTableFilterCommand,
 			SetSheetTableSortStateCommand,

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: "표 이름은 공백을 포함할 수 없으며 숫자로 시작할 수 없고 기존 표 이름과 중복될 수 없습니다"
 } };
 

package/lib/cjs/locale/pl-PL.js

@@ -2,6 +2,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "Kolumna",
 	tablePrefix: "Tabela",
+	moveTableOverlapError: "Zakres docelowy nakłada się na inną tabelę.",
 	tableNameError: "Nazwa tabeli nie może zawierać spacji, nie może zaczynać się od cyfry i nie może być identyczna z istniejącą nazwą tabeli"
 } };
 

package/lib/cjs/locale/pt-BR.js

@@ -2,6 +2,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "Coluna",
 	tablePrefix: "Tabela",
+	moveTableOverlapError: "O destino se sobrepõe a outra tabela.",
 	tableNameError: "O nome da tabela não pode conter espaços, não pode começar com um número e não pode ser idêntico a um nome de tabela existente"
 } };
 

package/lib/cjs/locale/ru-RU.js

@@ -2,6 +2,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "Столбец",
 	tablePrefix: "Таблица",
+	moveTableOverlapError: "Диапазон назначения пересекается с другой таблицей.",
 	tableNameError: "Имя таблицы не может содержать пробелы, не может начинаться с цифры и не может совпадать с именем существующей таблицы"
 } };
 

package/lib/cjs/locale/sk-SK.js

@@ -2,6 +2,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "Stĺpec",
 	tablePrefix: "Tabuľka",
+	moveTableOverlapError: "Cieľový rozsah sa prekrýva s inou tabuľkou.",
 	tableNameError: "Názov tabuľky nesmie obsahovať medzery, nesmie začínať číslom a nesmie byť zhodný s existujúcim názvom tabuľky"
 } };
 

package/lib/cjs/locale/vi-VN.js

@@ -2,6 +2,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "Cột",
 	tablePrefix: "Bảng",
+	moveTableOverlapError: "Vùng đích chồng lấp với một bảng khác.",
 	tableNameError: "Tên bảng không thể chứa khoảng trắng, không được bắt đầu bằng số và không được trùng với tên bảng đã có"
 } };
 

package/lib/cjs/locale/zh-CN.js

@@ -2,6 +2,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "列",
 	tablePrefix: "表格",
+	moveTableOverlapError: "目标区域与其他表格重叠。",
 	tableNameError: "表格名称不能包含空格， 不能以数字开头，不能和已有表格名称重复"
 } };
 

package/lib/cjs/locale/zh-HK.js

@@ -2,6 +2,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "列",
 	tablePrefix: "表格",
+	moveTableOverlapError: "目標區域與其他表格重疊。",
 	tableNameError: "表格名稱不能包含空格， 不能以數字開頭，不能和已有表格名稱重複"
 } };
 

package/lib/cjs/locale/zh-TW.js

@@ -2,6 +2,7 @@
 const locale = { "sheets-table": {
 	columnPrefix: "列",
 	tablePrefix: "表格",
+	moveTableOverlapError: "目標區域與其他表格重疊。",
 	tableNameError: "表格名稱不能包含空格， 不能以數字開頭，不能和已有表格名稱重複"
 } };