From b706a686cf28b8dbaaeb69ebe93cab096ee54ebf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=8A=B2=E6=9D=BE?= <chenjinsong@zdjizhi.com>
Date: Mon, 18 Jan 2021 16:42:32 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-471=20feat:=20account-box=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=97=B6=E5=A2=9E=E5=8A=A0=E6=94=B9=E5=AF=86=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/rightBox/accountBox.vue | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/nezha-fronted/src/components/common/rightBox/accountBox.vue b/nezha-fronted/src/components/common/rightBox/accountBox.vue
index 330bd0c14..499a16ce1 100644
--- a/nezha-fronted/src/components/common/rightBox/accountBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/accountBox.vue
@@ -17,19 +17,19 @@
 
     <!-- begin--表单-->
     <div class="right-box-form-box">
-      <el-form class="right-box-form right-box-form-left" :model="editUser" :rules="rules" ref="accountForm" label-position="right" label-width="120px">
+      <el-form :model="editUser" :rules="editUser.userId ? rules2 : rules" class="right-box-form right-box-form-left" label-position="right" label-width="120px" ref="accountForm">
         <!--username-->
         <el-form-item :label="$t('config.account.account')" prop="username">
           <el-input autocomplete="new-password" type="text" placeholder=""
                     v-model="editUser.username" maxlength="64" show-word-limit size="small" :disabled="editUser.username==='admin' && editUser.userId==1"></el-input>
         </el-form-item>
         <!--password-->
-        <el-form-item :label="$t('config.account.password')" prop="password" v-if="!editUser.userId">
+        <el-form-item :label="$t('config.account.password')" prop="password">
           <el-input autocomplete="new-password" type="password" placeholder="" v-model="editUser.password"
                     maxlength="16" show-word-limit size="small" @blur="passwordBlur"></el-input>
         </el-form-item>
         <!--passwordChange-->
-        <el-form-item :label="$t('config.account.confirmPwd')" prop="passwordChange" v-if="!editUser.userId" class="passwordChange" label-width="160px">
+        <el-form-item :label="$t('config.account.confirmPwd')" class="passwordChange" label-width="160px" prop="passwordChange">
           <el-input autocomplete="new-password" type="password" placeholder="" v-model="editUser.passwordChange"
                     maxlength="16" show-word-limit size="small"></el-input>
         </el-form-item>
@@ -112,10 +112,7 @@
     },
     data() {
       let validatePassword = (rule, value, callback) => { // 确认密码的二次校验
-        console.log(value);
-        if (value === ''&& !this.editUser.password) {
-          callback(new Error(this.$t('validate.required')));
-        }else if(value === ''&&this.editUser.password){
+        if(value === '' && this.editUser.password){
           callback(new Error(this.$t('config.account.inputConfirmPwd')));
         }else if (value !== this.editUser.password) {
           callback(new Error(this.$t('config.account.confirmPwdErr')));
@@ -134,7 +131,21 @@
           ],
           passwordChange: [
             { validator: validatePassword, trigger: 'blur' },
-            {required: true, message:'', trigger: 'blur'},
+            {required: true, message: '', trigger: 'blur'},
+          ],
+          roleIds: [
+            {required: true, message: this.$t('validate.required'), trigger: 'blur'}
+          ],
+          email: [
+            {type: 'email', message: this.$t('validate.email')}
+          ]
+        },
+        rules2: { //表单校验规则
+          username: [
+            {required: true, message: this.$t('validate.required'), trigger: 'blur'}
+          ],
+          passwordChange: [
+            { validator: validatePassword, trigger: 'blur' },
           ],
           roleIds: [
             {required: true, message: this.$t('validate.required'), trigger: 'blur'}