From 998134b1f13987e30ea2919f6395ee64ca6d3d65 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Sat, 9 May 2020 12:06:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../settings/personal/PersonSetting.vue         | 12 ++++++++++++
 .../components/settings/system/User.vue         | 17 +++++++++++++++++
 frontend/src/i18n/en-US.js                      |  2 ++
 frontend/src/i18n/zh-CN.js                      |  2 ++
 4 files changed, 33 insertions(+)

diff --git a/frontend/src/business/components/settings/personal/PersonSetting.vue b/frontend/src/business/components/settings/personal/PersonSetting.vue
index 62df4fb731..dc2c78823c 100644
--- a/frontend/src/business/components/settings/personal/PersonSetting.vue
+++ b/frontend/src/business/components/settings/personal/PersonSetting.vue
@@ -43,6 +43,9 @@
           <el-form-item :label="$t('commons.phone')" prop="phone">
             <el-input v-model="form.phone" autocomplete="off"/>
           </el-form-item>
+          <el-form-item :label="$t('commons.password')" prop="password">
+            <el-input v-model="form.password" autocomplete="off" show-password/>
+          </el-form-item>
         </el-form>
         <template v-slot:footer>
           <ms-dialog-footer
@@ -94,6 +97,15 @@
               message: this.$t('member.email_format_is_incorrect'),
               trigger: 'blur'
             }
+          ],
+          password: [
+            {required: true, message: this.$t('user.input_password'), trigger: 'blur'},
+            {
+              required:true,
+              pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[^]{8,16}$/,
+              message: this.$t('member.password_format_is_incorrect'),
+              trigger: 'blur'
+            }
           ]
         }
       }
diff --git a/frontend/src/business/components/settings/system/User.vue b/frontend/src/business/components/settings/system/User.vue
index f4149dfab1..95ec69897b 100644
--- a/frontend/src/business/components/settings/system/User.vue
+++ b/frontend/src/business/components/settings/system/User.vue
@@ -55,6 +55,9 @@
         <el-form-item :label="$t('commons.phone')" prop="phone">
           <el-input v-model="form.phone" autocomplete="off"/>
         </el-form-item>
+        <el-form-item :label="$t('commons.password')" prop="password">
+          <el-input v-model="form.password" autocomplete="off" show-password/>
+        </el-form-item>
       </el-form>
       <template v-slot:footer>
         <ms-dialog-footer
@@ -78,6 +81,10 @@
         <el-form-item :label="$t('commons.phone')" prop="phone">
           <el-input v-model="form.phone" autocomplete="off"/>
         </el-form-item>
+        <el-form-item :label="$t('commons.password')" prop="password">
+          <el-input v-model="form.password"   autocomplete="off" show-password/>
+        </el-form-item>
+        <!--<el-input placeholder="请输入密码" v-model="input" show-password></el-input>-->
       </el-form>
       <template v-slot:footer>
         <ms-dialog-footer
@@ -101,6 +108,7 @@
     components: {MsCreateBox, MsTablePagination, MsTableHeader, MsTableOperator, MsDialogFooter},
     data() {
       return {
+        /*input:'',*/
         queryPath: '/user/special/list',
         deletePath: '/user/special/delete/',
         createPath: '/user/special/add',
@@ -147,6 +155,15 @@
               message: this.$t('user.email_format_is_incorrect'),
               trigger: 'blur'
             }
+          ],
+          password: [
+            {required: true, message: this.$t('user.input_password'), trigger: 'blur'},
+            {
+              required:true,
+              pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[^]{8,16}$/,
+              message: this.$t('member.password_format_is_incorrect'),
+              trigger: 'blur'
+            }
           ]
         }
       }
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 686a981763..9a0e2cfc56 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -94,6 +94,7 @@ export default {
     'special_characters_are_not_supported': 'Special characters are not supported',
     'mobile_number_format_is_incorrect': 'Mobile number format is incorrect',
     'email_format_is_incorrect': 'Email format is incorrect',
+    'password_format_is_incorrect':'Password format is incorrect (At least 8-16 characters, at least 1 uppercase letter, 1 lowercase letter and 1 number)',
   },
   user: {
     'create': 'Create',
@@ -101,6 +102,7 @@ export default {
     'input_name': 'Please enter a user name',
     'input_id': 'Please enter a ID',
     'input_email': 'Please enter a email',
+    'input_password':'Please enter a password',
     'special_characters_are_not_supported': 'Special characters are not supported',
     'mobile_number_format_is_incorrect': 'Mobile number format is incorrect',
     'email_format_is_incorrect': 'Email format is incorrect',
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index d5565bdaba..534c12e010 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -96,6 +96,7 @@ export default {
     'special_characters_are_not_supported': '不支持特殊字符',
     'mobile_number_format_is_incorrect': '手机号码格式不正确',
     'email_format_is_incorrect': '邮箱格式不正确',
+    'password_format_is_incorrect':'密码格式不正确(至少8-16个字符，至少1个大写字母，1个小写字母和1个数字)',
   },
   user: {
     'create': '创建用户',
@@ -103,6 +104,7 @@ export default {
     'input_name': '请输入用户名',
     'input_id': '请输入ID',
     'input_email': '请输入邮箱',
+    'input_password':'请输入密码',
     'special_characters_are_not_supported': '不支持特殊字符',
     'mobile_number_format_is_incorrect': '手机号码格式不正确',
     'email_format_is_incorrect': '邮箱格式不正确',