@peng_kai/kit 0.3.0-beta.4 → 0.3.0-beta.40

package/utils/number.ts

@@ -1,8 +1,6 @@
-import type { BigNumber } from 'bignumber.js';
 import bn from 'bignumber.js';
 
 export { default as bn } from 'bignumber.js';
-export { calc } from 'a-calc';
 
 /**
  * 常用的数值格式化规则
@@ -23,42 +21,42 @@ export const numFmt = {
   /** 舍去小数，四舍五入，千位符 */
   d0r5t: (num: any, fallback: any = 'NaN') => {
     const result = bn(num);
-    return result.isNaN() ? fallback : result.decimalPlaces(0, bn.ROUND_HALF_UP).toFormat(0);
+    return result.isNaN() ? fallback : result.decimalPlaces(0, bn.ROUND_HALF_UP).toFormat();
   },
   /** 舍去小数，向下取整，千位符 */
   d0r0t: (num: any, fallback: any = 'NaN') => {
     const result = bn(num);
-    return result.isNaN() ? fallback : result.decimalPlaces(0, bn.ROUND_DOWN).toFormat(0);
+    return result.isNaN() ? fallback : result.decimalPlaces(0, bn.ROUND_DOWN).toFormat();
   },
   /** 保留2位小数，四舍五入，千位符 */
   d2r5t: (num: any, fallback: any = 'NaN') => {
     const result = bn(num);
-    return result.isNaN() ? fallback : result.decimalPlaces(2, bn.ROUND_HALF_UP).toFormat(2);
+    return result.isNaN() ? fallback : result.decimalPlaces(2, bn.ROUND_HALF_UP).toFormat();
   },
   /** 保留2位小数，向下取整，千位符 */
   d2r0t: (num: any, fallback: any = 'NaN') => {
     const result = bn(num);
-    return result.isNaN() ? fallback : result.decimalPlaces(2, bn.ROUND_DOWN).toFormat(2);
+    return result.isNaN() ? fallback : result.decimalPlaces(2, bn.ROUND_DOWN).toFormat();
   },
   /** 保留6位小数，四舍五入，千位符 */
   d6r5t: (num: any, fallback: any = 'NaN') => {
     const result = bn(num);
-    return result.isNaN() ? fallback : result.decimalPlaces(6, bn.ROUND_HALF_UP).toFormat(6);
+    return result.isNaN() ? fallback : result.decimalPlaces(6, bn.ROUND_HALF_UP).toFormat();
   },
   /** 保留6位小数，向下取整，千位符 */
   d6r0t: (num: any, fallback: any = 'NaN') => {
     const result = bn(num);
-    return result.isNaN() ? fallback : result.decimalPlaces(6, bn.ROUND_DOWN).toFormat(6);
+    return result.isNaN() ? fallback : result.decimalPlaces(6, bn.ROUND_DOWN).toFormat();
   },
   /** 保留8位小数，四舍五入，千位符 */
   d8r5t: (num: any, fallback: any = 'NaN') => {
     const result = bn(num);
-    return result.isNaN() ? fallback : result.decimalPlaces(8, bn.ROUND_HALF_UP).toFormat(8);
+    return result.isNaN() ? fallback : result.decimalPlaces(8, bn.ROUND_HALF_UP).toFormat();
   },
   /** 保留8位小数，向下取整，千位符 */
   d8r0t: (num: any, fallback: any = 'NaN') => {
     const result = bn(num);
-    return result.isNaN() ? fallback : result.decimalPlaces(8, bn.ROUND_DOWN).toFormat(8);
+    return result.isNaN() ? fallback : result.decimalPlaces(8, bn.ROUND_DOWN).toFormat();
   },
 };
 

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/string.ts

@@ -1,5 +1,4 @@
-import { Base64 } from 'crypto-es/lib/enc-base64';
-import { Utf8 } from 'crypto-es/lib/core';
+import { Base64, Utf8 } from 'crypto-es';
 
 /**
  * 字符串脱敏，省略中间字符串

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,22 @@ 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,
+        ContentType: file.type,
+      },
       leavePartsOnError: false,
+      queueSize: 4,
+      partSize: 5 * 1024 * 1024,
     });
 
     return { uploader, fileURL: `${this.domain}/${fullPath}` };
@@ -61,6 +67,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 {};
-});