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

package/lib/cjs/index.js

@@ -5030,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 = {};
@@ -5107,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);
@@ -5154,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);
@@ -5163,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() {
@@ -5352,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) => {
@@ -5474,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;
 	}
@@ -5578,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) || "";
@@ -5593,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: "",
@@ -5608,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;
@@ -5623,7 +5642,10 @@ 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_SCOPED_FIELD_REF_PATTERN = /\b([A-Z_][\w.]*)\[\[\s*#(This Row|Data)\s*\],\s*\[([^\]]+)\]\]/gi;
@@ -43107,7 +43129,7 @@ function getObjectValue(result, isUseStrip = false) {
 //#endregion
 //#region package.json
 var name = "@univerjs/engine-formula";
-var version = "1.0.0-beta.1";
+var version = "1.0.0-beta.2";
 
 //#endregion
 //#region src/services/global-computing-status.service.ts
@@ -57154,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;

package/lib/cjs/locale/ca-ES.js

@@ -3146,20 +3146,20 @@ const locale$9 = {
 		}
 	},
 	EFFECT: {
-		description: "Returns the effective annual interest rate",
-		abstract: "Returns the effective annual interest rate",
+		description: "Devuelve la tasa de interés anual efectiva",
+		abstract: "Devuelve la tasa de interés anual efectiva",
 		links: [{
-			title: "Instruction",
+			title: "Instrucciones",
 			url: "https://support.microsoft.com/ca-es/excel/functions/effect-function"
 		}],
 		functionParameter: {
 			nominalRate: {
-				name: "nominal_rate",
-				detail: "The nominal interest rate."
+				name: "tasa_nominal",
+				detail: "La tasa de interés nominal."
 			},
 			npery: {
-				name: "npery",
-				detail: "The number of compounding periods per year."
+				name: "núm_per_año",
+				detail: "El número de periodos de composición por año."
 			}
 		}
 	},
@@ -3212,66 +3212,66 @@ const locale$9 = {
 		}
 	},
 	INTRATE: {
-		description: "Returns the interest rate for a fully invested security",
-		abstract: "Returns the interest rate for a fully invested security",
+		description: "Devuelve la tasa de interés para la inversión total en un valor bursátil.",
+		abstract: "Devuelve la tasa de interés para la inversión total en un valor bursátil.",
 		links: [{
-			title: "Instruction",
+			title: "Instrucciones",
 			url: "https://support.microsoft.com/ca-es/excel/functions/intrate-function"
 		}],
 		functionParameter: {
 			settlement: {
-				name: "settlement",
-				detail: "The security's settlement date."
+				name: "liquidación",
+				detail: "Obligatorio. La fecha de liquidación del valor bursátil. La fecha de liquidación del valor bursátil es la fecha posterior a la fecha de emisión en la que el comprador adquiere el valor bursátil."
 			},
 			maturity: {
-				name: "maturity",
-				detail: "The security's maturity date."
+				name: "vencimiento",
+				detail: "Obligatorio. La fecha de vencimiento del valor bursátil. La fecha de vencimiento es aquella en la que expira el valor bursátil."
 			},
 			investment: {
-				name: "investment",
-				detail: "The amount invested in the security."
+				name: "inversión",
+				detail: "Obligatorio. Es la cantidad de dinero invertido en el valor bursátil."
 			},
 			redemption: {
-				name: "redemption",
-				detail: "The amount to be received at maturity."
+				name: "rescate",
+				detail: "Obligatorio. Es el valor que se recibirá en la fecha de vencimiento."
 			},
 			basis: {
-				name: "basis",
-				detail: "The type of day count basis to use."
+				name: "base",
+				detail: "Opcional. Determina en qué tipo de base deben contarse los días."
 			}
 		}
 	},
 	IPMT: {
-		description: "Returns the interest payment for an investment for a given period",
-		abstract: "Returns the interest payment for an investment for a given period",
+		description: "Devuelve el pago de intereses de una inversión durante un periodo determinado",
+		abstract: "Devuelve el pago de intereses de una inversión durante un periodo determinado",
 		links: [{
-			title: "Instruction",
+			title: "Instrucciones",
 			url: "https://support.microsoft.com/ca-es/excel/functions/ipmt-function"
 		}],
 		functionParameter: {
 			rate: {
-				name: "rate",
-				detail: "The interest rate per period."
+				name: "tasa",
+				detail: "La tasa de interés por periodo."
 			},
 			per: {
-				name: "per",
-				detail: "The period for which you want to find the interest and must be in the range 1 to nper."
+				name: "periodo",
+				detail: "El periodo para el cual desea buscar el interés y debe estar en el rango de 1 a núm_pagos."
 			},
 			nper: {
-				name: "nper",
-				detail: "The total number of payment periods in an annuity."
+				name: "núm_pagos",
+				detail: "El número total de periodos de pago en una anualidad."
 			},
 			pv: {
-				name: "pv",
-				detail: "The present value, or the lump-sum amount that a series of future payments is worth right now."
+				name: "va",
+				detail: "El valor actual, o la cantidad total que vale ahora una serie de pagos futuros."
 			},
 			fv: {
-				name: "fv",
-				detail: "The future value, or a cash balance you want to attain after the last payment is made."
+				name: "vf",
+				detail: "El valor futuro, o un saldo en efectivo que desea lograr después de realizar el último pago."
 			},
 			type: {
-				name: "type",
-				detail: "The number 0 or 1 and indicates when payments are due."
+				name: "tipo",
+				detail: "El número 0 o 1 e indica cuándo vencen los pagos."
 			}
 		}
 	},

package/lib/cjs/locale/fr-FR.js

@@ -3146,20 +3146,20 @@ const locale$9 = {
 		}
 	},
 	EFFECT: {
-		description: "Returns the effective annual interest rate",
-		abstract: "Returns the effective annual interest rate",
+		description: "Cette fonction renvoie le taux d’intérêt annuel effectif.",
+		abstract: "Taux d’intérêt annuel effectif.",
 		links: [{
 			title: "Instruction",
 			url: "https://support.microsoft.com/fr-fr/excel/functions/effect-function"
 		}],
 		functionParameter: {
 			nominalRate: {
-				name: "nominal_rate",
-				detail: "The nominal interest rate."
+				name: "taux_nominal",
+				detail: "Représente le taux d’intérêt nominal."
 			},
 			npery: {
-				name: "npery",
-				detail: "The number of compounding periods per year."
+				name: "nb_périodes",
+				detail: "Nombre de périodes annuelles pour le calcul des intérêts composés."
 			}
 		}
 	},
@@ -5149,20 +5149,20 @@ const locale$6 = {
 		}],
 		functionParameter: {
 			dataField: {
-				name: "dataField",
-				detail: ""
+				name: "champ_données",
+				detail: "Nom du champ du tableau croisé dynamique contenant les données à récupérer. Il doit être placé entre guillemets."
 			},
 			pivotTable: {
-				name: "pivotTable",
-				detail: ""
+				name: "tableau_croisé_dyn",
+				detail: "Référence à une cellule, une plage ou une plage nommée du tableau croisé dynamique contenant les données."
 			},
 			field1: {
-				name: "field1",
-				detail: ""
+				name: "champ1",
+				detail: "Paire facultative de noms de champ et d’élément décrivant les données à récupérer."
 			},
 			item1: {
-				name: "item1",
-				detail: ""
+				name: "élément1",
+				detail: "Paire facultative de noms de champ et d’élément décrivant les données à récupérer."
 			}
 		}
 	},

package/lib/cjs/locale/ko-KR.js

@@ -1863,20 +1863,20 @@ const locale$10 = {
 		}
 	},
 	BITAND: {
-		description: "Returns a 'Bitwise And' of two numbers",
-		abstract: "Returns a 'Bitwise And' of two numbers",
+		description: "두 숫자의 비트 단위 'AND'를 반환합니다.",
+		abstract: "두 숫자의 비트 단위 'AND'를 반환합니다.",
 		links: [{
 			title: "Instruction",
 			url: "https://support.microsoft.com/ko-kr/excel/functions/bitand-function"
 		}],
 		functionParameter: {
 			number1: {
-				name: "number1",
-				detail: "Must be in decimal form and greater than or equal to 0."
+				name: "번호1",
+				detail: "0보다 크거나 같은 10진수 형식이어야 합니다."
 			},
 			number2: {
-				name: "number2",
-				detail: "Must be in decimal form and greater than or equal to 0."
+				name: "번호2",
+				detail: "0보다 크거나 같은 10진수 형식이어야 합니다."
 			}
 		}
 	},
@@ -1983,16 +1983,16 @@ const locale$10 = {
 		}],
 		functionParameter: {
 			number: {
-				name: "number",
-				detail: "is the value in from_units to convert."
+				name: "숫자",
+				detail: "변환할 from_unit 단위의 값입니다."
 			},
 			fromUnit: {
 				name: "from_unit",
-				detail: "is the units for number."
+				detail: "숫자의 단위입니다."
 			},
 			toUnit: {
 				name: "to_unit",
-				detail: "is the units for the result."
+				detail: "결과의 단위입니다."
 			}
 		}
 	},
@@ -2309,8 +2309,8 @@ const locale$10 = {
 		} }
 	},
 	IMDIV: {
-		description: "Returns the quotient of two complex numbers",
-		abstract: "Returns the quotient of two complex numbers",
+		description: "x + yi 또는 x + yj 텍스트 형식인 두 복소수의 나눗셈 몫을 반환합니다.",
+		abstract: "두 복소수의 나눗셈 몫을 반환합니다.",
 		links: [{
 			title: "Instruction",
 			url: "https://support.microsoft.com/ko-kr/excel/functions/imdiv-function"
@@ -2318,11 +2318,11 @@ const locale$10 = {
 		functionParameter: {
 			inumber1: {
 				name: "inumber1",
-				detail: "The complex numerator or dividend."
+				detail: "분자 또는 피제수인 복소수입니다."
 			},
 			inumber2: {
 				name: "inumber2",
-				detail: "The complex denominator or divisor."
+				detail: "분모 또는 제수인 복소수입니다."
 			}
 		}
 	},
@@ -4764,7 +4764,7 @@ const locale$7 = {
 			},
 			value3: {
 				name: "lambda",
-				detail: " A LAMBDA that is called to create the array. The LAMBDA takes two parameters: row (The row index of the array), col (The column index of the array)."
+				detail: "배열을 만들기 위해 호출되는 LAMBDA입니다. LAMBDA는 행 인덱스와 열 인덱스 두 매개 변수를 사용합니다."
 			}
 		}
 	},
@@ -8315,8 +8315,8 @@ const locale$4 = {
 				detail: "MARGINOFERROR(A1:C3, 0.99)"
 			},
 			confidence: {
-				name: "confidence",
-				detail: "The desired confidence level between (0, 1)."
+				name: "신뢰도",
+				detail: "(0, 1) 범위에서 원하는 신뢰 수준입니다."
 			}
 		}
 	},

package/lib/cjs/locale/sk-SK.js

@@ -5149,20 +5149,20 @@ const locale$6 = {
 		}],
 		functionParameter: {
 			dataField: {
-				name: "dataField",
-				detail: ""
+				name: "údajové_pole",
+				detail: "Názov poľa kontingenčnej tabuľky obsahujúce údaje, ktoré chcete načítať. Musí byť v úvodzovkách."
 			},
 			pivotTable: {
-				name: "pivotTable",
-				detail: ""
+				name: "kontingenčná_tabuľka",
+				detail: "Odkaz na bunku, rozsah buniek alebo pomenovaný rozsah v kontingenčnej tabuľke obsahujúcej požadované údaje."
 			},
 			field1: {
-				name: "field1",
-				detail: ""
+				name: "pole1",
+				detail: "Voliteľná dvojica názvu poľa a položky opisujúca údaje, ktoré chcete načítať."
 			},
 			item1: {
-				name: "item1",
-				detail: ""
+				name: "položka1",
+				detail: "Voliteľná dvojica názvu poľa a položky opisujúca údaje, ktoré chcete načítať."
 			}
 		}
 	},

package/lib/cjs/locale/vi-VN.js

@@ -5822,8 +5822,8 @@ const locale$5 = {
 		}
 	},
 	ARABIC: {
-		description: "Converts a Roman number to Arabic, as a number",
-		abstract: "Converts a Roman number to Arabic, as a number",
+		description: "Chuyển đổi một chữ số La Mã sang một chữ số Ả-rập.",
+		abstract: "Chuyển đổi một chữ số La Mã sang một chữ số Ả-rập.",
 		links: [{
 			title: "Hướng dẫn",
 			url: "https://support.microsoft.com/vi-vn/excel/functions/arabic-function"