From b076db692e14cfdca9d8173a7c5c3f806fd4231a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=87=E7=BA=AF?= <harrywan@webank.com>
Date: Mon, 15 Mar 2021 20:02:46 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=20=E4=BC=98=E5=8C=96plugin-layout?=
 =?UTF-8?q?=E5=92=8Cplugin-locale?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/runtime/helpers/pluginAccess.js       |  2 +-
 .../src/runtime/helpers/pluginLocale.js       | 33 ++++++++++++++++++
 .../src/runtime/views/Menu.vue                | 34 +++++++------------
 packages/fes-plugin-locale/src/index.js       |  2 +-
 4 files changed, 48 insertions(+), 23 deletions(-)
 create mode 100644 packages/fes-plugin-layout/src/runtime/helpers/pluginLocale.js

diff --git a/packages/fes-plugin-layout/src/runtime/helpers/pluginAccess.js b/packages/fes-plugin-layout/src/runtime/helpers/pluginAccess.js
index f1221540..f293fc75 100644
--- a/packages/fes-plugin-layout/src/runtime/helpers/pluginAccess.js
+++ b/packages/fes-plugin-layout/src/runtime/helpers/pluginAccess.js
@@ -28,7 +28,7 @@ const _addAccessTag = (arr) => {
     }
 };
 
-export const addAccessTag = (menus) => {
+export const transform = (menus) => {
     const originData = unref(menus);
     _addAccessTag(originData);
     return originData;
diff --git a/packages/fes-plugin-layout/src/runtime/helpers/pluginLocale.js b/packages/fes-plugin-layout/src/runtime/helpers/pluginLocale.js
new file mode 100644
index 00000000..279ea2d4
--- /dev/null
+++ b/packages/fes-plugin-layout/src/runtime/helpers/pluginLocale.js
@@ -0,0 +1,33 @@
+import { unref, computed } from 'vue';
+import { plugin } from '@@/core/coreExports';
+
+
+const transTitle = (name) => {
+    const sharedLocale = plugin.getShared('locale');
+    if (sharedLocale) {
+        const { t } = sharedLocale.useI18n();
+        return t(name);
+    }
+    return name;
+};
+
+
+const _transform = (arr) => {
+    if (Array.isArray(arr)) {
+        arr.forEach((item) => {
+            if (item.title) {
+                item._title = item.title;
+                item.title = computed(() => transTitle(item._title));
+            }
+            if (item.children && item.children.length > 0) {
+                _transform(item.children);
+            }
+        });
+    }
+};
+
+export const transform = (menus) => {
+    const originData = unref(menus);
+    _transform(originData);
+    return originData;
+};
diff --git a/packages/fes-plugin-layout/src/runtime/views/Menu.vue b/packages/fes-plugin-layout/src/runtime/views/Menu.vue
index ce330873..b5fcf0b8 100644
--- a/packages/fes-plugin-layout/src/runtime/views/Menu.vue
+++ b/packages/fes-plugin-layout/src/runtime/views/Menu.vue
@@ -7,7 +7,7 @@
     >
         <template v-for="(item, index) in fixedMenus" :key="index">
             <template v-if="item.access">
-                <a-sub-menu v-if="item.children" :title="transTitle(item.title)">
+                <a-sub-menu v-if="item.children" :title="item.title">
                     <template
                         v-for="(item1, index) in item.children"
                         :key="index"
@@ -15,7 +15,7 @@
                         <template v-if="item1.access">
                             <a-sub-menu
                                 v-if="item1.children"
-                                :title="transTitle(item1.title)"
+                                :title="item1.title"
                             >
                                 <template
                                     v-for="(item2, index) in item1.children"
@@ -24,21 +24,21 @@
                                     <a-menu-item
                                         v-if="item2.access"
                                         :key="item2.path"
-                                        :title="transTitle(item2.title)"
+                                        :title="item2.title"
                                     >
-                                        {{transTitle(item2.title)}}
+                                        {{item2.title}}
                                     </a-menu-item>
                                 </template>
                             </a-sub-menu>
-                            <a-menu-item v-else :key="item1.path" :title="transTitle(item1.title)">
-                                {{transTitle(item1.title)}}
+                            <a-menu-item v-else :key="item1.path" :title="item1.title">
+                                {{item1.title}}
                             </a-menu-item>
                         </template>
                     </template>
                 </a-sub-menu>
-                <a-menu-item v-else :key="item.path" :title="transTitle(item.title)">
+                <a-menu-item v-else :key="item.path" :title="item.title">
                     <MenuIcon v-if="item.icon" :icon="item.icon" />
-                    <span>{{transTitle(item.title)}}</span>
+                    <span>{{item.title}}</span>
                 </a-menu-item>
             </template>
         </template>
@@ -47,11 +47,12 @@
 
 <script>
 import { toRefs, computed } from 'vue';
-import { useRoute, useRouter, plugin } from '@@/core/coreExports';
+import { useRoute, useRouter } from '@@/core/coreExports';
 import Menu from 'ant-design-vue/lib/menu';
 import 'ant-design-vue/lib/menu/style/css';
 import MenuIcon from './MenuIcon';
-import { addAccessTag } from '../helpers/pluginAccess';
+import { transform as transformByAccess } from '../helpers/pluginAccess';
+import { transform as transformByLocale } from '../helpers/pluginLocale';
 
 export default {
     components: {
@@ -73,11 +74,10 @@ export default {
         }
     },
     setup(props) {
-        const sharedLocale = plugin.getShared('locale');
         const { menus } = toRefs(props);
         const route = useRoute();
         const router = useRouter();
-        const fixedMenus = addAccessTag(menus);
+        const fixedMenus = transformByLocale(transformByAccess(menus));
         const onMenuClick = (e) => {
             const path = e.key;
             if (/^https?:\/\//.test(path)) {
@@ -90,19 +90,11 @@ export default {
                 );
             }
         };
-        const transTitle = (name) => {
-            if (sharedLocale) {
-                const { t } = sharedLocale.useI18n();
-                return t(name);
-            }
-            return name;
-        };
         const selectedKeys = computed(() => [route.path]);
         return {
             selectedKeys,
             fixedMenus,
-            onMenuClick,
-            transTitle
+            onMenuClick
         };
     }
 };
diff --git a/packages/fes-plugin-locale/src/index.js b/packages/fes-plugin-locale/src/index.js
index 947e53bf..c1bd35cc 100644
--- a/packages/fes-plugin-locale/src/index.js
+++ b/packages/fes-plugin-locale/src/index.js
@@ -10,7 +10,7 @@ export default (api) => {
     } = api;
 
     api.chainWebpack((memo) => {
-        memo.resolve.alias.set('vue-i18n', 'vue-i18n/dist/vue-i18n.esm-bundler.js');
+        memo.resolve.alias.set('vue-i18n', 'vue-i18n/dist/vue-i18n.runtime.esm-bundler.js');
     });
 
     api.describe({