From c8eecf587e9b1e2f27b2853fd1573863590cf7fb Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 31 May 2021 15:54:39 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=A9=BA=E9=97=B4=E6=B7=BB=E5=8A=A0=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=88=90=E5=91=98=E6=97=B6=E7=94=A8=E6=88=B7=E7=BB=84?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/business/components/settings/system/EditUser.vue  | 2 +-
 .../src/business/components/settings/workspace/MsProject.vue   | 2 +-
 frontend/src/i18n/en-US.js                                     | 3 +++
 frontend/src/i18n/zh-CN.js                                     | 3 +++
 frontend/src/i18n/zh-TW.js                                     | 3 +++
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/settings/system/EditUser.vue b/frontend/src/business/components/settings/system/EditUser.vue
index 26bf88142f..b5b3627d6f 100644
--- a/frontend/src/business/components/settings/system/EditUser.vue
+++ b/frontend/src/business/components/settings/system/EditUser.vue
@@ -93,7 +93,7 @@
         <el-form-item>
           <template>
             <el-button type="success" style="width: 100%;" @click="addGroup('createUserForm')" :disabled="btnAddRole">
-              {{ $t('role.add') }}
+              {{ $t('group.add') }}
             </el-button>
           </template>
         </el-form-item>
diff --git a/frontend/src/business/components/settings/workspace/MsProject.vue b/frontend/src/business/components/settings/workspace/MsProject.vue
index 2c0a220cc5..a5e2437c4b 100644
--- a/frontend/src/business/components/settings/workspace/MsProject.vue
+++ b/frontend/src/business/components/settings/workspace/MsProject.vue
@@ -219,7 +219,7 @@
             </template>
           </el-autocomplete>
         </el-form-item>
-        <el-form-item label="用户组" prop="groupIds">
+        <el-form-item label="用户组" prop="groupIds" :rules="{required: true, message: '请选择用户组', trigger: 'blur'}">
           <el-select v-model="memberForm.groupIds" multiple placeholder="请选择用户组" style="width: 100%">
             <el-option
               v-for="item in memberForm.groups"
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index ab64720ff8..99df63458a 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -472,6 +472,9 @@ export default {
       add_user_role_batch: 'Batch add user role',
     }
   },
+  group: {
+    add: 'Add User Group',
+  },
   role: {
     please_choose_role: 'Please Choose Role',
     admin: 'Admin',
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 0860ed316a..4bb1b41f06 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -470,6 +470,9 @@ export default {
       add_user_role_batch: '批量添加角色',
     }
   },
+  group: {
+    add: '添加用户组',
+  },
   role: {
     please_choose_role: '请选择角色',
     admin: '系统管理员',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index f24d0968c1..ab172648eb 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -470,6 +470,9 @@ export default {
       add_user_role_batch: '批量添加角色',
     }
   },
+  group: {
+    add: '添加用戶組',
+  },
   role: {
     please_choose_role: '請選擇角色',
     admin: '系統管理員',