From 2b1e078f492a9a5d6834d99ef60e0c7b8e5ca4de Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Thu, 15 Aug 2024 13:52:24 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=88=E6=9D=83=E7=AE=A1=E7=90=86=E6=96=87?=
 =?UTF-8?q?=E6=A1=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/config/pathMap.ts                               | 2 +-
 frontend/src/router/routes/modules/setting.ts                | 2 +-
 frontend/src/views/setting/organization/member/index.vue     | 1 +
 .../src/views/setting/system/authorizedManagement/index.vue  | 4 ++--
 .../setting/system/authorizedManagement/locale/en-US.ts      | 5 +++--
 .../setting/system/authorizedManagement/locale/zh-CN.ts      | 5 +++--
 frontend/src/views/setting/system/user/index.vue             | 1 +
 7 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/frontend/src/config/pathMap.ts b/frontend/src/config/pathMap.ts
index f5e0271533..f1e98160b3 100644
--- a/frontend/src/config/pathMap.ts
+++ b/frontend/src/config/pathMap.ts
@@ -313,7 +313,7 @@ export const pathMap: PathMapItem[] = [
           },
           {
             key: 'SETTING_SYSTEM_AUTHORIZED_MANAGEMENT', // 系统设置-系统-授权管理
-            locale: 'menu.settings.system.authorizedManagement',
+            locale: 'License',
             route: RouteEnum.SETTING_SYSTEM_AUTHORIZED_MANAGEMENT,
             permission: [],
             level: MENU_LEVEL[0],
diff --git a/frontend/src/router/routes/modules/setting.ts b/frontend/src/router/routes/modules/setting.ts
index a71f9451f5..685d8f3627 100644
--- a/frontend/src/router/routes/modules/setting.ts
+++ b/frontend/src/router/routes/modules/setting.ts
@@ -162,7 +162,7 @@ const Setting: AppRouteRecordRaw = {
           name: SettingRouteEnum.SETTING_SYSTEM_AUTHORIZED_MANAGEMENT,
           component: () => import('@/views/setting/system/authorizedManagement/index.vue'),
           meta: {
-            locale: 'menu.settings.system.authorizedManagement',
+            locale: 'License',
             roles: ['SYSTEM_AUTH:READ'],
             isTopMenu: true,
           },
diff --git a/frontend/src/views/setting/organization/member/index.vue b/frontend/src/views/setting/organization/member/index.vue
index 993f1c68a8..55badf620b 100644
--- a/frontend/src/views/setting/organization/member/index.vue
+++ b/frontend/src/views/setting/organization/member/index.vue
@@ -222,6 +222,7 @@
       slotName: 'userRoleIdNameMap',
       dataIndex: 'userRoleIdNameMap',
       showInTable: true,
+      isTag: true,
       showDrag: true,
       width: 300,
     },
diff --git a/frontend/src/views/setting/system/authorizedManagement/index.vue b/frontend/src/views/setting/system/authorizedManagement/index.vue
index b13e35108f..5f96304216 100644
--- a/frontend/src/views/setting/system/authorizedManagement/index.vue
+++ b/frontend/src/views/setting/system/authorizedManagement/index.vue
@@ -61,7 +61,7 @@
             </li>
             <li>
               <MsButton v-permission="['SYSTEM_AUTH:READ+UPDATE']" class="font-medium" @click="authChecking">
-                {{ t('system.authorized.authorityChecking') }}
+                {{ t('system.authorized.authorityUpdate') }}
               </MsButton>
             </li>
           </ul>
@@ -71,7 +71,7 @@
     <MsDrawer
       v-model:visible="authDrawer"
       :title="t('system.authorized.authorityChecking')"
-      :ok-text="t('system.authorized.authorization')"
+      :ok-text="t('common.update')"
       :ok-loading="drawerLoading"
       :width="680"
       @confirm="confirmHandler"
diff --git a/frontend/src/views/setting/system/authorizedManagement/locale/en-US.ts b/frontend/src/views/setting/system/authorizedManagement/locale/en-US.ts
index 0749a10832..1fb8befcdf 100644
--- a/frontend/src/views/setting/system/authorizedManagement/locale/en-US.ts
+++ b/frontend/src/views/setting/system/authorizedManagement/locale/en-US.ts
@@ -1,12 +1,13 @@
 export default {
   'system.authorized.customerName': 'Customer Name',
-  'system.authorized.authorizationTime': 'Authorization time',
+  'system.authorized.authorizationTime': 'Expiration date',
   'system.authorized.productName': 'Product Name',
   'system.authorized.productionVersion': 'Production Version',
-  'system.authorized.authorizedVersion': 'The authorized version',
+  'system.authorized.authorizedVersion': 'Version',
   'system.authorized.authorizationsCount': 'Number of authorizations',
   'system.authorized.authorizationStatus': 'Authorization status',
   'system.authorized.authorityChecking': 'Import License',
+  'system.authorized.authorityUpdate': 'Update License',
   'system.authorized.valid': 'valid',
   'system.authorized.invalid': 'invalid',
   'system.authorized.failure': 'failure',
diff --git a/frontend/src/views/setting/system/authorizedManagement/locale/zh-CN.ts b/frontend/src/views/setting/system/authorizedManagement/locale/zh-CN.ts
index 4a838ccabf..2158f4072c 100644
--- a/frontend/src/views/setting/system/authorizedManagement/locale/zh-CN.ts
+++ b/frontend/src/views/setting/system/authorizedManagement/locale/zh-CN.ts
@@ -1,12 +1,13 @@
 export default {
   'system.authorized.customerName': '客户名称',
-  'system.authorized.authorizationTime': '授权时间',
+  'system.authorized.authorizationTime': '过期时间',
   'system.authorized.productName': '产品名称',
   'system.authorized.productionVersion': '产品版本',
-  'system.authorized.authorizedVersion': '授权版本',
+  'system.authorized.authorizedVersion': '版本',
   'system.authorized.authorizationsCount': '授权数量',
   'system.authorized.authorizationStatus': '授权状态',
   'system.authorized.authorityChecking': '导入License',
+  'system.authorized.authorityUpdate': '更新License',
   'system.authorized.valid': '有效',
   'system.authorized.invalid': '无效',
   'system.authorized.failure': '失败',
diff --git a/frontend/src/views/setting/system/user/index.vue b/frontend/src/views/setting/system/user/index.vue
index 79710b00b9..b436b4cb55 100644
--- a/frontend/src/views/setting/system/user/index.vue
+++ b/frontend/src/views/setting/system/user/index.vue
@@ -377,6 +377,7 @@
       title: 'system.user.tableColumnUserGroup',
       dataIndex: 'userRoleList',
       slotName: 'userGroup',
+      isTag: true,
       showDrag: true,
       width: 300,
     },