@univerjs/engine-formula 1.0.0-beta.0 → 1.0.0-beta.2

package/lib/cjs/index.js

@@ -1477,7 +1477,8 @@ const TABLE_NAME_REGEX = "((?![~!@#$%^&*()+<>?:,./;’，。、‘：“《》
 const TABLE_TITLE_REGEX = "\\[#.+\\]\\s*?,\\s*?";
 const TABLE_CONTENT_REGEX = "\\[[^#]*#?\\]";
 const TABLE_MULTIPLE_COLUMN_REGEX = `${TABLE_CONTENT_REGEX}${RANGE_SYMBOL}${TABLE_CONTENT_REGEX}`;
-const TABLE_UNIT_QUALIFIER_REGEX = `(?:(?:${UNIT_NAME_REGEX}|'(?:[^']|'')+'|[^\\s!\\[\\]]+)!)?(?:${UNIT_NAME_REGEX})?`;
+const TABLE_BRACKETED_UNIT_QUALIFIER_REGEX = "\\[(?:[^\\]]|\\]\\])+\\]";
+const TABLE_UNIT_QUALIFIER_REGEX = `(?:(?:${TABLE_BRACKETED_UNIT_QUALIFIER_REGEX}|'(?:[^']|'')+'|[^\\s!\\[\\]]+)!)?(?:${TABLE_BRACKETED_UNIT_QUALIFIER_REGEX})?`;
 const REFERENCE_TABLE_ALL_COLUMN_REGEX = `^${TABLE_UNIT_QUALIFIER_REGEX}${TABLE_NAME_REGEX}$`;
 const REFERENCE_TABLE_SINGLE_COLUMN_REGEX = `^${TABLE_UNIT_QUALIFIER_REGEX}${TABLE_NAME_REGEX}(${TABLE_CONTENT_REGEX}|\\[${TABLE_TITLE_REGEX}${TABLE_CONTENT_REGEX}\\])+$`;
 const REFERENCE_TABLE_MULTIPLE_COLUMN_REGEX = `^${TABLE_UNIT_QUALIFIER_REGEX}${TABLE_NAME_REGEX}(\\[${TABLE_MULTIPLE_COLUMN_REGEX}\\])?$|^${TABLE_UNIT_QUALIFIER_REGEX}${TABLE_NAME_REGEX}(\\[${TABLE_TITLE_REGEX}${TABLE_MULTIPLE_COLUMN_REGEX}\\])?$`;
@@ -1934,8 +1935,13 @@ function splitTableStructuredRef(ref) {
 			}
 			quoteOpen = !quoteOpen;
 		} else if (!quoteOpen && char === "[") bracketDepth++;
-		else if (!quoteOpen && char === "]") bracketDepth--;
-		else if (!quoteOpen && bracketDepth === 0 && char === "!") {
+		else if (!quoteOpen && char === "]") {
+			if (bracketDepth > 0 && tableRef[i + 1] === "]") {
+				i++;
+				continue;
+			}
+			bracketDepth--;
+		} else if (!quoteOpen && bracketDepth === 0 && char === "!") {
 			qualifierEnd = i;
 			break;
 		}
@@ -1943,8 +1949,10 @@ function splitTableStructuredRef(ref) {
 	if (qualifierEnd >= 0) {
 		unitQualifier = tableRef.slice(0, qualifierEnd).trim();
 		tableRef = tableRef.slice(qualifierEnd + 1);
-		if (unitQualifier.startsWith("'") && unitQualifier.endsWith("'")) unitQualifier = unitQualifier.slice(1, -1);
-		if (unitQualifier.startsWith("[") && unitQualifier.endsWith("]")) unitQualifier = unitQualifier.slice(1, -1);
+		const isQuotedQualifier = unitQualifier.startsWith("'") && unitQualifier.endsWith("'");
+		const isBracketedQualifier = !isQuotedQualifier && unitQualifier.startsWith("[") && unitQualifier.endsWith("]");
+		if (isQuotedQualifier) unitQualifier = unitQualifier.slice(1, -1);
+		else if (isBracketedQualifier) unitQualifier = unitQualifier.slice(1, -1).replaceAll("]]", "]");
 		unitQualifier = unquoteSheetName(unitQualifier);
 	} else if (tableRef.startsWith("[")) {
 		const legacyQualifierEnd = tableRef.indexOf("]");
@@ -5022,12 +5030,14 @@ let FormulaDataModel = class FormulaDataModel extends _univerjs_core.Disposable
 		super();
 		this._univerInstanceService = _univerInstanceService;
 		this._lexerTreeBuilder = _lexerTreeBuilder;
+		_defineProperty(this, "_formulaIdMapData", {});
 		_defineProperty(this, "_arrayFormulaRange", {});
 		_defineProperty(this, "_arrayFormulaCellData", {});
 		_defineProperty(this, "_unitImageFormulaData", {});
 	}
 	dispose() {
 		super.dispose();
+		this._formulaIdMapData = {};
 		this._arrayFormulaRange = {};
 		this._arrayFormulaCellData = {};
 		this._unitImageFormulaData = {};
@@ -5099,7 +5109,7 @@ let FormulaDataModel = class FormulaDataModel extends _univerjs_core.Disposable
 				const cellMatrix = worksheet.getCellMatrix();
 				const sheetId = worksheet.getSheetId();
 				this._initSheetArrayFormulaData(unitId, sheetId, cellMatrix);
-				initSheetFormulaData(formulaData, unitId, sheetId, cellMatrix);
+				this.initSheetFormulaData(formulaData, unitId, sheetId, cellMatrix);
 			}
 		}
 		const allBases = this._univerInstanceService.getAllUnitsForType(_univerjs_core.UniverInstanceType.UNIVER_BASE);
@@ -5109,9 +5119,11 @@ let FormulaDataModel = class FormulaDataModel extends _univerjs_core.Disposable
 			const unitId = base.getUnitId();
 			formulaData[unitId] = {};
 			const tables = Object.values(snapshot.tables);
+			const formulaTableNames = (0, _univerjs_core.createBaseFormulaTableNameMap)(snapshot);
 			for (let j = 0; j < tables.length; j++) {
 				const table = tables[j];
 				const tableFormulaData = {};
+				const normalizedFormulaByFieldId = /* @__PURE__ */ new Map();
 				const recordOrder = table.recordOrder;
 				if (!recordOrder) {
 					formulaData[unitId][table.id] = tableFormulaData;
@@ -5127,9 +5139,14 @@ let FormulaDataModel = class FormulaDataModel extends _univerjs_core.Disposable
 						if (!field || field.type !== "formula") continue;
 						const formula = String(((_field$config = field.config) === null || _field$config === void 0 ? void 0 : _field$config.formula) ?? "").trim();
 						if (!formula) continue;
+						let normalizedFormula = normalizedFormulaByFieldId.get(field.id);
+						if (normalizedFormula == null) {
+							normalizedFormula = normalizeBaseFormulaForEngine(formula, table, snapshot, formulaTableNames);
+							normalizedFormulaByFieldId.set(field.id, normalizedFormula);
+						}
 						tableFormulaData[row] ??= {};
 						tableFormulaData[row][col] = {
-							f: normalizeBaseFormulaForEngine(formula, table, snapshot),
+							f: normalizedFormula,
 							si: field.id
 						};
 					}
@@ -5139,6 +5156,22 @@ let FormulaDataModel = class FormulaDataModel extends _univerjs_core.Disposable
 		}
 		return formulaData;
 	}
+	initSheetFormulaData(formulaData, unitId, sheetId, cellMatrix) {
+		const result = buildSheetFormulaData(formulaData, unitId, sheetId, cellMatrix);
+		if (!this._formulaIdMapData[unitId]) this._formulaIdMapData[unitId] = {};
+		this._formulaIdMapData[unitId][sheetId] = result.formulaIdMap;
+		return result.formulaData;
+	}
+	clearFormulaIdMap(unitId, sheetId) {
+		if (sheetId == null) {
+			delete this._formulaIdMapData[unitId];
+			return;
+		}
+		const unitFormulaIdMap = this._formulaIdMapData[unitId];
+		if (!unitFormulaIdMap) return;
+		delete unitFormulaIdMap[sheetId];
+		if (Object.keys(unitFormulaIdMap).length === 0) delete this._formulaIdMapData[unitId];
+	}
 	getSheetFormulaData(unitId, sheetId) {
 		const formulaData = {};
 		const workbook = this._univerInstanceService.getUnit(unitId);
@@ -5148,7 +5181,7 @@ let FormulaDataModel = class FormulaDataModel extends _univerjs_core.Disposable
 		if (worksheet == null) return {};
 		const cellMatrix = worksheet.getCellMatrix();
 		this._initSheetArrayFormulaData(unitId, sheetId, cellMatrix);
-		initSheetFormulaData(formulaData, unitId, sheetId, cellMatrix);
+		this.initSheetFormulaData(formulaData, unitId, sheetId, cellMatrix);
 		return formulaData[unitId][sheetId];
 	}
 	getArrayFormulaRange() {
@@ -5257,6 +5290,7 @@ let FormulaDataModel = class FormulaDataModel extends _univerjs_core.Disposable
 			};
 			const baseData = {};
 			const tableNameMap = {};
+			const formulaTableNames = (0, _univerjs_core.createBaseFormulaTableNameMap)(snapshot);
 			for (const table of Object.values(snapshot.tables)) {
 				var _table$recordOrder;
 				baseData[table.id] = {
@@ -5266,7 +5300,7 @@ let FormulaDataModel = class FormulaDataModel extends _univerjs_core.Disposable
 					rowData: {},
 					columnData: {}
 				};
-				tableNameMap[table.name] = table.id;
+				addEngineBaseTableNameMappings(tableNameMap, table, formulaTableNames);
 			}
 			allUnitData[unitId] = baseData;
 			unitStylesData[unitId] = new _univerjs_core.Styles();
@@ -5336,8 +5370,7 @@ let FormulaDataModel = class FormulaDataModel extends _univerjs_core.Disposable
 				c
 			};
 		});
-		const formulaData = {};
-		initSheetFormulaData(formulaData, unitId, sheetId, sharedFormulaCellMatrix);
+		const formulaData = buildSheetFormulaData({}, unitId, sheetId, sharedFormulaCellMatrix).formulaData;
 		const deleteFormulaIdMap = /* @__PURE__ */ new Map();
 		const sheetFormulaDataMatrix = new _univerjs_core.ObjectMatrix(((_formulaData$unitId = formulaData[unitId]) === null || _formulaData$unitId === void 0 ? void 0 : _formulaData$unitId[sheetId]) ?? {});
 		cellMatrix.forValue((r, c, cell) => {
@@ -5458,16 +5491,18 @@ let FormulaDataModel = class FormulaDataModel extends _univerjs_core.Disposable
 		const { f, si } = cell;
 		if ((0, _univerjs_core.isFormulaString)(f)) return f;
 		if ((0, _univerjs_core.isFormulaId)(si)) {
-			let formulaString = null;
-			cellMatrix.forValue((r, c, cell) => {
-				if (cell == null) return true;
-				const { f, si: currentId } = cell;
-				if ((0, _univerjs_core.isFormulaString)(f) && si === currentId) {
-					formulaString = this._lexerTreeBuilder.moveFormulaRefOffset(f, column - c, row - r);
-					return false;
-				}
-			});
-			return formulaString;
+			var _this$_formulaIdMapDa;
+			let formulaIdMap = (_this$_formulaIdMapDa = this._formulaIdMapData[unitId]) === null || _this$_formulaIdMapDa === void 0 ? void 0 : _this$_formulaIdMapDa[sheetId];
+			let formulaInfo = formulaIdMap === null || formulaIdMap === void 0 ? void 0 : formulaIdMap[String(si)];
+			const masterCell = formulaInfo == null ? null : cellMatrix.getValue(formulaInfo.r, formulaInfo.c);
+			if (formulaInfo == null || (masterCell === null || masterCell === void 0 ? void 0 : masterCell.si) !== si || (masterCell === null || masterCell === void 0 ? void 0 : masterCell.f) !== formulaInfo.f) {
+				var _this$_formulaIdMapDa2;
+				this.initSheetFormulaData({}, unitId, sheetId, cellMatrix);
+				formulaIdMap = (_this$_formulaIdMapDa2 = this._formulaIdMapData[unitId]) === null || _this$_formulaIdMapDa2 === void 0 ? void 0 : _this$_formulaIdMapDa2[sheetId];
+				formulaInfo = formulaIdMap === null || formulaIdMap === void 0 ? void 0 : formulaIdMap[String(si)];
+			}
+			if (!formulaInfo) return null;
+			return this._lexerTreeBuilder.moveFormulaRefOffset(formulaInfo.f, column - formulaInfo.c, row - formulaInfo.r);
 		}
 		return null;
 	}
@@ -5562,10 +5597,10 @@ let FormulaDataModel = class FormulaDataModel extends _univerjs_core.Disposable
 	}
 };
 FormulaDataModel = __decorate([__decorateParam(0, _univerjs_core.IUniverInstanceService), __decorateParam(1, (0, _univerjs_core.Inject)(LexerTreeBuilder))], FormulaDataModel);
-function initSheetFormulaData(formulaData, unitId, sheetId, cellMatrix) {
+function buildSheetFormulaData(formulaData, unitId, sheetId, cellMatrix) {
 	if (!formulaData[unitId]) formulaData[unitId] = {};
 	if (!formulaData[unitId][sheetId]) formulaData[unitId][sheetId] = {};
-	const formulaIdMap = /* @__PURE__ */ new Map();
+	const formulaIdMap = {};
 	const sheetFormulaDataMatrix = new _univerjs_core.ObjectMatrix(formulaData[unitId][sheetId]);
 	cellMatrix.forValue((r, c, cell) => {
 		const formulaString = (cell === null || cell === void 0 ? void 0 : cell.f) || "";
@@ -5577,11 +5612,11 @@ function initSheetFormulaData(formulaData, unitId, sheetId, cellMatrix) {
 				f: formulaString,
 				si: formulaId
 			});
-			formulaIdMap.set(formulaId, {
+			formulaIdMap[formulaId] = {
 				f: formulaString,
 				r,
 				c
-			});
+			};
 		} else if (checkFormulaString && !checkFormulaId) sheetFormulaDataMatrix.setValue(r, c, { f: formulaString });
 		else if (!checkFormulaString && checkFormulaId) sheetFormulaDataMatrix.setValue(r, c, {
 			f: "",
@@ -5592,7 +5627,7 @@ function initSheetFormulaData(formulaData, unitId, sheetId, cellMatrix) {
 		const formulaString = (cell === null || cell === void 0 ? void 0 : cell.f) || "";
 		const formulaId = (cell === null || cell === void 0 ? void 0 : cell.si) || "";
 		if ((0, _univerjs_core.isFormulaId)(formulaId) && !(0, _univerjs_core.isFormulaString)(formulaString)) {
-			const formulaInfo = formulaIdMap.get(formulaId);
+			const formulaInfo = formulaIdMap[formulaId];
 			if (formulaInfo) {
 				const x = c - formulaInfo.c;
 				const y = r - formulaInfo.r;
@@ -5607,31 +5642,53 @@ function initSheetFormulaData(formulaData, unitId, sheetId, cellMatrix) {
 		}
 	});
 	const newSheetFormulaData = sheetFormulaDataMatrix.getMatrix();
-	return { [unitId]: { [sheetId]: newSheetFormulaData } };
+	return {
+		formulaData: { [unitId]: { [sheetId]: newSheetFormulaData } },
+		formulaIdMap
+	};
 }
 const BASE_LEGACY_FIELD_REF_PATTERN = /\{([^}]+)\}/g;
-const BASE_TABLE_FIELD_REF_PATTERN = /\b([A-Z_]\w*)\[([^\]]+)\]/gi;
-const BASE_BRACKET_FIELD_REF_PATTERN = /(^|[^A-Za-z0-9_\]\[])\[([^\]]+)\]/g;
+const BASE_TABLE_SCOPED_FIELD_REF_PATTERN = /\b([A-Z_][\w.]*)\[\[\s*#(This Row|Data)\s*\],\s*\[([^\]]+)\]\]/gi;
+const BASE_TABLE_CURRENT_ROW_FIELD_REF_PATTERN = /\b([A-Z_][\w.]*)\[@\[([^\]]+)\]\]/gi;
+const BASE_TABLE_FIELD_REF_PATTERN = /\b([A-Z_][\w.]*)\[([^\[\]#]+)\]/gi;
+const BASE_SCOPED_FIELD_REF_PATTERN = /(^|[^\w\[])\[\[\s*#(This Row|Data)\s*\],\s*\[([^\]]+)\]\]/gi;
+const BASE_CURRENT_ROW_FIELD_REF_PATTERN = /(^|[^\w\[])\[@\[([^\]]+)\]\](?!\])/g;
+const BASE_BRACKET_FIELD_REF_PATTERN = /(^|[^\w\[])\[@?([^\[\]#]+)\](?!\])/g;
 const BASE_EXTERNAL_A1_REF_PATTERN = /(?:'\[[^\]]+\](?:[^']|'')+'|\[[^\]]+\][^\s'!]+)!\$?[A-Z]{1,3}\$?\d+(?::\$?[A-Z]{1,3}\$?\d+)?/gi;
 const BASE_EXTERNAL_STRUCTURED_REFERENCE_PREFIX = /(?:'((?:[^']|'')+)'|\[[^\]]+\]|[A-Za-z0-9_.-]+)![^\s!\[\]]+\[/g;
-function normalizeBaseFormulaForEngine(formula, currentTable, snapshot) {
+function normalizeBaseFormulaForEngine(formula, currentTable, snapshot, formulaTableNames) {
 	const refs = [];
 	const hold = (ref) => {
 		return `__BASE_FORMULA_REF_${refs.push(ref) - 1}__`;
 	};
-	return protectBaseExternalReferences(formula, hold).replace(BASE_LEGACY_FIELD_REF_PATTERN, (_match, fieldName) => hold(createEngineThisRowRef(currentTable, fieldName, snapshot))).replace(BASE_TABLE_FIELD_REF_PATTERN, (_match, sourceTableName, fieldName) => {
-		const targetTable = resolveBaseFormulaTable(sourceTableName, currentTable, snapshot);
-		return targetTable ? hold(createEngineColumnRef(targetTable, fieldName, snapshot)) : `${sourceTableName}[${fieldName}]`;
-	}).replace(BASE_BRACKET_FIELD_REF_PATTERN, (_match, prefix, fieldName) => `${prefix}${hold(createEngineThisRowRef(currentTable, fieldName, snapshot))}`).replace(/__BASE_FORMULA_REF_(\d+)__/g, (_match, index) => refs[Number(index)] ?? "");
+	return protectBaseFormulaParts(formula, hold).replace(BASE_LEGACY_FIELD_REF_PATTERN, (_match, fieldName) => hold(createEngineThisRowRef(currentTable, fieldName, formulaTableNames))).replace(BASE_TABLE_SCOPED_FIELD_REF_PATTERN, (_match, sourceTableName, scope, fieldName) => {
+		const targetTable = resolveBaseFormulaTable(sourceTableName, currentTable, snapshot, formulaTableNames);
+		if (!targetTable) return `${sourceTableName}[[#${scope}],[${fieldName}]]`;
+		return hold(scope.toLowerCase() === "data" ? createEngineColumnRef(targetTable, fieldName, formulaTableNames) : createEngineThisRowRef(targetTable, fieldName, formulaTableNames));
+	}).replace(BASE_TABLE_CURRENT_ROW_FIELD_REF_PATTERN, (_match, sourceTableName, fieldName) => {
+		const targetTable = resolveBaseFormulaTable(sourceTableName, currentTable, snapshot, formulaTableNames);
+		return targetTable ? hold(createEngineThisRowRef(targetTable, fieldName, formulaTableNames)) : `${sourceTableName}[@[${fieldName}]]`;
+	}).replace(BASE_SCOPED_FIELD_REF_PATTERN, (_match, prefix, scope, fieldName) => `${prefix}${hold(scope.toLowerCase() === "data" ? createEngineColumnRef(currentTable, fieldName, formulaTableNames) : createEngineThisRowRef(currentTable, fieldName, formulaTableNames))}`).replace(BASE_CURRENT_ROW_FIELD_REF_PATTERN, (_match, prefix, fieldName) => `${prefix}${hold(createEngineThisRowRef(currentTable, fieldName, formulaTableNames))}`).replace(BASE_TABLE_FIELD_REF_PATTERN, (_match, sourceTableName, fieldName) => {
+		const targetTable = resolveBaseFormulaTable(sourceTableName, currentTable, snapshot, formulaTableNames);
+		if (targetTable) return hold(createEngineColumnRef(targetTable, fieldName, formulaTableNames));
+		return `${sourceTableName}[${fieldName}]`;
+	}).replace(BASE_BRACKET_FIELD_REF_PATTERN, (_match, prefix, fieldName) => `${prefix}${hold(createEngineThisRowRef(currentTable, fieldName, formulaTableNames))}`).replace(/__BASE_FORMULA_REF_(\d+)__/g, (_match, index) => refs[Number(index)] ?? "");
 }
 function protectBaseExternalReferences(formula, replace) {
 	return protectBaseExternalStructuredReferences(formula.replace(BASE_EXTERNAL_A1_REF_PATTERN, (reference, offset) => isInsideBaseFormulaString(formula, offset) ? reference : replace(reference)), replace);
 }
+function protectBaseFormulaParts(formula, replace) {
+	return protectBaseFormulaStrings(protectBaseExternalReferences(formula, replace), replace);
+}
+function protectBaseFormulaStrings(formula, replace) {
+	return formula.replace(/"(?:""|[^"])*"/g, replace);
+}
 function protectBaseExternalStructuredReferences(formula, replace) {
 	const spans = [];
 	BASE_EXTERNAL_STRUCTURED_REFERENCE_PREFIX.lastIndex = 0;
-	let match;
-	while ((match = BASE_EXTERNAL_STRUCTURED_REFERENCE_PREFIX.exec(formula)) != null) {
+	while (true) {
+		const match = BASE_EXTERNAL_STRUCTURED_REFERENCE_PREFIX.exec(formula);
+		if (match == null) break;
 		if (isInsideBaseFormulaString(formula, match.index)) continue;
 		const openBracket = BASE_EXTERNAL_STRUCTURED_REFERENCE_PREFIX.lastIndex - 1;
 		let depth = 0;
@@ -5671,20 +5728,20 @@ function isInsideBaseFormulaString(formula, position) {
 	}
 	return inString;
 }
-function createEngineThisRowRef(table, fieldName, snapshot) {
-	return `${getEngineBaseTableName(table, snapshot)}[[#This Row],[${fieldName}]]`;
+function createEngineThisRowRef(table, fieldName, formulaTableNames) {
+	return `${formulaTableNames.get(table.id) ?? (0, _univerjs_core.getBaseFormulaTableName)(table, { tables: { [table.id]: table } })}[[#This Row],[${fieldName}]]`;
 }
-function createEngineColumnRef(table, fieldName, snapshot) {
-	return `${getEngineBaseTableName(table, snapshot)}[[#Data],[${fieldName}]]`;
+function createEngineColumnRef(table, fieldName, formulaTableNames) {
+	return `${formulaTableNames.get(table.id) ?? (0, _univerjs_core.getBaseFormulaTableName)(table, { tables: { [table.id]: table } })}[[#Data],[${fieldName}]]`;
 }
-function getEngineBaseTableName(table, snapshot) {
-	const tables = Object.values(snapshot.tables);
-	let sameNameCount = 0;
-	for (let i = 0; i < tables.length; i++) if (tables[i].name === table.name) {
-		sameNameCount++;
-		if (sameNameCount > 1) break;
-	}
-	return sameNameCount === 1 ? table.name : table.id;
+function addEngineBaseTableNameMappings(tableNameMap, table, formulaTableNames) {
+	tableNameMap[formulaTableNames.get(table.id) ?? table.name] = table.id;
+}
+function createStableExcelTableName(tableId) {
+	return `_T_${Array.from(tableId, (character) => {
+		var _character$codePointA;
+		return /[A-Za-z0-9]/.test(character) ? character : `_x${((_character$codePointA = character.codePointAt(0)) === null || _character$codePointA === void 0 ? void 0 : _character$codePointA.toString(16)) ?? "0"}_`;
+	}).join("")}`;
 }
 function buildBaseRuntimeCellData(table) {
 	const cellData = { ...table.cellData };
@@ -5772,11 +5829,13 @@ function isArrayConstantFormula(formula) {
 function isBaseCellData(value) {
 	return !!value && typeof value === "object" && (Object.prototype.hasOwnProperty.call(value, "v") || Object.prototype.hasOwnProperty.call(value, "t") || Object.prototype.hasOwnProperty.call(value, "p") || Object.prototype.hasOwnProperty.call(value, "f") || Object.prototype.hasOwnProperty.call(value, "si"));
 }
-function resolveBaseFormulaTable(tableName, currentTable, snapshot) {
-	if (!tableName || tableName === "table" || tableName === currentTable.id || tableName === currentTable.name) return currentTable;
-	const byId = snapshot.tables[tableName];
-	if (byId) return byId;
-	const matches = Object.values(snapshot.tables).filter((table) => table.name === tableName);
+function resolveBaseFormulaTable(tableName, currentTable, snapshot, formulaTableNames) {
+	if (!tableName) return currentTable;
+	const normalizedName = tableName.toLowerCase();
+	const matches = Object.values(snapshot.tables).filter((table) => {
+		var _formulaTableNames$ge;
+		return table.id.toLowerCase() === normalizedName || table.name.toLowerCase() === normalizedName || ((_formulaTableNames$ge = formulaTableNames.get(table.id)) === null || _formulaTableNames$ge === void 0 ? void 0 : _formulaTableNames$ge.toLowerCase()) === normalizedName || createStableExcelTableName(table.id).toLowerCase() === normalizedName;
+	});
 	return matches.length === 1 ? matches[0] : void 0;
 }
 
@@ -8160,11 +8219,16 @@ var ArrayValueObject = class ArrayValueObject extends BaseValueObject {
 	* the sequential matching approach is only used for special matches in XLOOKUP and XMATCH.
 	* For example, when match_mode is set to 1 and -1 for an exact match. If not found, it returns the next smaller item.
 	*/
-	orderSearch(valueObject, searchType = 1, isDesc = false, isFuzzyMatching = false) {
+	orderSearch(valueObject, searchType = 1, isDesc = false, isFuzzyMatching = false, keepFirstNearest = false) {
 		let result;
 		let maxOrMin;
 		let resultPosition;
 		let maxOrMinPosition;
+		const _isNearer = (itemValue, currentValue) => {
+			const distance = itemValue.minus(valueObject).abs();
+			const currentDistance = currentValue.minus(valueObject).abs();
+			return keepFirstNearest ? distance.isLessThan(currentDistance).getValue() === true : distance.isLessThanOrEqual(currentDistance).getValue() === true;
+		};
 		const _handleMatch = (itemValue, row, column) => {
 			if (itemValue == null || itemValue.isNull()) return true;
 			let matchObject;
@@ -8181,7 +8245,7 @@ var ArrayValueObject = class ArrayValueObject extends BaseValueObject {
 			}
 			if (searchType === 2) {
 				if (itemValue.isGreaterThan(valueObject).getValue() === true) {
-					if (maxOrMin == null || itemValue.minus(valueObject).abs().isLessThanOrEqual(maxOrMin.minus(valueObject).abs()).getValue() === true) {
+					if (maxOrMin == null || _isNearer(itemValue, maxOrMin)) {
 						maxOrMin = itemValue;
 						maxOrMinPosition = {
 							row,
@@ -8191,7 +8255,7 @@ var ArrayValueObject = class ArrayValueObject extends BaseValueObject {
 				}
 			} else if (searchType === 1) {
 				if (itemValue.isLessThan(valueObject).getValue() === true) {
-					if (maxOrMin == null || itemValue.minus(valueObject).abs().isLessThanOrEqual(maxOrMin.minus(valueObject).abs()).getValue() === true) {
+					if (maxOrMin == null || _isNearer(itemValue, maxOrMin)) {
 						maxOrMin = itemValue;
 						maxOrMinPosition = {
 							row,
@@ -8694,11 +8758,12 @@ var ArrayValueObject = class ArrayValueObject extends BaseValueObject {
 		const sheetId = this.getSheetId();
 		const startRow = this.getCurrentRow();
 		const startColumn = this.getCurrentColumn();
+		const isWildcardComparison = batchOperatorType === 5 && valueObject.isString() && isWildcard(String(valueObject.getValue()));
 		/**
 		* If comparison operations are conducted for a single numerical value,
 		* then retrieve the judgment from the inverted index. This enhances performance.
 		*/
-		if (batchOperatorType === 5 && this._useInvertedIndexCache) {
+		if (batchOperatorType === 5 && this._useInvertedIndexCache && !isWildcardComparison) {
 			const { rowsInCache, rowsNotInCache } = CELL_INVERTED_INDEX_CACHE.canUseCache(unitId, sheetId, column + startColumn, startRow, startRow + rowCount - 1);
 			if (rowsInCache.length > 0) {
 				if (operator === "=" && !(valueObject.isString() && isWildcard(valueObject.getValue()))) {
@@ -9086,6 +9151,7 @@ var BaseReferenceObject = class extends ObjectClassType {
 	}
 	setForcedSheetId(sheetNameMap) {
 		var _sheetNameMap$this$ge;
+		if (!this._forcedSheetName) return;
 		this._forcedSheetId = (_sheetNameMap$this$ge = sheetNameMap[this.getUnitId()]) === null || _sheetNameMap$this$ge === void 0 ? void 0 : _sheetNameMap$this$ge[this._forcedSheetName];
 	}
 	setForcedSheetIdDirect(sheetId) {
@@ -9486,7 +9552,7 @@ var CellReferenceObject = class extends BaseReferenceObject {
 	unionBy(referenceObject) {
 		if (!referenceObject.isCell()) return ErrorValueObject.create("#REF!");
 		const cellReferenceObject = referenceObject;
-		const newRangeData = this.unionRange(this.getRangeData(), cellReferenceObject.getRangeData());
+		const newRangeData = this.unionRange(this.getRangePosition(), cellReferenceObject.getRangePosition());
 		return this._createRange(newRangeData);
 	}
 	unionRange(rangeData1, rangeData2) {
@@ -9528,8 +9594,6 @@ var CellReferenceObject = class extends BaseReferenceObject {
 		rangeReferenceObject.setArrayFormulaCellData(this.getArrayFormulaCellData());
 		rangeReferenceObject.setRuntimeArrayFormulaCellData(this.getRuntimeArrayFormulaCellData());
 		rangeReferenceObject.setRuntimeFeatureCellData(this.getRuntimeFeatureCellData());
-		const { x, y } = this.getRefOffset();
-		rangeReferenceObject.setRefOffset(x, y);
 		const forceSheetId = this.getForcedSheetId();
 		rangeReferenceObject.setForcedSheetName(this.getForcedSheetName());
 		if (forceSheetId != null) rangeReferenceObject.setForcedSheetIdDirect(forceSheetId);
@@ -10285,6 +10349,9 @@ let FormulaRuntimeService = class FormulaRuntimeService extends _univerjs_core.D
 			this._functionRefInfoOverrideStack.pop();
 		};
 	}
+	hasFunctionRefInfoOverride() {
+		return this._functionRefInfoOverrideStack.length > 0;
+	}
 	clearFunctionDefinitionPrivacyVar() {
 		this._functionDefinitionPrivacyVar.clear();
 	}
@@ -10741,7 +10808,7 @@ var PrefixNode = class extends BaseAstNode {
 		if (value instanceof ArrayValueObject) return value.get(0, 0) ?? ErrorValueObject.create("#VALUE!");
 		if (!value.isReferenceObject()) return value;
 		const currentValue = value;
-		if (currentValue.isCell()) return ErrorValueObject.create("#VALUE!");
+		if (currentValue.isCell()) return currentValue.getCellByPosition();
 		if (this._preserveAtRangeForFormula2LookupArray()) return currentValue;
 		const runtimeService = this._runtimeService;
 		const currentRow = runtimeService.currentRow || 0;
@@ -10906,6 +10973,7 @@ var FunctionNode = class extends BaseAstNode {
 		if (!this._functionExecutor.returnsLegacyArrayAsScalar || !isTopLevel || !result.isArray()) return result;
 		const array = result;
 		if (array.getRowCount() <= 1 && array.getColumnCount() <= 1) return result;
+		if (this._runtimeService.hasFunctionRefInfoOverride() && (this._runtimeService.currentRowCount > 1 || this._runtimeService.currentColumnCount > 1)) return result;
 		return array.getFirstCell();
 	}
 	/**
@@ -11827,6 +11895,7 @@ var TableReferenceObject = class extends BaseReferenceObject {
 		const tableStartRow = range.startRow;
 		const tableEndRow = range.endRow;
 		const dataStartRow = tableStartRow + (this._tableData.showHeader === false ? 0 : 1);
+		const dataEndRow = tableEndRow - (this._tableData.showFooter === true ? 1 : 0);
 		let startRow = -1;
 		let endRow = -1;
 		switch (type) {
@@ -11836,7 +11905,7 @@ var TableReferenceObject = class extends BaseReferenceObject {
 				break;
 			case "#Data":
 				startRow = dataStartRow;
-				endRow = tableEndRow;
+				endRow = dataEndRow;
 				break;
 			case "#Headers":
 				if (this._tableData.showHeader === false) {
@@ -11852,14 +11921,14 @@ var TableReferenceObject = class extends BaseReferenceObject {
 				endRow = tableEndRow;
 				break;
 			case "#This Row": {
-				const r = this._resolveThisRow(tableStartRow, tableEndRow);
+				const r = this._resolveThisRow(dataStartRow, dataEndRow);
 				startRow = r;
 				endRow = r;
 				break;
 			}
 			default:
 				startRow = dataStartRow;
-				endRow = tableEndRow;
+				endRow = dataEndRow;
 				break;
 		}
 		this.setRangeData({
@@ -11886,7 +11955,8 @@ var TableReferenceObject = class extends BaseReferenceObject {
 	getCellData(row, column) {
 		if (this._isCurrentRowForRange) {
 			const { startRow, endRow } = this._tableData.range;
-			if (row < startRow || row > endRow) return { v: "#N/A" };
+			const lastCurrentRow = endRow - (this._tableData.showFooter === true ? 1 : 0);
+			if (row < startRow || row > lastCurrentRow) return { v: "#N/A" };
 		}
 		return super.getCellData(row, column);
 	}
@@ -12091,9 +12161,9 @@ var TableReferenceObject = class extends BaseReferenceObject {
 		return -1;
 	}
 	/** Resolve #This Row's row number; takes first data row (tableStartRow+1) when no context available */
-	_resolveThisRow(tableStartRow, tableEndRow) {
+	_resolveThisRow(dataStartRow, dataEndRow) {
 		this._isCurrentRowForRange = true;
-		return Math.min(tableStartRow + 1, tableEndRow);
+		return Math.min(dataStartRow, dataEndRow);
 	}
 };
 
@@ -15576,13 +15646,13 @@ let RegisterOtherFormulaService = class RegisterOtherFormulaService extends _uni
 		this._activeDirtyManagerService = _activeDirtyManagerService;
 		this._lifecycleService = _lifecycleService;
 		_defineProperty(this, "_formulaCacheMap", /* @__PURE__ */ new Map());
+		_defineProperty(this, "_mutationSyncHandler", void 0);
 		_defineProperty(this, "_formulaChangeWithRange$", new rxjs.Subject());
 		_defineProperty(this, "formulaChangeWithRange$", this._formulaChangeWithRange$.asObservable());
 		_defineProperty(this, "_formulaResult$", new rxjs.Subject());
 		_defineProperty(this, "formulaResult$", this._formulaResult$.asObservable());
 		_defineProperty(this, "_otherFormulaResultApplied$", new rxjs.Subject());
 		_defineProperty(this, "otherFormulaResultApplied$", this._otherFormulaResultApplied$.asObservable());
-		_defineProperty(this, "calculateStarted$", new rxjs.BehaviorSubject(false));
 		this._initFormulaRegister();
 		this._initFormulaCalculationResultChange();
 	}
@@ -15591,7 +15661,6 @@ let RegisterOtherFormulaService = class RegisterOtherFormulaService extends _uni
 		this._formulaChangeWithRange$.complete();
 		this._formulaResult$.complete();
 		this._otherFormulaResultApplied$.complete();
-		this.calculateStarted$.complete();
 	}
 	_ensureCacheMap(unitId, subUnitId) {
 		let unitMap = this._formulaCacheMap.get(unitId);
@@ -15617,6 +15686,7 @@ let RegisterOtherFormulaService = class RegisterOtherFormulaService extends _uni
 			}
 		});
 		const handleRegister = (option) => {
+			var _this$_mutationSyncHa;
 			const { unitId, subUnitId, formulaText, formulaId, ranges } = option;
 			if (!this._ensureCacheMap(unitId, subUnitId).has(formulaId)) return;
 			const params = {
@@ -15627,13 +15697,29 @@ let RegisterOtherFormulaService = class RegisterOtherFormulaService extends _uni
 					ranges
 				} }
 			};
-			this._commandService.executeCommand(SetOtherFormulaMutation.id, params, { onlyLocal: true }).then(() => {
+			const waitForMutationSync = (_this$_mutationSyncHa = this._mutationSyncHandler) === null || _this$_mutationSyncHa === void 0 ? void 0 : _this$_mutationSyncHa.call(this, unitId);
+			this._commandService.executeCommand(SetOtherFormulaMutation.id, params, { onlyLocal: true }).then(async () => {
+				if (this._disposed) return;
+				await (waitForMutationSync === null || waitForMutationSync === void 0 ? void 0 : waitForMutationSync());
 				if (this._disposed) return;
 				this._commandService.executeCommand(OtherFormulaMarkDirty.id, { [unitId]: { [subUnitId]: { [formulaId]: true } } }, { onlyLocal: true });
 			});
 		};
-		this.disposeWithMe(this._formulaChangeWithRange$.pipe((0, rxjs.bufferWhen)(() => this.calculateStarted$.pipe((0, rxjs.skip)(1), (0, rxjs.filter)((calculateStarted) => calculateStarted)))).subscribe((options) => options.forEach(handleRegister)));
-		this.disposeWithMe(this._formulaChangeWithRange$.pipe((0, rxjs.filter)(() => this.calculateStarted$.getValue())).subscribe(handleRegister));
+		this.disposeWithMe(this._formulaChangeWithRange$.subscribe((option) => {
+			if (this._commandService.hasCommand(SetOtherFormulaMutation.id) && this._commandService.hasCommand(OtherFormulaMarkDirty.id)) {
+				handleRegister(option);
+				return;
+			}
+			this._lifecycleService.onStage(_univerjs_core.LifecycleStages.Ready).then(() => {
+				if (!this._disposed) handleRegister(option);
+			});
+		}));
+	}
+	setMutationSyncHandler(handler) {
+		this._mutationSyncHandler = handler;
+		return (0, _univerjs_core.toDisposable)(() => {
+			if (this._mutationSyncHandler === handler) this._mutationSyncHandler = void 0;
+		});
 	}
 	_initFormulaCalculationResultChange() {
 		this.disposeWithMe(this._commandService.onCommandExecuted((commandInfo) => {
@@ -15705,11 +15791,13 @@ let RegisterOtherFormulaService = class RegisterOtherFormulaService extends _uni
 		return Object.fromEntries(Array.from(unitMap.entries(), ([subUnitId, formulas]) => [subUnitId, Object.fromEntries(Array.from(formulas.keys(), (formulaId) => [formulaId, true]))]));
 	}
 	deleteFormula(unitId, subUnitId, formulaIdList) {
+		var _this$_mutationSyncHa2;
 		const params = {
 			unitId,
 			subUnitId,
 			formulaIdList
 		};
+		(_this$_mutationSyncHa2 = this._mutationSyncHandler) === null || _this$_mutationSyncHa2 === void 0 || _this$_mutationSyncHa2.call(this, unitId);
 		this._commandService.executeCommand(RemoveOtherFormulaMutation.id, params, { onlyLocal: true });
 		const cacheMap = this._ensureCacheMap(unitId, subUnitId);
 		formulaIdList.forEach((id) => cacheMap.delete(id));
@@ -16598,8 +16686,8 @@ var BaseFunction = class {
 		if (isFirst) return this._getOneFirstByRaw(resultArrayValue);
 		return this._getOneLastByRaw(resultArrayValue);
 	}
-	orderSearch(value, searchArray, resultArray, searchType = 1, isDesc = false) {
-		const position = searchArray.orderSearch(value, searchType, isDesc);
+	orderSearch(value, searchArray, resultArray, searchType = 1, isDesc = false, keepFirstNearest = false) {
+		const position = searchArray.orderSearch(value, searchType, isDesc, false, keepFirstNearest);
 		if (position == null) return ErrorValueObject.create("#N/A");
 		const resultValue = resultArray.get(position.row, position.column) || NullValueObject.create();
 		if (resultValue.isNull()) return ErrorValueObject.create("#N/A");
@@ -16629,8 +16717,8 @@ var BaseFunction = class {
 		if (axis === 0) return resultArray.slice([position.row, position.row + 1]);
 		return resultArray.slice(void 0, [position.column, position.column + 1]);
 	}
-	orderSearchExpand(value, searchArray, resultArray, searchType = 1, isDesc = false, axis = 0) {
-		const position = searchArray.orderSearch(value, searchType, isDesc);
+	orderSearchExpand(value, searchArray, resultArray, searchType = 1, isDesc = false, axis = 0, keepFirstNearest = false) {
+		const position = searchArray.orderSearch(value, searchType, isDesc, false, keepFirstNearest);
 		if (position == null) return ErrorValueObject.create("#N/A");
 		if (axis === 0) return resultArray.slice([position.row, position.row + 1]);
 		return resultArray.slice(void 0, [position.column, position.column + 1]);
@@ -30430,20 +30518,72 @@ var Or = class extends BaseFunction {
 	}
 };
 
+//#endregion
+//#region src/functions/math/sum/index.ts
+var Sum = class extends BaseFunction {
+	constructor(..._args) {
+		super(..._args);
+		_defineProperty(this, "minParams", 1);
+		_defineProperty(this, "maxParams", 255);
+	}
+	calculate(...variants) {
+		let accumulatorAll = NumberValueObject.create(0);
+		for (let i = 0; i < variants.length; i++) {
+			let variant = variants[i];
+			variant = this._legacyImplicitDerivedArray(variant);
+			if (variant.isString()) variant = variant.convertToNumberObjectValue();
+			if (variant.isError()) return variant;
+			if (variant.isArray()) variant = variant.sum();
+			if (variant.isError()) return variant;
+			accumulatorAll = accumulatorAll.plus(variant);
+			if (accumulatorAll.isError()) return accumulatorAll;
+		}
+		return accumulatorAll;
+	}
+	_legacyImplicitDerivedArray(variant) {
+		if (!variant.isArray()) return variant;
+		const array = variant;
+		if (array.usesInvertedIndexCache() || !array.usesLegacyImplicitForAggregate()) return variant;
+		const startRow = array.getCurrentRow();
+		const startColumn = array.getCurrentColumn();
+		if (startRow < 0 || startColumn < 0) return variant;
+		const rowCount = array.getRowCount();
+		const columnCount = array.getColumnCount();
+		let rowIndex = -1;
+		let columnIndex = -1;
+		if (rowCount === 1) {
+			rowIndex = 0;
+			columnIndex = this.column - startColumn;
+		} else if (columnCount === 1) {
+			rowIndex = this.row - startRow;
+			columnIndex = 0;
+		} else {
+			rowIndex = this.row - startRow;
+			columnIndex = this.column - startColumn;
+		}
+		if (rowIndex < 0 || rowIndex >= rowCount || columnIndex < 0 || columnIndex >= columnCount) return variant;
+		return array.get(rowIndex, columnIndex) || variant;
+	}
+};
+
 //#endregion
 //#region src/functions/logical/percentof/index.ts
 /**
-* PERCENTOF is an Excel GROUPBY aggregator token. It is evaluated by GROUPBY's
-* AST path, not as a standalone scalar function.
+* PERCENTOF is logically equivalent to SUM(dataSubset) / SUM(dataAll).
+* GROUPBY also consumes the function name as an aggregator token through its AST path.
 */
-var Percentof = class extends BaseFunction {
+var Percentof = class extends Sum {
 	constructor(..._args) {
 		super(..._args);
-		_defineProperty(this, "minParams", 0);
-		_defineProperty(this, "maxParams", 0);
+		_defineProperty(this, "minParams", 2);
+		_defineProperty(this, "maxParams", 2);
 	}
-	calculate(..._variants) {
-		return ErrorValueObject.create("#VALUE!");
+	calculate(dataSubset, dataAll) {
+		const subsetTotal = super.calculate(dataSubset);
+		if (subsetTotal.isError()) return subsetTotal;
+		const allTotal = super.calculate(dataAll);
+		if (allTotal.isError()) return allTotal;
+		return subsetTotal.divided(allTotal);
 	}
 };
 
@@ -33011,8 +33151,8 @@ var Xlookup = class extends BaseFunction {
 			return this.binarySearchExpand(value, searchArray, resultArray, axis, searchType, matchType);
 		}
 		if (matchModeValue === 2) return this.fuzzySearchExpand(value, searchArray, resultArray, searchModeValue !== -1, axis);
-		if (matchModeValue === -1 || matchModeValue === 1) return this.orderSearchExpand(value, searchArray, resultArray, matchModeValue === 1 ? 2 : 1, searchModeValue === -1, axis);
-		return this.equalSearchExpand(value, searchArray, resultArray, searchModeValue !== -1, axis);
+		if (matchModeValue === -1 || matchModeValue === 1) return this.orderSearchExpand(value, searchArray, resultArray, matchModeValue === 1 ? 2 : 1, searchModeValue === -1, axis, true);
+		return this._exactSearchExpand(value, searchArray, resultArray, searchModeValue !== -1, axis);
 	}
 	_handleSingleObject(value, searchArray, resultArray, matchModeValue, searchModeValue) {
 		if ((searchModeValue === 2 || searchModeValue === -2) && matchModeValue !== 2) {
@@ -33021,8 +33161,38 @@ var Xlookup = class extends BaseFunction {
 			return this.binarySearch(value, searchArray, resultArray, searchType, matchType);
 		}
 		if (matchModeValue === 2) return this.fuzzySearch(value, searchArray, resultArray, searchModeValue !== -1);
-		if (matchModeValue === -1 || matchModeValue === 1) return this.orderSearch(value, searchArray, resultArray, matchModeValue === 1 ? 2 : 1, searchModeValue === -1);
-		return this.equalSearch(value, searchArray, resultArray, searchModeValue !== -1);
+		if (matchModeValue === -1 || matchModeValue === 1) return this.orderSearch(value, searchArray, resultArray, matchModeValue === 1 ? 2 : 1, searchModeValue === -1, true);
+		return this._exactSearch(value, searchArray, resultArray, searchModeValue !== -1);
+	}
+	_exactSearch(value, searchArray, resultArray, isFirst) {
+		const position = this._findExactPosition(value, searchArray, isFirst);
+		if (position == null) return ErrorValueObject.create("#N/A");
+		return resultArray.get(position.row, position.column) ?? ErrorValueObject.create("#N/A");
+	}
+	_exactSearchExpand(value, searchArray, resultArray, isFirst, axis) {
+		const position = this._findExactPosition(value, searchArray, isFirst);
+		if (position == null) return ErrorValueObject.create("#N/A");
+		return axis === 0 ? resultArray.slice([position.row, position.row + 1]) ?? ErrorValueObject.create("#N/A") : resultArray.slice(void 0, [position.column, position.column + 1]) ?? ErrorValueObject.create("#N/A");
+	}
+	_findExactPosition(value, searchArray, isFirst) {
+		let position;
+		const find = (candidate, row, column) => {
+			if (candidate != null && this._isExactMatch(candidate, value)) {
+				position = {
+					row,
+					column
+				};
+				return false;
+			}
+		};
+		if (isFirst) searchArray.iterator(find);
+		else searchArray.iteratorReverse(find);
+		return position;
+	}
+	_isExactMatch(candidate, value) {
+		if (candidate.isError() || value.isError()) return candidate.isError() && value.isError() && candidate.getValue() === value.getValue();
+		if (candidate.isNull() !== value.isNull() || candidate.isNumber() !== value.isNumber() || candidate.isString() !== value.isString() || candidate.isBoolean() !== value.isBoolean()) return false;
+		return candidate.isEqual(value).getValue() === true;
 	}
 	_blankResultAsZero(value) {
 		if (value.isNull()) return NumberValueObject.create(0);
@@ -35589,54 +35759,6 @@ var Subtotal = class extends BaseFunction {
 	}
 };
 
-//#endregion
-//#region src/functions/math/sum/index.ts
-var Sum = class extends BaseFunction {
-	constructor(..._args) {
-		super(..._args);
-		_defineProperty(this, "minParams", 1);
-		_defineProperty(this, "maxParams", 255);
-	}
-	calculate(...variants) {
-		let accumulatorAll = NumberValueObject.create(0);
-		for (let i = 0; i < variants.length; i++) {
-			let variant = variants[i];
-			variant = this._legacyImplicitDerivedArray(variant);
-			if (variant.isString()) variant = variant.convertToNumberObjectValue();
-			if (variant.isError()) return variant;
-			if (variant.isArray()) variant = variant.sum();
-			if (variant.isError()) return variant;
-			accumulatorAll = accumulatorAll.plus(variant);
-			if (accumulatorAll.isError()) return accumulatorAll;
-		}
-		return accumulatorAll;
-	}
-	_legacyImplicitDerivedArray(variant) {
-		if (!variant.isArray()) return variant;
-		const array = variant;
-		if (array.usesInvertedIndexCache() || !array.usesLegacyImplicitForAggregate()) return variant;
-		const startRow = array.getCurrentRow();
-		const startColumn = array.getCurrentColumn();
-		if (startRow < 0 || startColumn < 0) return variant;
-		const rowCount = array.getRowCount();
-		const columnCount = array.getColumnCount();
-		let rowIndex = -1;
-		let columnIndex = -1;
-		if (rowCount === 1) {
-			rowIndex = 0;
-			columnIndex = this.column - startColumn;
-		} else if (columnCount === 1) {
-			rowIndex = this.row - startRow;
-			columnIndex = 0;
-		} else {
-			rowIndex = this.row - startRow;
-			columnIndex = this.column - startColumn;
-		}
-		if (rowIndex < 0 || rowIndex >= rowCount || columnIndex < 0 || columnIndex >= columnCount) return variant;
-		return array.get(rowIndex, columnIndex) || variant;
-	}
-};
-
 //#endregion
 //#region src/functions/math/sumif/index.ts
 var Sumif = class extends BaseFunction {
@@ -43007,7 +43129,7 @@ function getObjectValue(result, isUseStrip = false) {
 //#endregion
 //#region package.json
 var name = "@univerjs/engine-formula";
-var version = "1.0.0-beta.0";
+var version = "1.0.0-beta.2";
 
 //#endregion
 //#region src/services/global-computing-status.service.ts
@@ -43307,12 +43429,9 @@ function hasSameNestedKey(left, right) {
 * limitations under the License.
 */
 let FormulaCalculationTriggerController = class FormulaCalculationTriggerController extends _univerjs_core.Disposable {
-	constructor(formulaCalculationTriggerService, registerOtherFormulaService, lifecycleService) {
+	constructor(formulaCalculationTriggerService, lifecycleService) {
 		super();
-		const start = () => {
-			formulaCalculationTriggerService.start();
-			registerOtherFormulaService.calculateStarted$.next(true);
-		};
+		const start = () => formulaCalculationTriggerService.start();
 		if ((0, _univerjs_core.isNodeEnv)()) {
 			start();
 			return;
@@ -43320,11 +43439,7 @@ let FormulaCalculationTriggerController = class FormulaCalculationTriggerControl
 		this.disposeWithMe(lifecycleService.lifecycle$.pipe((0, rxjs.filter)((stage) => stage >= _univerjs_core.LifecycleStages.Rendered), (0, rxjs.take)(1)).subscribe(start));
 	}
 };
-FormulaCalculationTriggerController = __decorate([
-	__decorateParam(0, (0, _univerjs_core.Inject)(FormulaCalculationTriggerService)),
-	__decorateParam(1, (0, _univerjs_core.Inject)(RegisterOtherFormulaService)),
-	__decorateParam(2, (0, _univerjs_core.Inject)(_univerjs_core.LifecycleService))
-], FormulaCalculationTriggerController);
+FormulaCalculationTriggerController = __decorate([__decorateParam(0, (0, _univerjs_core.Inject)(FormulaCalculationTriggerService)), __decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_core.LifecycleService))], FormulaCalculationTriggerController);
 
 //#endregion
 //#region src/controllers/formula.controller.ts
@@ -43347,10 +43462,12 @@ let FormulaController = class FormulaController extends _univerjs_core.Disposabl
 	_syncOtherFormulaUnits() {
 		const dataSyncPrimaryController = this._dataSyncPrimaryController;
 		if (!dataSyncPrimaryController) return;
-		this.disposeWithMe(this._registerOtherFormulaService.formulaChangeWithRange$.subscribe(({ unitId }) => {
-			if (this._syncedOtherFormulaUnits.has(unitId)) return;
-			this._syncedOtherFormulaUnits.add(unitId);
-			this.disposeWithMe(dataSyncPrimaryController.syncUnitMutations(unitId));
+		this.disposeWithMe(this._registerOtherFormulaService.setMutationSyncHandler((unitId) => {
+			if (!this._syncedOtherFormulaUnits.has(unitId)) {
+				this._syncedOtherFormulaUnits.add(unitId);
+				this.disposeWithMe(dataSyncPrimaryController.syncUnitMutations(unitId));
+			}
+			return () => dataSyncPrimaryController.waitForPendingMutations();
 		}));
 	}
 	_registerCommands() {
@@ -57059,7 +57176,6 @@ exports.getRangeWithRefsString = getRangeWithRefsString;
 exports.handleNumfmtInCell = handleNumfmtInCell;
 exports.handleRefStringInfo = handleRefStringInfo;
 exports.includeFormulaLexerToken = includeFormulaLexerToken;
-exports.initSheetFormulaData = initSheetFormulaData;
 exports.isFormulaLexerToken = isFormulaLexerToken;
 exports.isFormulaReferenceAddingContext = isFormulaReferenceAddingContext;
 exports.isFormulaReferenceAddingTextContext = isFormulaReferenceAddingTextContext;