@univerjs/sheets-formula 1.0.0-alpha.7 → 1.0.0-alpha.8

package/lib/cjs/facade.js

@@ -1,38 +1,10 @@
 let _univerjs_core = require("@univerjs/core");
-let _univerjs_core_facade = require("@univerjs/core/facade");
 let _univerjs_engine_formula = require("@univerjs/engine-formula");
-let _univerjs_formula = require("@univerjs/formula");
-require("@univerjs/formula/facade");
 let _univerjs_engine_formula_facade = require("@univerjs/engine-formula/facade");
 let _univerjs_sheets_formula = require("@univerjs/sheets-formula");
+let _univerjs_core_facade = require("@univerjs/core/facade");
 let _univerjs_sheets_facade = require("@univerjs/sheets/facade");
 
-//#region src/facade/f-univer.ts
-/**
-* @ignore
-*/
-var FUniverSheetsFormulaMixin = class extends _univerjs_core_facade.FUniver {
-	/**
-	* Initialize the FUniver instance.
-	* @ignore
-	*/
-	_initialize() {
-		this._debouncedFormulaCalculation = (0, _univerjs_core.debounce)(() => {
-			this._commandService.executeCommand(_univerjs_engine_formula.SetTriggerFormulaCalculationStartMutation.id, {
-				commands: [],
-				forceCalculation: true
-			}, { onlyLocal: true });
-		}, 10);
-	}
-	registerFunction(config) {
-		const functionsDisposable = this._injector.get(_univerjs_formula.IRegisterFunctionService).registerFunctions(config);
-		this._debouncedFormulaCalculation();
-		return functionsDisposable;
-	}
-};
-_univerjs_core_facade.FUniver.extend(FUniverSheetsFormulaMixin);
-
-//#endregion
 //#region src/facade/f-formula.ts
 var FFormulaSheetsMixin = class extends _univerjs_engine_formula_facade.FFormula {
 	/**
@@ -61,7 +33,7 @@ var FFormulaSheetsMixin = class extends _univerjs_engine_formula_facade.FFormula
 	}
 	registerFunction(name, func, options) {
 		var _options$description;
-		const registerFunctionService = this._injector.get(_univerjs_formula.IRegisterFunctionService);
+		const registerFunctionService = this._injector.get(_univerjs_engine_formula.IRegisterFunctionService);
 		const params = {
 			name,
 			func,
@@ -74,7 +46,7 @@ var FFormulaSheetsMixin = class extends _univerjs_engine_formula_facade.FFormula
 	}
 	registerAsyncFunction(name, func, options) {
 		var _options$description2;
-		const registerFunctionService = this._injector.get(_univerjs_formula.IRegisterFunctionService);
+		const registerFunctionService = this._injector.get(_univerjs_engine_formula.IRegisterFunctionService);
 		const params = {
 			name,
 			func,

package/lib/cjs/index.js

@@ -4,7 +4,6 @@ let _univerjs_sheets = require("@univerjs/sheets");
 let _univerjs_engine_formula = require("@univerjs/engine-formula");
 let _univerjs_docs = require("@univerjs/docs");
 let rxjs = require("rxjs");
-let _univerjs_formula = require("@univerjs/formula");
 let _univerjs_rpc = require("@univerjs/rpc");
 
 //#region src/commands/commands/insert-function.command.ts
@@ -30,7 +29,7 @@ const InsertFunctionCommand = {
 			const { primary, formula } = item;
 			cellMatrix.setValue(primary.row, primary.column, { f: formula });
 		});
-		const setRangeValuesParams = { value: cellMatrix.getData() };
+		const setRangeValuesParams = { value: cellMatrix.clone() };
 		return commandService.executeCommand(_univerjs_sheets.SetRangeValuesCommand.id, setRangeValuesParams);
 	}
 };
@@ -155,7 +154,7 @@ const PLUGIN_CONFIG_KEY_MOBILE = "sheets-formula.mobile.config";
 const configSymbolMobile = Symbol(PLUGIN_CONFIG_KEY_MOBILE);
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -163,7 +162,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorate.js
 function __decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -277,7 +276,7 @@ function getDataLength(copyDataPiece) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -288,7 +287,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -301,14 +300,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -502,7 +501,7 @@ let TriggerCalculationController = class TriggerCalculationController extends _u
 		this._totalCalculationTaskCount = 0;
 		this._emitProgress();
 	}
-	constructor(_commandService, _univerInstanceService, _logService, _configService, _formulaDataModel, _localeService, _registerOtherFormulaService) {
+	constructor(_commandService, _univerInstanceService, _logService, _configService, _formulaDataModel, _localeService) {
 		super();
 		this._commandService = _commandService;
 		this._univerInstanceService = _univerInstanceService;
@@ -510,7 +509,6 @@ let TriggerCalculationController = class TriggerCalculationController extends _u
 		this._configService = _configService;
 		this._formulaDataModel = _formulaDataModel;
 		this._localeService = _localeService;
-		this._registerOtherFormulaService = _registerOtherFormulaService;
 		_defineProperty(this, "_startExecutionTime", 0);
 		_defineProperty(this, "_totalCalculationTaskCount", 0);
 		_defineProperty(this, "_doneCalculationTaskCount", 0);
@@ -620,9 +618,10 @@ let TriggerCalculationController = class TriggerCalculationController extends _u
 	}
 	_initialExecuteFormula() {
 		const calculationMode = this._getCalculationMode();
-		const params = this._getDirtyDataByCalculationMode(calculationMode);
-		this._commandService.executeCommand(_univerjs_engine_formula.SetTriggerFormulaCalculationStartMutation.id, params, lo);
-		this._registerOtherFormulaService.calculateStarted$.next(true);
+		if (calculationMode !== 2) {
+			const params = this._getDirtyDataByCalculationMode(calculationMode);
+			this._commandService.executeCommand(_univerjs_engine_formula.SetTriggerFormulaCalculationStartMutation.id, params, lo);
+		}
 	}
 	_getDirtyDataByCalculationMode(calculationMode) {
 		return {
@@ -643,8 +642,7 @@ TriggerCalculationController = __decorate([
 	__decorateParam(2, _univerjs_core.ILogService),
 	__decorateParam(3, _univerjs_core.IConfigService),
 	__decorateParam(4, (0, _univerjs_core.Inject)(_univerjs_engine_formula.FormulaDataModel)),
-	__decorateParam(5, (0, _univerjs_core.Inject)(_univerjs_core.LocaleService)),
-	__decorateParam(6, (0, _univerjs_core.Inject)(_univerjs_engine_formula.RegisterOtherFormulaService))
+	__decorateParam(5, (0, _univerjs_core.Inject)(_univerjs_core.LocaleService))
 ], TriggerCalculationController);
 
 //#endregion
@@ -658,7 +656,7 @@ function collectUnitQualifierFormulaPatches(workbook, oldName, newName) {
 			const formula = (0, _univerjs_engine_formula.refactorFormulaUnitQualifier)(cell.f, oldName, newName);
 			if (formula !== cell.f) updates.setValue(row, column, { f: formula });
 		});
-		const cellValue = updates.getData();
+		const cellValue = updates.clone();
 		return Object.keys(cellValue).length > 0 ? [{
 			unitId,
 			subUnitId: sheet.getSheetId(),
@@ -707,7 +705,7 @@ let UnitQualifierRenameController = class UnitQualifierRenameController extends
 					id: _univerjs_sheets.SetRangeValuesMutation.id,
 					params: {
 						...patch,
-						cellValue: undoCellValue.getData()
+						cellValue: undoCellValue.clone()
 					}
 				});
 			}
@@ -1575,7 +1573,7 @@ function getReferenceMoveParams(workbook, command) {
 			result = handleRefRemoveRow(command, workbook);
 			break;
 		case _univerjs_sheets.RemoveColCommand.id:
-			result = handleRefRemoveCol(command, workbook);
+			result = handleRefRemoveCol(command);
 			break;
 		case _univerjs_sheets.DeleteRangeMoveUpCommand.id:
 			result = handleRefDeleteRangeMoveUp(command, workbook);
@@ -1753,8 +1751,7 @@ function handleRefRemoveRow(command, workbook) {
 	var _workbook$getSheetByS3, _workbook$getSheetByS4;
 	const { params } = command;
 	if (!params) return null;
-	const { range } = params;
-	const { unitId, sheetId } = getCurrentSheetInfo(workbook);
+	const { range, unitId, subUnitId: sheetId } = params;
 	return {
 		type: 5,
 		range,
@@ -1763,11 +1760,10 @@ function handleRefRemoveRow(command, workbook) {
 		rangeFilteredRows: (_workbook$getSheetByS3 = (_workbook$getSheetByS4 = workbook.getSheetBySheetId(sheetId)) === null || _workbook$getSheetByS4 === void 0 ? void 0 : _workbook$getSheetByS4.getRangeFilterRows(range)) !== null && _workbook$getSheetByS3 !== void 0 ? _workbook$getSheetByS3 : []
 	};
 }
-function handleRefRemoveCol(command, workbook) {
+function handleRefRemoveCol(command) {
 	const { params } = command;
 	if (!params) return null;
-	const { range } = params;
-	const { unitId, sheetId } = getCurrentSheetInfo(workbook);
+	const { range, unitId, subUnitId: sheetId } = params;
 	return {
 		type: 6,
 		range,
@@ -1931,7 +1927,7 @@ let UpdateDefinedNameController = class UpdateDefinedNameController extends _uni
 			};
 			if (result.type === 12) {
 				var _this$_univerInstance;
-				result.oldUnitName = (_this$_univerInstance = this._univerInstanceService.getUnit(result.unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET)) === null || _this$_univerInstance === void 0 ? void 0 : _this$_univerInstance.getName();
+				result.oldUnitName = (_this$_univerInstance = this._univerInstanceService.getUnit(result.unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET)) === null || _this$_univerInstance === void 0 ? void 0 : _this$_univerInstance.name;
 			}
 			return this._getUpdateDefinedNameMutations(workbook, result);
 		} }));
@@ -2350,7 +2346,7 @@ let UpdateFormulaController = class UpdateFormulaController extends _univerjs_co
 					const newSequenceNodes = updateRefOffset(sequenceNodes, refChangeIds, x, y);
 					newFormulaDataItem.setValue(row, column, { f: `=${(0, _univerjs_engine_formula.generateStringWithSequence)(newSequenceNodes)}` });
 				});
-				if (newFormulaData[unitId]) newFormulaData[unitId][sheetId] = newFormulaDataItem.getData();
+				if (newFormulaData[unitId]) newFormulaData[unitId][sheetId] = newFormulaDataItem.clone();
 			}
 		}
 		if (inCrossSheetCutRangeNewFormulas.length > 0 && targetUnitId && targetSheetId) {
@@ -2426,7 +2422,7 @@ function tableReferenceContainsColumn(columnStruct, columnNames) {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-formula";
-var version = "1.0.0-alpha.7";
+var version = "1.0.0-alpha.8";
 
 //#endregion
 //#region src/common/plugin-name.ts
@@ -2582,12 +2578,6 @@ let ActiveDirtyController = class ActiveDirtyController extends _univerjs_core.D
 		});
 	}
 	_initialSheet() {
-		this._activeDirtyManagerService.register(_univerjs_engine_formula.SetTriggerFormulaCalculationStartMutation.id, {
-			commandId: _univerjs_engine_formula.SetTriggerFormulaCalculationStartMutation.id,
-			getDirtyData: (command) => {
-				return { ...command.params };
-			}
-		});
 		this._activeDirtyManagerService.register(_univerjs_sheets.RemoveSheetMutation.id, {
 			commandId: _univerjs_sheets.RemoveSheetMutation.id,
 			getDirtyData: (command) => {
@@ -2646,8 +2636,8 @@ let ActiveDirtyController = class ActiveDirtyController extends _univerjs_core.D
 	_getMoveRowsMutationDirtyRange(params) {
 		const { subUnitId: sheetId, unitId, sourceRange, targetRange } = params;
 		const dirtyRanges = [];
-		const sourceMatrix = this._rangeToMatrix(sourceRange).getData();
-		const targetMatrix = this._rangeToMatrix(targetRange).getData();
+		const sourceMatrix = this._rangeToMatrix(sourceRange).clone();
+		const targetMatrix = this._rangeToMatrix(targetRange).clone();
 		dirtyRanges.push(...this._getDirtyRangesByCellValue(unitId, sheetId, sourceMatrix));
 		dirtyRanges.push(...this._getDirtyRangesByCellValue(unitId, sheetId, targetMatrix));
 		dirtyRanges.push(...this._getDirtyRangesForArrayFormula(unitId, sheetId, targetMatrix));
@@ -2655,7 +2645,7 @@ let ActiveDirtyController = class ActiveDirtyController extends _univerjs_core.D
 	}
 	_getReorderRangeMutationDirtyRange(params) {
 		const { unitId, subUnitId: sheetId, range } = params;
-		const matrix = this._rangeToMatrix(range).getData();
+		const matrix = this._rangeToMatrix(range).clone();
 		const dirtyRanges = [];
 		dirtyRanges.push(...this._getDirtyRangesByCellValue(unitId, sheetId, matrix));
 		dirtyRanges.push(...this._getDirtyRangesForArrayFormula(unitId, sheetId, matrix));
@@ -2664,7 +2654,7 @@ let ActiveDirtyController = class ActiveDirtyController extends _univerjs_core.D
 	_getRemoveRowOrColumnMutation(params, isRow = true) {
 		const { subUnitId: sheetId, unitId, range } = params;
 		const dirtyRanges = [];
-		const workbook = this._univerInstanceService.getUniverSheetInstance(unitId);
+		const workbook = this._univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 		const worksheet = workbook === null || workbook === void 0 ? void 0 : workbook.getSheetBySheetId(sheetId);
 		const rowCount = (worksheet === null || worksheet === void 0 ? void 0 : worksheet.getRowCount()) || 0;
 		const columnCount = (worksheet === null || worksheet === void 0 ? void 0 : worksheet.getColumnCount()) || 0;
@@ -2682,7 +2672,7 @@ let ActiveDirtyController = class ActiveDirtyController extends _univerjs_core.D
 			endRow: rowCount,
 			endColumn
 		});
-		const matrixData = matrix.getData();
+		const matrixData = matrix.clone();
 		dirtyRanges.push(...this._getDirtyRangesByCellValue(unitId, sheetId, matrixData));
 		dirtyRanges.push(...this._getDirtyRangesForArrayFormula(unitId, sheetId, matrixData));
 		return dirtyRanges;
@@ -2967,7 +2957,7 @@ let DefinedNameController = class DefinedNameController extends _univerjs_core.D
 	}
 };
 DefinedNameController = __decorate([
-	__decorateParam(0, _univerjs_formula.IDescriptionService),
+	__decorateParam(0, _univerjs_engine_formula.IDescriptionService),
 	__decorateParam(1, _univerjs_engine_formula.IDefinedNamesService),
 	__decorateParam(2, _univerjs_core.IUniverInstanceService),
 	__decorateParam(3, _univerjs_core.ICommandService)
@@ -2994,11 +2984,7 @@ let FormulaController = class FormulaController extends _univerjs_core.Disposabl
 	constructor(_commandService) {
 		super();
 		this._commandService = _commandService;
-		[
-			InsertFunctionCommand,
-			QuickSumCommand,
-			_univerjs_engine_formula.OtherFormulaMarkDirty
-		].forEach((c) => this._commandService.registerCommand(c));
+		[InsertFunctionCommand, QuickSumCommand].forEach((c) => this._commandService.registerCommand(c));
 	}
 };
 FormulaController = __decorate([__decorateParam(0, _univerjs_core.ICommandService)], FormulaController);
@@ -3026,11 +3012,11 @@ let SheetFormulaCalculationResultApplyController = class SheetFormulaCalculation
 		this._commandService = _commandService;
 		this._sessionService = _sessionService;
 		this.disposeWithMe(this._commandService.onCommandExecuted((command, options) => {
-			if (command.id === _univerjs_sheets.SetRangeValuesMutation.id && (options === null || options === void 0 ? void 0 : options.applyFormulaCalculationResult)) this._sessionService.markResultApplied(_univerjs_formula.FormulaResultApplicationType.SHEET);
+			if (command.id === _univerjs_sheets.SetRangeValuesMutation.id && (options === null || options === void 0 ? void 0 : options.applyFormulaCalculationResult)) this._sessionService.markResultApplied(_univerjs_engine_formula.FormulaResultApplicationType.SHEET);
 		}));
 	}
 };
-SheetFormulaCalculationResultApplyController = __decorate([__decorateParam(0, _univerjs_core.ICommandService), __decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_formula.FormulaCalculationSessionService))], SheetFormulaCalculationResultApplyController);
+SheetFormulaCalculationResultApplyController = __decorate([__decorateParam(0, _univerjs_core.ICommandService), __decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_engine_formula.FormulaCalculationSessionService))], SheetFormulaCalculationResultApplyController);
 
 //#endregion
 //#region src/controllers/super-table.controller.ts
@@ -3153,7 +3139,7 @@ let SuperTableController = class SuperTableController extends _univerjs_core.Dis
 	}
 };
 SuperTableController = __decorate([
-	__decorateParam(0, _univerjs_formula.IDescriptionService),
+	__decorateParam(0, _univerjs_engine_formula.IDescriptionService),
 	__decorateParam(1, _univerjs_core.IUniverInstanceService),
 	__decorateParam(2, _univerjs_core.ICommandService),
 	__decorateParam(3, _univerjs_engine_formula.ISuperTableService)
@@ -3537,7 +3523,7 @@ let UniverSheetsFormulaPlugin = class UniverSheetsFormulaPlugin extends _univerj
 			dependencies.push([IRemoteRegisterFunctionService, { useFactory: () => (0, _univerjs_rpc.toModule)(rpcChannelService.requestChannel(RemoteRegisterFunctionServiceName)) }]);
 		}
 		dependencies.forEach((dependency) => j.add(dependency));
-		if ((_this$_config$descrip = this._config.description) === null || _this$_config$descrip === void 0 ? void 0 : _this$_config$descrip.length) this.disposeWithMe(j.get(_univerjs_formula.IDescriptionService).registerDescriptions(this._config.description));
+		if ((_this$_config$descrip = this._config.description) === null || _this$_config$descrip === void 0 ? void 0 : _this$_config$descrip.length) this.disposeWithMe(j.get(_univerjs_engine_formula.IDescriptionService).registerDescriptions(this._config.description));
 	}
 	onReady() {
 		(0, _univerjs_core.touchDependencies)(this._injector, [
@@ -3563,7 +3549,7 @@ _defineProperty(UniverSheetsFormulaPlugin, "packageName", name);
 _defineProperty(UniverSheetsFormulaPlugin, "version", version);
 _defineProperty(UniverSheetsFormulaPlugin, "type", _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 UniverSheetsFormulaPlugin = __decorate([
-	(0, _univerjs_core.DependentOn)(_univerjs_formula.UniverFormulaPlugin, _univerjs_sheets.UniverSheetsPlugin),
+	(0, _univerjs_core.DependentOn)(_univerjs_engine_formula.UniverFormulaEnginePlugin, _univerjs_sheets.UniverSheetsPlugin),
 	__decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_core.Injector)),
 	__decorateParam(2, _univerjs_core.IConfigService)
 ], UniverSheetsFormulaPlugin);

package/lib/es/facade.js

@@ -1,38 +1,10 @@
 import { IConfigService, ILogService, LifecycleService, LifecycleStages, debounce } from "@univerjs/core";
-import { FEnum, FUniver } from "@univerjs/core/facade";
-import { FormulaDataModel, SetTriggerFormulaCalculationStartMutation, extractFormulaError } from "@univerjs/engine-formula";
-import { IRegisterFunctionService } from "@univerjs/formula";
-import "@univerjs/formula/facade";
+import { FormulaDataModel, IRegisterFunctionService, SetTriggerFormulaCalculationStartMutation, extractFormulaError } from "@univerjs/engine-formula";
 import { FFormula } from "@univerjs/engine-formula/facade";
 import { CalculationMode, PLUGIN_CONFIG_KEY_BASE } from "@univerjs/sheets-formula";
+import { FEnum } from "@univerjs/core/facade";
 import { FRange, FWorkbook } from "@univerjs/sheets/facade";
 
-//#region src/facade/f-univer.ts
-/**
-* @ignore
-*/
-var FUniverSheetsFormulaMixin = class extends FUniver {
-	/**
-	* Initialize the FUniver instance.
-	* @ignore
-	*/
-	_initialize() {
-		this._debouncedFormulaCalculation = debounce(() => {
-			this._commandService.executeCommand(SetTriggerFormulaCalculationStartMutation.id, {
-				commands: [],
-				forceCalculation: true
-			}, { onlyLocal: true });
-		}, 10);
-	}
-	registerFunction(config) {
-		const functionsDisposable = this._injector.get(IRegisterFunctionService).registerFunctions(config);
-		this._debouncedFormulaCalculation();
-		return functionsDisposable;
-	}
-};
-FUniver.extend(FUniverSheetsFormulaMixin);
-
-//#endregion
 //#region src/facade/f-formula.ts
 var FFormulaSheetsMixin = class extends FFormula {
 	/**

package/lib/es/index.js

@@ -1,9 +1,8 @@
 import { AbsoluteRefType, BooleanNumber, BuildTextUtils, CellValueType, CommandType, DependentOn, Direction, Disposable, DisposableCollection, DrawingTypeEnum, ICommandService, IConfigService, ILogService, IUndoRedoService, IUniverInstanceService, ImageSourceType, Inject, Injector, InterceptorEffectEnum, LocaleService, ObjectMatrix, Plugin, PositionedObjectLayoutType, RANGE_TYPE, Rectangle, Tools, UniverInstanceType, WrapTextType, cellToRange, createDocumentModelWithStyle, createIdentifier, generateRandomId, getIntersectRange, isFormulaId, isFormulaString, isNodeEnv, isRealNum, merge, moveRangeByOffset, sequenceExecute, sequenceExecuteAsync, toDisposable, touchDependencies } from "@univerjs/core";
 import { AUTO_FILL_APPLY_TYPE, AUTO_FILL_DATA_TYPE, ClearSelectionFormatCommand, DeleteRangeMoveLeftCommand, DeleteRangeMoveUpCommand, EffectRefRangId, IAutoFillService, INTERCEPTOR_POINT, InsertColCommand, InsertColMutation, InsertRangeMoveDownCommand, InsertRangeMoveRightCommand, InsertRowCommand, InsertRowMutation, InsertSheetMutation, InterceptCellContentPriority, MoveColsCommand, MoveColsMutation, MoveRangeCommand, MoveRangeMutation, MoveRowsCommand, MoveRowsMutation, RefRangeService, RemoveColCommand, RemoveColMutation, RemoveDefinedNameCommand, RemoveRowCommand, RemoveRowMutation, RemoveSheetCommand, RemoveSheetMutation, ReorderRangeMutation, SCOPE_WORKBOOK_VALUE_DEFINED_NAME, SetBorderCommand, SetDefinedNameCommand, SetRangeCustomMetadataCommand, SetRangeValuesCommand, SetRangeValuesMutation, SetRowHiddenMutation, SetRowVisibleMutation, SetSelectionsOperation, SetStyleCommand, SetWorkbookNameCommand, SetWorksheetActiveOperation, SetWorksheetNameCommand, SheetInterceptorService, SheetsSelectionsService, UniverSheetsPlugin, alignToMergedCellsBorders, expandToContinuousRange, findFirstNonEmptyCell, getSeparateEffectedRangesOnCommand, getSheetCommandTarget, handleCommonDefaultRangeChangeWithEffectRefCommands, handleDefaultRangeChangeWithEffectRefCommands, handleDeleteRangeMoveLeft, handleDeleteRangeMoveUp, handleIRemoveCol, handleIRemoveRow, handleInsertCol, handleInsertRangeMoveDown, handleInsertRangeMoveRight, handleInsertRow, handleMoveCols, handleMoveRange, handleMoveRows, runRefRangeMutations } from "@univerjs/sheets";
-import { AstTreeBuilder, ENGINE_FORMULA_CYCLE_REFERENCE_COUNT, ENGINE_FORMULA_RETURN_DEPENDENCY_TREE, ErrorType, FormulaDataModel, FormulaExecuteStageType, FormulaExecutedStateType, FunctionType, IActiveDirtyManagerService, IDefinedNamesService, IFormulaCurrentConfigService, IFunctionService, ISuperTableService, Interpreter, Lexer, LexerTreeBuilder, OtherFormulaMarkDirty, RegisterOtherFormulaService, RemoveDefinedNameMutation, RemoveSuperTableMutation, SetArrayFormulaDataMutation, SetDefinedNameMutation, SetFormulaCalculationNotificationMutation, SetFormulaCalculationStartMutation, SetFormulaCalculationStopMutation, SetFormulaDataMutation, SetFormulaStringBatchCalculationMutation, SetImageFormulaDataMutation, SetSuperTableMutation, SetTriggerFormulaCalculationStartMutation, UniverFormulaEnginePlugin, deserializeRangeWithSheetWithCache, generateExecuteAstNodeData, generateStringWithSequence, getObjectValue, initSheetFormulaData, refactorFormulaUnitQualifier, sequenceNodeType, serializeRange, serializeRangeToRefString, serializeRangeWithSheet, serializeRangeWithSpreadsheet, splitTableStructuredRef, stripErrorMargin } from "@univerjs/engine-formula";
+import { AstTreeBuilder, ENGINE_FORMULA_CYCLE_REFERENCE_COUNT, ENGINE_FORMULA_RETURN_DEPENDENCY_TREE, ErrorType, FormulaCalculationSessionService, FormulaDataModel, FormulaExecuteStageType, FormulaExecutedStateType, FormulaResultApplicationType, FunctionType, IActiveDirtyManagerService, IDefinedNamesService, IDescriptionService, IFormulaCurrentConfigService, IFunctionService, ISuperTableService, Interpreter, Lexer, LexerTreeBuilder, RemoveDefinedNameMutation, RemoveSuperTableMutation, SetArrayFormulaDataMutation, SetDefinedNameMutation, SetFormulaCalculationNotificationMutation, SetFormulaCalculationStartMutation, SetFormulaCalculationStopMutation, SetFormulaDataMutation, SetFormulaStringBatchCalculationMutation, SetImageFormulaDataMutation, SetSuperTableMutation, SetTriggerFormulaCalculationStartMutation, UniverFormulaEnginePlugin, deserializeRangeWithSheetWithCache, generateExecuteAstNodeData, generateStringWithSequence, getObjectValue, initSheetFormulaData, refactorFormulaUnitQualifier, sequenceNodeType, serializeRange, serializeRangeToRefString, serializeRangeWithSheet, serializeRangeWithSpreadsheet, splitTableStructuredRef, stripErrorMargin } from "@univerjs/engine-formula";
 import { buildDocTransform } from "@univerjs/docs";
 import { BehaviorSubject, map } from "rxjs";
-import { FormulaCalculationSessionService, FormulaResultApplicationType, IDescriptionService, UniverFormulaPlugin } from "@univerjs/formula";
 import { IRPCChannelService, fromModule, toModule } from "@univerjs/rpc";
 
 //#region src/commands/commands/insert-function.command.ts
@@ -29,7 +28,7 @@ const InsertFunctionCommand = {
 			const { primary, formula } = item;
 			cellMatrix.setValue(primary.row, primary.column, { f: formula });
 		});
-		const setRangeValuesParams = { value: cellMatrix.getData() };
+		const setRangeValuesParams = { value: cellMatrix.clone() };
 		return commandService.executeCommand(SetRangeValuesCommand.id, setRangeValuesParams);
 	}
 };
@@ -154,7 +153,7 @@ const PLUGIN_CONFIG_KEY_MOBILE = "sheets-formula.mobile.config";
 const configSymbolMobile = Symbol(PLUGIN_CONFIG_KEY_MOBILE);
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -162,7 +161,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorate.js
 function __decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -276,7 +275,7 @@ function getDataLength(copyDataPiece) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -287,7 +286,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -300,14 +299,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -501,7 +500,7 @@ let TriggerCalculationController = class TriggerCalculationController extends Di
 		this._totalCalculationTaskCount = 0;
 		this._emitProgress();
 	}
-	constructor(_commandService, _univerInstanceService, _logService, _configService, _formulaDataModel, _localeService, _registerOtherFormulaService) {
+	constructor(_commandService, _univerInstanceService, _logService, _configService, _formulaDataModel, _localeService) {
 		super();
 		this._commandService = _commandService;
 		this._univerInstanceService = _univerInstanceService;
@@ -509,7 +508,6 @@ let TriggerCalculationController = class TriggerCalculationController extends Di
 		this._configService = _configService;
 		this._formulaDataModel = _formulaDataModel;
 		this._localeService = _localeService;
-		this._registerOtherFormulaService = _registerOtherFormulaService;
 		_defineProperty(this, "_startExecutionTime", 0);
 		_defineProperty(this, "_totalCalculationTaskCount", 0);
 		_defineProperty(this, "_doneCalculationTaskCount", 0);
@@ -619,9 +617,10 @@ let TriggerCalculationController = class TriggerCalculationController extends Di
 	}
 	_initialExecuteFormula() {
 		const calculationMode = this._getCalculationMode();
-		const params = this._getDirtyDataByCalculationMode(calculationMode);
-		this._commandService.executeCommand(SetTriggerFormulaCalculationStartMutation.id, params, lo);
-		this._registerOtherFormulaService.calculateStarted$.next(true);
+		if (calculationMode !== 2) {
+			const params = this._getDirtyDataByCalculationMode(calculationMode);
+			this._commandService.executeCommand(SetTriggerFormulaCalculationStartMutation.id, params, lo);
+		}
 	}
 	_getDirtyDataByCalculationMode(calculationMode) {
 		return {
@@ -642,8 +641,7 @@ TriggerCalculationController = __decorate([
 	__decorateParam(2, ILogService),
 	__decorateParam(3, IConfigService),
 	__decorateParam(4, Inject(FormulaDataModel)),
-	__decorateParam(5, Inject(LocaleService)),
-	__decorateParam(6, Inject(RegisterOtherFormulaService))
+	__decorateParam(5, Inject(LocaleService))
 ], TriggerCalculationController);
 
 //#endregion
@@ -657,7 +655,7 @@ function collectUnitQualifierFormulaPatches(workbook, oldName, newName) {
 			const formula = refactorFormulaUnitQualifier(cell.f, oldName, newName);
 			if (formula !== cell.f) updates.setValue(row, column, { f: formula });
 		});
-		const cellValue = updates.getData();
+		const cellValue = updates.clone();
 		return Object.keys(cellValue).length > 0 ? [{
 			unitId,
 			subUnitId: sheet.getSheetId(),
@@ -706,7 +704,7 @@ let UnitQualifierRenameController = class UnitQualifierRenameController extends
 					id: SetRangeValuesMutation.id,
 					params: {
 						...patch,
-						cellValue: undoCellValue.getData()
+						cellValue: undoCellValue.clone()
 					}
 				});
 			}
@@ -1574,7 +1572,7 @@ function getReferenceMoveParams(workbook, command) {
 			result = handleRefRemoveRow(command, workbook);
 			break;
 		case RemoveColCommand.id:
-			result = handleRefRemoveCol(command, workbook);
+			result = handleRefRemoveCol(command);
 			break;
 		case DeleteRangeMoveUpCommand.id:
 			result = handleRefDeleteRangeMoveUp(command, workbook);
@@ -1752,8 +1750,7 @@ function handleRefRemoveRow(command, workbook) {
 	var _workbook$getSheetByS3, _workbook$getSheetByS4;
 	const { params } = command;
 	if (!params) return null;
-	const { range } = params;
-	const { unitId, sheetId } = getCurrentSheetInfo(workbook);
+	const { range, unitId, subUnitId: sheetId } = params;
 	return {
 		type: 5,
 		range,
@@ -1762,11 +1759,10 @@ function handleRefRemoveRow(command, workbook) {
 		rangeFilteredRows: (_workbook$getSheetByS3 = (_workbook$getSheetByS4 = workbook.getSheetBySheetId(sheetId)) === null || _workbook$getSheetByS4 === void 0 ? void 0 : _workbook$getSheetByS4.getRangeFilterRows(range)) !== null && _workbook$getSheetByS3 !== void 0 ? _workbook$getSheetByS3 : []
 	};
 }
-function handleRefRemoveCol(command, workbook) {
+function handleRefRemoveCol(command) {
 	const { params } = command;
 	if (!params) return null;
-	const { range } = params;
-	const { unitId, sheetId } = getCurrentSheetInfo(workbook);
+	const { range, unitId, subUnitId: sheetId } = params;
 	return {
 		type: 6,
 		range,
@@ -1930,7 +1926,7 @@ let UpdateDefinedNameController = class UpdateDefinedNameController extends Disp
 			};
 			if (result.type === 12) {
 				var _this$_univerInstance;
-				result.oldUnitName = (_this$_univerInstance = this._univerInstanceService.getUnit(result.unitId, UniverInstanceType.UNIVER_SHEET)) === null || _this$_univerInstance === void 0 ? void 0 : _this$_univerInstance.getName();
+				result.oldUnitName = (_this$_univerInstance = this._univerInstanceService.getUnit(result.unitId, UniverInstanceType.UNIVER_SHEET)) === null || _this$_univerInstance === void 0 ? void 0 : _this$_univerInstance.name;
 			}
 			return this._getUpdateDefinedNameMutations(workbook, result);
 		} }));
@@ -2349,7 +2345,7 @@ let UpdateFormulaController = class UpdateFormulaController extends Disposable {
 					const newSequenceNodes = updateRefOffset(sequenceNodes, refChangeIds, x, y);
 					newFormulaDataItem.setValue(row, column, { f: `=${generateStringWithSequence(newSequenceNodes)}` });
 				});
-				if (newFormulaData[unitId]) newFormulaData[unitId][sheetId] = newFormulaDataItem.getData();
+				if (newFormulaData[unitId]) newFormulaData[unitId][sheetId] = newFormulaDataItem.clone();
 			}
 		}
 		if (inCrossSheetCutRangeNewFormulas.length > 0 && targetUnitId && targetSheetId) {
@@ -2425,7 +2421,7 @@ function tableReferenceContainsColumn(columnStruct, columnNames) {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-formula";
-var version = "1.0.0-alpha.7";
+var version = "1.0.0-alpha.8";
 
 //#endregion
 //#region src/common/plugin-name.ts
@@ -2581,12 +2577,6 @@ let ActiveDirtyController = class ActiveDirtyController extends Disposable {
 		});
 	}
 	_initialSheet() {
-		this._activeDirtyManagerService.register(SetTriggerFormulaCalculationStartMutation.id, {
-			commandId: SetTriggerFormulaCalculationStartMutation.id,
-			getDirtyData: (command) => {
-				return { ...command.params };
-			}
-		});
 		this._activeDirtyManagerService.register(RemoveSheetMutation.id, {
 			commandId: RemoveSheetMutation.id,
 			getDirtyData: (command) => {
@@ -2645,8 +2635,8 @@ let ActiveDirtyController = class ActiveDirtyController extends Disposable {
 	_getMoveRowsMutationDirtyRange(params) {
 		const { subUnitId: sheetId, unitId, sourceRange, targetRange } = params;
 		const dirtyRanges = [];
-		const sourceMatrix = this._rangeToMatrix(sourceRange).getData();
-		const targetMatrix = this._rangeToMatrix(targetRange).getData();
+		const sourceMatrix = this._rangeToMatrix(sourceRange).clone();
+		const targetMatrix = this._rangeToMatrix(targetRange).clone();
 		dirtyRanges.push(...this._getDirtyRangesByCellValue(unitId, sheetId, sourceMatrix));
 		dirtyRanges.push(...this._getDirtyRangesByCellValue(unitId, sheetId, targetMatrix));
 		dirtyRanges.push(...this._getDirtyRangesForArrayFormula(unitId, sheetId, targetMatrix));
@@ -2654,7 +2644,7 @@ let ActiveDirtyController = class ActiveDirtyController extends Disposable {
 	}
 	_getReorderRangeMutationDirtyRange(params) {
 		const { unitId, subUnitId: sheetId, range } = params;
-		const matrix = this._rangeToMatrix(range).getData();
+		const matrix = this._rangeToMatrix(range).clone();
 		const dirtyRanges = [];
 		dirtyRanges.push(...this._getDirtyRangesByCellValue(unitId, sheetId, matrix));
 		dirtyRanges.push(...this._getDirtyRangesForArrayFormula(unitId, sheetId, matrix));
@@ -2663,7 +2653,7 @@ let ActiveDirtyController = class ActiveDirtyController extends Disposable {
 	_getRemoveRowOrColumnMutation(params, isRow = true) {
 		const { subUnitId: sheetId, unitId, range } = params;
 		const dirtyRanges = [];
-		const workbook = this._univerInstanceService.getUniverSheetInstance(unitId);
+		const workbook = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET);
 		const worksheet = workbook === null || workbook === void 0 ? void 0 : workbook.getSheetBySheetId(sheetId);
 		const rowCount = (worksheet === null || worksheet === void 0 ? void 0 : worksheet.getRowCount()) || 0;
 		const columnCount = (worksheet === null || worksheet === void 0 ? void 0 : worksheet.getColumnCount()) || 0;
@@ -2681,7 +2671,7 @@ let ActiveDirtyController = class ActiveDirtyController extends Disposable {
 			endRow: rowCount,
 			endColumn
 		});
-		const matrixData = matrix.getData();
+		const matrixData = matrix.clone();
 		dirtyRanges.push(...this._getDirtyRangesByCellValue(unitId, sheetId, matrixData));
 		dirtyRanges.push(...this._getDirtyRangesForArrayFormula(unitId, sheetId, matrixData));
 		return dirtyRanges;
@@ -2993,11 +2983,7 @@ let FormulaController = class FormulaController extends Disposable {
 	constructor(_commandService) {
 		super();
 		this._commandService = _commandService;
-		[
-			InsertFunctionCommand,
-			QuickSumCommand,
-			OtherFormulaMarkDirty
-		].forEach((c) => this._commandService.registerCommand(c));
+		[InsertFunctionCommand, QuickSumCommand].forEach((c) => this._commandService.registerCommand(c));
 	}
 };
 FormulaController = __decorate([__decorateParam(0, ICommandService)], FormulaController);
@@ -3562,7 +3548,7 @@ _defineProperty(UniverSheetsFormulaPlugin, "packageName", name);
 _defineProperty(UniverSheetsFormulaPlugin, "version", version);
 _defineProperty(UniverSheetsFormulaPlugin, "type", UniverInstanceType.UNIVER_SHEET);
 UniverSheetsFormulaPlugin = __decorate([
-	DependentOn(UniverFormulaPlugin, UniverSheetsPlugin),
+	DependentOn(UniverFormulaEnginePlugin, UniverSheetsPlugin),
 	__decorateParam(1, Inject(Injector)),
 	__decorateParam(2, IConfigService)
 ], UniverSheetsFormulaPlugin);