From a2a39cb9f43600ad82c94c7b8aeca65d54a2e26a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Sun, 29 May 2022 14:20:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/lang/en.js             |   1 +
 src/i18n/lang/zh-cn.js          |   1 +
 src/i18n/lang/zh-tw.js          |   1 +
 src/i18n/pages/menu/en.js       |   1 +
 src/i18n/pages/menu/zh-cn.js    |   1 +
 src/i18n/pages/menu/zh-tw.js    |   1 +
 src/views/index_v1.vue          |   2 +-
 src/views/system/menu/index.vue | 125 +++++++++++++++++++-------------
 8 files changed, 82 insertions(+), 51 deletions(-)

diff --git a/src/i18n/lang/en.js b/src/i18n/lang/en.js
index b040b5e..cfe01f9 100644
--- a/src/i18n/lang/en.js
+++ b/src/i18n/lang/en.js
@@ -86,6 +86,7 @@ export default {
     backendTechnology: 'Backend technology',
     backstageManagement: 'Backstage management',
     bottomBar: 'Footer',
+    identity: 'Identity',
   },
   common: {
     ok: 'Ok',
diff --git a/src/i18n/lang/zh-cn.js b/src/i18n/lang/zh-cn.js
index 2b6ab45..5405355 100644
--- a/src/i18n/lang/zh-cn.js
+++ b/src/i18n/lang/zh-cn.js
@@ -86,6 +86,7 @@ export default {
     backendTechnology: '后端技术',
     backstageManagement: '后台管理',
     bottomBar: '底部栏',
+    identity: '身份',
   },
   common: {
     ok: '确定',
diff --git a/src/i18n/lang/zh-tw.js b/src/i18n/lang/zh-tw.js
index 53ca1d1..a8b7f8e 100644
--- a/src/i18n/lang/zh-tw.js
+++ b/src/i18n/lang/zh-tw.js
@@ -85,6 +85,7 @@ export default {
     backendTechnology: '後端技術',
     backstageManagement: '後台管理',
     bottomBar: '底部欄',
+    identity: '身份',
   },
   common: {
     ok: '確定',
diff --git a/src/i18n/pages/menu/en.js b/src/i18n/pages/menu/en.js
index a3fe483..8246000 100644
--- a/src/i18n/pages/menu/en.js
+++ b/src/i18n/pages/menu/en.js
@@ -18,5 +18,6 @@ export default {
     routePath: 'routePath',
     permissionStr: 'permission',
     isCache: 'isCache',
+    menuNameKey: 'menuNameKey',
   }
 }
\ No newline at end of file
diff --git a/src/i18n/pages/menu/zh-cn.js b/src/i18n/pages/menu/zh-cn.js
index fda46ca..4d14395 100644
--- a/src/i18n/pages/menu/zh-cn.js
+++ b/src/i18n/pages/menu/zh-cn.js
@@ -18,5 +18,6 @@ export default {
     routePath: '路由地址',
     permissionStr: '权限字符',
     isCache: '是否缓存',
+    menuNameKey: '菜单名(key)',
   }
 }
\ No newline at end of file
diff --git a/src/i18n/pages/menu/zh-tw.js b/src/i18n/pages/menu/zh-tw.js
index d51793d..2f6044a 100644
--- a/src/i18n/pages/menu/zh-tw.js
+++ b/src/i18n/pages/menu/zh-tw.js
@@ -18,5 +18,6 @@ export default {
     routePath: '路由地址',
     permissionStr: '權限字符',
     isCache: '是否緩存',
+    menuNameKey: '菜單名(key)',
   }
 }
\ No newline at end of file
diff --git a/src/views/index_v1.vue b/src/views/index_v1.vue
index 8a86b87..7beb9d1 100644
--- a/src/views/index_v1.vue
+++ b/src/views/index_v1.vue
@@ -24,7 +24,7 @@
                       <div class="right-value">{{ userInfo.nickName }}</div>
                     </el-col>
                     <el-col :xs="24" :lg="16" class="right-l-v">
-                      <div class="right-label">身份：</div>
+                      <div class="right-label">{{ $t('layout.identity') }}：</div>
                       <div class="right-value">
                         <span v-for="item in userInfo.roles" :key="item.roleId">
                           {{ item.roleName }}
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 234b4ae..1fcddbc 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -40,7 +40,16 @@
       lazy
       :load="loadMenu"
       :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
-      <el-table-column prop="menuName" :label="$t('m.menuName')" :show-overflow-tooltip="true" width="160"></el-table-column>
+      <el-table-column prop="menuName" :label="$t('m.menuName')" :show-overflow-tooltip="true" width="160">
+        <template #default="scope">
+          <span v-if="scope.row.menuNameKey">
+            {{ $t(scope.row.menuNameKey) }}
+          </span>
+          <span v-else>
+            {{ scope.row.menuName }}
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column prop="icon" :label="$t('m.icon')" align="center" width="60">
         <template #default="scope">
           <svg-icon :name="scope.row.icon" />
@@ -126,14 +135,16 @@
             </el-form-item>
           </el-col>
           <el-col :lg="12">
-            <el-form-item label="多语言key" prop="menuNameKey">
+            <el-form-item label="菜单名(key)" prop="menuNameKey">
               <template #label>
-                <el-tooltip content="多语言翻译key：eg：menu.system" placement="top">
-                  <el-icon :size="15">
-                    <questionFilled />
-                  </el-icon>
-                </el-tooltip>
-                {{ $t('languageKey') }}
+                <span>
+                  <el-tooltip content="多语言翻译key：eg：menu.system" placement="top">
+                    <el-icon :size="15">
+                      <questionFilled />
+                    </el-icon>
+                  </el-tooltip>
+                  {{ $t('m.menuNameKey') }}
+                </span>
               </template>
               <el-input v-model="form.menuNameKey" placeholder="请输入多语言菜单key" />
             </el-form-item>
@@ -163,12 +174,14 @@
           <el-col :lg="12" v-if="form.menuType != 'F'">
             <el-form-item>
               <template #label>
-                <el-tooltip content="选择是外链则路由地址需要以`http(s)://`开头" placement="top">
-                  <el-icon :size="15">
-                    <questionFilled />
-                  </el-icon>
-                </el-tooltip>
-                {{ $t('m.isFrame') }}
+                <span>
+                  <el-tooltip content="选择是外链则路由地址需要以`http(s)://`开头" placement="top">
+                    <el-icon :size="15">
+                      <questionFilled />
+                    </el-icon>
+                  </el-tooltip>
+                  {{ $t('m.isFrame') }}
+                </span>
               </template>
               <el-radio-group v-model="form.isFrame">
                 <el-radio label="1">{{ $t('common.yes') }}</el-radio>
@@ -179,12 +192,14 @@
           <el-col :lg="12" v-if="form.menuType != 'F'">
             <el-form-item prop="path">
               <template #label>
-                <el-tooltip content="访问的路由地址，如：`user`，如外网地址需内链访问则以`http(s)://`开头" placement="top">
-                  <el-icon :size="15">
-                    <questionFilled />
-                  </el-icon>
-                </el-tooltip>
-                {{ $t('m.routePath') }}
+                <span>
+                  <el-tooltip content="访问的路由地址，如：`user`，如外网地址需内链访问则以`http(s)://`开头" placement="top">
+                    <el-icon :size="15">
+                      <questionFilled />
+                    </el-icon>
+                  </el-tooltip>
+                  {{ $t('m.routePath') }}
+                </span>
               </template>
               <el-input v-model="form.path" placeholder="请输入路由地址" />
             </el-form-item>
@@ -192,12 +207,14 @@
           <el-col :lg="12" v-if="form.menuType == 'C'">
             <el-form-item prop="component">
               <template #label>
-                <el-tooltip content="访问的组件路径，如：`system/user/index`，默认在`views`目录下" placement="top">
-                  <el-icon :size="15">
-                    <questionFilled />
-                  </el-icon>
-                </el-tooltip>
-                {{ $t('m.componentPath') }}
+                <span>
+                  <el-tooltip content="访问的组件路径，如：`system/user/index`，默认在`views`目录下" placement="top">
+                    <el-icon :size="15">
+                      <questionFilled />
+                    </el-icon>
+                  </el-tooltip>
+                  {{ $t('m.componentPath') }}
+                </span>
               </template>
               <el-input v-model="form.component" placeholder="请输入组件路径" />
             </el-form-item>
@@ -206,12 +223,14 @@
             <el-form-item>
               <el-input v-model="form.perms" placeholder="请输入权限标识" maxlength="100" />
               <template #label>
-                <el-tooltip content="控制器中定义的权限字符，如：[ActionPermissionFilter(Permission = 'system:user:delete')])" placement="top">
-                  <el-icon :size="15">
-                    <questionFilled />
-                  </el-icon>
-                </el-tooltip>
-                {{ $t('m.permissionStr') }}
+                <span>
+                  <el-tooltip content="控制器中定义的权限字符，如：[ActionPermissionFilter(Permission = 'system:user:delete')])" placement="top">
+                    <el-icon :size="15">
+                      <questionFilled />
+                    </el-icon>
+                  </el-tooltip>
+                  {{ $t('m.permissionStr') }}
+                </span>
               </template>
             </el-form-item>
           </el-col>
@@ -231,12 +250,14 @@
           <el-col :lg="12" v-if="form.menuType == 'C'">
             <el-form-item prop="isCache">
               <template #label>
-                <el-tooltip content="选择是则会被`keep-alive`缓存，需要匹配组件的`name`和地址保持一致" placement="top">
-                  <el-icon :size="15">
-                    <questionFilled />
-                  </el-icon>
-                </el-tooltip>
-                {{ $t('m.isCache') }}
+                <span>
+                  <el-tooltip content="选择是则会被`keep-alive`缓存，需要匹配组件的`name`和地址保持一致" placement="top">
+                    <el-icon :size="15">
+                      <questionFilled />
+                    </el-icon>
+                  </el-tooltip>
+                  {{ $t('m.isCache') }}
+                </span>
               </template>
               <el-radio-group v-model="form.isCache">
                 <el-radio label="0">{{ $t('common.yes') }}</el-radio>
@@ -247,12 +268,14 @@
           <el-col :lg="12" v-if="form.menuType != 'F'">
             <el-form-item prop="visible">
               <template #label>
-                <el-tooltip content="选择隐藏则路由将不会出现在侧边栏，但仍然可以访问" placement="top">
-                  <el-icon :size="15">
-                    <questionFilled />
-                  </el-icon>
-                </el-tooltip>
-                {{ $t('m.isShow') }}
+                <span>
+                  <el-tooltip content="选择隐藏则路由将不会出现在侧边栏，但仍然可以访问" placement="top">
+                    <el-icon :size="15">
+                      <questionFilled />
+                    </el-icon>
+                  </el-tooltip>
+                  {{ $t('m.isShow') }}
+                </span>
               </template>
               <el-radio-group v-model="form.visible">
                 <el-radio v-for="dict in sys_show_hide" :key="dict.dictValue" :label="dict.dictValue">{{ dict.dictLabel }}</el-radio>
@@ -262,12 +285,14 @@
           <el-col :lg="12" v-if="form.menuType != 'F'">
             <el-form-item>
               <template #label>
-                <el-tooltip content="选择停用则路由将不会出现在侧边栏，也不能被访问" placement="top">
-                  <el-icon :size="15">
-                    <questionFilled />
-                  </el-icon>
-                </el-tooltip>
-                {{ $t('m.menuState') }}
+                <span>
+                  <el-tooltip content="选择停用则路由将不会出现在侧边栏，也不能被访问" placement="top">
+                    <el-icon :size="15">
+                      <questionFilled />
+                    </el-icon>
+                  </el-tooltip>
+                  {{ $t('m.menuState') }}
+                </span>
               </template>
               <el-radio-group v-model="form.status">
                 <el-radio v-for="dict in sys_normal_disable" :key="dict.dictValue" :label="dict.dictValue">{{ dict.dictLabel }}</el-radio>