From 9d80e3e14a4e5cbb9fd2f83784f8a0827adff3cb Mon Sep 17 00:00:00 2001
From: FairyEver <1711467488@qq.com>
Date: Sat, 19 Feb 2022 10:10:10 +0800
Subject: [PATCH] feat: useMenu

---
 .vscode/settings.json                         |  3 +-
 .../layout/dashboard/menu/render/item.vue     |  4 +--
 d2/use/menu.js                                | 28 +++++++++----------
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 8866a0dd..87ee29f3 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -10,6 +10,5 @@
     "vue": "\\B@apply\\s+([_a-zA-Z0-9\\s\\-\\:\\/]+);",
     "javascript": "(?:\\bclassName\\s*=\\s*[\\\"\\']([_a-zA-Z0-9\\s\\-\\:\\/]+)[\\\"\\'])|(?:\\btw\\s*`([_a-zA-Z0-9\\s\\-\\:\\/]*)`)",
   },
-  "scss.lint.emptyRules": "ignore",
-  "workbench.colorTheme": "One Dark Pro"
+  "scss.lint.emptyRules": "ignore"
 }
diff --git a/d2/components/d2/admin/layout/dashboard/menu/render/item.vue b/d2/components/d2/admin/layout/dashboard/menu/render/item.vue
index 81880c7e..5cef3e95 100644
--- a/d2/components/d2/admin/layout/dashboard/menu/render/item.vue
+++ b/d2/components/d2/admin/layout/dashboard/menu/render/item.vue
@@ -10,7 +10,7 @@
 <script>
 import { makeNameByUrl } from 'd2/utils/framework/component.js'
 import { defineComponent } from 'vue'
-import { useMenuData } from 'd2/use/menu.js'
+import { useMenu } from 'd2/use/menu.js'
 
 export default defineComponent({
   name: makeNameByUrl(import.meta.url),
@@ -23,7 +23,7 @@ export default defineComponent({
   setup (props) {
     const { menu } = props
 
-    const { menuId, menuTitle, menuIcon } = useMenuData(menu)
+    const { menuId, menuTitle, menuIcon } = useMenu(menu)
 
     return {
       menuId,
diff --git a/d2/use/menu.js b/d2/use/menu.js
index 241f9711..082644a1 100644
--- a/d2/use/menu.js
+++ b/d2/use/menu.js
@@ -1,27 +1,27 @@
 import { computed } from 'vue'
 import { useRouter } from 'vue-router'
-import { getMenuId, getMenuTitle, getMenuIcon, getMenuUrl } from 'd2/utils/framework/menu.js'
+import {
+  getMenuId,
+  getMenuTitle,
+  getMenuIcon,
+  getMenuUrl
+} from 'd2/utils/framework/menu.js'
 
-export function useMenu () {
+export function useMenu (menu) {
   const router = useRouter()
 
+  const menuId = computed(() => getMenuId(menu))
+  const menuTitle = computed(() => getMenuTitle(menu))
+  const menuIcon = computed(() => getMenuIcon(menu))
+
   function navigateByMenu (menu) {
     router.push(getMenuUrl(menu))
   }
 
   return {
+    menuId,
+    menuTitle,
+    menuIcon,
     navigateByMenu
   }
 }
-
-export function useMenuData (menu) {
-  const menuId = computed(() => getMenuId(menu))
-  const menuTitle = computed(() => getMenuTitle(menu))
-  const menuIcon = computed(() => getMenuIcon(menu))
-
-  return {
-    menuId,
-    menuTitle,
-    menuIcon
-  }
-}