From 1c3850e30b07826d75714d70180f9aae89f2ea54 Mon Sep 17 00:00:00 2001
From: Gary Fu <xuebaiyouling@gmail.com>
Date: Sun, 30 Jun 2024 11:23:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E7=99=BB=E5=87=BA=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/TopNav.vue         | 12 ++++++++++--
 src/main.js                   |  2 ++
 src/stores/MenuConfigStore.js |  4 ++--
 src/utils/index.js            | 28 +++++++++++++++++++++++++++-
 4 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/src/layout/TopNav.vue b/src/layout/TopNav.vue
index 6301660..dad9f30 100644
--- a/src/layout/TopNav.vue
+++ b/src/layout/TopNav.vue
@@ -1,13 +1,17 @@
 <script setup>
 import { useGlobalConfigStore } from '@/stores/GlobalConfigStore'
 import { useMenuConfigStore } from '@/stores/MenuConfigStore'
+import { useTabsViewStore } from '@/stores/TabsViewStore'
+import { useBreadcrumbConfigStore } from '@/stores/BreadcrumbConfigStore'
 import { GlobalLayoutMode } from '@/consts/GlobalConstants'
 import { computed } from 'vue'
 const globalConfigStore = useGlobalConfigStore()
 const menuConfigStore = useMenuConfigStore()
+const tabsViewStore = useTabsViewStore()
+const breadcrumbConfigStore = useBreadcrumbConfigStore()
 
 const allMenus = computed(() => {
-  const topMenus = menuConfigStore.loadBaseTopMenus().value
+  const topMenus = menuConfigStore.loadBaseTopMenus()
   const businessMenus = menuConfigStore.calcBusinessMenus()
   if (globalConfigStore.layoutMode === GlobalLayoutMode.TOP) {
     return [...businessMenus, ...topMenus.slice(1)]
@@ -28,7 +32,11 @@ const allMenus = computed(() => {
       v-if="globalConfigStore.layoutMode === GlobalLayoutMode.LEFT && globalConfigStore.isShowBreadcrumb"
       #split
     >
-      <common-breadcrumb :style="{'padding-left': '0','padding-top': '22px'}" />
+      <common-breadcrumb
+        :show-icon="tabsViewStore.isShowTabIcon"
+        :label-config="breadcrumbConfigStore.breadcrumbConfig"
+        :style="{'padding-left': '0','padding-top': '22px'}"
+      />
     </template>
   </common-menu>
 </template>
diff --git a/src/main.js b/src/main.js
index 8d2f4b7..859bea3 100644
--- a/src/main.js
+++ b/src/main.js
@@ -7,6 +7,7 @@ import stores from '@/stores'
 import icons from '@/icons'
 import messages from '@/messages'
 import commons from '@/components'
+import utils from '@/utils'
 
 import App from '@/App.vue'
 import router from '@/route/routes'
@@ -23,6 +24,7 @@ app.use(ElementPlus)
 app.use(icons)
 app.use(messages)
 app.use(commons)
+app.use(utils)
 app.use(MonacoEditor)
 
 app.mount('#app')
diff --git a/src/stores/MenuConfigStore.js b/src/stores/MenuConfigStore.js
index f08fa32..86874a4 100644
--- a/src/stores/MenuConfigStore.js
+++ b/src/stores/MenuConfigStore.js
@@ -1,5 +1,5 @@
 import { defineStore } from 'pinia'
-import { ref } from 'vue'
+import { ref, reactive } from 'vue'
 import { loadAndParseMenus, menu2CommonMenu, useBaseTopMenus } from '@/services/menu/MenuService'
 
 export const useMenuConfigStore = defineStore('menuConfig', () => {
@@ -10,7 +10,7 @@ export const useMenuConfigStore = defineStore('menuConfig', () => {
   return {
     businessMenus,
     loadBaseTopMenus () {
-      return ref(useBaseTopMenus())
+      return reactive(useBaseTopMenus())
     },
     async loadBusinessMenus () {
       businessMenus.value = await loadAndParseMenus()
diff --git a/src/utils/index.js b/src/utils/index.js
index a70f2c9..bc3f5f3 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -92,7 +92,7 @@ export const addParamsToURL = (url, params = {}) => {
   const baseUrl = hasParams ? url.substring(0, queryIndex) : url
   return `${baseUrl}?${toGetParams({ ...getParams, ...params })}`
 }
-const router = null
+let router = null
 /**
  * @param {string|RouteLocationRaw|number} path 路径、路由对象、数字
  * @param replace 是否用replace方法
@@ -303,3 +303,29 @@ export const $copyText = (text) => {
     }
   }
 }
+
+export default {
+  install (app) {
+    router = app.config.globalProperties.$router
+    Object.assign(app.config.globalProperties, {
+      $goto,
+      $reload,
+      $back: $goto,
+      $logout,
+      $date: formatDate,
+      $day: formatDay,
+      $number,
+      $currency,
+      $currencyShort,
+      $coreShowLoading,
+      $coreHideLoading,
+      $coreAlert,
+      $coreSuccess,
+      $coreWarning,
+      $coreError,
+      $coreConfirm,
+      $openNewWin,
+      $openWin
+    })
+  }
+}