@peng_kai/kit 0.3.0-beta.2 → 0.3.0-beta.21

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@peng_kai/kit",
   "type": "module",
-  "version": "0.3.0-beta.2",
+  "version": "0.3.0-beta.21",
   "description": "",
   "author": "",
   "license": "ISC",
@@ -13,83 +13,82 @@
     "lint:fix": "eslint . --fix"
   },
   "peerDependencies": {
-    "ant-design-vue": "4.2.5",
-    "vue": "3.5.11",
-    "vue-router": "4.4.5"
+    "ant-design-vue": "4.2.6",
+    "vue": "3.5.18",
+    "vue-router": "4.5.1"
   },
   "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",
-    "@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",
-    "a-calc": "^2.2.10",
+    "@aws-sdk/client-s3": "^3.855.0",
+    "@aws-sdk/lib-storage": "^3.855.0",
+    "@babel/generator": "^7.28.0",
+    "@babel/parser": "^7.28.0",
+    "@babel/traverse": "^7.28.0",
+    "@babel/types": "^7.28.2",
+    "@ckeditor/ckeditor5-vue": "^7.3.0",
+    "@fingerprintjs/fingerprintjs": "^4.6.2",
+    "@tanstack/vue-query": "^5.83.0",
+    "@vueuse/components": "^13.6.0",
+    "@vueuse/core": "^13.6.0",
+    "@vueuse/router": "^13.6.0",
     "archiver": "^7.0.1",
-    "axios": "^1.7.7",
-    "bignumber.js": "^9.1.2",
+    "axios": "^1.11.0",
+    "bignumber.js": "^9.3.1",
     "chokidar": "^3.6.0",
     "crypto-es": "^2.1.0",
     "dayjs": "^1.11.13",
     "echarts": "^5.5.1",
     "execa": "^9.4.0",
     "fast-glob": "^3.3.2",
+    "fluid-dnd": "^2.4.0",
     "localstorage-slim": "^2.7.1",
     "lodash-es": "^4.17.21",
     "nprogress": "^0.2.0",
-    "pinia": "^2.2.4",
+    "pinia": "^3.0.3",
     "tsx": "^4.16.00",
-    "vue": "^3.5.11",
-    "vue-i18n": "^10.0.4",
-    "vue-router": "^4.4.5"
+    "vue": "^3.5.18",
+    "vue-i18n": "^11.1.11",
+    "vue-router": "^4.5.1"
   },
   "devDependencies": {
-    "@ckeditor/ckeditor5-adapter-ckfinder": "^41.1.0",
-    "@ckeditor/ckeditor5-alignment": "^41.1.0",
-    "@ckeditor/ckeditor5-autoformat": "^41.1.0",
-    "@ckeditor/ckeditor5-basic-styles": "^41.1.0",
-    "@ckeditor/ckeditor5-block-quote": "^41.1.0",
-    "@ckeditor/ckeditor5-build-classic": "^41.1.0",
-    "@ckeditor/ckeditor5-code-block": "^41.1.0",
-    "@ckeditor/ckeditor5-document-outline": "^41.1.0",
-    "@ckeditor/ckeditor5-editor-classic": "^41.1.0",
-    "@ckeditor/ckeditor5-essentials": "^41.1.0",
-    "@ckeditor/ckeditor5-font": "^41.1.0",
-    "@ckeditor/ckeditor5-heading": "^41.1.0",
-    "@ckeditor/ckeditor5-highlight": "^41.1.0",
-    "@ckeditor/ckeditor5-horizontal-line": "^41.1.0",
-    "@ckeditor/ckeditor5-html-embed": "^41.1.0",
-    "@ckeditor/ckeditor5-html-support": "^41.1.0",
-    "@ckeditor/ckeditor5-image": "^41.1.0",
-    "@ckeditor/ckeditor5-import-word": "^41.1.0",
-    "@ckeditor/ckeditor5-indent": "^41.1.0",
-    "@ckeditor/ckeditor5-link": "^41.1.0",
-    "@ckeditor/ckeditor5-list": "^41.1.0",
-    "@ckeditor/ckeditor5-media-embed": "^41.1.0",
-    "@ckeditor/ckeditor5-paragraph": "^41.1.0",
-    "@ckeditor/ckeditor5-remove-format": "^41.1.0",
-    "@ckeditor/ckeditor5-show-blocks": "^41.1.0",
-    "@ckeditor/ckeditor5-source-editing": "^41.1.0",
-    "@ckeditor/ckeditor5-table": "^41.1.0",
-    "@ckeditor/ckeditor5-theme-lark": "^41.1.0",
-    "@ckeditor/ckeditor5-typing": "^41.1.0",
-    "@ckeditor/ckeditor5-upload": "^41.1.0",
-    "@ckeditor/ckeditor5-word-count": "^41.1.0",
+    "@ckeditor/ckeditor5-adapter-ckfinder": "^46.0.0",
+    "@ckeditor/ckeditor5-alignment": "^46.0.0",
+    "@ckeditor/ckeditor5-autoformat": "^46.0.0",
+    "@ckeditor/ckeditor5-basic-styles": "^46.0.0",
+    "@ckeditor/ckeditor5-block-quote": "^46.0.0",
+    "@ckeditor/ckeditor5-code-block": "^46.0.0",
+    "@ckeditor/ckeditor5-document-outline": "^46.0.0",
+    "@ckeditor/ckeditor5-editor-classic": "^46.0.0",
+    "@ckeditor/ckeditor5-essentials": "^46.0.0",
+    "@ckeditor/ckeditor5-font": "^46.0.0",
+    "@ckeditor/ckeditor5-heading": "^46.0.0",
+    "@ckeditor/ckeditor5-highlight": "^46.0.0",
+    "@ckeditor/ckeditor5-horizontal-line": "^46.0.0",
+    "@ckeditor/ckeditor5-html-embed": "^46.0.0",
+    "@ckeditor/ckeditor5-html-support": "^46.0.0",
+    "@ckeditor/ckeditor5-image": "^46.0.0",
+    "@ckeditor/ckeditor5-import-word": "^46.0.0",
+    "@ckeditor/ckeditor5-indent": "^46.0.0",
+    "@ckeditor/ckeditor5-link": "^46.0.0",
+    "@ckeditor/ckeditor5-list": "^46.0.0",
+    "@ckeditor/ckeditor5-media-embed": "^46.0.0",
+    "@ckeditor/ckeditor5-paragraph": "^46.0.0",
+    "@ckeditor/ckeditor5-remove-format": "^46.0.0",
+    "@ckeditor/ckeditor5-show-blocks": "^46.0.0",
+    "@ckeditor/ckeditor5-source-editing": "^46.0.0",
+    "@ckeditor/ckeditor5-table": "^46.0.0",
+    "@ckeditor/ckeditor5-theme-lark": "^46.0.0",
+    "@ckeditor/ckeditor5-typing": "^46.0.0",
+    "@ckeditor/ckeditor5-upload": "^46.0.0",
+    "@ckeditor/ckeditor5-word-count": "^46.0.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": "^22.16.5",
     "@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"
+    "ant-design-vue": "^4.2.6",
+    "type-fest": "^4.41.0",
+    "typescript": "^5.8.3",
+    "vue-component-type-helpers": "^3.0.4"
   }
 }

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;
@@ -32,6 +33,19 @@ export function getDeviceInfo(callback: (base: Record<string, any>, all: GetResu
   ];
 }
 
+function getDeviceID(visitorId: string) {
+  const key = 'backend_device_id';
+  let id = localStorage.getItem(key);
+  if (!id) {
+    id = visitorId
+    if (!id) {
+      id = crypto.randomUUID();
+    }
+    localStorage.setItem(key, id);
+  }
+  return id;
+}
+
 function getCurrentTimeZone() {
   const now = new Date();
   const [_, time, tz, describe] = now.toString().match(/(\w{3} \w{3} \d{2} \d{4} \d{2}:\d{2}:\d{2})? (GMT[+-]\d{4}) \((.*?)\)/) ?? [];

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/locale/helpers.ts

@@ -1,3 +1,4 @@
+import type { I18nOptions } from 'vue-i18n';
 import { omitBy } from '../../libs/lodash-es';
 
 /**
@@ -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/number.ts

@@ -2,7 +2,6 @@ import type { BigNumber } from 'bignumber.js';
 import bn from 'bignumber.js';
 
 export { default as bn } from 'bignumber.js';
-export { calc } from 'a-calc';
 
 /**
  * 常用的数值格式化规则

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/utils/upload/AwsS3.ts

@@ -1,4 +1,4 @@
-import { S3Client } from '@aws-sdk/client-s3';
+import { S3Client, ChecksumAlgorithm } from '@aws-sdk/client-s3';
 import { Upload } from '@aws-sdk/lib-storage';
 import type { FileHandler } from './fileHandlers';
 
@@ -20,16 +20,21 @@ export class AwsS3 {
   public constructor(private getParams: TGetParams, private fileHandler?: FileHandler) {
   }
 
-  public async upload(file: File, root?: string) {
+  public async upload(file: File, root = 'unclassified') {
     const s3Client = await this.refreshClient();
-    const filePath = await this.genFilePath(root || 'unclassified');
+    const filePath = root.includes('/') ? root : await this.genFilePath(root);
     const fileName = await (this.fileHandler?.genFileName?.(file) ?? this.genFileName(file));
     const fullPath = `${filePath}/${fileName}`;
 
     const uploader = new Upload({
       client: s3Client!,
-      params: { Bucket: this.bucket, Key: fullPath, Body: file },
+      params: { 
+        Bucket: this.bucket, Key: fullPath, Body: file,
+        ChecksumAlgorithm: ChecksumAlgorithm.CRC32,
+      },
       leavePartsOnError: false,
+      queueSize: 4,
+      partSize: 5 * 1024 * 1024,
     });
 
     return { uploader, fileURL: `${this.domain}/${fullPath}` };
@@ -61,6 +66,8 @@ export class AwsS3 {
         secretAccessKey: params.secretAccessKey,
         sessionToken: params.sessionToken,
       },
+      requestChecksumCalculation: 'WHEN_REQUIRED',
+      responseChecksumValidation: 'WHEN_REQUIRED',
     });
 
     return this.s3Client;

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';

package/vue/components/test/KitTest.vue

@@ -1,9 +0,0 @@
-<script setup lang="ts">
-import { useTestStore } from './testStore';
-
-useTestStore();
-</script>
-
-<template>
-  <div>123</div>
-</template>

package/vue/components/test/testStore.ts

@@ -1,11 +0,0 @@
-import { useQueryClient } from '@tanstack/vue-query';
-import { defineStore } from 'pinia';
-import { useRouter } from 'vue-router';
-
-export const useTestStore = defineStore('test-store', () => {
-  const router = useRouter();
-  const queryClient = useQueryClient();
-  console.log('🤡 / router:', router);
-  console.log('🤡 / queryClient:', queryClient);
-  return {};
-});