@peng_kai/kit 0.3.0-beta.7 → 0.3.0-beta.9

package/antd/hooks/useAntdDrawer.ts

@@ -6,7 +6,12 @@ import type { ComponentProps } from 'vue-component-type-helpers';
 import type { Writable } from 'type-fest';
 import { useTemplateRefs } from '../../vue';
 
-const defaultDrawerProps: DrawerProps = { open: false, destroyOnClose: true, rootClassName: 'antd-cover__basic-drawer' };
+const defaultDrawerProps: DrawerProps = {
+  open: false,
+  destroyOnClose: true,
+  rootClassName: 'antd-cover__basic-drawer',
+  maskClosable: false,
+};
 
 interface IComponentConfig<Comp extends Component> {
   is: Comp

package/antd/hooks/useAntdModal.ts

@@ -30,6 +30,7 @@ const defaultModalProps: AntdModalProps = {
   destroyOnClose: true,
   wrapClassName: 'antd-cover__basic-modal',
   rejectOnClose: false,
+  maskClosable: false,
 };
 
 /**

package/libs/fingerprintjs.ts

@@ -0,0 +1,4 @@
+import fingerprintjs from '@fingerprintjs/fingerprintjs';
+export * from '@fingerprintjs/fingerprintjs';
+
+export default fingerprintjs;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@peng_kai/kit",
   "type": "module",
-  "version": "0.3.0-beta.7",
+  "version": "0.3.0-beta.9",
   "description": "",
   "author": "",
   "license": "ISC",
@@ -14,25 +14,25 @@
   },
   "peerDependencies": {
     "ant-design-vue": "4.2.5",
-    "vue": "3.5.11",
-    "vue-router": "4.4.5"
+    "vue": "3.5.13",
+    "vue-router": "4.5.0"
   },
   "dependencies": {
     "@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",
+    "@babel/generator": "^7.26.5",
+    "@babel/parser": "^7.26.7",
+    "@babel/traverse": "^7.26.7",
+    "@babel/types": "^7.26.7",
     "@ckeditor/ckeditor5-vue": "^5.1.0",
-    "@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",
+    "@fingerprintjs/fingerprintjs": "^4.5.1",
+    "@tanstack/vue-query": "^5.64.2",
+    "@vueuse/components": "^12.5.0",
+    "@vueuse/core": "^12.5.0",
+    "@vueuse/router": "^12.5.0",
     "a-calc": "^2.2.10",
     "archiver": "^7.0.1",
-    "axios": "^1.7.7",
+    "axios": "^1.7.9",
     "bignumber.js": "^9.1.2",
     "chokidar": "^3.6.0",
     "crypto-es": "^2.1.0",
@@ -43,11 +43,11 @@
     "localstorage-slim": "^2.7.1",
     "lodash-es": "^4.17.21",
     "nprogress": "^0.2.0",
-    "pinia": "^2.2.4",
+    "pinia": "^2.3.1",
     "tsx": "^4.16.00",
-    "vue": "^3.5.11",
-    "vue-i18n": "^10.0.4",
-    "vue-router": "^4.4.5"
+    "vue": "^3.5.13",
+    "vue-i18n": "^11.0.1",
+    "vue-router": "^4.5.0"
   },
   "devDependencies": {
     "@ckeditor/ckeditor5-adapter-ckfinder": "^41.1.0",
@@ -82,14 +82,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": "^20.16.11",
+    "@types/node": "^20.17.16",
     "@types/nprogress": "^0.2.3",
     "ant-design-vue": "^4.2.5",
-    "type-fest": "^4.26.1",
-    "typescript": "^5.6.3",
-    "vue-component-type-helpers": "^2.1.6"
+    "type-fest": "^4.33.0",
+    "typescript": "^5.7.3",
+    "vue-component-type-helpers": "^2.2.0"
   }
 }

package/request/interceptors/getDeviceInfo.ts

@@ -25,6 +25,7 @@ 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;
@@ -38,3 +39,24 @@ 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

@@ -1,3 +1,4 @@
+// 废弃，转移至 ./locale/index.ts
 import { mapKeys } from 'lodash-es';
 
 interface ILocaleMeta {

package/utils/blockchain.ts

@@ -40,6 +40,10 @@ export function getScanBrowser(chain: string, hash: string, type: 'transaction'
     },
     'DOGE': () => `https://dogechain.info/${evmType()}/${hash}`,
     'BTC': () => `https://mempool.space/${evmType()}/${hash}`,
+    'TON': () => {
+      const _type = type === 'transaction' ? '/transactions' : '';
+      return `https://tonscan.com${_type}/${hash}`;
+    },
   }[_chain] ?? (() => '');
 
   return urlFn();

package/utils/locale/LocaleManager.ts

@@ -1,4 +1,5 @@
 import { mapKeys } from 'lodash-es';
+import { normalizeLocaleCode } from './helpers';
 
 interface ILocaleMeta {
   label: string
@@ -59,20 +60,10 @@ export class LocaleManager {
     const localeTargets = [searchParams.get('locale'), searchParams.get('lang'), this.getStorageLocale(), navigator.language]
       .filter(locale => !!locale)
       .map(locale => locale!.replace('_', '-'));
-    // 区域代码矩阵，2级数组的第1项是这个区域的标识（也是这个语言对应的文件名:en-US.json），后面是这个区域的代码
-    const codeMatrix = this.localesAvailable.map(locale => [locale, ...this.localeMetas[locale].codes]);
     let localeFinal = '';
 
     for (const target of localeTargets) {
-      for (const codes of codeMatrix) {
-        const matched = codes.some(code => code.toUpperCase().startsWith(target.toUpperCase()));
-
-        if (matched) {
-          localeFinal = codes[0];
-          break;
-        }
-      }
-
+      localeFinal = this.findMatchingLocale(target);
       if (localeFinal)
         break;
     }
@@ -110,6 +101,26 @@ export class LocaleManager {
     return meta;
   }
 
+  /**
+   * 获取可用的区域
+   */
+  public findMatchingLocale(targetLocale: string) {
+    targetLocale = normalizeLocaleCode(targetLocale);
+    const codeMatrix = this.localesAvailable.map(locale => [locale, ...this.localeMetas[locale].codes]);
+    let matchedLocale = '';
+
+    for (const codes of codeMatrix) {
+      const matched = codes.some(code => code.toUpperCase().startsWith(targetLocale.toUpperCase()));
+
+      if (matched) {
+        matchedLocale = codes[0];
+        break;
+      }
+    }
+
+    return matchedLocale;
+  }
+
   private clearUrlLocale() {
     const url = new URL(location.href);
     url.searchParams.delete('locale');

package/utils/locale/helpers.ts

@@ -1,3 +1,4 @@
+import type { I18nOptions } from 'vue-i18n';
 import { omitBy } from '../../libs/lodash-es';
 
 /**
@@ -5,7 +6,7 @@ import { omitBy } from '../../libs/lodash-es';
  */
 export function normalizeLocaleCode(code: string) {
   // 移除所有空白字符并转换为小写
-  const normalized = code.replace(/\s/g, '').toLowerCase();
+  const normalized = code.replace(/\s/g, '').replace('_', '-').toLowerCase();
 
   // 处理特殊情况：中文
   if (normalized === 'zh-cn' || normalized === 'zh-hans')
@@ -32,6 +33,14 @@ export function omitLocale(modules: Record<string, any>, excludes: string[] = []
   return omitBy(modules, (_, path) => excludes.some(locale => path.includes(locale)));
 }
 
+/** 添加语言格式 */
+export function addDatetimeFormat<T extends string>(name: T, config: NonNullable<I18nOptions['datetimeFormats']>[string][string]) {
+  return {
+    [name]: config,
+    [`${name}-utc`]: { ...config, timeZone: 'UTC' },
+  } as Record<T | `${T}-utc`, typeof config>;
+}
+
 /**
  * 加密 JSON 消息
  */

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;
+  }
+}