From 9f3bc47b98cbc51df7cfcea94d4aa0c35f40cbc5 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 13 十月 2026 14:09:06 +0800
Subject: [PATCH] feat: 添加数字格式化工具，支持去掉小数末尾多余的 0 和四舍五入功能
---
src/utils/summarizeTable.js | 47 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 40 insertions(+), 7 deletions(-)
diff --git a/src/utils/summarizeTable.js b/src/utils/summarizeTable.js
index 1ad480d..cb667d2 100644
--- a/src/utils/summarizeTable.js
+++ b/src/utils/summarizeTable.js
@@ -1,8 +1,16 @@
+import { trimZeros, roundHalfUp } from "./formatNumber.js";
+
/**
* 閫氱敤鐨勮〃鏍煎悎璁℃柟娉�
* @param {Object} param - 鍖呭惈琛ㄦ牸鍒楅厤缃拰鏁版嵁婧愮殑瀵硅薄
* @param {Array<string>} summaryProps - 闇�瑕佹眹鎬荤殑瀛楁鍚嶆暟缁�
* @param {Object} specialFormat - 鐗规畩鏍煎紡鍖栬鍒欙細瀛楁鍚� -> 鏍煎紡鍖栭�夐」锛堝鏄惁鍘绘帀灏忔暟锛�
+ * 鏀寔 { noDecimal: true } 鍙栨暣鏄剧ず
+ * { trimZeros: true, decimalPlaces: 6 } 鏈�澶氫繚鐣� 6 浣嶅皬鏁板苟鍘绘帀鏈熬澶氫綑鐨� 0
+ * { roundEach: 2 } 姣忚鍏堟寜 2 浣嶅皬鏁板洓鑸嶄簲鍏ュ啀姹傚拰锛�
+ * 鐢ㄤ簬閲戦鍒楋細淇濊瘉鍚堣涓庡垪鍐呭睍绀哄�肩浉鍔犲畬鍏ㄤ竴鑷�
+ * { formatter: fn } 鑷畾涔夋牸寮忓寲鍑芥暟锛屼紭鍏堢骇鏈�楂�
+ * { decimalPlaces: 2 } 鍥哄畾淇濈暀 2 浣嶅皬鏁帮紙榛樿锛�
* @returns {Array} 鍚堣琛屾暟鎹�
*/
const summarizeTable = (param, summaryProps, specialFormat = {}) => {
@@ -15,7 +23,15 @@
}
const prop = column.property;
if (summaryProps.includes(prop)) {
- const values = data.map((item) => Number(item[prop]));
+ const rule = specialFormat[prop];
+ const values = data.map((item) => {
+ const val = Number(item[prop]);
+ // NaN 淇濇寔 NaN锛屼究浜庝笅闈㈠垽鏂�屾暣鍒楅兘涓嶆槸鏁板瓧銆�
+ if (Number.isNaN(val)) return NaN;
+ return rule && rule.roundEach != null
+ ? roundHalfUp(val, rule.roundEach)
+ : val;
+ });
// 鍙鏈夋晥鏁板瓧杩涜姹傚拰
if (!values.every(isNaN)) {
const sum = values.reduce(
@@ -25,6 +41,15 @@
if (specialFormat[prop] && specialFormat[prop].noDecimal) {
// 濡傛灉鎸囧畾浜嗕笉闇�瑕佷繚鐣欏皬鏁帮紝鍒欑洿鎺ヨ浆鎹负鏁存暟
sums[index] = Math.round(sum).toString();
+ } else if (
+ specialFormat[prop] &&
+ typeof specialFormat[prop].formatter === "function"
+ ) {
+ // 鑷畾涔夋牸寮忓寲鍑芥暟浼樺厛
+ sums[index] = specialFormat[prop].formatter(sum);
+ } else if (specialFormat[prop] && specialFormat[prop].trimZeros) {
+ // 鎸囧畾浜嗗幓鎺夋湯灏惧浣欑殑 0锛堟渶澶氫繚鐣� decimalPlaces 浣嶏紝榛樿 6 浣嶏級
+ sums[index] = trimZeros(sum, specialFormat[prop].decimalPlaces ?? 6);
} else {
// 榛樿淇濈暀涓や綅灏忔暟
sums[index] = parseFloat(sum).toFixed(
@@ -40,14 +65,22 @@
});
return sums;
};
-// 涓嶅惈绋庢�讳环璁＄畻
-const calculateTaxExclusiveTotalPrice = (taxInclusiveTotalPrice, taxRate) => {
+// 涓嶅惈绋庢�讳环璁＄畻锛宒ecimals 涓轰繚鐣欏皬鏁颁綅鏁帮紙閿�鍞�/閲囪喘鐩稿叧椤甸潰浼� 6锛�
+const calculateTaxExclusiveTotalPrice = (
+ taxInclusiveTotalPrice,
+ taxRate,
+ decimals = 2
+) => {
const taxRateDecimal = taxRate / 100;
- return (taxInclusiveTotalPrice / (1 + taxRateDecimal)).toFixed(2);
+ return (taxInclusiveTotalPrice / (1 + taxRateDecimal)).toFixed(decimals);
};
-// 鍚◣鎬讳环璁＄畻
-const calculateTaxIncludeTotalPrice = (taxInclusiveUnitPrice, quantity) => {
- return (taxInclusiveUnitPrice * quantity).toFixed(2);
+// 鍚◣鎬讳环璁＄畻锛宒ecimals 涓轰繚鐣欏皬鏁颁綅鏁帮紙閿�鍞�/閲囪喘鐩稿叧椤甸潰浼� 6锛�
+const calculateTaxIncludeTotalPrice = (
+ taxInclusiveUnitPrice,
+ quantity,
+ decimals = 2
+) => {
+ return (taxInclusiveUnitPrice * quantity).toFixed(decimals);
};
// 瀵煎嚭鍑芥暟渚涘叾浠栨枃浠朵娇鐢�
export {
--
Gitblit v1.9.3