From c8ec6a755ead5c2000fd421339c03d58b1edc341 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com>
Date: Wed, 3 Jul 2024 16:02:25 +0800
Subject: [PATCH] =?UTF-8?q?CN-1663=20fix:=20=E7=AE=A1=E7=90=86--=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E3=80=821=E3=80=81=E4=BF=AE=E6=94=B9=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E5=92=8C=E7=A1=AE=E8=AE=A4=E5=AF=86=E7=A0=81=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4=E7=9A=84=E6=8F=90=E7=A4=BA=EF=BC=9B2?=
 =?UTF-8?q?=E3=80=81=E4=BF=AE=E5=A4=8D=E7=A1=AE=E8=AE=A4=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4=E6=97=B6=EF=BC=8C=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E6=9C=89error=E6=8A=A5=E9=94=99=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/rightBox/settings/UserBox.vue | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/components/rightBox/settings/UserBox.vue b/src/components/rightBox/settings/UserBox.vue
index 174214bf..a6af74b5 100644
--- a/src/components/rightBox/settings/UserBox.vue
+++ b/src/components/rightBox/settings/UserBox.vue
@@ -124,8 +124,10 @@ export default {
         const isValid = value.match(reg) // 返回匹配到的值
         if (value && value.length < 8) {
           callback(new Error(this.$t('validate.atLeastEight')))
-        } else if (!isValid || this.passwordLevel(this.editObject.pin) === 1) {
+        } else if (!isValid) {
           callback(new Error(handleSpecialCode(this.$t('validate.passwordError'))))
+        } else if (this.passwordLevel(this.editObject.pin) === 1) {
+          callback(new Error(this.$t('validate.passwordTwoTypes')))
         } else {
           callback()
         }
@@ -138,8 +140,10 @@ export default {
         callback()
       } else if (_.isEmpty(value) && !_.isEmpty(this.editObject.pin)) { // 密码有内容，确认密码没内容
         callback(new Error(this.$t('config.user.confirmPin')))
-      } else if (!_.isEmpty(value) && value !== this.editObject.pin) { // 密码有内容，确认密码也有内容，内容不一致
+      } else if (!_.isEmpty(value) && !_.isEmpty(this.editObject.pin) && value !== this.editObject.pin) { // 密码有内容，确认密码也有内容，内容不一致
         callback(new Error(this.$t('config.user.confirmPinErr')))
+      } else if (!_.isEmpty(value) && _.isEmpty(this.editObject.pin)) { // 确认密码有内容，密码没内容
+        callback(new Error(this.$t('config.user.confirmNoPin')))
       } else {
         callback()
       }
@@ -173,7 +177,7 @@ export default {
         ],
         pinChange: [
           { required: true, message: this.$t('validate.required') },
-          { validator: validatePin, trigger: 'blur' },
+          // { validator: validatePin, trigger: 'blur' },
           { validator: validateConfirmPin, trigger: 'blur' }
         ],
         roleIds: [
@@ -199,8 +203,8 @@ export default {
           { validator: validatePin, trigger: 'blur' }
         ],
         pinChange: [
-          { validator: validateConfirmPin, trigger: 'blur' },
-          { validator: validatePin, trigger: 'blur' }
+          { validator: validateConfirmPin, trigger: 'blur' }
+          // { validator: validatePin, trigger: 'blur' }
         ],
         roleIds: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
@@ -238,7 +242,7 @@ export default {
     /* 密码失去焦点 检验确认密码 */
     pinBlur () {
       if (this.editObject.pin && this.editObject.pinChange) {
-        this.$refs.userForm.validateField('pinChange')
+        this.$refs.userForm.validateField('pinChange', () => null) // 没有null，则会报错
       }
     },
     save () {
@@ -312,8 +316,10 @@ export default {
       })
     },
     pinInput () {
-      if (this.editObject?.pin.length < 8) {
+      if (this.editObject?.pin.length < 8 && this.editObject?.pin.length !== 0) {
         this.percentage = 25
+      } else if (this.editObject?.pin.length === 0) {
+        this.percentage = 0
       } else if (this.editObject?.pin.length < 10) {
         this.percentage = this.passwordLevel(this.editObject.pin) > 1 ? 2 * 25 : this.passwordLevel(this.editObject.pin) * 25
       } else if (this.editObject?.pin.length < 12) {