@univerjs/sheets-table 0.22.1 → 0.23.0-insiders.20260522-e8f2a3b

package/lib/index.js

@@ -247,8 +247,8 @@ const tableDefaultThemeStyleArr = [
 	[[
 		"#6280F9",
 		"#FFFFFF",
-		"#BAC6F8",
-		"#D2DAFA"
+		"#EEF2FF",
+		"#DCE4FF"
 	], ["#fff"]],
 	[[
 		"#16BDCA",
@@ -1838,7 +1838,8 @@ let TableManager = class TableManager extends Disposable {
 			}
 		} else if (newRange.endColumn > oldRange.endColumn) {
 			const diff = newRange.endColumn - oldRange.endColumn;
-			for (let i = 0; i < diff; i++) table.insertColumn(oldRange.endColumn, new TableColumn(generateRandomId(), getColumnName(table.getColumnsCount() + 1, "Column")));
+			const columnPrefix = this._localeService.t("sheets-table.columnPrefix");
+			for (let i = 0; i < diff; i++) table.insertColumn(oldRange.endColumn, new TableColumn(generateRandomId(), getColumnName(table.getColumnsCount() + 1, columnPrefix)));
 		}
 		table.setRange(newRange);
 		this._tableRangeChanged$.next({
@@ -2304,6 +2305,37 @@ const RemoveTableThemeCommand = {
 	}
 };
 
+//#endregion
+//#region src/util/table-name.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.
+*/
+function validateSheetTableName(name, existingNamesSet) {
+	const trimmedName = name.trim();
+	if (!trimmedName) return {
+		valid: false,
+		reason: "empty"
+	};
+	const normalizedExistingNames = new Set(Array.from(existingNamesSet, (item) => item.toLowerCase()));
+	if (!customNameCharacterCheck(trimmedName.toLowerCase(), normalizedExistingNames)) return {
+		valid: false,
+		reason: "invalid"
+	};
+	return { valid: true };
+}
+
 //#endregion
 //#region src/commands/commands/set-sheet-table.command.ts
 const SetSheetTableCommand = {
@@ -2324,7 +2356,7 @@ const SetSheetTableCommand = {
 			definedNamesService: accessor.get(IDefinedNamesService)
 		});
 		if (name) {
-			if (!customNameCharacterCheck(name.toLowerCase(), existingNamesSet)) {
+			if (!validateSheetTableName(name, existingNamesSet).valid) {
 				accessor.get(ILogService).warn(localeService.t("sheets-table.tableNameError"));
 				return false;
 			}
@@ -2677,6 +2709,17 @@ SheetsTableController = __decorate([
 
 //#endregion
 //#region src/commands/commands/sheet-table-row-col.command.ts
+function executeTableMutationSequence(accessor, unitId, redos, undos) {
+	if (sequenceExecute(redos, accessor.get(ICommandService)).result) {
+		accessor.get(IUndoRedoService).pushUndoRedo({
+			unitID: unitId,
+			undoMutations: undos,
+			redoMutations: redos
+		});
+		return true;
+	}
+	return false;
+}
 const SheetTableInsertRowCommand = {
 	id: "sheet.command.table-insert-row",
 	type: CommandType.COMMAND,
@@ -2791,6 +2834,70 @@ const SheetTableInsertRowCommand = {
 		return false;
 	}
 };
+const SheetTableInsertRowAtCommand = {
+	id: "sheet.command.table-insert-row-at",
+	type: CommandType.COMMAND,
+	handler: (accessor, params) => {
+		if (!params) return false;
+		const { unitId, subUnitId, tableId, index, count = 1 } = params;
+		if (count <= 0) return false;
+		const target = getSheetCommandTarget(accessor.get(IUniverInstanceService), {
+			unitId,
+			subUnitId
+		});
+		if (!target) return false;
+		const table = accessor.get(TableManager).getTableById(unitId, tableId);
+		if (!table || table.getSubunitId() !== subUnitId) return false;
+		const oldRange = table.getRange();
+		if (index <= oldRange.startRow || index > oldRange.endRow + 1) return false;
+		const redos = [{
+			id: SetSheetTableMutation.id,
+			params: {
+				unitId,
+				subUnitId,
+				tableId,
+				config: { updateRange: { newRange: {
+					...oldRange,
+					endRow: oldRange.endRow + count
+				} } }
+			}
+		}];
+		const undos = [{
+			id: SetSheetTableMutation.id,
+			params: {
+				unitId,
+				subUnitId,
+				tableId,
+				config: { updateRange: { newRange: { ...oldRange } } }
+			}
+		}];
+		const rowContentIndex = target.worksheet.getCellMatrix().getDataRange().endRow;
+		const moveRangeMutations = getMoveRangeUndoRedoMutations(accessor, {
+			unitId,
+			subUnitId,
+			range: {
+				startRow: index,
+				endRow: rowContentIndex,
+				startColumn: oldRange.startColumn,
+				endColumn: oldRange.endColumn
+			}
+		}, {
+			unitId,
+			subUnitId,
+			range: {
+				startRow: index + count,
+				endRow: rowContentIndex + count,
+				startColumn: oldRange.startColumn,
+				endColumn: oldRange.endColumn
+			}
+		});
+		if (moveRangeMutations) {
+			redos.push(...moveRangeMutations.redos);
+			undos.push(...moveRangeMutations.undos);
+		}
+		return executeTableMutationSequence(accessor, unitId, redos, undos);
+	}
+};
 const SheetTableInsertColCommand = {
 	id: "sheet.command.table-insert-col",
 	type: CommandType.COMMAND,
@@ -2918,6 +3025,159 @@ const SheetTableInsertColCommand = {
 		return false;
 	}
 };
+const SheetTableInsertColumnAtCommand = {
+	id: "sheet.command.table-insert-column-at",
+	type: CommandType.COMMAND,
+	handler: (accessor, params) => {
+		if (!params) return false;
+		const { unitId, subUnitId, tableId, index, count = 1 } = params;
+		if (count <= 0) return false;
+		const target = getSheetCommandTarget(accessor.get(IUniverInstanceService), {
+			unitId,
+			subUnitId
+		});
+		if (!target) return false;
+		const table = accessor.get(TableManager).getTableById(unitId, tableId);
+		if (!table || table.getSubunitId() !== subUnitId) return false;
+		const oldRange = table.getRange();
+		if (index < oldRange.startColumn || index > oldRange.endColumn + 1) return false;
+		const redos = [{
+			id: SetSheetTableMutation.id,
+			params: {
+				unitId,
+				subUnitId,
+				tableId,
+				config: { rowColOperation: {
+					operationType: "insert",
+					rowColType: "column",
+					index,
+					count
+				} }
+			}
+		}];
+		const undos = [{
+			id: SetSheetTableMutation.id,
+			params: {
+				unitId,
+				subUnitId,
+				tableId,
+				config: { rowColOperation: {
+					operationType: "delete",
+					rowColType: "column",
+					index,
+					count
+				} }
+			}
+		}];
+		const colContentIndex = target.worksheet.getCellMatrix().getDataRange().endColumn;
+		if (index <= colContentIndex) {
+			const moveRangeMutations = getMoveRangeUndoRedoMutations(accessor, {
+				unitId,
+				subUnitId,
+				range: {
+					startRow: oldRange.startRow,
+					endRow: oldRange.endRow,
+					startColumn: index,
+					endColumn: colContentIndex
+				}
+			}, {
+				unitId,
+				subUnitId,
+				range: {
+					startRow: oldRange.startRow,
+					endRow: oldRange.endRow,
+					startColumn: index + count,
+					endColumn: colContentIndex + count
+				}
+			});
+			if (moveRangeMutations) {
+				redos.push(...moveRangeMutations.redos);
+				undos.push(...moveRangeMutations.undos);
+			}
+		}
+		return executeTableMutationSequence(accessor, unitId, redos, undos);
+	}
+};
+const SheetTableRemoveColumnAtCommand = {
+	id: "sheet.command.table-remove-column-at",
+	type: CommandType.COMMAND,
+	handler: (accessor, params) => {
+		if (!params) return false;
+		const { unitId, subUnitId, tableId, index, count = 1 } = params;
+		if (count <= 0) return false;
+		const target = getSheetCommandTarget(accessor.get(IUniverInstanceService), {
+			unitId,
+			subUnitId
+		});
+		if (!target) return false;
+		const table = accessor.get(TableManager).getTableById(unitId, tableId);
+		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 columns = [];
+		const gap = index - oldRange.startColumn;
+		for (let i = 0; i < count; i++) {
+			const column = table.getTableInfo().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,
+			params: {
+				unitId,
+				subUnitId,
+				tableId,
+				config: { rowColOperation: {
+					operationType: "insert",
+					rowColType: "column",
+					index,
+					count,
+					columnsJson: columns
+				} }
+			}
+		}];
+		const colContentIndex = target.worksheet.getCellMatrix().getDataRange().endColumn;
+		if (index + count <= colContentIndex) {
+			const moveRangeMutations = getMoveRangeUndoRedoMutations(accessor, {
+				unitId,
+				subUnitId,
+				range: {
+					startRow: oldRange.startRow,
+					endRow: oldRange.endRow,
+					startColumn: index + count,
+					endColumn: colContentIndex
+				}
+			}, {
+				unitId,
+				subUnitId,
+				range: {
+					startRow: oldRange.startRow,
+					endRow: oldRange.endRow,
+					startColumn: index,
+					endColumn: colContentIndex - count
+				}
+			});
+			if (moveRangeMutations) {
+				redos.push(...moveRangeMutations.redos);
+				undos.push(...moveRangeMutations.undos);
+			}
+		}
+		return executeTableMutationSequence(accessor, unitId, redos, undos);
+	}
+};
 const SheetTableRemoveRowCommand = {
 	id: "sheet.command.table-remove-row",
 	type: CommandType.COMMAND,
@@ -3083,7 +3343,7 @@ const SheetTableRemoveColCommand = {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-table";
-var version = "0.22.1";
+var version = "0.23.0-insiders.20260522-e8f2a3b";
 
 //#endregion
 //#region src/controllers/sheet-table-formula.controller.ts
@@ -3888,8 +4148,11 @@ let UniverSheetsTablePlugin = class UniverSheetsTablePlugin extends Plugin {
 			RemoveTableThemeCommand,
 			SheetTableInsertRowCommand,
 			SheetTableInsertColCommand,
+			SheetTableInsertRowAtCommand,
+			SheetTableInsertColumnAtCommand,
 			SheetTableRemoveRowCommand,
-			SheetTableRemoveColCommand
+			SheetTableRemoveColCommand,
+			SheetTableRemoveColumnAtCommand
 		].forEach((m) => this._commandService.registerCommand(m));
 	}
 };
@@ -3904,4 +4167,4 @@ UniverSheetsTablePlugin = __decorate([
 ], UniverSheetsTablePlugin);
 
 //#endregion
-export { AddSheetTableCommand, AddSheetTableMutation, AddTableThemeCommand, DeleteSheetTableCommand, DeleteSheetTableMutation, RemoveTableThemeCommand, SHEET_TABLE_CUSTOM_THEME_PREFIX, SetSheetTableCommand, SetSheetTableFilterCommand, SetSheetTableFilterMutation, SetSheetTableMutation, SheetTableInsertColCommand, SheetTableInsertRowCommand, SheetTableRemoveColCommand, SheetTableRemoveRowCommand, SheetTableService, SheetsTableButtonStateEnum, SheetsTableController, SheetsTableSortStateEnum, TableColumnDataTypeEnum, TableColumnFilterTypeEnum, TableConditionTypeEnum, TableDateCompareTypeEnum, TableManager, TableNumberCompareTypeEnum, TableStringCompareTypeEnum, UniverSheetsTablePlugin, customEmptyThemeWithBorderStyle, isConditionFilter, isManualTableFilter, processStyleWithBorderStyle };
+export { AddSheetTableCommand, AddSheetTableMutation, AddTableThemeCommand, DeleteSheetTableCommand, DeleteSheetTableMutation, RemoveTableThemeCommand, SHEET_TABLE_CUSTOM_THEME_PREFIX, SetSheetTableCommand, SetSheetTableFilterCommand, SetSheetTableFilterMutation, SetSheetTableMutation, SheetTableInsertColCommand, SheetTableInsertColumnAtCommand, SheetTableInsertRowAtCommand, SheetTableInsertRowCommand, SheetTableRemoveColCommand, SheetTableRemoveColumnAtCommand, SheetTableRemoveRowCommand, SheetTableService, SheetsTableButtonStateEnum, SheetsTableController, SheetsTableSortStateEnum, TableColumnDataTypeEnum, TableColumnFilterTypeEnum, TableConditionTypeEnum, TableDateCompareTypeEnum, TableManager, TableNumberCompareTypeEnum, TableStringCompareTypeEnum, UniverSheetsTablePlugin, customEmptyThemeWithBorderStyle, getExistingNamesSet, isConditionFilter, isManualTableFilter, processStyleWithBorderStyle, validateSheetTableName };

package/lib/types/commands/commands/sheet-table-row-col.command.d.ts

@@ -19,8 +19,15 @@ interface ISheetTableRowColOperationCommandParams {
     unitId: string;
     subUnitId: string;
 }
+interface ISheetTableInsertAtCommandParams extends ISheetTableRowColOperationCommandParams {
+    index: number;
+    count?: number;
+}
 export declare const SheetTableInsertRowCommand: ICommand<ISheetTableRowColOperationCommandParams>;
+export declare const SheetTableInsertRowAtCommand: ICommand<ISheetTableInsertAtCommandParams>;
 export declare const SheetTableInsertColCommand: ICommand<ISheetTableRowColOperationCommandParams>;
+export declare const SheetTableInsertColumnAtCommand: ICommand<ISheetTableInsertAtCommandParams>;
+export declare const SheetTableRemoveColumnAtCommand: ICommand<ISheetTableInsertAtCommandParams>;
 export declare const SheetTableRemoveRowCommand: ICommand<ISheetTableRowColOperationCommandParams>;
 export declare const SheetTableRemoveColCommand: ICommand<ISheetTableRowColOperationCommandParams>;
 export {};

package/lib/types/index.d.ts

@@ -22,7 +22,7 @@ export { RemoveTableThemeCommand } from './commands/commands/remove-table-theme.
 export { SetSheetTableCommand } from './commands/commands/set-sheet-table.command';
 export type { ISetSheetTableCommandParams } from './commands/commands/set-sheet-table.command';
 export { SetSheetTableFilterCommand } from './commands/commands/set-table-filter.command';
-export { SheetTableInsertColCommand, SheetTableInsertRowCommand, SheetTableRemoveColCommand, SheetTableRemoveRowCommand } from './commands/commands/sheet-table-row-col.command';
+export { SheetTableInsertColCommand, SheetTableInsertColumnAtCommand, SheetTableInsertRowAtCommand, SheetTableInsertRowCommand, SheetTableRemoveColCommand, SheetTableRemoveColumnAtCommand, SheetTableRemoveRowCommand } from './commands/commands/sheet-table-row-col.command';
 export { AddSheetTableMutation } from './commands/mutations/add-sheet-table.mutation';
 export type { IAddSheetTableParams } from './commands/mutations/add-sheet-table.mutation';
 export { DeleteSheetTableMutation } from './commands/mutations/delete-sheet-table.mutation';
@@ -41,4 +41,6 @@ export { SheetTableService } from './services/table-service';
 export { SheetsTableButtonStateEnum, SheetsTableSortStateEnum, TableColumnDataTypeEnum, TableColumnFilterTypeEnum, TableConditionTypeEnum, TableDateCompareTypeEnum, TableNumberCompareTypeEnum, TableStringCompareTypeEnum } from './types/enum';
 export type { ITableColumnJson, ITableConditionFilterItem, ITableData, ITableFilterItem, ITableInfo, ITableInfoWithUnitId, ITableManualFilterItem, ITableOptions, ITableRange, ITableRangeWithState, TableMetaType, TableRelationTupleType } from './types/type';
 export type { ITableJson, ITableSetConfig } from './types/type';
-export { isConditionFilter, isManualTableFilter } from './util';
+export { getExistingNamesSet, isConditionFilter, isManualTableFilter } from './util';
+export { validateSheetTableName } from './util/table-name';
+export type { ISheetTableNameValidationResult, SheetTableNameValidationReason } from './util/table-name';

package/lib/types/util/table-name.d.ts

@@ -0,0 +1,21 @@
+/**
+ * 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.
+ */
+export type SheetTableNameValidationReason = 'empty' | 'invalid';
+export interface ISheetTableNameValidationResult {
+    valid: boolean;
+    reason?: SheetTableNameValidationReason;
+}
+export declare function validateSheetTableName(name: string, existingNamesSet: Set<string>): ISheetTableNameValidationResult;