From 0f5b9564c696aa9e71eccfcd3877696b879bedf2 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Mon, 10 Mar 2025 16:06:40 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/tutorial/index.vue         | 10 +++-
 .../certd-client/src/layout/layout-basic.vue  |  3 -
 .../src/router/source/modules/about.tsx       | 60 +++++++------------
 .../src/vben/menu-ui/components/menu-item.vue |  4 ++
 .../src/vben/menu-ui/sub-menu.vue             |  8 +--
 .../ui/certd-client/src/vben/menu-ui/types.ts | 17 ++----
 6 files changed, 43 insertions(+), 59 deletions(-)

diff --git a/packages/ui/certd-client/src/components/tutorial/index.vue b/packages/ui/certd-client/src/components/tutorial/index.vue
index c2132848..96d6cffb 100644
--- a/packages/ui/certd-client/src/components/tutorial/index.vue
+++ b/packages/ui/certd-client/src/components/tutorial/index.vue
@@ -1,7 +1,11 @@
 <script setup lang="ts">
 import { ref } from "vue";
 import TutorialSteps from "/@/components/tutorial/tutorial-steps.vue";
-import { useSettingStore } from "/@/store/modules/settings";
+
+const props = defineProps<{
+  showIcon?: boolean;
+}>();
+
 const openedRef = ref(false);
 function open() {
   openedRef.value = true;
@@ -12,8 +16,8 @@ const slots = defineSlots();
 <template>
   <div class="tutorial-button pointer" @click="open">
     <template v-if="!slots.default">
-      <fs-icon icon="ant-design:question-circle-outlined"></fs-icon>
-      <div class="hidden md:block ml-0.5">使用教程</div>
+      <fs-icon v-if="showIcon" icon="ant-design:question-circle-outlined"></fs-icon>
+      <div class="hidden md:block">使用教程</div>
     </template>
     <slot></slot>
     <a-modal v-model:open="openedRef" class="tutorial-modal" width="90%">
diff --git a/packages/ui/certd-client/src/layout/layout-basic.vue b/packages/ui/certd-client/src/layout/layout-basic.vue
index e663b42f..b9ccbad0 100644
--- a/packages/ui/certd-client/src/layout/layout-basic.vue
+++ b/packages/ui/certd-client/src/layout/layout-basic.vue
@@ -63,9 +63,6 @@ onMounted(async () => {
       <LockScreen :avatar @to-login="handleLogout" />
     </template>
     <template #header-right-0>
-      <div class="hover:bg-accent ml-1 mr-2 cursor-pointer rounded-full hidden md:block">
-        <tutorial-button v-if="!settingStore.isComm" class="flex-center header-btn" />
-      </div>
       <div class="hover:bg-accent ml-1 mr-2 cursor-pointer rounded-full">
         <vip-button class="flex-center header-btn" mode="nav" />
       </div>
diff --git a/packages/ui/certd-client/src/router/source/modules/about.tsx b/packages/ui/certd-client/src/router/source/modules/about.tsx
index bd1ddaba..9909a95b 100644
--- a/packages/ui/certd-client/src/router/source/modules/about.tsx
+++ b/packages/ui/certd-client/src/router/source/modules/about.tsx
@@ -1,54 +1,40 @@
 import { IFrameView } from "/@/vben/layouts";
 import { useSettingStore } from "/@/store/modules/settings";
 import { computed } from "vue";
-
+import TutorialButton from "/@/components/tutorial/index.vue";
 export const aboutResource = [
   {
     title: "文档",
-    name: "about",
-    path: "/about",
-    redirect: "/about/doc",
+    name: "document",
+    path: "/about/doc",
+    component: IFrameView,
+    meta: {
+      icon: "lucide:book-open-text",
+      link: "https://certd.docmirror.cn",
+      title: "文档",
+      order: 9999,
+      show: () => {
+        const settingStore = useSettingStore();
+        return !settingStore.isComm;
+      }
+    }
+  },
+  {
+    title: "教程",
+    name: "help",
+    path: "/help",
     meta: {
       icon: "lucide:copyright",
       order: 9999,
       show: () => {
         const settingStore = useSettingStore();
         return !settingStore.isComm;
-      }
-    },
-    children: [
-      {
-        title: "文档",
-        name: "document",
-        path: "/about/doc",
-        component: IFrameView,
-        meta: {
-          icon: "lucide:book-open-text",
-          link: "https://certd.docmirror.cn",
-          title: "文档"
-        }
       },
-      {
-        name: "Github",
-        path: "/about/github",
-        component: IFrameView,
-        meta: {
-          icon: "mdi:github",
-          link: "https://github.com/certd/certd",
-          title: "Github"
-        }
+      slot() {
+        return <TutorialButton className="flex-center" show-icon={false} />;
       },
-      {
-        name: "Gitee",
-        path: "/about/gitee",
-        component: IFrameView,
-        meta: {
-          icon: "ion:logo-octocat",
-          link: "https://gitee.com/certd/certd",
-          title: "Gite"
-        }
-      }
-    ]
+      click() {}
+    }
   }
 ];
 
diff --git a/packages/ui/certd-client/src/vben/menu-ui/components/menu-item.vue b/packages/ui/certd-client/src/vben/menu-ui/components/menu-item.vue
index 0d0b3b18..a86a9a75 100644
--- a/packages/ui/certd-client/src/vben/menu-ui/components/menu-item.vue
+++ b/packages/ui/certd-client/src/vben/menu-ui/components/menu-item.vue
@@ -48,6 +48,10 @@ function handleClick() {
   if (props.disabled) {
     return;
   }
+  if (props.click) {
+    props.click();
+    return;
+  }
   rootMenu?.handleMenuItemClick?.({
     parentPaths: parentPaths.value,
     path: props.path
diff --git a/packages/ui/certd-client/src/vben/menu-ui/sub-menu.vue b/packages/ui/certd-client/src/vben/menu-ui/sub-menu.vue
index ff69cc92..0605e166 100644
--- a/packages/ui/certd-client/src/vben/menu-ui/sub-menu.vue
+++ b/packages/ui/certd-client/src/vben/menu-ui/sub-menu.vue
@@ -40,14 +40,14 @@ const hasChildren = computed(() => {
     :badge-variants="menu.badgeVariants"
     :icon="menu.icon"
     :path="menu.path"
-    @click="menu.meta?.onClick"
+    :click="menu.meta?.click"
   >
-    <template #title>
-      <span>{{ menu.name }}</span>
-    </template>
     <template v-if="menu.meta?.slot" #default>
       <fs-render :render-func="menu.meta.slot" />
     </template>
+    <template v-else #title>
+      <span>{{ menu.name }}</span>
+    </template>
   </MenuItem>
   <SubMenuComp v-else :key="`${menu.path}_sub`" :active-icon="menu.activeIcon" :icon="menu.icon" :path="menu.path">
     <template #content>
diff --git a/packages/ui/certd-client/src/vben/menu-ui/types.ts b/packages/ui/certd-client/src/vben/menu-ui/types.ts
index a6927a08..3f4fdf5d 100644
--- a/packages/ui/certd-client/src/vben/menu-ui/types.ts
+++ b/packages/ui/certd-client/src/vben/menu-ui/types.ts
@@ -1,6 +1,6 @@
-import type { Component, Ref } from 'vue';
+import type { Component, Ref } from "vue";
 
-import type { MenuRecordBadgeRaw, ThemeModeType } from '/@/vben/typings';
+import type { MenuRecordBadgeRaw, ThemeModeType } from "/@/vben/typings";
 
 interface MenuProps {
   /**
@@ -34,7 +34,7 @@ interface MenuProps {
    * @zh_CN 菜单模式
    * @default vertical
    */
-  mode?: 'horizontal' | 'vertical';
+  mode?: "horizontal" | "vertical";
 
   /**
    * @zh_CN 是否圆润风格
@@ -85,6 +85,7 @@ interface MenuItemProps extends MenuRecordBadgeRaw {
    * @zh_CN menuitem 名称
    */
   path: string;
+  click?: any;
 }
 
 interface MenuItemRegistered {
@@ -128,12 +129,4 @@ interface SubMenuProvider {
   removeSubMenu: (item: MenuItemRegistered) => void;
 }
 
-export type {
-  MenuItemClicked,
-  MenuItemProps,
-  MenuItemRegistered,
-  MenuProps,
-  MenuProvider,
-  SubMenuProps,
-  SubMenuProvider,
-};
+export type { MenuItemClicked, MenuItemProps, MenuItemRegistered, MenuProps, MenuProvider, SubMenuProps, SubMenuProvider };