@peng_kai/kit 0.3.0-beta.15 → 0.3.0-beta.17

package/admin/components/provider/admin-router.ts

@@ -277,7 +277,10 @@ export function getMenusByRouter(router: Router) {
         key: name,
         label: route.meta.title ?? name,
         icon: route.meta.icon,
-        trigger: () => router.push({ name }),
+        trigger: () => {
+          if (router.currentRoute.value.name !== name)
+            router.push({ name })
+        },
         order,
       };
 

package/admin/layout/large/Tabs.vue

@@ -33,6 +33,12 @@ function isScrollEnd() {
   }
 }
 
+function open(tab: TTab) {
+  if (props.current.path !== tab.path) {
+    emits('open', tab);
+  }
+}
+
 function refresh(tab: TTab) {
   if (!refreshAnim.value) {
     refreshAnim.value = true;
@@ -51,7 +57,7 @@ useMutationObserver($tabList, isScrollEnd, { childList: true });
       <div
         v-for="tab of props.tabs" :key="tab.path"
         class="tab" :class="{ opened: tab.path === props.current?.path }"
-        @click="emits('open', tab)"
+        @click="open(tab)"
       >
         <span class="title">{{ tab.title }}</span>
         <span v-if="tab.type !== 2 && props.tabs.length > 1" class="close-btn" @click.stop="emits('close', tab)">

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@peng_kai/kit",
   "type": "module",
-  "version": "0.3.0-beta.15",
+  "version": "0.3.0-beta.17",
   "description": "",
   "author": "",
   "license": "ISC",

package/utils/upload/AwsS3.ts

@@ -20,9 +20,9 @@ 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}`;