From 6ca4ac6168c7e92a4920b59fc9cc822d93dbf4e2 Mon Sep 17 00:00:00 2001
From: "gary.fu" <xuebaiyouling@gmail.com>
Date: Wed, 10 Jan 2024 11:57:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=98=BE=E7=A4=BA=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .eslintrc.js                     | 1 +
 src/layout/TopNav.vue            | 3 ++-
 src/services/menu/MenuService.js | 1 +
 src/stores/MenuConfigStore.js    | 7 +------
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index d175372..912f784 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -9,6 +9,7 @@ module.exports = {
     '@vue/eslint-config-standard',
     'plugin:@typescript-eslint/recommended'
   ],
+  parser: 'vue-eslint-parser',
   plugins: ['@typescript-eslint'],
   parserOptions: {
     ecmaVersion: 'latest',
diff --git a/src/layout/TopNav.vue b/src/layout/TopNav.vue
index 4296b42..526696c 100644
--- a/src/layout/TopNav.vue
+++ b/src/layout/TopNav.vue
@@ -7,7 +7,7 @@ const globalConfigStore = useGlobalConfigStore()
 const menuConfigStore = useMenuConfigStore()
 
 const allMenus = computed(() => {
-  const topMenus = menuConfigStore.baseTopMenus
+  const topMenus = menuConfigStore.loadBaseTopMenus()
   const businessMenus = menuConfigStore.calcBusinessMenus()
   if (globalConfigStore.layoutMode === GlobalLayoutMode.TOP) {
     return [...businessMenus, ...topMenus.slice(1)]
@@ -18,6 +18,7 @@ const allMenus = computed(() => {
 </script>
 <template>
   <common-menu
+    class="padding-right2"
     router
     mode="horizontal"
     :ellipsis="false"
diff --git a/src/services/menu/MenuService.js b/src/services/menu/MenuService.js
index 7ab6908..ae932bb 100644
--- a/src/services/menu/MenuService.js
+++ b/src/services/menu/MenuService.js
@@ -177,6 +177,7 @@ export const useBaseTopMenus = () => {
     {
       icon: 'user',
       isDropdown: true,
+      label: $i18nMsg(loginConfigStore.accountInfo.userNameCN, loginConfigStore.accountInfo.userNameEN),
       children: [
         {
           labelKey: 'common.label.personalInfo',
diff --git a/src/stores/MenuConfigStore.js b/src/stores/MenuConfigStore.js
index a074c6b..e380490 100644
--- a/src/stores/MenuConfigStore.js
+++ b/src/stores/MenuConfigStore.js
@@ -3,19 +3,14 @@ import { ref } from 'vue'
 import { loadAndParseMenus, menu2CommonMenu, useBaseTopMenus } from '@/services/menu/MenuService'
 
 export const useMenuConfigStore = defineStore('menuConfig', () => {
-  /**
-   * @type {[CommonMenuItem]}
-   */
-  const baseTopMenus = ref([])
   /**
    * @type {[MenuDto]}
    */
   const businessMenus = ref([])
   return {
-    baseTopMenus,
     businessMenus,
     loadBaseTopMenus () {
-      baseTopMenus.value = useBaseTopMenus()
+      return useBaseTopMenus()
     },
     async loadBusinessMenus () {
       businessMenus.value = await loadAndParseMenus()