From c31196ab7673e854e12c2353c05697931305be06 Mon Sep 17 00:00:00 2001
From: wanchun <445436867@qq.com>
Date: Tue, 11 Apr 2023 15:21:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dmenu=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/runtime/helpers/pluginLocale.js                |  2 +-
 packages/fes-plugin-layout/src/runtime/views/Menu.vue  | 10 +++++-----
 packages/fes-plugin-locale/src/runtime/core.tpl        | 10 +++++-----
 packages/fes-plugin-locale/src/runtime/runtime.js      |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/fes-plugin-layout/src/runtime/helpers/pluginLocale.js b/packages/fes-plugin-layout/src/runtime/helpers/pluginLocale.js
index fc2a6693..0691f188 100644
--- a/packages/fes-plugin-layout/src/runtime/helpers/pluginLocale.js
+++ b/packages/fes-plugin-layout/src/runtime/helpers/pluginLocale.js
@@ -6,7 +6,7 @@ export const transTitle = (name) => {
     }
     const sharedLocale = plugin.getShared('locale');
     if (sharedLocale) {
-        const { t } = sharedLocale.useI18n();
+        const { t } = sharedLocale.locale;
         return t(name.slice(1));
     }
     return name;
diff --git a/packages/fes-plugin-layout/src/runtime/views/Menu.vue b/packages/fes-plugin-layout/src/runtime/views/Menu.vue
index e23e7479..0e4ba224 100644
--- a/packages/fes-plugin-layout/src/runtime/views/Menu.vue
+++ b/packages/fes-plugin-layout/src/runtime/views/Menu.vue
@@ -1,7 +1,7 @@
 <template>
     <f-menu
+        v-model:expandedKeys="expandedKeysRef"
         :modelValue="activePath"
-        :expandedKeys="expandedKeysRef"
         :inverted="inverted"
         :mode="mode"
         :options="transformedMenus"
@@ -20,12 +20,12 @@ import { transform as transformByLocale } from '../helpers/pluginLocale';
 import { flatNodes } from '../helpers/utils';
 import MenuIcon from './MenuIcon.vue';
 
-const transform = (menus) =>
-    menus.map((menu) => {
+const transform = (menus, level = 1) =>
+    menus.map((menu, index) => {
         const copy = {
             ...menu,
             label: menu.title,
-            value: menu.path || Date.now(),
+            value: menu.path || `${level}_${index}`,
         };
         if (menu.icon) {
             copy.icon = () =>
@@ -34,7 +34,7 @@ const transform = (menus) =>
                 });
         }
         if (menu.children) {
-            copy.children = transform(menu.children);
+            copy.children = transform(menu.children, level + 1);
         }
         return copy;
     });
diff --git a/packages/fes-plugin-locale/src/runtime/core.tpl b/packages/fes-plugin-locale/src/runtime/core.tpl
index 0e4b6f26..72b876f8 100644
--- a/packages/fes-plugin-locale/src/runtime/core.tpl
+++ b/packages/fes-plugin-locale/src/runtime/core.tpl
@@ -85,19 +85,19 @@ const getAllLocales = () => {
 };
 
 const install = (app) => {
-    const runtimeConfig = plugin.applyPlugins({
-        key: "locale",
-        type: ApplyPluginsType.modify,
-        initialValue: {},
-    });
     app.use(i18n);
 };
 
+const t = (key) => {
+    return i18n.global.t(key)
+}
+
 const locale = {
     setLocale,
     addLocale,
     getAllLocales,
     messages,
+    t
 };
 
 export { useI18n, locale, install };
diff --git a/packages/fes-plugin-locale/src/runtime/runtime.js b/packages/fes-plugin-locale/src/runtime/runtime.js
index c642d7e7..a555ea87 100644
--- a/packages/fes-plugin-locale/src/runtime/runtime.js
+++ b/packages/fes-plugin-locale/src/runtime/runtime.js
@@ -1,10 +1,10 @@
 import { plugin } from '@@/core/coreExports';
 // eslint-disable-next-line import/extensions
-import { useI18n, install } from './core';
+import { useI18n, locale, install } from './core';
 import SelectLang from './views/SelectLang.vue';
 
 // 共享出去
-plugin.share('locale', { useI18n, SelectLang });
+plugin.share('locale', { useI18n, locale, SelectLang });
 
 export function onAppCreated({ app }) {
     install(app);