iv-npm 1.7.33 → 1.7.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iv-npm",
-  "version": "1.7.33",
+  "version": "1.7.35",
   "description": "公共通用包",
   "author": "Mr.Cong",
   "license": "ISC",

package/packages/shared/dist/utils/index.d.ts

@@ -133,6 +133,11 @@ declare function getAmountByUnit(amount: number): string;
  * @description 将金额保留两位小数。如果包含元字，处理结果也会返回元
  * @param amount
  * */
-declare const amountToFixed: (_v?: number | string) => string | 0;
+declare const amountToFixed: (_v?: number | string) => string | 0;
+/**
+ * @description 将金额加千分符并保留两位小数。如果包含元字，处理结果也会返回元
+ * @param amount
+ * */
+declare const amountToThousandthFixed: (num?: number | string, fixed?: number) => string | 0;
 
-export { LineIDEnum, ProjectStausEnum, SignStatusEnum, amountToFixed, apiConfiger, arrToTree, arraySum, arraySumByKey, assign, buildURL as buildUrl, dateFormat, filterOptionHeadle, findTree, formatPercentage, formatType, getAmountByUnit, hostConfiger, isArraySumCompared, isDate, isObject, isPlainObject, isURLSearchParams, numFormat, onChangeTail, tranListToTreeData, yearMonthDayFormat, yearMonthFormat };
+export { LineIDEnum, ProjectStausEnum, SignStatusEnum, amountToFixed, amountToThousandthFixed, apiConfiger, arrToTree, arraySum, arraySumByKey, assign, buildURL as buildUrl, dateFormat, filterOptionHeadle, findTree, formatPercentage, formatType, getAmountByUnit, hostConfiger, isArraySumCompared, isDate, isObject, isPlainObject, isURLSearchParams, numFormat, onChangeTail, tranListToTreeData, yearMonthDayFormat, yearMonthFormat };

package/packages/shared/dist/utils/index.mjs

@@ -464,11 +464,35 @@ var amountToFixed = (_v) => {
   }
   return (!Number.isNaN(value) ? value.toFixed(2) : 0) + (flag ? " \u5143" : "");
 };
+var amountToThousandthFixed = (num, fixed = 2) => {
+  if (!num)
+    return 0;
+  let value = num;
+  let flag = false;
+  if (typeof num === "string") {
+    if (num.includes("\u5143")) {
+      flag = true;
+      value = parseFloat(num.split("\u5143")[0]);
+    } else {
+      value = parseFloat(num);
+    }
+  }
+  value = isNaN(Number(value)) ? 0 : Number(value);
+  if (fixed)
+    value = value.toFixed(fixed);
+  value = value.toString().replace(/\d+/, function(n) {
+    return n.replace(/(\d)(?=(\d{3})+$)/g, function($1) {
+      return $1 + ",";
+    });
+  });
+  return (!Number.isNaN(value) ? value : 0) + (flag ? " \u5143" : "");
+};
 export {
   LineIDEnum,
   ProjectStausEnum,
   SignStatusEnum,
   amountToFixed,
+  amountToThousandthFixed,
   apiConfiger,
   arrToTree,
   arraySum,