@peng_kai/kit 0.2.50 → 0.3.0-beta.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@peng_kai/kit",
   "type": "module",
-  "version": "0.2.50",
+  "version": "0.3.0-beta.2",
   "description": "",
   "author": "",
   "license": "ISC",
@@ -13,41 +13,41 @@
     "lint:fix": "eslint . --fix"
   },
   "peerDependencies": {
-    "ant-design-vue": "4.2.3",
-    "vue": "3.4.31",
-    "vue-router": "4.4.0"
+    "ant-design-vue": "4.2.5",
+    "vue": "3.5.11",
+    "vue-router": "4.4.5"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.609.0",
-    "@aws-sdk/lib-storage": "^3.609.0",
-    "@babel/generator": "^7.24.7",
-    "@babel/parser": "^7.24.7",
-    "@babel/traverse": "^7.24.7",
-    "@babel/types": "^7.24.7",
+    "@aws-sdk/client-s3": "^3.667.0",
+    "@aws-sdk/lib-storage": "^3.667.0",
+    "@babel/generator": "^7.25.7",
+    "@babel/parser": "^7.25.7",
+    "@babel/traverse": "^7.25.7",
+    "@babel/types": "^7.25.7",
     "@ckeditor/ckeditor5-vue": "^5.1.0",
-    "@fingerprintjs/fingerprintjs": "^4.4.1",
-    "@tanstack/vue-query": "^5.49.1",
-    "@vueuse/components": "^10.11.0",
-    "@vueuse/core": "^10.11.0",
-    "@vueuse/router": "^10.11.0",
-    "a-calc": "^1.3.12",
+    "@fingerprintjs/fingerprintjs": "^4.5.0",
+    "@tanstack/vue-query": "^5.59.1",
+    "@vueuse/components": "^11.1.0",
+    "@vueuse/core": "^11.1.0",
+    "@vueuse/router": "^11.1.0",
+    "a-calc": "^2.2.10",
     "archiver": "^7.0.1",
-    "axios": "^1.7.2",
+    "axios": "^1.7.7",
     "bignumber.js": "^9.1.2",
     "chokidar": "^3.6.0",
     "crypto-es": "^2.1.0",
-    "dayjs": "^1.11.11",
-    "echarts": "^5.4.3",
-    "execa": "^9.3.0",
+    "dayjs": "^1.11.13",
+    "echarts": "^5.5.1",
+    "execa": "^9.4.0",
     "fast-glob": "^3.3.2",
     "localstorage-slim": "^2.7.1",
     "lodash-es": "^4.17.21",
     "nprogress": "^0.2.0",
-    "pinia": "^2.1.7",
+    "pinia": "^2.2.4",
     "tsx": "^4.16.00",
-    "vue": "^3.4.31",
-    "vue-i18n": "^9.13.1",
-    "vue-router": "^4.4.0"
+    "vue": "^3.5.11",
+    "vue-i18n": "^10.0.4",
+    "vue-router": "^4.4.5"
   },
   "devDependencies": {
     "@ckeditor/ckeditor5-adapter-ckfinder": "^41.1.0",
@@ -85,11 +85,11 @@
     "@types/archiver": "^6.0.2",
     "@types/crypto-js": "^4.2.2",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^18.19.39",
+    "@types/node": "^20.16.11",
     "@types/nprogress": "^0.2.3",
-    "ant-design-vue": "^4.2.3",
-    "type-fest": "^4.21.0",
-    "typescript": "^5.5.3",
-    "vue-component-type-helpers": "^2.0.24"
+    "ant-design-vue": "^4.2.5",
+    "type-fest": "^4.26.1",
+    "typescript": "^5.6.3",
+    "vue-component-type-helpers": "^2.1.6"
   }
 }

package/utils/number.ts

@@ -1,4 +1,3 @@
-import { calc } from 'a-calc';
 import type { BigNumber } from 'bignumber.js';
 import bn from 'bignumber.js';
 
@@ -17,23 +16,50 @@ export { calc } from 'a-calc';
  */
 export const numFmt = {
   /** 保留18位小数，千位符 */
-  t: (num: any, err: any = null) => calc('a | <=18 ,', { a: String(num), _error: err }) as string | null,
+  t: (num: any, fallback: any = 'NaN') => {
+    const result = bn(num);
+    return result.isNaN() ? fallback : result.decimalPlaces(18, bn.ROUND_DOWN).toFormat();
+  },
   /** 舍去小数，四舍五入，千位符 */
-  d0r5t: (num: any, err: any = null) => calc('a | =0 ~5 ,', { a: String(num), _error: err }) as string | null,
+  d0r5t: (num: any, fallback: any = 'NaN') => {
+    const result = bn(num);
+    return result.isNaN() ? fallback : result.decimalPlaces(0, bn.ROUND_HALF_UP).toFormat(0);
+  },
   /** 舍去小数，向下取整，千位符 */
-  d0r0t: (num: any, err: any = null) => calc('a | =0 ~- ,', { a: String(num), _error: err }) as string | null,
+  d0r0t: (num: any, fallback: any = 'NaN') => {
+    const result = bn(num);
+    return result.isNaN() ? fallback : result.decimalPlaces(0, bn.ROUND_DOWN).toFormat(0);
+  },
   /** 保留2位小数，四舍五入，千位符 */
-  d2r5t: (num: any, err: any = null) => calc('a | <=2 ~5 ,', { a: String(num), _error: err }) as string | null,
+  d2r5t: (num: any, fallback: any = 'NaN') => {
+    const result = bn(num);
+    return result.isNaN() ? fallback : result.decimalPlaces(2, bn.ROUND_HALF_UP).toFormat(2);
+  },
   /** 保留2位小数，向下取整，千位符 */
-  d2r0t: (num: any, err: any = null) => calc('a | <=2 ~- ,', { a: String(num), _error: err }) as string | null,
+  d2r0t: (num: any, fallback: any = 'NaN') => {
+    const result = bn(num);
+    return result.isNaN() ? fallback : result.decimalPlaces(2, bn.ROUND_DOWN).toFormat(2);
+  },
   /** 保留6位小数，四舍五入，千位符 */
-  d6r5t: (num: any, err: any = null) => calc('a | <=6 ~5 ,', { a: String(num), _error: err }) as string | null,
+  d6r5t: (num: any, fallback: any = 'NaN') => {
+    const result = bn(num);
+    return result.isNaN() ? fallback : result.decimalPlaces(6, bn.ROUND_HALF_UP).toFormat(6);
+  },
   /** 保留6位小数，向下取整，千位符 */
-  d6r0t: (num: any, err: any = null) => calc('a | <=6 ~- ,', { a: String(num), _error: err }) as string | null,
+  d6r0t: (num: any, fallback: any = 'NaN') => {
+    const result = bn(num);
+    return result.isNaN() ? fallback : result.decimalPlaces(6, bn.ROUND_DOWN).toFormat(6);
+  },
   /** 保留8位小数，四舍五入，千位符 */
-  d8r5t: (num: any, err: any = null) => calc('a | <=8 ~5 ,', { a: String(num), _error: err }) as string | null,
+  d8r5t: (num: any, fallback: any = 'NaN') => {
+    const result = bn(num);
+    return result.isNaN() ? fallback : result.decimalPlaces(8, bn.ROUND_HALF_UP).toFormat(8);
+  },
   /** 保留8位小数，向下取整，千位符 */
-  d8r0t: (num: any, err: any = null) => calc('a | <=8 ~- ,', { a: String(num), _error: err }) as string | null,
+  d8r0t: (num: any, fallback: any = 'NaN') => {
+    const result = bn(num);
+    return result.isNaN() ? fallback : result.decimalPlaces(8, bn.ROUND_DOWN).toFormat(8);
+  },
 };
 
 /**
@@ -43,7 +69,7 @@ export const numFmt = {
  * @returns 金额的格式化字符串表示。
  */
 export function toAmount(amount: any, decimal: string | number = 0) {
-  const res = calc('a / 10 ** d', { a: String(amount), d: Number(decimal), _error: null });
+  const res = bn(amount).div(bn(10).pow(Number(decimal)));
   const fmt = (fmt: keyof typeof numFmt) => (numFmt[fmt] ?? numFmt.t)(res);
   fmt.toString = () => numFmt.t(res);