@peng_kai/kit 0.2.51 → 0.3.0-beta.10

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@peng_kai/kit",
   "type": "module",
-  "version": "0.2.51",
+  "version": "0.3.0-beta.10",
   "description": "",
   "author": "",
   "license": "ISC",
@@ -13,41 +13,40 @@
     "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.6",
+    "vue": "3.5.17",
+    "vue-router": "4.5.1"
   },
   "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.835.0",
+    "@aws-sdk/lib-storage": "^3.835.0",
+    "@babel/generator": "^7.27.5",
+    "@babel/parser": "^7.27.5",
+    "@babel/traverse": "^7.27.4",
+    "@babel/types": "^7.27.6",
     "@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.6.2",
+    "@tanstack/vue-query": "^5.81.2",
+    "@vueuse/components": "^13.4.0",
+    "@vueuse/core": "^13.4.0",
+    "@vueuse/router": "^13.4.0",
     "archiver": "^7.0.1",
-    "axios": "^1.7.2",
-    "bignumber.js": "^9.1.2",
+    "axios": "^1.10.0",
+    "bignumber.js": "^9.3.0",
     "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": "^3.0.3",
     "tsx": "^4.16.00",
-    "vue": "^3.4.31",
-    "vue-i18n": "^9.13.1",
-    "vue-router": "^4.4.0"
+    "vue": "^3.5.17",
+    "vue-i18n": "^11.1.7",
+    "vue-router": "^4.5.1"
   },
   "devDependencies": {
     "@ckeditor/ckeditor5-adapter-ckfinder": "^41.1.0",
@@ -82,14 +81,14 @@
     "@ckeditor/ckeditor5-upload": "^41.1.0",
     "@ckeditor/ckeditor5-word-count": "^41.1.0",
     "@peng_kai/lint": "^0.1.0",
-    "@types/archiver": "^6.0.2",
+    "@types/archiver": "^6.0.3",
     "@types/crypto-js": "^4.2.2",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^18.19.39",
+    "@types/node": "^22.15.33",
     "@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.6",
+    "type-fest": "^4.41.0",
+    "typescript": "^5.8.3",
+    "vue-component-type-helpers": "^2.2.10"
   }
 }

package/request/interceptors/getDeviceInfo.ts

@@ -25,7 +25,6 @@ export function getDeviceInfo(callback: (base: Record<string, any>, all: GetResu
       };
 
       req.headers.set('Device', callback(base, result));
-      req.headers.set('Device-Id', getDeviceID(base.visitor_id));
       req.headers.set('Accept-Date', getCurrentTimeZone());
 
       return req;
@@ -39,24 +38,3 @@ function getCurrentTimeZone() {
   const tzOffset = now.getTimezoneOffset() / 60;
   return toBase64([time, tz, tzOffset, describe].join('|'));
 }
-
-function getDeviceID(visitorId: string) {
-  const key = 'APP_DEVICE_ID';
-  const oldId = localStorage.getItem(key);
-  const newId = oldId || visitorId || generateRandomStringSecure(32);
-  newId !== oldId && localStorage.setItem(key, newId);
-  return newId;
-}
-
-function generateRandomStringSecure(length: number) {
-  const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-  const randomValues = new Uint32Array(length);
-  window.crypto.getRandomValues(randomValues); // 浏览器内置加密 API
-
-  let result = '';
-  for (let i = 0; i < length; i++) {
-    result += chars[randomValues[i] % chars.length];
-  }
-
-  return result;
-}

package/utils/LocaleManager.ts

@@ -63,7 +63,7 @@ export class LocaleManager {
 
     for (const target of localeTargets) {
       for (const codes of codeMatrix) {
-        const matched = codes.some(code => code.toUpperCase().startsWith(target.toUpperCase()));
+        const matched = codes.some(code => target.toUpperCase().startsWith(code.toUpperCase()));
 
         if (matched) {
           localeFinal = codes[0];

package/utils/locale/LocaleManager.ts

@@ -65,7 +65,7 @@ export class LocaleManager {
 
     for (const target of localeTargets) {
       for (const codes of codeMatrix) {
-        const matched = codes.some(code => code.toUpperCase().startsWith(target.toUpperCase()));
+        const matched = codes.some(code => target.toUpperCase().startsWith(code.toUpperCase()));
 
         if (matched) {
           localeFinal = codes[0];
@@ -92,6 +92,7 @@ export class LocaleManager {
     if (!this.localesAvailable.includes(locale))
       return;
 
+    // TODO: 这样可能无法支持code中的语言
     const message = await this.messageLoaders[locale]?.().catch(() => undefined);
 
     // 由于是异步加载，所以需要再判断是否已经加载过

package/utils/number.ts

@@ -1,9 +1,7 @@
-import { calc } from 'a-calc';
 import type { BigNumber } from 'bignumber.js';
 import bn from 'bignumber.js';
 
 export { default as bn } from 'bignumber.js';
-export { calc } from 'a-calc';
 
 /**
  * 常用的数值格式化规则
@@ -17,23 +15,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 +68,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);
 

package/utils/storage.ts

@@ -0,0 +1,31 @@
+import { type MaybeRefOrGetter, computed, isReactive, reactive, toValue } from 'vue';
+
+export class StorageKey<F extends Record<string, string | number>> {
+  public factors: F;
+  private split = '_';
+
+  public constructor(factors: F, private order: Array<keyof F>) {
+    this.factors = isReactive(factors) ? factors : reactive(factors) as F;
+  }
+
+  /**
+   * 构建存储键
+   * @param parts 键的部分
+   * @param excludeFactors 排除键的因素
+   */
+  public build(parts: Array<MaybeRefOrGetter<F[string]>>, excludeFactors: Array<keyof F> | boolean = false) {
+    const finalKey = computed(() => {
+      const thisKeys = parts.map(k => String(toValue(k)));
+      const factorKeys = Array.isArray(excludeFactors)
+        ? this.order.filter(k => !excludeFactors?.includes(k)).map(k => this.factors[k])
+        : excludeFactors
+          ? []
+          : this.order.map(k => this.factors[k]);
+      const thisStr = thisKeys.join(this.split);
+      const factorStr = factorKeys.join(this.split);
+      return `${factorStr}${factorStr ? this.split : ''}${thisStr}`;
+    });
+
+    return finalKey;
+  }
+}

package/admin/layout/large/PageTab.vue

@@ -1,70 +0,0 @@
-<script setup lang="ts">
-import { TabPane as ATabPane, Tabs as ATabs } from 'ant-design-vue';
-import { injectTTAdmin } from '../../adminPlugin';
-
-const pageTabStore = injectTTAdmin()!.deps.usePageTabStore();
-</script>
-
-<template>
-  <ATabs
-    class="app-page-tabs"
-    :activeKey="pageTabStore.activeTab"
-    type="editable-card"
-    size="small"
-    :animated="false"
-    :hideAdd="true"
-    :tabBarGutter="4"
-    @tabClick="(pageTabStore.openTab as any)"
-    @edit="(pageTabStore.closeTab as any)"
-  >
-    <ATabPane v-for="tab of pageTabStore.tabList" :key="tab.key" :tab="tab.title">
-      <template #closeIcon>
-        <i class="i-icon-park-outline:close" />
-      </template>
-    </ATabPane>
-  </ATabs>
-</template>
-
-<style scoped lang="scss">
-.app-page-tabs {
-  :deep(.ant-tabs-nav) {
-    margin: 0;
-  }
-
-  :deep(.ant-tabs-nav::before) {
-    display: none;
-  }
-
-  :deep(.ant-tabs-tab) {
-    --uno: 'border-rd-3px! text-14px p-[3px_1px_3px_8px]! select-none';
-  }
-
-  :deep(.ant-tabs-tab .ant-tabs-tab-btn) {
-    transform: translateX(8px);
-  }
-
-  :deep(.ant-tabs-tab-active) {
-    --uno: 'border-[currentColor]!';
-  }
-
-  :deep(.ant-tabs-tab-remove) {
-    display: flex;
-    height: 100%;
-    align-items: center;
-    margin: 0;
-    opacity: 0;
-    transition: all 150ms;
-  }
-
-  :deep(.ant-tabs-tab:hover .ant-tabs-tab-btn),
-  :deep(.ant-tabs-tab-active .ant-tabs-tab-btn) {
-    transform: translateX(0);
-  }
-
-  :deep(.ant-tabs-tab:hover .ant-tabs-tab-remove),
-  :deep(.ant-tabs-tab-active .ant-tabs-tab-remove) {
-    margin-left: 0;
-    opacity: 1;
-  }
-}
-</style>

package/admin/route-guards/collapseMenu.ts

@@ -1,11 +0,0 @@
-import type { Router } from 'vue-router';
-import { adminPlugin } from '../adminPlugin';
-
-export function setupCollapseMenu(router: Router) {
-  const menuStore = adminPlugin.deps.useMenuStore();
-
-  router.beforeEach(() => {
-    menuStore.collapsed = false;
-    return true;
-  });
-}

package/libs/a-calc.ts

@@ -1 +0,0 @@
-export * from 'a-calc';