From c2398150b44b54a1f08e7af4b6a64f0c170046f0 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 27 十月 2026 14:35:48 +0800
Subject: [PATCH] fix: 支持计算值和最终值按批注格式化
---
src/utils/excelFountion.js | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/src/utils/excelFountion.js b/src/utils/excelFountion.js
index a61500b..0013a84 100644
--- a/src/utils/excelFountion.js
+++ b/src/utils/excelFountion.js
@@ -61,21 +61,18 @@
*/
function AVERAGE(...val) {
try {
- let num = null;
- let arr = [];
- if (val && val.length > 0) {
- arr = val.filter((item) => item != null && item !== "");
- arr.forEach((item) => {
- num += item;
- });
- if (arr.length > 0) {
- return num / arr.length;
- } else {
- return null;
+ // 鍗曞厓鏍煎�肩粡甯镐互瀛楃涓插舰寮忎紶鍏ワ紱鍏堝睍寮�鍙傛暟骞惰浆鎴愭暟瀛楋紝閬垮厤
+ // `AVERAGE(C3:D3)` 鍦ㄥ睍寮�鍚庢敹鍒板瓧绗︿覆鑰屽緱鍒� NaN銆�
+ const values = [];
+ const flatten = (items) => items.forEach((item) => {
+ if (Array.isArray(item)) return flatten(item);
+ if (item !== null && item !== undefined && item !== "" && item !== " ") {
+ const number = Number(item);
+ if (Number.isFinite(number)) values.push(number);
}
- } else {
- return null;
- }
+ });
+ flatten(val);
+ return values.length ? values.reduce((sum, item) => sum + item, 0) / values.length : null;
} catch (error) {}
}
/**
--
Gitblit v1.9.3