From 15343f2f94ad9e44ab61620c932fc2207b894543 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 11 Jun 2021 15:19:30 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):?=
 =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E6=88=90=E5=91=98=E6=97=B6=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=BB=84=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../settings/organization/OrganizationMember.vue | 12 ++++++------
 .../organization/OrganizationWorkspace.vue       | 14 +++++++-------
 .../components/settings/project/Member.vue       |  6 +++---
 .../components/settings/system/Organization.vue  | 16 ++++++++--------
 .../settings/system/SystemWorkspace.vue          | 16 ++++++++--------
 .../components/settings/workspace/MsProject.vue  | 10 +++++-----
 .../settings/workspace/WorkspaceMember.vue       | 12 ++++++------
 frontend/src/i18n/en-US.js                       |  3 ++-
 frontend/src/i18n/zh-CN.js                       |  3 ++-
 frontend/src/i18n/zh-TW.js                       |  3 ++-
 10 files changed, 49 insertions(+), 46 deletions(-)

diff --git a/frontend/src/business/components/settings/organization/OrganizationMember.vue b/frontend/src/business/components/settings/organization/OrganizationMember.vue
index ce1b51b7a1..ebd21fbb6a 100644
--- a/frontend/src/business/components/settings/organization/OrganizationMember.vue
+++ b/frontend/src/business/components/settings/organization/OrganizationMember.vue
@@ -78,7 +78,7 @@
         </el-form-item>
 
         <el-form-item :label="$t('commons.group')" prop="groupIds">
-          <el-select v-model="form.groupIds" multiple :placeholder="$t('role.please_choose_role')" class="select-width">
+          <el-select v-model="form.groupIds" multiple :placeholder="$t('group.please_select_group')" class="select-width">
             <el-option
               v-for="item in form.groups"
               :key="item.id"
@@ -111,9 +111,9 @@
         <el-form-item :label="$t('commons.phone')" prop="phone">
           <el-input v-model="form.phone" autocomplete="off" :disabled="true"/>
         </el-form-item>
-        <el-form-item label="用户组" prop="groupIds"
-                      :rules="{required: true, message: '请选择用户组', trigger: 'change'}">
-          <el-select v-model="form.groupIds" multiple placeholder="请选择用户组" class="select-width">
+        <el-form-item :label="$t('commons.group')" prop="groupIds"
+                      :rules="{required: true, message: $t('group.please_select_group'), trigger: 'change'}">
+          <el-select v-model="form.groupIds" multiple :placeholder="$t('group.please_select_group')" class="select-width">
             <el-option
               v-for="item in form.allgroups"
               :key="item.id"
@@ -174,8 +174,8 @@
           userIds: [
             {required: true, message: this.$t('member.please_choose_member'), trigger: ['blur']}
           ],
-          roleIds: [
-            {required: true, message: this.$t('role.please_choose_role'), trigger: ['blur']}
+          groupIds: [
+            {required: true, message: this.$t('group.please_select_group'), trigger: ['blur']}
           ]
         },
         multipleSelection: [],
diff --git a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
index 3da727c4ec..909ded0286 100644
--- a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
+++ b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
@@ -79,7 +79,7 @@
         <el-table-column prop="name" :label="$t('commons.username')"/>
         <el-table-column prop="email" :label="$t('commons.email')"/>
         <el-table-column prop="phone" :label="$t('commons.phone')"/>
-        <el-table-column label="用户组" width="150">
+        <el-table-column :label="$t('commons.group')" width="150">
           <template v-slot:default="scope">
             <ms-roles-tag :roles="scope.row.groups" type="success"/>
           </template>
@@ -127,8 +127,8 @@
             </template>
           </el-autocomplete>
         </el-form-item>
-        <el-form-item label="用户组" prop="groupIds">
-          <el-select v-model="memberForm.groupIds" multiple placeholder="请选择用户组"
+        <el-form-item :label="$t('commons.group')" prop="groupIds">
+          <el-select v-model="memberForm.groupIds" multiple :placeholder="$t('group.please_select_group')"
                      class="select-width">
             <el-option
               v-for="item in memberForm.groups"
@@ -164,9 +164,9 @@
         <el-form-item :label="$t('commons.phone')" prop="phone">
           <el-input v-model="memberForm.phone" autocomplete="off" :disabled="true"/>
         </el-form-item>
-        <el-form-item label="用户组" prop="groupIds"
-                      :rules="{required: true, message: $t('role.please_choose_role'), trigger: 'change'}">
-          <el-select v-model="memberForm.groupIds" multiple placeholder="请选择用户组"
+        <el-form-item :label="$t('commons.group')" prop="groupIds"
+                      :rules="{required: true, message: $t('group.please_select_group'), trigger: 'change'}">
+          <el-select v-model="memberForm.groupIds" multiple :placeholder="$t('group.please_select_group')"
                      class="select-width">
             <el-option
               v-for="item in memberForm.allgroups"
@@ -547,7 +547,7 @@ export default {
           {required: true, message: this.$t('member.please_choose_member'), trigger: ['blur']}
         ],
         groupIds: [
-          {required: true, message: this.$t('role.please_choose_role'), trigger: ['blur']}
+          {required: true, message: this.$t('group.please_select_group'), trigger: ['blur']}
         ]
       },
       currentWorkspaceRow: {},
diff --git a/frontend/src/business/components/settings/project/Member.vue b/frontend/src/business/components/settings/project/Member.vue
index 19f3d42831..05562cf755 100644
--- a/frontend/src/business/components/settings/project/Member.vue
+++ b/frontend/src/business/components/settings/project/Member.vue
@@ -13,7 +13,7 @@
         <el-table-column prop="name" :label="$t('commons.username')"/>
         <el-table-column prop="email" :label="$t('commons.email')"/>
         <el-table-column prop="phone" :label="$t('commons.phone')"/>
-        <el-table-column prop="groups" label="用户组" width="150">
+        <el-table-column prop="groups" :label="$t('commons.group')" width="150">
           <template v-slot:default="scope">
             <ms-roles-tag :roles="scope.row.groups" type="success"/>
           </template>
@@ -49,8 +49,8 @@
         <el-form-item :label="$t('commons.phone')" prop="phone">
           <el-input v-model="form.phone" autocomplete="off" :disabled="true"/>
         </el-form-item>
-        <el-form-item label="用户组" prop="groupIds" :rules="{required: true, message: '请选择用户组', trigger: 'change'}">
-          <el-select v-model="form.groupIds" multiple placeholder="请选择用户组" class="select-width">
+        <el-form-item :label="$t('commons.group')" prop="groupIds" :rules="{required: true, message: $t('group.please_select_group'), trigger: 'change'}">
+          <el-select v-model="form.groupIds" multiple :placeholder="$t('group.please_select_group')" class="select-width">
             <el-option
               v-for="item in form.allgroups"
               :key="item.id"
diff --git a/frontend/src/business/components/settings/system/Organization.vue b/frontend/src/business/components/settings/system/Organization.vue
index 66f819eb3a..c1494ab5a3 100644
--- a/frontend/src/business/components/settings/system/Organization.vue
+++ b/frontend/src/business/components/settings/system/Organization.vue
@@ -48,7 +48,7 @@
         <el-table-column prop="name" :label="$t('commons.username')"/>
         <el-table-column prop="email" :label="$t('commons.email')"/>
         <el-table-column prop="phone" :label="$t('commons.phone')"/>
-        <el-table-column label="用户组" width="140">
+        <el-table-column :label="$t('commons.group')" width="140">
           <template v-slot:default="scope">
             <ms-roles-tag :roles="scope.row.groups"/>
           </template>
@@ -112,7 +112,7 @@
 
     <!-- add organization member form -->
     <el-dialog :close-on-click-modal="false" :title="$t('member.create')" :visible.sync="dialogOrgMemberAddVisible"
-               width="30%"
+               width="40%"
                :destroy-on-close="true"
                @close="closeFunc">
       <el-form :model="memberForm" ref="form" :rules="orgMemberRule" label-position="right" label-width="100px"
@@ -130,8 +130,8 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="用户组" prop="groupIds">
-          <el-select filterable v-model="memberForm.groupIds" multiple placeholder="请选择用户组"
+        <el-form-item :label="$t('commons.group')" prop="groupIds">
+          <el-select filterable v-model="memberForm.groupIds" multiple :placeholder="$t('group.please_select_group')"
                      class="select-width">
             <el-option
               v-for="item in memberForm.groups"
@@ -168,8 +168,8 @@
           <el-input v-model="memberForm.phone" autocomplete="off" :disabled="true"/>
         </el-form-item>
         <el-form-item :label="$t('commons.group')" prop="groupIds"
-                      :rules="{required: true, message: $t('role.please_choose_role'), trigger: 'change'}">
-          <el-select filterable v-model="memberForm.groupIds" multiple :placeholder="$t('role.please_choose_role')"
+                      :rules="{required: true, message: $t('group.please_select_group'), trigger: 'change'}">
+          <el-select filterable v-model="memberForm.groupIds" multiple :placeholder="$t('group.please_select_group')"
                      class="select-width">
             <el-option
               v-for="item in memberForm.allgroups"
@@ -270,8 +270,8 @@ export default {
         userIds: [
           {required: true, message: this.$t('member.please_choose_member'), trigger: ['blur']}
         ],
-        roleIds: [
-          {required: true, message: this.$t('role.please_choose_role'), trigger: ['blur']}
+        groupIds: [
+          {required: true, message: this.$t('group.please_select_group'), trigger: ['blur']}
         ]
       },
       orgId: ""
diff --git a/frontend/src/business/components/settings/system/SystemWorkspace.vue b/frontend/src/business/components/settings/system/SystemWorkspace.vue
index deaaf8e3ab..f42468d126 100644
--- a/frontend/src/business/components/settings/system/SystemWorkspace.vue
+++ b/frontend/src/business/components/settings/system/SystemWorkspace.vue
@@ -106,7 +106,7 @@
         <el-table-column prop="name" :label="$t('commons.username')"/>
         <el-table-column prop="email" :label="$t('commons.email')"/>
         <el-table-column prop="phone" :label="$t('commons.phone')"/>
-        <el-table-column label="用户组" width="150">
+        <el-table-column :label="$t('commons.group')" width="150">
           <template v-slot:default="scope">
             <ms-roles-tag :roles="scope.row.groups" type="success"/>
           </template>
@@ -145,8 +145,8 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="用户组" prop="groupIds">
-          <el-select filterable v-model="memberForm.groupIds" multiple placeholder="请选择用户组"
+        <el-form-item :label="$t('commons.group')" prop="groupIds">
+          <el-select filterable v-model="memberForm.groupIds" multiple :placeholder="$t('group.please_select_group')"
                      class="select-width">
             <el-option
               v-for="item in memberForm.groups"
@@ -182,9 +182,9 @@
         <el-form-item :label="$t('commons.phone')" prop="phone">
           <el-input v-model="memberForm.phone" autocomplete="off" :disabled="true"/>
         </el-form-item>
-        <el-form-item label="用户组" prop="groupIds"
-                      :rules="{required: true, message: $t('role.please_choose_role'), trigger: 'change'}">
-          <el-select filterable v-model="memberForm.groupIds" multiple placeholder="请选择用户组"
+        <el-form-item :label="$t('commons.group')" prop="groupIds"
+                      :rules="{required: true, message: $t('group.please_select_group'), trigger: 'change'}">
+          <el-select filterable v-model="memberForm.groupIds" multiple :placeholder="$t('group.please_select_group')"
                      class="select-width">
             <el-option
               v-for="item in memberForm.allgroups"
@@ -545,8 +545,8 @@ export default {
         userIds: [
           {required: true, message: this.$t('member.please_choose_member'), trigger: ['blur']}
         ],
-        roleIds: [
-          {required: true, message: this.$t('role.please_choose_role'), trigger: ['blur']}
+        groupIds: [
+          {required: true, message: this.$t('group.please_select_group'), trigger: ['blur']}
         ]
       },
       currentWorkspaceRow: {},
diff --git a/frontend/src/business/components/settings/workspace/MsProject.vue b/frontend/src/business/components/settings/workspace/MsProject.vue
index 97f389cb53..9f38d3a9ce 100644
--- a/frontend/src/business/components/settings/workspace/MsProject.vue
+++ b/frontend/src/business/components/settings/workspace/MsProject.vue
@@ -145,7 +145,7 @@
           <el-table-column prop="name" :label="$t('commons.username')"/>
           <el-table-column prop="email" :label="$t('commons.email')"/>
           <el-table-column prop="phone" :label="$t('commons.phone')"/>
-          <el-table-column label="用户组" width="150">
+          <el-table-column :label="$t('commons.group')" width="150">
             <template v-slot:default="scope">
               <ms-roles-tag :roles="scope.row.groups" type="success"/>
             </template>
@@ -181,8 +181,8 @@
         <el-form-item :label="$t('commons.phone')" prop="phone">
           <el-input v-model="form.phone" autocomplete="off" :disabled="true"/>
         </el-form-item>
-        <el-form-item label="用户组" prop="groupIds" :rules="{required: true, message: '请选择用户组', trigger: 'change'}">
-          <el-select v-model="form.groupIds" multiple placeholder="请选择用户组" class="select-width">
+        <el-form-item :label="$t('commons.group')" prop="groupIds" :rules="{required: true, message: $t('group.please_select_group'), trigger: 'change'}">
+          <el-select v-model="form.groupIds" multiple :placeholder="$t('group.please_select_group')" style="width: 100%">
             <el-option
               v-for="item in form.allgroups"
               :key="item.id"
@@ -223,8 +223,8 @@
             </template>
           </el-autocomplete>
         </el-form-item>
-        <el-form-item label="用户组" prop="groupIds" :rules="{required: true, message: '请选择用户组', trigger: 'blur'}">
-          <el-select v-model="memberForm.groupIds" multiple placeholder="请选择用户组" style="width: 100%">
+        <el-form-item :label="$t('commons.group')" prop="groupIds" :rules="{required: true, message: $t('group.please_select_group'), trigger: 'blur'}">
+          <el-select v-model="memberForm.groupIds" multiple :placeholder="$t('group.please_select_group')" style="width: 100%">
             <el-option
               v-for="item in memberForm.groups"
               :key="item.id"
diff --git a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
index 3f6aa51dc8..27e341b8cf 100644
--- a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
+++ b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
@@ -29,7 +29,7 @@
         <el-table-column prop="name" :label="$t('commons.username')"/>
         <el-table-column prop="email" :label="$t('commons.email')"/>
         <el-table-column prop="phone" :label="$t('commons.phone')"/>
-        <el-table-column prop="groups" label="用户组" width="150">
+        <el-table-column prop="groups" :label="$t('commons.group')" width="150">
           <template v-slot:default="scope">
             <ms-roles-tag :roles="scope.row.groups" type="success"/>
           </template>
@@ -70,8 +70,8 @@
             </template>
           </el-autocomplete>
         </el-form-item>
-        <el-form-item label="用户组" prop="groupIds">
-          <el-select v-model="form.groupIds" multiple placeholder="请选择用户组" class="select-width">
+        <el-form-item :label="$t('commons.group')" prop="groupIds">
+          <el-select v-model="form.groupIds" multiple :placeholder="$t('group.please_select_group')" class="select-width">
             <el-option
               v-for="item in form.groups"
               :key="item.id"
@@ -103,8 +103,8 @@
         <el-form-item :label="$t('commons.phone')" prop="phone">
           <el-input v-model="form.phone" autocomplete="off" :disabled="true"/>
         </el-form-item>
-        <el-form-item label="用户组" prop="groupIds" :rules="{required: true, message: '请选择用户组', trigger: 'change'}">
-          <el-select v-model="form.groupIds" multiple placeholder="请选择用户组" class="select-width">
+        <el-form-item :label="$t('commons.group')" prop="groupIds" :rules="{required: true, message: $t('group.please_select_group'), trigger: 'change'}">
+          <el-select v-model="form.groupIds" multiple :placeholder="$t('group.please_select_group')" class="select-width">
             <el-option
               v-for="item in form.allgroups"
               :key="item.id"
@@ -168,7 +168,7 @@
             {required: true, message: this.$t('member.please_choose_member'), trigger: ['blur']}
           ],
           groupIds: [
-            {required: true, message: "请选择用户组", trigger: ['blur']}
+            {required: true, message: this.$t('group.please_select_group'), trigger: ['blur']}
           ]
         },
         screenHeight: 'calc(100vh - 255px)',
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index efc480a01d..53020c3abe 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -498,7 +498,8 @@ export default {
     functional_menu: 'Functional Menu',
     operation_object: 'Operation Object',
     check_all: 'ALL',
-    permission: 'Permission'
+    permission: 'Permission',
+    please_select_group: 'Please Select Group'
   },
   role: {
     please_choose_role: 'Please Choose Role',
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index b01e0da2dc..095528a4ba 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -496,7 +496,8 @@ export default {
     functional_menu: '功能菜单',
     operation_object: '操作对象',
     check_all: '全选',
-    permission: '权限'
+    permission: '权限',
+    please_select_group: '请选择用户组'
   },
   role: {
     please_choose_role: '请选择角色',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index e233ab83ef..5c0665c2a3 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -496,7 +496,8 @@ export default {
     functional_menu: '功能菜單',
     operation_object: '操作對象',
     check_all: '全選',
-    permission: '權限'
+    permission: '權限',
+    please_select_group: '請選擇用戶組'
   },
   role: {
     please_choose_role: '請選擇角色',