@univerjs/engine-formula 1.0.2 → 1.0.4

package/lib/cjs/index.js

@@ -9770,6 +9770,89 @@ function baseValueObjectToArrayValueObject(valueObject) {
 	if (valueObject.isArray()) return valueObject;
 	return ArrayValueObject.createByArray([[valueObject.getValue()]]);
 }
+function getEqualityValueKeys(value) {
+	const keys = [];
+	if (value.isString()) keys.push(normalizeTextForComparison(String(value.getValue())));
+	else if (!value.isNumber()) return keys;
+	const number = value.isNumber() ? value : createCriteriaValueObject(String(value.getValue()), value.getDateSystem());
+	if (number.isNumber() && Number.isFinite(Number(number.getValue()))) keys.push(stripErrorMargin(Number(number.getValue())));
+	return keys;
+}
+function buildEqualityIndex(range) {
+	const index = /* @__PURE__ */ new Map();
+	range.iterator((value, row, column) => {
+		if (!value) return;
+		const position = [row, column];
+		for (const key of getEqualityValueKeys(value)) {
+			let matches = index.get(key);
+			if (!matches) {
+				matches = [];
+				index.set(key, matches);
+			}
+			matches.push(position);
+		}
+	});
+	return index;
+}
+function getIndexedPositions(index, keys, range) {
+	const buckets = keys.map((key) => index.get(key) ?? []);
+	if (buckets.reduce((count, bucket) => count + bucket.length, 0) >= range.getRowCount() * range.getColumnCount() / 2) return;
+	if (buckets.length === 1) return buckets[0];
+	return Array.from(new Set(buckets.flat())).sort((a, b) => a[0] - b[0] || a[1] - b[1]);
+}
+function pickRangePositions(range, positions) {
+	return ArrayValueObject.create({
+		calculateValueList: positions.map(([row, column]) => [range.get(row, column)]),
+		rowCount: positions.length,
+		columnCount: 1,
+		unitId: "",
+		sheetId: "",
+		row: -1,
+		column: -1
+	});
+}
+function getExactCriteriaKeys(criteria) {
+	if (!criteria || !criteria.isString() && !criteria.isNumber()) return;
+	const [operator, value] = criteria.isString() ? findCompareToken(String(criteria.getValue()), criteria.getDateSystem()) : ["=", criteria];
+	if (operator !== "=" || value.isDateFormat()) return;
+	if (value.isString() && (value.getValue() === "" || isWildcard(String(value.getValue())))) return;
+	const keys = getEqualityValueKeys(value);
+	return keys.length > 0 ? keys : void 0;
+}
+function getCriteriaCacheKey(criteria) {
+	if (criteria.length === 0 || criteria.some((value) => getExactCriteriaKeys(value) === void 0)) return;
+	const values = criteria.map((value) => value.getValue());
+	return values.length === 1 ? values[0] : JSON.stringify(values);
+}
+function getCriteriaPositions(pairs, indexes, row, column) {
+	for (const { range, criteriaArray } of pairs) {
+		const keys = getExactCriteriaKeys(criteriaArray.get(row, column));
+		if (!keys) continue;
+		let index = indexes.get(range);
+		if (!index) {
+			index = buildEqualityIndex(range);
+			indexes.set(range, index);
+		}
+		const positions = getIndexedPositions(index, keys, range);
+		if (positions !== void 0) return positions;
+	}
+}
+function getConditionalAggregateResult(formulaName, comparison, targetRange) {
+	if (formulaName === "COUNTIFS") {
+		let count = 0;
+		comparison.iterator((value) => {
+			if ((value === null || value === void 0 ? void 0 : value.isBoolean()) && value.getValue() === true) count++;
+		});
+		return NumberValueObject.create(count);
+	}
+	const picked = targetRange === null || targetRange === void 0 ? void 0 : targetRange.pick(comparison);
+	switch (formulaName) {
+		case "SUMIFS": return picked.sum();
+		case "AVERAGEIFS": return picked.sum().divided(picked.count());
+		case "MAXIFS": return picked.getColumnCount() === 0 ? NumberValueObject.create(0) : picked.max();
+		case "MINIFS": return picked.getColumnCount() === 0 ? NumberValueObject.create(0) : picked.min();
+	}
+}
 /**
 * Get the paired range and criteria result for COUNTIFS, SUMIFS, etc.
 */
@@ -9788,50 +9871,48 @@ function getPairedRangeAndCriteriaResult(variants, params) {
 	}
 	if (rangeAndCriteriaArrays.length === 0) return [];
 	const results = [];
-	/**
-	* Iterate through all criteria values for each dimension, calculate the comparison result with the corresponding range, and then calculate the Boolean intersection of all comparison results as the final result for that dimension criteria value.
-	* Then calculate this dimension criteria value's result.
-	* This avoiding store the all dimension comparison result in memory and then calculating all dimension criteria value's result, which may cause memory overflow when the range is large and there are multiple dimension criteria.
-	* For example, `=COUNTIFS(Q$3:Q$10002,C$3:C$5002,R$3:R$10002,L6)`.
-	*/
+	const arrayPairs = rangeAndCriteriaArrays.filter((_, index) => {
+		const criteria = variants[index * 2 + 1];
+		return criteria.isArray() && criteria.getRowCount() * criteria.getColumnCount() > 1;
+	});
+	const useEqualityIndex = isNumberSensitive && maxRowLength * maxColumnLength > 1 && arrayPairs.length > 0;
+	const repeatedResults = /* @__PURE__ */ new Map();
+	const equalityIndexes = /* @__PURE__ */ new Map();
 	rangeAndCriteriaArrays[0].criteriaArray.iterator((_, rowIndex, columnIndex) => {
 		let finalCompareResult;
-		for (let i = 0; i < rangeAndCriteriaArrays.length; i++) {
-			const { range, criteriaArray } = rangeAndCriteriaArrays[i];
+		let positions;
+		const cacheKey = useEqualityIndex ? getCriteriaCacheKey(arrayPairs.map(({ criteriaArray }) => criteriaArray.get(rowIndex, columnIndex))) : void 0;
+		const cached = cacheKey === void 0 ? void 0 : repeatedResults.get(cacheKey);
+		if (cached) {
+			results[rowIndex] ??= [];
+			results[rowIndex][columnIndex] = cached;
+			return;
+		}
+		if (useEqualityIndex) {
+			positions = getCriteriaPositions(arrayPairs, equalityIndexes, rowIndex, columnIndex);
+			if ((positions === null || positions === void 0 ? void 0 : positions.length) === 0) {
+				results[rowIndex] ??= [];
+				results[rowIndex][columnIndex] = formulaName === "AVERAGEIFS" ? ErrorValueObject.create("#DIV/0!") : NumberValueObject.create(0);
+				return;
+			}
+		}
+		rangeAndCriteriaArrays.forEach(({ range: sourceRange, criteriaArray }) => {
+			const range = positions === void 0 ? sourceRange : pickRangePositions(sourceRange, positions);
 			const criteriaValueObject = criteriaArray.get(rowIndex, columnIndex);
-			if (!criteriaValueObject) continue;
+			if (!criteriaValueObject) return;
 			let compareResult = valueObjectCompare(range, criteriaValueObject);
 			if (isNumberSensitive) compareResult = filterSameValueObjectResult(compareResult, range, criteriaValueObject);
 			if (finalCompareResult === void 0) {
 				finalCompareResult = compareResult;
-				continue;
+				return;
 			}
 			finalCompareResult = booleanObjectIntersection(finalCompareResult, compareResult);
-		}
-		let result;
-		if (formulaName === "COUNTIFS") {
-			let count = 0;
-			finalCompareResult.iterator((value) => {
-				if ((value === null || value === void 0 ? void 0 : value.isBoolean()) && value.getValue() === true) count++;
-			});
-			result = NumberValueObject.create(count);
-		} else if (formulaName === "SUMIFS") result = targetRange.pick(finalCompareResult).sum();
-		else if (formulaName === "AVERAGEIFS") {
-			const picked = targetRange.pick(finalCompareResult);
-			const sum = picked.sum();
-			const count = picked.count();
-			result = sum.divided(count);
-		} else if (formulaName === "MAXIFS") {
-			const picked = targetRange.pick(finalCompareResult);
-			if (picked.getColumnCount() === 0) result = NumberValueObject.create(0);
-			else result = picked.max();
-		} else if (formulaName === "MINIFS") {
-			const picked = targetRange.pick(finalCompareResult);
-			if (picked.getColumnCount() === 0) result = NumberValueObject.create(0);
-			else result = picked.min();
-		}
+		});
+		const aggregateRange = positions === void 0 || !targetRange ? targetRange : pickRangePositions(targetRange, positions);
+		const result = getConditionalAggregateResult(formulaName, finalCompareResult, aggregateRange);
 		if (!results[rowIndex]) results[rowIndex] = [];
 		results[rowIndex][columnIndex] = result;
+		if (cacheKey !== void 0 && result) repeatedResults.set(cacheKey, result);
 	});
 	return results;
 }
@@ -9993,6 +10074,8 @@ let FormulaRuntimeService = class FormulaRuntimeService extends _univerjs_core.D
 		_defineProperty(this, "_currentSubUnitId", "");
 		_defineProperty(this, "_currentUnitId", "");
 		_defineProperty(this, "_runtimeData", Object.create(null));
+		_defineProperty(this, "_sourceFormulaData", Object.create(null));
+		_defineProperty(this, "_currentSourceFormula", void 0);
 		_defineProperty(this, "_runtimeOtherData", Object.create(null));
 		_defineProperty(this, "_unitArrayFormulaRange", Object.create(null));
 		_defineProperty(this, "_unitArrayFormulaEmbeddedMap", Object.create(null));
@@ -10105,6 +10188,8 @@ let FormulaRuntimeService = class FormulaRuntimeService extends _univerjs_core.D
 	reset() {
 		this._formulaExecuteStage = 0;
 		this._runtimeData = Object.create(null);
+		this._sourceFormulaData = Object.create(null);
+		this._currentSourceFormula = void 0;
 		this._runtimeOtherData = Object.create(null);
 		this._unitArrayFormulaRange = Object.create(null);
 		this._unitArrayFormulaEmbeddedMap = Object.create(null);
@@ -10126,6 +10211,7 @@ let FormulaRuntimeService = class FormulaRuntimeService extends _univerjs_core.D
 		clearReferenceToRangeCache();
 	}
 	setCurrent(row, column, rowCount, columnCount, sheetId, unitId) {
+		var _this$_currentConfigS, _this$_currentConfigS2;
 		this._externalReferenceUnavailable = false;
 		this._currentRow = row;
 		this._currentColumn = column;
@@ -10133,6 +10219,18 @@ let FormulaRuntimeService = class FormulaRuntimeService extends _univerjs_core.D
 		this._currentColumnCount = columnCount;
 		this._currentSubUnitId = sheetId;
 		this._currentUnitId = unitId;
+		const cell = (_this$_currentConfigS = this._currentConfigService.getUnitData()[unitId]) === null || _this$_currentConfigS === void 0 || (_this$_currentConfigS = _this$_currentConfigS[sheetId]) === null || _this$_currentConfigS === void 0 ? void 0 : _this$_currentConfigS.cellData.getValue(row, column);
+		const formula = (_this$_currentConfigS2 = this._currentConfigService.getFormulaData()[unitId]) === null || _this$_currentConfigS2 === void 0 || (_this$_currentConfigS2 = _this$_currentConfigS2[sheetId]) === null || _this$_currentConfigS2 === void 0 || (_this$_currentConfigS2 = _this$_currentConfigS2[row]) === null || _this$_currentConfigS2 === void 0 ? void 0 : _this$_currentConfigS2[column];
+		if (formula) {
+			const isSharedFollower = (formula.x ?? 0) !== 0 || (formula.y ?? 0) !== 0;
+			this._currentSourceFormula = {
+				f: isSharedFollower ? "" : formula.f,
+				si: formula.si
+			};
+		} else this._currentSourceFormula = (cell === null || cell === void 0 ? void 0 : cell.f) || (cell === null || cell === void 0 ? void 0 : cell.si) ? {
+			f: cell.f ?? "",
+			si: cell.si ?? void 0
+		} : void 0;
 	}
 	setFunctionRefInfoOverride(rowCount, columnCount) {
 		this._functionRefInfoOverrideStack.push({
@@ -10183,9 +10281,9 @@ let FormulaRuntimeService = class FormulaRuntimeService extends _univerjs_core.D
 	}
 	setRuntimeData(functionVariant) {
 		if (this._externalReferenceUnavailable) {
-			var _this$_currentConfigS, _this$_currentConfigS2;
-			const cell = (_this$_currentConfigS = this._currentConfigService.getUnitData()[this._currentUnitId]) === null || _this$_currentConfigS === void 0 || (_this$_currentConfigS = _this$_currentConfigS[this._currentSubUnitId]) === null || _this$_currentConfigS === void 0 ? void 0 : _this$_currentConfigS.cellData.getValue(this._currentRow, this._currentColumn);
-			const formula = (_this$_currentConfigS2 = this._currentConfigService.getFormulaData()[this._currentUnitId]) === null || _this$_currentConfigS2 === void 0 || (_this$_currentConfigS2 = _this$_currentConfigS2[this._currentSubUnitId]) === null || _this$_currentConfigS2 === void 0 || (_this$_currentConfigS2 = _this$_currentConfigS2[this._currentRow]) === null || _this$_currentConfigS2 === void 0 || (_this$_currentConfigS2 = _this$_currentConfigS2[this._currentColumn]) === null || _this$_currentConfigS2 === void 0 ? void 0 : _this$_currentConfigS2.f;
+			var _this$_currentConfigS3, _this$_currentConfigS4;
+			const cell = (_this$_currentConfigS3 = this._currentConfigService.getUnitData()[this._currentUnitId]) === null || _this$_currentConfigS3 === void 0 || (_this$_currentConfigS3 = _this$_currentConfigS3[this._currentSubUnitId]) === null || _this$_currentConfigS3 === void 0 ? void 0 : _this$_currentConfigS3.cellData.getValue(this._currentRow, this._currentColumn);
+			const formula = (_this$_currentConfigS4 = this._currentConfigService.getFormulaData()[this._currentUnitId]) === null || _this$_currentConfigS4 === void 0 || (_this$_currentConfigS4 = _this$_currentConfigS4[this._currentSubUnitId]) === null || _this$_currentConfigS4 === void 0 || (_this$_currentConfigS4 = _this$_currentConfigS4[this._currentRow]) === null || _this$_currentConfigS4 === void 0 || (_this$_currentConfigS4 = _this$_currentConfigS4[this._currentColumn]) === null || _this$_currentConfigS4 === void 0 ? void 0 : _this$_currentConfigS4.f;
 			if ((cell === null || cell === void 0 ? void 0 : cell.f) && cell.v != null && (formula == null || formula === cell.f)) return;
 		}
 		const row = this._currentRow;
@@ -10244,7 +10342,7 @@ let FormulaRuntimeService = class FormulaRuntimeService extends _univerjs_core.D
 			const hasDataInArrayFormulaRange = this._checkIfArrayFormulaRangeHasData(unitId, sheetId, row, column, arrayRange);
 			const isArrayFormulaExceeded = this._checkIfArrayFormulaExceeded(rowCount, columnCount, arrayRange);
 			if (hasDataInArrayFormulaRange || isArrayFormulaExceeded) {
-				var _this$_currentConfigS3;
+				var _this$_currentConfigS5;
 				const errorObject = this._getValueObjectOfRuntimeData(ErrorValueObject.create("#SPILL!"));
 				sheetData.setValue(row, column, errorObject);
 				clearArrayUnitData.setValue(row, column, errorObject);
@@ -10255,7 +10353,7 @@ let FormulaRuntimeService = class FormulaRuntimeService extends _univerjs_core.D
 				*/
 				const unitData = this._currentConfigService.getUnitData();
 				const arrayData = this._currentConfigService.getArrayFormulaCellData();
-				const previousArrayFormulaRange = (_this$_currentConfigS3 = this._currentConfigService.getArrayFormulaRange()[unitId]) === null || _this$_currentConfigS3 === void 0 || (_this$_currentConfigS3 = _this$_currentConfigS3[sheetId]) === null || _this$_currentConfigS3 === void 0 || (_this$_currentConfigS3 = _this$_currentConfigS3[row]) === null || _this$_currentConfigS3 === void 0 ? void 0 : _this$_currentConfigS3[column];
+				const previousArrayFormulaRange = (_this$_currentConfigS5 = this._currentConfigService.getArrayFormulaRange()[unitId]) === null || _this$_currentConfigS5 === void 0 || (_this$_currentConfigS5 = _this$_currentConfigS5[sheetId]) === null || _this$_currentConfigS5 === void 0 || (_this$_currentConfigS5 = _this$_currentConfigS5[row]) === null || _this$_currentConfigS5 === void 0 ? void 0 : _this$_currentConfigS5[column];
 				objectValueRefOrArray.iterator((_, rowIndex, columnIndex) => {
 					var _unitData$unitId, _arrayData$unitId;
 					const currentRow = rowIndex - startRow + row;
@@ -10295,6 +10393,12 @@ let FormulaRuntimeService = class FormulaRuntimeService extends _univerjs_core.D
 		} else {
 			const valueObject = this._getValueObjectOfRuntimeData(functionVariant);
 			sheetData.setValue(row, column, valueObject);
+			if (this._currentSourceFormula != null) {
+				const unitFormulas = this._sourceFormulaData[unitId] ??= {};
+				const sheetFormulas = unitFormulas[sheetId] ??= {};
+				const rowFormulas = sheetFormulas[row] ??= {};
+				rowFormulas[column] = { ...this._currentSourceFormula };
+			}
 			if (functionVariant.isString() && functionVariant.isImage()) {
 				const imageInfo = functionVariant.getImageInfo();
 				if (imageInfo) this._runtimeImageFormulaData.push({
@@ -10366,6 +10470,7 @@ let FormulaRuntimeService = class FormulaRuntimeService extends _univerjs_core.D
 	getAllRuntimeData() {
 		return {
 			unitData: this.getUnitData(),
+			sourceFormulaData: this._sourceFormulaData,
 			arrayFormulaRange: this.getUnitArrayFormula(),
 			arrayFormulaEmbedded: this.getUnitArrayFormulaEmbeddedMap(),
 			unitOtherData: this.getRuntimeOtherData(),
@@ -10392,11 +10497,11 @@ let FormulaRuntimeService = class FormulaRuntimeService extends _univerjs_core.D
 		FORMULA_REF_TO_ARRAY_CACHE.clear();
 	}
 	_checkIfArrayFormulaRangeHasData(formulaUnitId, formulaSheetId, formulaRow, formulaColumn, arrayRange) {
-		var _this$_currentConfigS4;
+		var _this$_currentConfigS6;
 		const { startRow, startColumn, endRow, endColumn } = arrayRange;
 		const unitData = this._currentConfigService.getUnitData();
 		const arrayData = this._currentConfigService.getArrayFormulaCellData();
-		const previousArrayFormulaRange = (_this$_currentConfigS4 = this._currentConfigService.getArrayFormulaRange()[formulaUnitId]) === null || _this$_currentConfigS4 === void 0 || (_this$_currentConfigS4 = _this$_currentConfigS4[formulaSheetId]) === null || _this$_currentConfigS4 === void 0 || (_this$_currentConfigS4 = _this$_currentConfigS4[formulaRow]) === null || _this$_currentConfigS4 === void 0 ? void 0 : _this$_currentConfigS4[formulaColumn];
+		const previousArrayFormulaRange = (_this$_currentConfigS6 = this._currentConfigService.getArrayFormulaRange()[formulaUnitId]) === null || _this$_currentConfigS6 === void 0 || (_this$_currentConfigS6 = _this$_currentConfigS6[formulaSheetId]) === null || _this$_currentConfigS6 === void 0 || (_this$_currentConfigS6 = _this$_currentConfigS6[formulaRow]) === null || _this$_currentConfigS6 === void 0 ? void 0 : _this$_currentConfigS6[formulaColumn];
 		for (let r = startRow; r <= endRow; r++) for (let c = startColumn; c <= endColumn; c++) {
 			var _this$_runtimeData, _arrayData$formulaUni, _unitData$formulaUnit;
 			if (r === formulaRow && formulaColumn === c) continue;
@@ -10432,8 +10537,8 @@ let FormulaRuntimeService = class FormulaRuntimeService extends _univerjs_core.D
 	* @returns
 	*/
 	_isInOtherArrayFormulaRange(formulaUnitId, formulaSheetId, formulaRow, formulaColumn, r, c) {
-		var _this$_currentConfigS5;
-		const arrayFormulaRange = (_this$_currentConfigS5 = this._currentConfigService.getArrayFormulaRange()[formulaUnitId]) === null || _this$_currentConfigS5 === void 0 ? void 0 : _this$_currentConfigS5[formulaSheetId];
+		var _this$_currentConfigS7;
+		const arrayFormulaRange = (_this$_currentConfigS7 = this._currentConfigService.getArrayFormulaRange()[formulaUnitId]) === null || _this$_currentConfigS7 === void 0 ? void 0 : _this$_currentConfigS7[formulaSheetId];
 		if (arrayFormulaRange == null) return false;
 		let isCellOverlapping = false;
 		new _univerjs_core.ObjectMatrix(arrayFormulaRange).forValue((rangeRow, rangeCol, range) => {
@@ -10446,8 +10551,8 @@ let FormulaRuntimeService = class FormulaRuntimeService extends _univerjs_core.D
 		return isCellOverlapping;
 	}
 	_isCurrentSingleCellArrayFormulaRange(unitId, sheetId, row, column) {
-		var _this$_currentConfigS6;
-		const range = (_this$_currentConfigS6 = this._currentConfigService.getArrayFormulaRange()[unitId]) === null || _this$_currentConfigS6 === void 0 || (_this$_currentConfigS6 = _this$_currentConfigS6[sheetId]) === null || _this$_currentConfigS6 === void 0 || (_this$_currentConfigS6 = _this$_currentConfigS6[row]) === null || _this$_currentConfigS6 === void 0 ? void 0 : _this$_currentConfigS6[column];
+		var _this$_currentConfigS8;
+		const range = (_this$_currentConfigS8 = this._currentConfigService.getArrayFormulaRange()[unitId]) === null || _this$_currentConfigS8 === void 0 || (_this$_currentConfigS8 = _this$_currentConfigS8[sheetId]) === null || _this$_currentConfigS8 === void 0 || (_this$_currentConfigS8 = _this$_currentConfigS8[row]) === null || _this$_currentConfigS8 === void 0 ? void 0 : _this$_currentConfigS8[column];
 		return range != null && range.startRow === range.endRow && range.startColumn === range.endColumn;
 	}
 	_isInArrayFormulaRange(range, r, c) {
@@ -14807,13 +14912,13 @@ let CalculateFormulaService = class CalculateFormulaService extends _univerjs_co
 		this._runtimeService.setRuntimeFeatureRange(featureId, featureRange);
 	}
 	async execute(formulaDatasetConfig) {
-		this._runtimeService.setFormulaExecuteStage(1);
-		this._executionInProgressListener$.next(this._runtimeService.getRuntimeState());
-		this._currentConfigService.load(formulaDatasetConfig);
-		this._runtimeService.reset();
-		const cycleReferenceCount = formulaDatasetConfig.maxIteration || 1;
-		this._isCalculateTreeModel = formulaDatasetConfig.isCalculateTreeModel || false;
-		this._executeLock.acquire("FORMULA_EXECUTION_LOCK", async () => {
+		return this._executeLock.acquire("FORMULA_EXECUTION_LOCK", async () => {
+			this._runtimeService.setFormulaExecuteStage(1);
+			this._executionInProgressListener$.next(this._runtimeService.getRuntimeState());
+			this._currentConfigService.load(formulaDatasetConfig);
+			this._runtimeService.reset();
+			const cycleReferenceCount = formulaDatasetConfig.maxIteration || 1;
+			this._isCalculateTreeModel = formulaDatasetConfig.isCalculateTreeModel || false;
 			for (let i = 0; i < cycleReferenceCount; i++) {
 				this._runtimeService.setFormulaCycleIndex(i);
 				const executed = await this._executeStep();
@@ -15186,7 +15291,7 @@ let CalculateController = class CalculateController extends _univerjs_core.Dispo
 		if (dependencyTreeModelData.length > 0) this._commandService.executeCommand(SetFormulaDependencyCalculationResultMutation.id, { result: dependencyTreeModelData }, { onlyLocal: true });
 	}
 	async _applyResult(data) {
-		const { unitData, unitOtherData, arrayFormulaRange, arrayFormulaCellData, clearArrayFormulaCellData, arrayFormulaEmbedded, imageFormulaData } = data;
+		const { unitData, sourceFormulaData, unitOtherData, arrayFormulaRange, arrayFormulaCellData, clearArrayFormulaCellData, arrayFormulaEmbedded, imageFormulaData } = data;
 		if (!unitData) {
 			this._applyTreeResult(data);
 			console.error("No sheetData from Formula Engine!");
@@ -15206,6 +15311,7 @@ let CalculateController = class CalculateController extends _univerjs_core.Dispo
 		this._applyTreeResult(data);
 		this._commandService.executeCommand(SetFormulaCalculationResultMutation.id, {
 			unitData: convertRuntimeToUnitData(unitData),
+			sourceFormulaData,
 			unitOtherData
 		}, { onlyLocal: true });
 	}
@@ -36245,6 +36351,19 @@ var Sumif = class extends BaseFunction {
 		let _criteria = criteria;
 		if (criteria.isReferenceObject()) _criteria = criteria.toArrayValueObject();
 		if (_criteria.isArray()) {
+			const criteriaArray = _criteria;
+			const rangeArray = range.toArrayValueObject();
+			const targetArray = sumRange ? sumRange.toArrayValueObject() : rangeArray;
+			if (criteriaArray.getRowCount() * criteriaArray.getColumnCount() > 1 && rangeArray.getRowCount() === targetArray.getRowCount() && rangeArray.getColumnCount() === targetArray.getColumnCount()) {
+				const values = getPairedRangeAndCriteriaResult([rangeArray, criteriaArray], {
+					formulaName: "SUMIFS",
+					maxRowLength: criteriaArray.getRowCount(),
+					maxColumnLength: criteriaArray.getColumnCount(),
+					isNumberSensitive: true,
+					targetRange: targetArray
+				});
+				return criteriaArray.mapValue((_, row, column) => values[row][column]);
+			}
 			const resultArray = _criteria.mapValue((criteriaObject) => this._handleSingleObject(range, criteriaObject, sumRange));
 			if (resultArray.getRowCount() === 1 && resultArray.getColumnCount() === 1) return resultArray.get(0, 0);
 			return resultArray;
@@ -37230,6 +37349,19 @@ var Averageif = class extends BaseFunction {
 		let _criteria = criteria;
 		if (criteria.isReferenceObject()) _criteria = criteria.toArrayValueObject();
 		if (_criteria.isArray()) {
+			const criteriaArray = _criteria;
+			const rangeArray = range.toArrayValueObject();
+			const targetArray = averageRange ? averageRange.toArrayValueObject() : rangeArray;
+			if (criteriaArray.getRowCount() * criteriaArray.getColumnCount() > 1 && rangeArray.getRowCount() === targetArray.getRowCount() && rangeArray.getColumnCount() === targetArray.getColumnCount()) {
+				const values = getPairedRangeAndCriteriaResult([rangeArray, criteriaArray], {
+					formulaName: "AVERAGEIFS",
+					maxRowLength: criteriaArray.getRowCount(),
+					maxColumnLength: criteriaArray.getColumnCount(),
+					isNumberSensitive: true,
+					targetRange: targetArray
+				});
+				return criteriaArray.mapValue((_, row, column) => values[row][column]);
+			}
 			const resultArray = _criteria.mapValue((criteriaObject) => this._handleSingleObject(range, criteriaObject, averageRange));
 			if (resultArray.getRowCount() === 1 && resultArray.getColumnCount() === 1) return resultArray.get(0, 0);
 			return resultArray;
@@ -37648,6 +37780,18 @@ var Countif = class extends BaseFunction {
 			}
 		}
 		if (_criteria.isArray()) {
+			const criteriaArray = _criteria;
+			const rangeArray = range.toArrayValueObject();
+			if (criteriaArray.getRowCount() * criteriaArray.getColumnCount() > 1) {
+				const normalized = criteria.isReferenceObject() ? criteriaArray.mapValue((value) => value.isNull() ? NumberValueObject.create(0) : value) : criteriaArray;
+				const values = getPairedRangeAndCriteriaResult([rangeArray, normalized], {
+					formulaName: "COUNTIFS",
+					maxRowLength: criteriaArray.getRowCount(),
+					maxColumnLength: criteriaArray.getColumnCount(),
+					isNumberSensitive: true
+				});
+				return criteriaArray.mapValue((_, row, column) => values[row][column]);
+			}
 			const resultArray = _criteria.mapValue((criteriaObject) => this._handleSingleObject(range, criteria.isReferenceObject() && criteriaObject.isNull() ? NumberValueObject.create(0) : criteriaObject));
 			if (resultArray.getRowCount() === 1 && resultArray.getColumnCount() === 1) return resultArray.get(0, 0);
 			return resultArray;
@@ -43630,7 +43774,7 @@ function getObjectValue(result, isUseStrip = false) {
 //#endregion
 //#region package.json
 var name = "@univerjs/engine-formula";
-var version = "1.0.2";
+var version = "1.0.4";
 
 //#endregion
 //#region src/services/global-computing-status.service.ts