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.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
fix(sheets): normalize and validate freeze data (#7542)
wpxp1234567b9b8fb0efcf
diff --git a/packages/core/src/sheets/sheet-snapshot-utils.ts b/packages/core/src/sheets/sheet-snapshot-utils.tsindex 17e1a3dcb9..235b21e84b 100644--- a/packages/core/src/sheets/sheet-snapshot-utils.ts+++ b/packages/core/src/sheets/sheet-snapshot-utils.ts@@ -88,5 +88,11 @@ export function mergeWorksheetSnapshotWithDefault(snapshot: Partial<IWorksheetDa}});+ const freeze = snapshot.freeze!;+ freeze.xSplit = freeze.xSplit ?? defaultSnapshot.freeze.xSplit;+ freeze.ySplit = freeze.ySplit ?? defaultSnapshot.freeze.ySplit;+ freeze.startRow = freeze.ySplit === 0 ? defaultSnapshot.freeze.startRow : (freeze.startRow ?? defaultSnapshot.freeze.startRow);+ freeze.startColumn = freeze.xSplit === 0 ? defaultSnapshot.freeze.startColumn : (freeze.startColumn ?? defaultSnapshot.freeze.startColumn);+return snapshot as IWorksheetData;}diff --git a/packages/sheets/src/commands/commands/__tests__/set-frozen.command.spec.ts b/packages/sheets/src/commands/commands/__tests__/set-frozen.command.spec.tsindex e6bf587875..6ff8d7968c 100644--- a/packages/sheets/src/commands/commands/__tests__/set-frozen.command.spec.ts+++ b/packages/sheets/src/commands/commands/__tests__/set-frozen.command.spec.ts@@ -158,6 +158,20 @@ describe('Test set frozen commands', () => {})).toBeFalsy();});++ it('should reject incomplete freeze params without changing the worksheet', async () => {+ const workbook = get(IUniverInstanceService).getCurrentUnitOfType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;+ const worksheet = workbook.getActiveSheet()!;+ const originFreeze = worksheet.getFreeze();+ const params = {+ startRow: 1,+ startColumn: 0,+ xSplit: 0,+ };++ expect(await commandService.executeCommand(SetFrozenCommand.id, params)).toBeFalsy();+ expect(worksheet.getFreeze()).toEqual(originFreeze);+ });});});});diff --git a/packages/sheets/src/commands/commands/set-frozen.command.ts b/packages/sheets/src/commands/commands/set-frozen.command.tsindex 22cf80b989..214f438e20 100644--- a/packages/sheets/src/commands/commands/set-frozen.command.ts+++ b/packages/sheets/src/commands/commands/set-frozen.command.ts@@ -44,6 +44,12 @@ export const SetFrozenCommand: ICommand = {const { startColumn, startRow, xSplit, ySplit } = params;if (+ !Number.isInteger(startRow) ||+ !Number.isInteger(startColumn) ||+ !Number.isInteger(xSplit) ||+ !Number.isInteger(ySplit) ||+ xSplit < 0 ||+ ySplit < 0 ||startRow >= worksheet.getRowCount() ||startColumn >= worksheet.getColumnCount() ||xSplit >= worksheet.getColumnCount() ||