Skip to content

Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.

refactor(sheets): refactor mergecell generating logic (#1636)

ybzky02cd6957cb65
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 47f677d6e7..f1ffe51d21 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -92,6 +92,7 @@ export { IResourceManagerService, ISnapshotPersistenceService } from './services
export { type IStyleSheet, ThemeService } from './services/theme/theme.service';
export {
type IUndoRedoCommandInfos,
+ type IUndoRedoCommandInfosByInterceptor,
type IUndoRedoItem,
IUndoRedoService,
type IUndoRedoStatus,
diff --git a/packages/core/src/services/undoredo/undoredo.service.ts b/packages/core/src/services/undoredo/undoredo.service.ts
index 8da5174bb7..603512d541 100644
--- a/packages/core/src/services/undoredo/undoredo.service.ts
+++ b/packages/core/src/services/undoredo/undoredo.service.ts
@@ -65,6 +65,17 @@ enum BatchingStatus {
CREATED,
}
+export interface IUndoRedoCommandInfosByInterceptor {
+ /**
+ * Sometimes, mutations generated by interceptors need to ensure a certain execution order
+ * PreMutations run before user's intent to make sure the undo/redo works correctly.
+ */
+ preUndos?: IMutationInfo[];
+ undos: IMutationInfo[];
+ redos: IMutationInfo[];
+ preRedos?: IMutationInfo[];
+}
+
export interface IUndoRedoCommandInfos {
undos: IMutationInfo[];
redos: IMutationInfo[];
diff --git a/packages/core/src/shared/__test__/object-matrix.spec.ts b/packages/core/src/shared/__test__/object-matrix.spec.ts
index 341bd010ee..2127ab4caa 100644
--- a/packages/core/src/shared/__test__/object-matrix.spec.ts
+++ b/packages/core/src/shared/__test__/object-matrix.spec.ts
@@ -16,7 +16,7 @@
import { describe, expect, it } from 'vitest';
-import { moveMatrixArray, ObjectMatrix } from '../object-matrix';
+import { moveMatrixArray, ObjectMatrix, spliceArray } from '../object-matrix';
describe('test ObjectMatrix', () => {
const getPrimitiveObj = () => ({
@@ -90,4 +90,22 @@ describe('test ObjectMatrix', () => {
1: '111', 2: '333', 3: null,
});
});
+ it('test spliceMatrix row', () => {
+ const matrix = new ObjectMatrix(getPrimitiveObj());
+ spliceArray(1, 1, matrix.getMatrix());
+ expect(matrix.getMatrix()).toStrictEqual({
+ 1: { 1: '111', 2: '121', 3: '313' },
+ });
+ });
+
+ it('test spliceMatrix col', () => {
+ const matrix = new ObjectMatrix(getPrimitiveObj());
+ matrix.forEach((row, value) => {
+ spliceArray(1, 1, value);
+ });
+ expect(matrix.getMatrix()).toStrictEqual({
+ 1: { 1: '222', 2: '333' },
+ 2: { 1: '121', 2: '313' },
+ });
+ });
});
diff --git a/packages/core/src/shared/object-matrix.ts b/packages/core/src/shared/object-matrix.ts
index 3bdc3803ea..7c46dd8f92 100644
--- a/packages/core/src/shared/object-matrix.ts
+++ b/packages/core/src/shared/object-matrix.ts
@@ -58,52 +58,23 @@ export function insertMatrixArray<T>(
export function spliceArray<T>(
start: number,
count: number,
- o: IObjectArrayPrimitiveType<T> | IObjectMatrixPrimitiveType<T>,
- insert?: IObjectArrayPrimitiveType<T> | IObjectMatrixPrimitiveType<T>
+ o: IObjectArrayPrimitiveType<T> | IObjectMatrixPrimitiveType<T>
) {
- const end = start + count;
- const length = getArrayLength(o);
- const array = o;
- let effective = 0;
- const splice: IObjectArrayPrimitiveType<T> | IObjectMatrixPrimitiveType<T> = {};
- for (let i = start; i < end; i++) {
- const item = array[i];
- if (item !== undefined) {
- delete array[i];
- splice[effective] = item;
- effective++;
- }
- }
- const insertLength = insert ? getArrayLength(insert) : 0;
-
- const diff = start - end + insertLength;
- const last = length;
-
- if (diff > 0) {
- for (let i = last - 1; i >= end; i--) {
- const item = array[i];
- if (item !== undefined) {
- array[i + diff] = array[i];
- delete array[i];
- }
- }
- } else if (diff < 0) {
- for (let i = end; i < last; i++) {
- const item = array[i];
- if (item !== undefined) {
- array[i + diff] = array[i];
- delete array[i];
+ const length = Object.keys(o).reduce((max, key) => Math.max(max, Number.parseInt(key)), 0) + 1;
+
+ // Delete elements within the specified range
+ for (let i = start; i < length; i++) {
+ if (i < start + count) {
+ // If within deletion range, delete directly
+ delete o[i];
+ } else {
+ // If not within deletion range, move forward count positions
+ if (o[i] !== undefined) {
+ o[i - count] = o[i];
+ delete o[i];
}
}
}
-
- if (insert) {
- for (let i = 0; i < insertLength; i++) {
- array[start + i] = insert[i];
- }
- }
-
- return splice;
}
export function concatMatrixArray<T>(source: IObjectArrayPrimitiveType<T>, target: IObjectArrayPrimitiveType<T>) {
diff --git a/packages/sheets-ui/src/commands/commands/__tests__/add-worksheet-merge.command.spec.ts b/packages/sheets-ui/src/commands/commands/__tests__/add-worksheet-merge.command.spec.ts
index 1170f8099b..03c4fbb29b 100644
--- a/packages/sheets-ui/src/commands/commands/__tests__/add-worksheet-merge.command.spec.ts
+++ b/packages/sheets-ui/src/commands/commands/__tests__/add-worksheet-merge.command.spec.ts
@@ -25,11 +25,29 @@ import {
} from '@univerjs/core';
import {
AddWorksheetMergeMutation,
+ InsertColAfterCommand,
+ InsertColBeforeCommand,
+ InsertColCommand,
+ InsertColMutation,
+ InsertRowAfterCommand,
+ InsertRowBeforeCommand,
+ InsertRowCommand,
+ InsertRowMutation,
+ MergeCellController,
+ MoveColsCommand,
+ MoveColsMutation,
+ MoveRangeMutation,
NORMAL_SELECTION_PLUGIN_NAME,
+ RefRangeService,
+ RemoveColCommand,
+ RemoveColMutation,
+ RemoveRowCommand,
+ RemoveRowMutation,
RemoveWorksheetMergeCommand,
RemoveWorksheetMergeMutation,
SelectionManagerService,
SetRangeValuesMutation,
+ SetSelectionsOperation,
} from '@univerjs/sheets';
import { type IConfirmPartMethodOptions, IConfirmService } from '@univerjs/ui';
import type { IDisposable, Injector } from '@wendellhu/redi';
@@ -48,6 +66,7 @@ describe('Test add worksheet merge commands', () => {
let univer: Univer;
let get: Injector['get'];
let commandService: ICommandService;
+ let selectionManager: SelectionManagerService;
beforeEach(() => {
const testBed = createCommandTestBed(undefined, [
@@ -71,6 +90,8 @@ describe('Test add worksheet merge commands', () => {
},
},
],
+ [RefRangeService],
+ [MergeCellController],
]);
univer = testBed.univer;
@@ -86,7 +107,36 @@ describe('Test add worksheet merge commands', () => {
commandService.registerCommand(AddWorksheetMergeMutation);
commandService.registerCommand(RemoveWorksheetMergeMutation);
+ [
+ InsertRowCommand,
+ InsertRowBeforeCommand,
+ InsertRowAfterCommand,
+ InsertColAfterCommand,
+ InsertColBeforeCommand,
+ InsertColCommand,
+ RemoveRowCommand,
+ RemoveColCommand,
+ MoveColsCommand,
+
+ InsertColMutation,
+ InsertRowMutation,
+ RemoveRowMutation,
+ RemoveColMutation,
+ MoveRangeMutation,
+ MoveColsMutation,
+
+ SetSelectionsOperation,
+ ].forEach((c) => commandService.registerCommand(c));
+
get(LocaleService).load({});
+ get(MergeCellController);
+
+ selectionManager = get(SelectionManagerService);
+ selectionManager.setCurrentSelection({
+ pluginName: NORMAL_SELECTION_PLUGIN_NAME,
+ unitId: 'test',
+ sheetId: 'sheet1',
+ });
});
afterEach(() => {
@@ -281,4 +331,186 @@ describe('Test add worksheet merge commands', () => {
});
});
});
+
+ describe('with insert or remove col', () => {
+ it('will adjust the merge data when insert col and remove col', async () => {
+ selectionManager.clear();
+ selectionManager.add([
+ {
+ range: { startRow: 0, startColumn: 0, endColumn: 5, endRow: 5, rangeType: RANGE_TYPE.NORMAL },
+ primary: null,
+ style: null,
+ },
+ {
+ range: { startRow: 10, startColumn: 10, endColumn: 15, endRow: 15, rangeType: RANGE_TYPE.NORMAL },
+ primary: null,
+ style: null,
+ },
+ ]);
+ const commandService = get(ICommandService);
+ const univerInstanceService = get(IUniverInstanceService);
+ const workbook = univerInstanceService.getCurrentUniverSheetInstance();
+ const worksheet = workbook.getActiveSheet();
+ const mergeData = worksheet.getConfig().mergeData;
+ expect(mergeData.length).toBe(0);
+ expect(await commandService.executeCommand(AddWorksheetMergeAllCommand.id)).toBeTruthy();
+ expect(mergeData.length).toBe(2);
+ selectionManager.clear();
+ selectionManager.add([
+ {
+ range: {
+ startRow: 0,
+ startColumn: 7,
+ endColumn: 7,
+ endRow: worksheet.getRowCount() - 1,
+ rangeType: RANGE_TYPE.COLUMN,
+ },
+ primary: null,
+ style: null,
+ },
+ ]);
+ expect(await commandService.executeCommand(InsertColAfterCommand.id)).toBeTruthy();
+ expect(worksheet.getMergeData().length).toBe(2);
+ expect(worksheet.getMergeData()[1]).toStrictEqual({ startRow: 10, startColumn: 11, endColumn: 16, endRow: 15, rangeType: 0 });
+ selectionManager.clear();
+ selectionManager.add([
+ {
+ range: {
+ startRow: 0,
+ startColumn: 12,
+ endColumn: 13,
+ endRow: worksheet.getRowCount() - 1,
+ rangeType: RANGE_TYPE.COLUMN,
+ },
+ primary: null,
+ style: null,
+ },
+ ]);
+ expect(await commandService.executeCommand(InsertColAfterCommand.id)).toBeTruthy();
+ expect(worksheet.getMergeData().length).toBe(2);
+ expect(worksheet.getMergeData()[1]).toStrictEqual({ startRow: 10, startColumn: 11, endColumn: 18, endRow: 15, rangeType: 0 });
+
+ selectionManager.clear();
+ selectionManager.add([
+ {
+ range: {
+ startRow: 0,
+ startColumn: 7,
+ endColumn: 7,
+ endRow: worksheet.getRowCount() - 1,
+ rangeType: RANGE_TYPE.COLUMN,
+ },
+ primary: null,
+ style: null,
+ },
+ ]);
+ expect(await commandService.executeCommand(RemoveColCommand.id)).toBeTruthy();
+ expect(worksheet.getMergeData().length).toBe(2);
+ expect(worksheet.getMergeData()[1]).toStrictEqual({ startRow: 10, startColumn: 10, endColumn: 17, endRow: 15, rangeType: 0 });
+ selectionManager.clear();
+ selectionManager.add([
+ {
+ range: {
+ startRow: 0,
+ startColumn: 12,
+ endColumn: 13,
+ endRow: worksheet.getRowCount() - 1,
+ rangeType: RANGE_TYPE.COLUMN,
+ },
+ primary: null,
+ style: null,
+ },
+ ]);
+ expect(await commandService.executeCommand(RemoveColCommand.id)).toBeTruthy();
+ expect(worksheet.getMergeData().length).toBe(2);
+ expect(worksheet.getMergeData()[1]).toStrictEqual({ startRow: 10, startColumn: 10, endColumn: 15, endRow: 15, rangeType: 0 });
+ });
+ });
+
+ describe('with move col', () => {
+ it('will adjust the merge data when move col', async () => {
+ selectionManager.clear();
+ selectionManager.add([
+ {
+ range: { startRow: 0, startColumn: 0, endColumn: 5, endRow: 5, rangeType: RANGE_TYPE.NORMAL },
+ primary: null,
+ style: null,
+ },
+ {
+ range: { startRow: 10, startColumn: 10, endColumn: 15, endRow: 15, rangeType: RANGE_TYPE.NORMAL },
+ primary: null,
+ style: null,
+ },
+ ]);
+ const commandService = get(ICommandService);
+ const univerInstanceService = get(IUniverInstanceService);
+ const workbook = univerInstanceService.getCurrentUniverSheetInstance();
+ const worksheet = workbook.getActiveSheet();
+ const mergeData = worksheet.getConfig().mergeData;
+ expect(mergeData.length).toBe(0);
+ expect(await commandService.executeCommand(AddWorksheetMergeAllCommand.id)).toBeTruthy();
+ expect(mergeData.length).toBe(2);
+ selectionManager.clear();
+ selectionManager.add([{
+ primary: null,
+ style: null,
+ range: {
+ startRow: 0,
+ startColumn: 18,
+ endRow: worksheet.getRowCount() - 1,
+ endColumn: 18,
+ rangeType: 2,
+ },
+ }]);
+ expect(await commandService.executeCommand(MoveColsCommand.id, {
+ fromRange: {
+ startRow: 0,
+ startColumn: 18,
+ endRow: worksheet.getRowCount() - 1,
+ endColumn: 18,
+ rangeType: 2,
+ },
+ toRange: {
+ startRow: 0,
+ startColumn: 7,
+ endRow: worksheet.getRowCount() - 1,
+ endColumn: 7,
+ rangeType: 2,
+ },
+ })).toBeTruthy();
+ expect(worksheet.getMergeData().length).toBe(2);
+ expect(worksheet.getMergeData()[1]).toStrictEqual({ startRow: 10, startColumn: 11, endColumn: 16, endRow: 15, rangeType: 0 });
+
+ selectionManager.clear();
+ selectionManager.add([{
+ primary: null,
+ style: null,
+ range: {
+ startRow: 0,
+ startColumn: 6,
+ endRow: worksheet.getRowCount() - 1,
+ endColumn: 8,
+ rangeType: 2,
+ },
+ }]);
+ expect(await commandService.executeCommand(MoveColsCommand.id, {
+ fromRange: {
+ startRow: 0,
+ startColumn: 6,
+ endRow: worksheet.getRowCount() - 1,
+ endColumn: 8,
+ rangeType: 2,
+ },
+ toRange: {
+ startRow: 0,
+ startColumn: 17,
+ endRow: worksheet.getRowCount() - 1,
+ endColumn: 19,
+ rangeType: 2,
+ },
+ })).toBeTruthy();
+ expect(worksheet.getMergeData().length).toBe(2);
+ expect(worksheet.getMergeData()[1]).toStrictEqual({ startRow: 10, startColumn: 8, endColumn: 13, endRow: 15, rangeType: 0 });
+ });
+ });
});
diff --git a/packages/sheets/src/commands/commands/__tests__/insert-remove-rows-cols.command.spec.ts b/packages/sheets/src/commands/commands/__tests__/insert-remove-rows-cols.command.spec.ts
index 48b5fae9c2..3892937f28 100644
--- a/packages/sheets/src/commands/commands/__tests__/insert-remove-rows-cols.command.spec.ts
+++ b/packages/sheets/src/commands/commands/__tests__/insert-remove-rows-cols.command.spec.ts
@@ -59,6 +59,7 @@ describe('Test insert and remove rows cols commands', () => {
univer = testBed.univer;
get = testBed.get;
get(MergeCellController);
+
commandService = get(ICommandService);
[
diff --git a/packages/sheets/src/commands/commands/insert-row-col.command.ts b/packages/sheets/src/commands/commands/insert-row-col.command.ts
index a4621feb98..a975cbaede 100644
--- a/packages/sheets/src/commands/commands/insert-row-col.command.ts
+++ b/packages/sheets/src/commands/commands/insert-row-col.command.ts
@@ -117,7 +117,7 @@ export const InsertRowCommand: ICommand = {
if (result.result) {
undoRedoService.pushUndoRedo({
unitID: params.unitId,
- undoMutations: [...intercepted.undos, { id: RemoveRowMutation.id, params: undoRowInsertionParams }],
+ undoMutations: [{ id: RemoveRowMutation.id, params: undoRowInsertionParams }, ...intercepted.undos],
redoMutations: [{ id: InsertRowMutation.id, params: insertRowParams }, ...intercepted.redos],
});
@@ -287,6 +287,7 @@ export const InsertColCommand: ICommand<IInsertColCommandParams> = {
const result = sequenceExecute(
[
+
{ id: InsertColMutation.id, params: insertColParams },
...intercepted.redos,
followSelectionOperation(range, workbook, worksheet),
@@ -298,13 +299,16 @@ export const InsertColCommand: ICommand<IInsertColCommandParams> = {
undoRedoService.pushUndoRedo({
unitID: params.unitId,
undoMutations: [
- ...intercepted.undos,
{
id: RemoveColMutation.id,
params: undoColInsertionParams,
},
- ],
- redoMutations: [{ id: InsertColMutation.id, params: insertColParams }, ...intercepted.redos],
+ ...intercepted.undos,
+ ].filter(Boolean),
+ redoMutations: [
+ { id: InsertColMutation.id, params: insertColParams },
+ ...intercepted.redos,
+ ].filter(Boolean),
});
return true;
}
diff --git a/packages/sheets/src/commands/commands/remove-row-col.command.ts b/packages/sheets/src/commands/commands/remove-row-col.command.ts
index 57940f1ea4..6c2a2a4813 100644
--- a/packages/sheets/src/commands/commands/remove-row-col.command.ts
+++ b/packages/sheets/src/commands/commands/remove-row-col.command.ts
@@ -96,6 +96,7 @@ export const RemoveRowCommand: ICommand = {
const commandService = accessor.get(ICommandService);
const result = sequenceExecute(
[
+ ...(intercepted.preRedos ?? []),
{ id: RemoveRowMutation.id, params: removeRowsParams },
...intercepted.redos,
followSelectionOperation(range, workbook, worksheet),
@@ -106,8 +107,8 @@ export const RemoveRowCommand: ICommand = {
if (result.result) {
accessor.get(IUndoRedoService).pushUndoRedo({
unitID: unitId,
- undoMutations: [...intercepted.undos, { id: InsertRowMutation.id, params: undoRemoveRowsParams }],
- redoMutations: [{ id: RemoveRowMutation.id, params: removeRowsParams }, ...intercepted.redos],
+ undoMutations: [...(intercepted.preUndos ?? []), { id: InsertRowMutation.id, params: undoRemoveRowsParams }, ...intercepted.undos],
+ redoMutations: [...(intercepted.preRedos ?? []), { id: RemoveRowMutation.id, params: removeRowsParams }, ...intercepted.redos],
});
return true;
}
@@ -161,6 +162,7 @@ export const RemoveColCommand: ICommand = {
const commandService = accessor.get(ICommandService);
const result = sequenceExecute(
[
+ ...(intercepted.preRedos ?? []),
{ id: RemoveColMutation.id, params: removeColParams },
...intercepted.redos,
followSelectionOperation(range, workbook, worksheet),
@@ -172,8 +174,14 @@ export const RemoveColCommand: ICommand = {
const undoRedoService = accessor.get(IUndoRedoService);
undoRedoService.pushUndoRedo({
unitID: unitId,
- undoMutations: [...intercepted.undos, { id: InsertColMutation.id, params: undoRemoveColParams }],
- redoMutations: [{ id: RemoveColMutation.id, params: removeColParams }, ...intercepted.redos],
+ undoMutations: [
+ ...(intercepted.preUndos ?? []),
+ { id: InsertColMutation.id, params: undoRemoveColParams },
+ ...intercepted.undos],
+ redoMutations: [
+ ...(intercepted.preRedos ?? []),
+ { id: RemoveColMutation.id, params: removeColParams },
+ ...intercepted.redos],
});
return true;
diff --git a/packages/sheets/src/controllers/merge-cell.controller.ts b/packages/sheets/src/controllers/merge-cell.controller.ts
index 7134ab4429..a074991ba2 100644
--- a/packages/sheets/src/controllers/merge-cell.controller.ts
+++ b/packages/sheets/src/controllers/merge-cell.controller.ts
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import type { IMutationInfo, IRange, Workbook } from '@univerjs/core';
+import type { ICommandInfo, IMutationInfo, IRange, Workbook } from '@univerjs/core';
import {
Dimension,
Disposable,
@@ -28,9 +28,9 @@ import {
} from '@univerjs/core';
import { Inject, Injector } from '@wendellhu/redi';
-import type { IMoveColsCommandParams, IMoveRowsCommandParams } from '..';
import type {
IAddWorksheetMergeMutationParams,
+ IInsertColMutationParams,
IRemoveColMutationParams,
IRemoveRowsMutationParams,
IRemoveWorksheetMergeMutationParams,
@@ -66,6 +66,16 @@ import { EffectRefRangId } from '../services/ref-range/type';
import { handleMoveCols, handleMoveRows, runRefRangeMutations } from '../services/ref-range/util';
import { SelectionManagerService } from '../services/selection-manager.service';
import { SheetInterceptorService } from '../services/sheet-interceptor/sheet-interceptor.service';
+import type { IMoveRowsMutationParams } from '../commands/mutations/move-rows-cols.mutation';
+import { MoveColsMutation, MoveRowsMutation } from '../commands/mutations/move-rows-cols.mutation';
+import { InsertColMutation, InsertRowMutation } from '../commands/mutations/insert-row-col.mutation';
+import { RemoveColMutation, RemoveRowMutation } from '../commands/mutations/remove-row-col.mutation';
+import type { IMoveColsCommandParams, IMoveRowsCommandParams } from '../commands/commands/move-rows-cols.command';
+
+const mutationIdByRowCol = [InsertColMutation.id, InsertRowMutation.id, RemoveColMutation.id, RemoveRowMutation.id];
+const mutationIdArrByMove = [MoveRowsMutation.id, MoveColsMutation.id];
+
+type IMoveRowsOrColsMutationParams = IMoveRowsMutationParams;
/**
* calculates the selection based on the merged cell type
@@ -108,6 +118,7 @@ export function getAddMergeMutationRangeByType(selection: IRange[], type?: Dimen
@OnLifecycle(LifecycleStages.Steady, MergeCellController)
export class MergeCellController extends Disposable {
+ disposableCollection = new DisposableCollection();
constructor(
@Inject(ICommandService) private readonly _commandService: ICommandService,
@Inject(RefRangeService) private readonly _refRangeService: RefRangeService,
@@ -119,6 +130,7 @@ export class MergeCellController extends Disposable {
super();
this._onRefRangeChange();
this._initCommandInterceptor();
+ this._commandExecutedListener();
}
private _initCommandInterceptor() {
@@ -163,8 +175,62 @@ export class MergeCellController extends Disposable {
});
}
+ refRangeHandle(config: EffectRefRangeParams, unitId: string, subUnitId: string) {
+ switch (config.id) {
+ case EffectRefRangId.MoveColsCommandId: {
+ const params = config.params as unknown as IMoveColsCommandParams;
+ return this._handleMoveColsCommand(params, unitId, subUnitId);
+ }
+ case EffectRefRangId.MoveRowsCommandId: {
+ const params = config.params as unknown as IMoveRowsCommandParams;
+ return this._handleMoveRowsCommand(params, unitId, subUnitId);
+ }
+ case InsertRowCommand.id: {
+ const params = config.params as unknown as IInsertRowCommandParams;
+ const _unitId = params.unitId || unitId;
+ const _subUnitId = params.subUnitId || subUnitId;
+ return this._handleInsertRowCommand(params, _unitId, _subUnitId);
+ }
+ case InsertColCommand.id: {
+ const params = config.params as unknown as IInsertColCommandParams;
+ const _unitId = params.unitId || unitId;
+ const _subUnitId = params.subUnitId || subUnitId;
+ return this._handleInsertColCommand(params, _unitId, _subUnitId);
+ }
+ case RemoveColCommand.id: {
+ const params = config.params as unknown as IRemoveColMutationParams;
+ return this._handleRemoveColCommand(params, unitId, subUnitId);
+ }
+ case RemoveRowCommand.id: {
+ const params = config.params as unknown as IRemoveRowsMutationParams;
+ return this._handleRemoveRowCommand(params, unitId, subUnitId);
+ }
+
+ case MoveRangeCommand.id: {
+ const params = config.params as IMoveRangeCommandParams;
+ return this._handleMoveRangeCommand(params, unitId, subUnitId);
+ }
+ case InsertRangeMoveRightCommand.id: {
+ const params = config.params as unknown as InsertRangeMoveRightCommandParams;
+ return this._handleInsertRangeMoveRightCommand(params, unitId, subUnitId);
+ }
+ case InsertRangeMoveDownCommand.id: {
+ const params = config.params as unknown as InsertRangeMoveDownCommandParams;
+ return this._handleInsertRangeMoveDownCommand(params, unitId, subUnitId);
+ }
+ case DeleteRangeMoveUpCommand.id: {
+ const params = config.params as unknown as IDeleteRangeMoveUpCommandParams;
+ return this._handleDeleteRangeMoveUpCommand(params, unitId, subUnitId);
+ }
+ case DeleteRangeMoveLeftCommand.id: {
+ const params = config.params as unknown as IDeleteRangeMoveLeftCommandParams;
+ return this._handleDeleteRangeMoveLeftCommand(params, unitId, subUnitId);
+ }
+ }
+ return { redos: [], undos: [] };
+ }
+
private _onRefRangeChange() {
- const disposableCollection = new DisposableCollection();
const registerRefRange = (unitId: string, subUnitId: string) => {
const workbook = this._univerInstanceService.getUniverSheetInstance(unitId);
if (!workbook) {
@@ -175,64 +241,14 @@ export class MergeCellController extends Disposable {
return;
}
- disposableCollection.dispose();
+ this.disposableCollection.dispose();
const mergeData = workSheet.getMergeData();
// Handles all merged unit tasks,if multiple range effect and called only once.
const handler = (config: EffectRefRangeParams) => {
- switch (config.id) {
- case MoveRangeCommand.id: {
- const params = config.params as IMoveRangeCommandParams;
- return this._handleMoveRangeCommand(params, unitId, subUnitId);
- }
- case InsertRowCommand.id: {
- const params = config.params as unknown as IInsertRowCommandParams;
- const _unitId = params.unitId || unitId;
- const _subUnitId = params.subUnitId || subUnitId;
- return this._handleInsertRowCommand(params, _unitId, _subUnitId);
- }
- case InsertColCommand.id: {
- const params = config.params as unknown as IInsertColCommandParams;
- const _unitId = params.unitId || unitId;
- const _subUnitId = params.subUnitId || subUnitId;
- return this._handleInsertColCommand(params, _unitId, _subUnitId);
- }
- case RemoveColCommand.id: {
- const params = config.params as unknown as IRemoveColMutationParams;
- return this._handleRemoveColCommand(params, unitId, subUnitId);
- }
- case RemoveRowCommand.id: {
- const params = config.params as unknown as IRemoveRowsMutationParams;
- return this._handleRemoveRowCommand(params, unitId, subUnitId);
- }
- case InsertRangeMoveRightCommand.id: {
- const params = config.params as unknown as InsertRangeMoveRightCommandParams;
- return this._handleInsertRangeMoveRightCommand(params, unitId, subUnitId);
- }
- case InsertRangeMoveDownCommand.id: {
- const params = config.params as unknown as InsertRangeMoveDownCommandParams;
- return this._handleInsertRangeMoveDownCommand(params, unitId, subUnitId);
- }
- case DeleteRangeMoveUpCommand.id: {
- const params = config.params as unknown as IDeleteRangeMoveUpCommandParams;
- return this._handleDeleteRangeMoveUpCommand(params, unitId, subUnitId);
- }
- case DeleteRangeMoveLeftCommand.id: {
- const params = config.params as unknown as IDeleteRangeMoveLeftCommandParams;
- return this._handleDeleteRangeMoveLeftCommand(params, unitId, subUnitId);
- }
- case EffectRefRangId.MoveColsCommandId: {
- const params = config.params as unknown as IMoveColsCommandParams;
- return this._handleMoveColsCommand(params, unitId, subUnitId);
- }
- case EffectRefRangId.MoveRowsCommandId: {
- const params = config.params as unknown as IMoveRowsCommandParams;
- return this._handleMoveRowsCommand(params, unitId, subUnitId);
- }
- }
- return { redos: [], undos: [] };
+ return this.refRangeHandle(config, unitId, subUnitId);
};
mergeData.forEach((range) => {
- disposableCollection.add(this._refRangeService.registerRefRange(range, handler, unitId, subUnitId));
+ this.disposableCollection.add(this._refRangeService.registerRefRange(range, handler, unitId, subUnitId));
});
};
this.disposeWithMe(
@@ -274,13 +290,21 @@ export class MergeCellController extends Disposable {
}
const mergeData = [...worksheet.getMergeData()];
- const removeParams: IRemoveWorksheetMergeMutationParams = { unitId, subUnitId, ranges: mergeData };
+ const removeParams: IRemoveWorksheetMergeMutationParams = { unitId, subUnitId, ranges: [] };
const addParams: IAddWorksheetMergeMutationParams = { unitId, subUnitId, ranges: [] };
+ const { fromRange } = params;
+ const { startRow: sourceStart, endRow: sourceEnd } = fromRange;
mergeData.forEach((range) => {
- const operation = handleMoveRows({ id: EffectRefRangId.MoveRowsCommandId, params }, range);
- const result = runRefRangeMutations(operation, range);
- result && addParams.ranges.push(result);
+ if (sourceStart <= range.startRow && sourceEnd >= range.endRow) {
+ removeParams.ranges.push(range);
+ const operation = handleMoveRows({ id: EffectRefRangId.MoveRowsCommandId, params }, range);
+ const result = runRefRangeMutations(operation, range);
+ result && addParams.ranges.push(result);
+ }
});
+ if (removeParams.ranges.length === 0) {
+ return this._handleNull();
+ }
const removeUndo = RemoveMergeUndoMutationFactory(this._injector, removeParams);
const addUndo = AddMergeUndoMutationFactory(this._injector, addParams);
return {
@@ -312,13 +336,21 @@ export class MergeCellController extends Disposable {
}
const mergeData = [...worksheet.getMergeData()];
- const removeParams: IRemoveWorksheetMergeMutationParams = { unitId, subUnitId, ranges: mergeData };
+ const removeParams: IRemoveWorksheetMergeMutationParams = { unitId, subUnitId, ranges: [] };
const addParams: IAddWorksheetMergeMutationParams = { unitId, subUnitId, ranges: [] };
+ const { fromRange } = params;
+ const { startColumn: sourceStart, endColumn: sourceEnd } = fromRange;
mergeData.forEach((range) => {
- const operation = handleMoveCols({ id: EffectRefRangId.MoveColsCommandId, params }, range);
- const result = runRefRangeMutations(operation, range);
- result && addParams.ranges.push(result);
+ if (sourceStart <= range.startColumn && sourceEnd >= range.endColumn) {
+ removeParams.ranges.push(range);
+ const operation = handleMoveCols({ id: EffectRefRangId.MoveColsCommandId, params }, range);
+ const result = runRefRangeMutations(operation, range);
+ result && addParams.ranges.push(result);
+ }
});
+ if (removeParams.ranges.length === 0) {
+ return this._handleNull();
+ }
const removeUndo = RemoveMergeUndoMutationFactory(this._injector, removeParams);
const addUndo = AddMergeUndoMutationFactory(this._injector, addParams);
return {
@@ -432,19 +464,28 @@ export class MergeCellController extends Disposable {
}
const { range } = config;
const { startRow, endRow } = range;
- const oldMergeCells = Tools.deepClone(worksheet.getMergeData());
- const newMergeCells = Tools.deepClone(worksheet.getMergeData()).map((mergedCell: IRange) => {
- const count = endRow - startRow + 1;
- if (startRow > mergedCell.endRow) {
- return mergedCell;
+ const oldMergeCells = Tools.deepClone(worksheet.getMergeData()).reduce((mergeCellsHasLapping, cell) => {
+ if (startRow > cell.startRow && startRow <= cell.endRow) {
+ mergeCellsHasLapping.push(cell);
}
- if (startRow <= mergedCell.startRow) {
- return Rectangle.moveVertical(mergedCell, count);
- }
- mergedCell.endRow += count;
+ return mergeCellsHasLapping;
+ }, [] as IRange[]);
- return mergedCell;
- });
+ if (oldMergeCells.length === 0) {
+ return this._handleNull();
+ }
+
+ const newMergeCells = Tools.deepClone(worksheet.getMergeData()).reduce((mergeCellsHasLapping, cell) => {
+ if (startRow > cell.startRow && startRow <= cell.endRow) {
+ const count = endRow - startRow + 1;
+ cell.endRow += count;
+
+ if (this._checkIsMergeCell(cell)) {
+ mergeCellsHasLapping.push(cell);
+ }
+ }
+ return mergeCellsHasLapping;
+ }, [] as IRange[]);
const removeMergeParams: IRemoveWorksheetMergeMutationParams = {
unitId,
@@ -486,19 +527,28 @@ export class MergeCellController extends Disposable {
return this._handleNull();
}
const { startColumn, endColumn } = range;
- const oldMergeCells = Tools.deepClone(worksheet.getMergeData());
- const newMergeCells = Tools.deepClone(worksheet.getMergeData()).map((mergedCell: IRange) => {
- const count = endColumn - startColumn + 1;
- if (startColumn > mergedCell.endColumn) {
- return mergedCell;
+ const oldMergeCells = Tools.deepClone(worksheet.getMergeData()).reduce((mergeCellsHasLapping, cell) => {
+ if (startColumn > cell.startColumn && startColumn <= cell.endColumn) {
+ mergeCellsHasLapping.push(cell);
}
- if (startColumn <= mergedCell.startColumn) {
- return Rectangle.moveHorizontal(mergedCell, count);
- }
- mergedCell.endColumn += count;
+ return mergeCellsHasLapping;
+ }, [] as IRange[]);
- return mergedCell;
- });
+ if (oldMergeCells.length === 0) {
+ return this._handleNull();
+ }
+
+ const newMergeCells = Tools.deepClone(worksheet.getMergeData()).reduce((mergeCellsHasLapping, cell) => {
+ if (startColumn > cell.startColumn && startColumn <= cell.endColumn) {
+ const count = endColumn - startColumn + 1;
+ cell.endColumn += count;
+
+ if (this._checkIsMergeCell(cell)) {
+ mergeCellsHasLapping.push(cell);
+ }
+ }
+ return mergeCellsHasLapping;
+ }, [] as IRange[]);
const removeMergeParams: IRemoveWorksheetMergeMutationParams = {
unitId,
@@ -539,38 +589,42 @@ export class MergeCellController extends Disposable {
return this._handleNull();
}
const { range } = config;
- const mergeData: IRange[] = Tools.deepClone(worksheet.getMergeData());
- for (let i = 0; i < mergeData.length; i++) {
- const merge = mergeData[i];
- const { startColumn: mergeStartColumn, endColumn: mergeEndColumn } = merge;
- const mergedCellColumnCount = mergeEndColumn - mergeStartColumn + 1;
- const { startColumn, endColumn } = range;
- const count = endColumn - startColumn + 1;
- if (endColumn < merge.startColumn) {
- merge.startColumn -= count;
- merge.endColumn -= count;
- } else if (startColumn > merge.endColumn) {
- continue;
- } else if (startColumn <= merge.startColumn && endColumn >= merge.endColumn) {
- mergeData.splice(i, 1);
- i--;
- } else {
- const intersects = Rectangle.getIntersects(range, merge)!;
- const interLength = intersects.endColumn - intersects.startColumn + 1;
- const isSimpleRow = intersects.endRow - intersects.startRow === 0;
-
- if (interLength === mergedCellColumnCount - 1 && isSimpleRow) {
- mergeData.splice(i, 1);
- i--;
- } else {
- merge.endColumn -= intersects.endColumn - intersects.startColumn + 1;
- }
+ const { startColumn, endColumn } = range;
+
+ const oldMergeCells = Tools.deepClone(worksheet.getMergeData()).reduce((mergeCellsHasLapping, cell) => {
+ if (Rectangle.intersects(range, cell)) {
+ mergeCellsHasLapping.push(cell);
}
+ return mergeCellsHasLapping;
+ }, [] as IRange[]);
+
+ if (oldMergeCells.length === 0) {
+ return this._handleNull();
}
+
+ const newMergeCells = Tools.deepClone(worksheet.getMergeData()).reduce((mergeCellsHasLapping, cell) => {
+ if (Rectangle.intersects(range, cell)) {
+ if (startColumn <= cell.startColumn && endColumn >= cell.endColumn) {
+ return mergeCellsHasLapping;
+ } else if (startColumn >= cell.startColumn && endColumn <= cell.endColumn) {
+ cell.endColumn -= endColumn - startColumn + 1;
+ } else if (startColumn < cell.startColumn) {
+ cell.startColumn = startColumn;
+ cell.endColumn -= endColumn - startColumn + 1;
+ } else if (endColumn > cell.endColumn) {
+ cell.endColumn = startColumn - 1;
+ }
+ if (this._checkIsMergeCell(cell)) {
+ mergeCellsHasLapping.push(cell);
+ }
+ }
+ return mergeCellsHasLapping;
+ }, [] as IRange[]);
+
const removeMergeMutationParams: IRemoveWorksheetMergeMutationParams = {
unitId,
subUnitId,
- ranges: Tools.deepClone(worksheet.getMergeData()),
+ ranges: oldMergeCells,
};
const undoRemoveMergeMutationParams: IAddWorksheetMergeMutationParams = RemoveMergeUndoMutationFactory(
this._injector,
@@ -579,21 +633,18 @@ export class MergeCellController extends Disposable {
const addMergeMutationParams: IAddWorksheetMergeMutationParams = {
unitId,
subUnitId,
- ranges: mergeData,
+ ranges: newMergeCells,
};
const undoAddMergeParams: IRemoveWorksheetMergeMutationParams = AddMergeUndoMutationFactory(
this._injector,
addMergeMutationParams
);
- const redos = [
- { id: RemoveWorksheetMergeMutation.id, params: removeMergeMutationParams },
- { id: AddWorksheetMergeMutation.id, params: addMergeMutationParams },
- ];
- const undos = [
- { id: RemoveWorksheetMergeMutation.id, params: undoAddMergeParams },
- { id: AddWorksheetMergeMutation.id, params: undoRemoveMergeMutationParams },
- ];
- return { redos, undos };
+
+ const preRedos = [{ id: RemoveWorksheetMergeMutation.id, params: removeMergeMutationParams }];
+ const redos = [{ id: AddWorksheetMergeMutation.id, params: addMergeMutationParams }];
+ const preUndos = [{ id: RemoveWorksheetMergeMutation.id, params: undoAddMergeParams }];
+ const undos = [{ id: AddWorksheetMergeMutation.id, params: undoRemoveMergeMutationParams }];
+ return { preUndos, undos, preRedos, redos };
}
private _handleRemoveRowCommand(config: IRemoveRowsMutationParams, unitId: string, subUnitId: string) {
@@ -606,37 +657,43 @@ export class MergeCellController extends Disposable {
if (!worksheet) {
return this._handleNull();
}
- const mergeData: IRange[] = Tools.deepClone(worksheet.getMergeData());
- for (let i = 0; i < mergeData.length; i++) {
- const merge = mergeData[i];
- const { startRow: mergeStartRow, endRow: mergeEndRow } = merge;
- const mergedCellRowCount = mergeEndRow - mergeStartRow + 1;
- const { startRow, endRow } = range;
- const count = endRow - startRow + 1;
- if (endRow < mergeStartRow) {
- merge.startRow -= count;
- merge.endRow -= count;
- } else if (startRow > mergeEndRow) {
- continue;
- } else if (startRow <= mergeStartRow && endRow >= mergeEndRow) {
- mergeData.splice(i, 1);
- i--;
- } else {
- const intersects = Rectangle.getIntersects(range, merge)!;
- const interLength = intersects.endRow - intersects.startRow + 1;
- const isSimpleCol = intersects.endColumn - intersects.startColumn === 0;
- if (interLength === mergedCellRowCount - 1 && isSimpleCol) {
- mergeData.splice(i, 1);
- i--;
- } else {
- merge.endRow -= intersects.endRow - intersects.startRow + 1;
- }
+
+ const { startRow, endRow } = range;
+
+ const oldMergeCells = Tools.deepClone(worksheet.getMergeData()).reduce((mergeCellsHasLapping, cell) => {
+ if (Rectangle.intersects(range, cell)) {
+ mergeCellsHasLapping.push(cell);
}
+ return mergeCellsHasLapping;
+ }, [] as IRange[]);
+
+ if (oldMergeCells.length === 0) {
+ return this._handleNull();
}
+
+ const newMergeCells = Tools.deepClone(worksheet.getMergeData()).reduce((mergeCellsHasLapping, cell) => {
+ if (Rectangle.intersects(range, cell)) {
+ if (startRow <= cell.startRow && endRow >= cell.endRow) {
+ return mergeCellsHasLapping;
+ } else if (startRow >= cell.startRow && endRow <= cell.endRow) {
+ cell.endRow -= endRow - startRow + 1;
+ } else if (startRow < cell.startRow) {
+ cell.startRow = startRow;
+ cell.endRow -= endRow - startRow + 1;
+ } else if (endRow > cell.endRow) {
+ cell.endRow = startRow - 1;
+ }
+ if (this._checkIsMergeCell(cell)) {
+ mergeCellsHasLapping.push(cell);
+ }
+ }
+ return mergeCellsHasLapping;
+ }, [] as IRange[]);
+
const removeMergeMutationParams: IRemoveWorksheetMergeMutationParams = {
unitId,
subUnitId,
- ranges: Tools.deepClone(worksheet.getMergeData()),
+ ranges: oldMergeCells,
};
const undoRemoveMergeMutationParams: IAddWorksheetMergeMutationParams = RemoveMergeUndoMutationFactory(
this._injector,
@@ -645,21 +702,18 @@ export class MergeCellController extends Disposable {
const addMergeMutationParams: IAddWorksheetMergeMutationParams = {
unitId,
subUnitId,
- ranges: mergeData,
+ ranges: newMergeCells,
};
const undoAddMergeParams: IRemoveWorksheetMergeMutationParams = AddMergeUndoMutationFactory(
this._injector,
addMergeMutationParams
);
- const redos = [
- { id: RemoveWorksheetMergeMutation.id, params: removeMergeMutationParams },
- { id: AddWorksheetMergeMutation.id, params: addMergeMutationParams },
- ];
- const undos = [
- { id: RemoveWorksheetMergeMutation.id, params: undoAddMergeParams },
- { id: AddWorksheetMergeMutation.id, params: undoRemoveMergeMutationParams },
- ];
- return { redos, undos };
+
+ const preRedos = [{ id: RemoveWorksheetMergeMutation.id, params: removeMergeMutationParams }];
+ const redos = [{ id: AddWorksheetMergeMutation.id, params: addMergeMutationParams }];
+ const preUndos = [{ id: RemoveWorksheetMergeMutation.id, params: undoAddMergeParams }];
+ const undos = [{ id: AddWorksheetMergeMutation.id, params: undoRemoveMergeMutationParams }];
+ return { preUndos, undos, preRedos, redos };
}
private _handleInsertRangeMoveRightCommand(
@@ -985,9 +1039,139 @@ export class MergeCellController extends Disposable {
};
}
+ private _checkIsMergeCell(cell: IRange) {
+ return !(cell.startRow === cell.endRow && cell.startColumn === cell.endColumn);
+ }
+
private _handleNull() {
return { redos: [], undos: [] };
}
+
+ private _commandExecutedListener() {
+ this.disposeWithMe(this._commandService.onCommandExecuted((command: ICommandInfo) => {
+ // 1. MoveRowsOrColsMutation
+ if (mutationIdArrByMove.includes(command.id)) {
+ if (!command.params) return;
+ const workbook = this._univerInstanceService.getUniverSheetInstance((command.params as IMoveRowsMutationParams).unitId);
+ if (!workbook) return;
+ const worksheet = workbook.getSheetBySheetId((command.params as IMoveRowsMutationParams).subUnitId);
+ if (!worksheet) return;
+ const { sourceRange, targetRange } = command.params as IMoveRowsOrColsMutationParams;
+ const isRowMove = sourceRange.startColumn === targetRange.startColumn && sourceRange.endColumn === targetRange.endColumn;
+ const moveLength = isRowMove
+ ? sourceRange.endRow - sourceRange.startRow + 1
+ : sourceRange.endColumn - sourceRange.startColumn + 1;
+ const sourceStart = isRowMove ? sourceRange.startRow : sourceRange.startColumn;
+ const targetStart = isRowMove ? targetRange.startRow : targetRange.startColumn;
+ const mergeData = worksheet.getConfig().mergeData;
+
+ const adjustedMergedCells: IRange[] = [];
+ mergeData.forEach((merge) => {
+ let { startRow, endRow, startColumn, endColumn, rangeType } = merge;
+
+ if (!Rectangle.intersects(merge, sourceRange)) {
+ if (isRowMove) {
+ if (sourceStart < startRow && targetStart > endRow) {
+ startRow -= moveLength;
+ endRow -= moveLength;
+ } else if (sourceStart > endRow && targetStart <= startRow) {
+ startRow += moveLength;
+ endRow += moveLength;
+ }
+ } else {
+ if (sourceStart < startColumn && targetStart > endColumn) {
+ startColumn -= moveLength;
+ endColumn -= moveLength;
+ } else if (sourceStart > endColumn && targetStart <= startColumn) {
+ startColumn += moveLength;
+ endColumn += moveLength;
+ }
+ }
+ }
+
+ if (!(merge.startRow === merge.endRow && merge.startColumn === merge.endColumn)) {
+ adjustedMergedCells.push({ startRow, endRow, startColumn, endColumn, rangeType });
+ }
+ });
+ worksheet.getConfig().mergeData = adjustedMergedCells;
+
+ this.disposableCollection.dispose();
+ const { unitId, subUnitId } = command.params as IMoveRowsMutationParams;
+ const handler = (config: EffectRefRangeParams) => {
+ return this.refRangeHandle(config, unitId, subUnitId);
+ };
+ adjustedMergedCells.forEach((range) => {
+ this.disposableCollection.add(this._refRangeService.registerRefRange(range, handler, unitId, subUnitId));
+ });
+ }
+
+ // 2. InsertRowsOrCols / RemoveRowsOrCols Mutations
+ if (mutationIdByRowCol.includes(command.id)) {
+ const workbook = this._univerInstanceService.getUniverSheetInstance((command.params as IInsertColMutationParams).unitId);
+ if (!workbook) return;
+ const worksheet = workbook.getSheetBySheetId((command.params as IInsertColMutationParams).subUnitId);
+ if (!worksheet) return;
+
+ const mergeData = worksheet.getConfig().mergeData;
+ const params = command.params as IInsertRowCommandParams;
+ if (!params) return;
+ const { range } = params;
+
+ const isRowOperation = command.id.includes('row');
+ const isAddOperation = command.id.includes('insert');
+
+ const operationStart = isRowOperation ? range.startRow : range.startColumn;
+ const operationEnd = isRowOperation ? range.endRow : range.endColumn;
+ const operationCount = operationEnd - operationStart + 1;
+ const adjustedMergedCells: IRange[] = [];
+
+ mergeData.forEach((merge) => {
+ let { startRow, endRow, startColumn, endColumn, rangeType } = merge;
+
+ if (isAddOperation) {
+ if (isRowOperation) {
+ if (operationStart <= startRow) {
+ startRow += operationCount;
+ endRow += operationCount;
+ }
+ } else {
+ if (operationStart <= startColumn) {
+ startColumn += operationCount;
+ endColumn += operationCount;
+ }
+ }
+ } else {
+ if (isRowOperation) {
+ if (operationEnd < startRow) {
+ startRow -= operationCount;
+ endRow -= operationCount;
+ }
+ } else {
+ if (operationEnd < startColumn) {
+ startColumn -= operationCount;
+ endColumn -= operationCount;
+ }
+ }
+ }
+
+ if (!(merge.startRow === merge.endRow && merge.startColumn === merge.endColumn)) {
+ adjustedMergedCells.push({ startRow, endRow, startColumn, endColumn, rangeType });
+ }
+ });
+
+ worksheet.getConfig().mergeData = adjustedMergedCells;
+
+ this.disposableCollection.dispose();
+ const { unitId, subUnitId } = command.params as IMoveRowsMutationParams;
+ const handler = (config: EffectRefRangeParams) => {
+ return this.refRangeHandle(config, unitId, subUnitId);
+ };
+ adjustedMergedCells.forEach((range) => {
+ this.disposableCollection.add(this._refRangeService.registerRefRange(range, handler, unitId, subUnitId));
+ });
+ }
+ }));
+ }
}
function getWorkbook(univerInstanceService: IUniverInstanceService, unitId?: string) {
diff --git a/packages/sheets/src/services/ref-range/ref-range.service.ts b/packages/sheets/src/services/ref-range/ref-range.service.ts
index a598ff2c76..c10623e16f 100644
--- a/packages/sheets/src/services/ref-range/ref-range.service.ts
+++ b/packages/sheets/src/services/ref-range/ref-range.service.ts
@@ -36,6 +36,8 @@ import { EffectRefRangId } from './type';
type RefRangCallback = (params: EffectRefRangeParams) => {
redos: IMutationInfo[];
undos: IMutationInfo[];
+ preRedos?: IMutationInfo[];
+ preUndos?: IMutationInfo[];
};
const MERGE_REDO = createInterceptorKey<IMutationInfo[], null>('MERGE_REDO');
const MERGE_UNDO = createInterceptorKey<IMutationInfo[], null>('MERGE_UNDO');
@@ -182,30 +184,42 @@ export class RefRangeService extends Disposable {
result.push(v);
return result;
},
- [] as Array<{ redos: IMutationInfo[]; undos: IMutationInfo[] }>
+ [] as Array<{ redos: IMutationInfo[]; undos: IMutationInfo[]; preUndos?: IMutationInfo[]; preRedos?: IMutationInfo[] }>
)
.reduce(
(result, currentValue) => {
result.redos.push(...currentValue.redos);
result.undos.push(...currentValue.undos);
+ result.preRedos!.push(...(currentValue.preRedos ?? []));
+ result.preUndos!.push(...(currentValue.preUndos ?? []));
return result;
},
- { redos: [], undos: [] }
+ { redos: [], undos: [], preUndos: [], preRedos: [] }
);
+ const preRedos = this.interceptor.fetchThroughInterceptors(this.interceptor.getInterceptPoints().MERGE_REDO)(
+ result.preRedos,
+ null
+ ) || [];
+
const redos =
this.interceptor.fetchThroughInterceptors(this.interceptor.getInterceptPoints().MERGE_REDO)(
result.redos,
null
) || [];
+ const preUndos = this.interceptor.fetchThroughInterceptors(this.interceptor.getInterceptPoints().MERGE_UNDO)(
+ result.preUndos,
+ null
+ ) || [];
+
const undos =
this.interceptor.fetchThroughInterceptors(this.interceptor.getInterceptPoints().MERGE_UNDO)(
result.undos,
null
) || [];
- return { redos, undos };
+ return { redos, undos, preRedos, preUndos };
},
});
};
diff --git a/packages/sheets/src/services/sheet-interceptor/sheet-interceptor.service.ts b/packages/sheets/src/services/sheet-interceptor/sheet-interceptor.service.ts
index 59ba8d2f63..3a5ecdf371 100644
--- a/packages/sheets/src/services/sheet-interceptor/sheet-interceptor.service.ts
+++ b/packages/sheets/src/services/sheet-interceptor/sheet-interceptor.service.ts
@@ -18,7 +18,7 @@ import type {
ICellData,
ICommandInfo,
IInterceptor,
- IUndoRedoCommandInfos,
+ IUndoRedoCommandInfosByInterceptor,
Nullable,
Workbook,
Worksheet,
@@ -39,7 +39,7 @@ import { INTERCEPTOR_POINT } from './interceptor-const';
export interface ICommandInterceptor {
priority?: number;
- getMutations(command: ICommandInfo): IUndoRedoCommandInfos;
+ getMutations(command: ICommandInfo): IUndoRedoCommandInfosByInterceptor;
}
/**
@@ -118,11 +118,13 @@ export class SheetInterceptorService extends Disposable {
* @param command
* @returns
*/
- onCommandExecute(command: ICommandInfo): IUndoRedoCommandInfos {
+ onCommandExecute(command: ICommandInfo): IUndoRedoCommandInfosByInterceptor {
const infos = this._commandInterceptors.map((i) => i.getMutations(command));
return {
+ preUndos: infos.map((i) => i.preUndos ?? []).flat(),
undos: infos.map((i) => i.undos).flat(),
+ preRedos: infos.map((i) => i.preRedos ?? []).flat(),
redos: infos.map((i) => i.redos).flat(),
};
}