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.

fix(embed): preserve sheet editing and calculation state (#7504)

Univerfe5cc4d07bcb
diff --git a/packages/sheets-formula/src/controllers/__tests__/update-formula.controller.spec.ts b/packages/sheets-formula/src/controllers/__tests__/update-formula.controller.spec.ts
index 56cb241bb4..8bba271d22 100644
--- a/packages/sheets-formula/src/controllers/__tests__/update-formula.controller.spec.ts
+++ b/packages/sheets-formula/src/controllers/__tests__/update-formula.controller.spec.ts
@@ -84,12 +84,16 @@ function createWorkbookData(): IWorkbookData {
};
}
-function createControllerTestBed() {
+function createControllerTestBed(initialFormulaComputing?: CalculationMode) {
const dependencies: Dependency[] = [
[UpdateFormulaController],
];
- return createFacadeTestBed(createWorkbookData(), dependencies);
+ const testBed = createFacadeTestBed(createWorkbookData(), dependencies);
+ if (initialFormulaComputing != null) {
+ testBed.injector.get(IConfigService).setConfig(PLUGIN_CONFIG_KEY_BASE, { initialFormulaComputing });
+ }
+ return testBed;
}
describe('UpdateFormulaController', () => {
@@ -134,6 +138,26 @@ describe('UpdateFormulaController', () => {
testBed?.univer.dispose();
});
+ it('does not schedule workbook-added calculation in no-calculation mode', () => {
+ testBed.univer.dispose();
+ testBed = createControllerTestBed(CalculationMode.NO_CALCULATION);
+ commandService = testBed.injector.get(ICommandService);
+ commandService.registerCommand(SetFormulaDataMutation);
+ const executeCommand = vi.spyOn(commandService, 'executeCommand');
+
+ testBed.injector.get(UpdateFormulaController);
+ testBed.injector.get(IUniverInstanceService).createUnit(UniverInstanceType.UNIVER_SHEET, {
+ ...createWorkbookData(),
+ id: 'second',
+ });
+
+ expect(executeCommand).not.toHaveBeenCalledWith(
+ SetTriggerFormulaCalculationStartMutation.id,
+ expect.anything(),
+ expect.anything()
+ );
+ });
+
it('should update formula references when a referenced range moves', async () => {
expect(await commandService.executeCommand(MoveRangeCommand.id, {
fromRange: {
diff --git a/packages/sheets-formula/src/controllers/update-formula.controller.ts b/packages/sheets-formula/src/controllers/update-formula.controller.ts
index feb05bd848..8316256ac5 100644
--- a/packages/sheets-formula/src/controllers/update-formula.controller.ts
+++ b/packages/sheets-formula/src/controllers/update-formula.controller.ts
@@ -279,6 +279,7 @@ export class UpdateFormulaController extends Disposable {
const config = this._configService.getConfig<IUniverSheetsFormulaBaseConfig>(PLUGIN_CONFIG_KEY_BASE);
const calculationMode = config?.initialFormulaComputing ?? CalculationMode.WHEN_EMPTY;
+ if (calculationMode === CalculationMode.NO_CALCULATION) return;
const params = this._getDirtyDataByCalculationMode(calculationMode);
this._commandService.executeCommand(SetTriggerFormulaCalculationStartMutation.id, params, { onlyLocal: true });
diff --git a/packages/sheets-ui/src/controllers/permission/__tests__/sheet-permission-check-ui.controller.spec.ts b/packages/sheets-ui/src/controllers/permission/__tests__/sheet-permission-check-ui.controller.spec.ts
index 52c4cb346e..ec65b558c2 100644
--- a/packages/sheets-ui/src/controllers/permission/__tests__/sheet-permission-check-ui.controller.spec.ts
+++ b/packages/sheets-ui/src/controllers/permission/__tests__/sheet-permission-check-ui.controller.spec.ts
@@ -25,6 +25,7 @@ import { IMEInputCommand } from '@univerjs/docs-ui';
import { EMPTY } from 'rxjs';
import { describe, expect, it, vi } from 'vitest';
import { SheetCopyCommand, SheetCutCommand, SheetPasteCommand } from '../../../commands/commands/clipboard.command';
+import { SetCellEditVisibleOperation } from '../../../commands/operations/cell-edit.operation';
import { SheetPermissionCheckUIController } from '../sheet-permission-check-ui.controller';
type ControllerConstructorArgs = ConstructorParameters<typeof SheetPermissionCheckUIController>;
@@ -83,6 +84,18 @@ describe('SheetPermissionCheckUIController', () => {
controller.dispose();
});
+ it('checks the workbook identified by a cell editor visibility operation', () => {
+ const { controller, executeBefore, permissionCheckWithoutRange } = createController();
+
+ executeBefore({
+ id: SetCellEditVisibleOperation.id,
+ params: { visible: true, unitId: 'embedded-sheet' },
+ });
+
+ expect(permissionCheckWithoutRange).toHaveBeenCalledWith(expect.any(Object), 'embedded-sheet');
+ controller.dispose();
+ });
+
it.each([
[InsertTextCommand.id, DOCS_NORMAL_EDITOR_UNIT_ID_KEY],
[IMEInputCommand.id, DOCS_NORMAL_EDITOR_UNIT_ID_KEY],
diff --git a/packages/sheets-ui/src/controllers/permission/sheet-permission-check-ui.controller.ts b/packages/sheets-ui/src/controllers/permission/sheet-permission-check-ui.controller.ts
index 02adb14f57..1820d98c90 100644
--- a/packages/sheets-ui/src/controllers/permission/sheet-permission-check-ui.controller.ts
+++ b/packages/sheets-ui/src/controllers/permission/sheet-permission-check-ui.controller.ts
@@ -138,7 +138,7 @@ export class SheetPermissionCheckUIController extends Disposable {
workbookTypes: [WorkbookEditablePermission],
worksheetTypes: [WorksheetSetCellValuePermission, WorksheetEditPermission],
rangeTypes: [RangeProtectionPermissionEditPoint],
- });
+ }, params.unitId);
errorMsg = this._localeService.t<LocaleKey>('sheets-ui.permission.dialog.editErr');
break;
case ApplyFormatPainterCommand.id: