From 1a39d0962e70906535ae51a4423a96e8cc00719b Mon Sep 17 00:00:00 2001
From: xiaoxian521 <1923740402@qq.com>
Date: Fri, 2 Dec 2022 17:57:51 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E3=80=81=E8=8F=9C=E5=8D=95=E6=96=87=E5=AD=97=E8=B6=85=E5=87=BA?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=20Tooltip=20=E6=96=87=E5=AD=97=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BAdemo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/en.yaml                               |  2 ++
 locales/zh-CN.yaml                            |  2 ++
 src/layout/components/sidebar/sidebarItem.vue |  4 ++--
 src/layout/components/sidebar/vertical.vue    | 12 ++--------
 src/router/enums.ts                           | 16 ++++++++------
 src/router/modules/menuoverflow.ts            | 22 +++++++++++++++++++
 src/views/menuoverflow/index.vue              |  9 ++++++++
 7 files changed, 48 insertions(+), 19 deletions(-)
 create mode 100644 src/router/modules/menuoverflow.ts
 create mode 100644 src/views/menuoverflow/index.vue

diff --git a/locales/en.yaml b/locales/en.yaml
index cc3f0b88a..10f96c543 100644
--- a/locales/en.yaml
+++ b/locales/en.yaml
@@ -101,6 +101,8 @@ menus:
   hsPureTableBase: Base Usage
   hsPureTableHigh: High Usage
   hsTree: Big Data Tree
+  hsMenuoverflow: Menu Overflow Show Tooltip Text
+  hsChildMenuoverflow: Child Menu Overflow Show Tooltip Text
 status:
   hsLoad: Loading...
 login:
diff --git a/locales/zh-CN.yaml b/locales/zh-CN.yaml
index 1ae1a584c..4c11b78de 100644
--- a/locales/zh-CN.yaml
+++ b/locales/zh-CN.yaml
@@ -101,6 +101,8 @@ menus:
   hsPureTableBase: 基础用法（23个示例）
   hsPureTableHigh: 高级用法（8个示例）
   hsTree: 大数据树业务组件
+  hsMenuoverflow: 目录超出显示 Tooltip 文字提示
+  hsChildMenuoverflow: 菜单超出显示 Tooltip 文字提示
 status:
   hsLoad: 加载中...
 login:
diff --git a/src/layout/components/sidebar/sidebarItem.vue b/src/layout/components/sidebar/sidebarItem.vue
index 2277896ab..9c1be77ec 100644
--- a/src/layout/components/sidebar/sidebarItem.vue
+++ b/src/layout/components/sidebar/sidebarItem.vue
@@ -203,7 +203,7 @@ function resolvePath(routePath) {
             placement="top"
             :effect="tooltipEffect"
             :offset="-10"
-            :disabled="!onlyOneChild.showTooltip"
+            :disabled="!isCollapse && !onlyOneChild.showTooltip"
           >
             <template #content>
               {{ transformI18n(onlyOneChild.meta.title) }}
@@ -249,7 +249,7 @@ function resolvePath(routePath) {
         placement="top"
         :effect="tooltipEffect"
         :offset="-10"
-        :disabled="!isCollapse || !props.item.showTooltip"
+        :disabled="!props.item.showTooltip"
       >
         <template #content>
           {{ transformI18n(props.item.meta.title) }}
diff --git a/src/layout/components/sidebar/vertical.vue b/src/layout/components/sidebar/vertical.vue
index eb4220441..6973b1ce3 100644
--- a/src/layout/components/sidebar/vertical.vue
+++ b/src/layout/components/sidebar/vertical.vue
@@ -15,15 +15,8 @@ const showLogo = ref(
   storageLocal.getItem<StorageConfigs>("responsive-configure")?.showLogo ?? true
 );
 
-const {
-  routers,
-  device,
-  pureApp,
-  isCollapse,
-  tooltipEffect,
-  menuSelect,
-  toggleSideBar
-} = useNav();
+const { routers, device, pureApp, isCollapse, menuSelect, toggleSideBar } =
+  useNav();
 
 const subMenuData = ref([]);
 
@@ -76,7 +69,6 @@ watch(
         router
         unique-opened
         mode="vertical"
-        :popper-effect="tooltipEffect"
         class="outer-most select-none"
         :collapse="isCollapse"
         :default-active="route.path"
diff --git a/src/router/enums.ts b/src/router/enums.ts
index 655f26138..ef8e32fb4 100644
--- a/src/router/enums.ts
+++ b/src/router/enums.ts
@@ -13,13 +13,14 @@ const home = 0, // 平台规定只有 home 路由的 rank 才能为 0 ，所以
   list = 10,
   permission = 11,
   system = 12,
-  tabs = 13,
-  formdesign = 14,
-  flowchart = 15,
-  ppt = 16,
-  editor = 17,
-  guide = 18,
-  about = 19;
+  menuoverflow = 13,
+  tabs = 14,
+  formdesign = 15,
+  flowchart = 16,
+  ppt = 17,
+  editor = 18,
+  guide = 19,
+  about = 20;
 
 export {
   home,
@@ -35,6 +36,7 @@ export {
   list,
   permission,
   system,
+  menuoverflow,
   tabs,
   formdesign,
   flowchart,
diff --git a/src/router/modules/menuoverflow.ts b/src/router/modules/menuoverflow.ts
new file mode 100644
index 000000000..322f15211
--- /dev/null
+++ b/src/router/modules/menuoverflow.ts
@@ -0,0 +1,22 @@
+import { $t } from "@/plugins/i18n";
+import { menuoverflow } from "@/router/enums";
+
+export default {
+  path: "/menuoverflow",
+  redirect: "/menuoverflow/index",
+  meta: {
+    title: $t("menus.hsMenuoverflow"),
+    rank: menuoverflow
+  },
+  children: [
+    {
+      path: "/menuoverflow/index",
+      name: "MenuOverflow",
+      component: () => import("@/views/menuoverflow/index.vue"),
+      meta: {
+        title: $t("menus.hsChildMenuoverflow"),
+        showParent: true
+      }
+    }
+  ]
+} as RouteConfigsTable;
diff --git a/src/views/menuoverflow/index.vue b/src/views/menuoverflow/index.vue
new file mode 100644
index 000000000..b52c5eab4
--- /dev/null
+++ b/src/views/menuoverflow/index.vue
@@ -0,0 +1,9 @@
+<script setup lang="ts">
+defineOptions({
+  name: "MenuOverflow"
+});
+</script>
+
+<template>
+  <div>目录、菜单文字超出显示 Tooltip 文字提示</div>
+</template>