From 4ebf6017f0e7c6e012fb1b27afbd9c6858e0c4ab Mon Sep 17 00:00:00 2001
From: hyx <hanyuxia@iie.ac.cn>
Date: Fri, 15 Sep 2023 15:15:14 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A1.=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=94=A8=E6=88=B7=E6=97=B6=EF=BC=8C=E5=8C=85?=
 =?UTF-8?q?=E5=90=AB=E4=B8=AD=E6=96=87=E7=9A=84=E7=99=BB=E5=BD=95=E5=90=8D?=
 =?UTF-8?q?=E8=A2=AB=E6=8B=A6=E6=88=AA=EF=BC=9B2.=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=A1=B5=E5=88=9B=E5=BB=BA=E7=94=A8=E6=88=B7=E6=97=B6=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E9=87=8D=E5=A4=8D=E7=9A=84=E7=94=A8=E6=88=B7=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=EF=BC=8C=E4=BF=9D=E5=AD=98=E5=90=8E=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E4=B8=8A=E6=97=A0=E6=8A=A5=E9=94=99=E4=BF=A1=E6=81=AF=E4=B8=94?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=8C=89=E9=92=AE=E5=8F=98=E4=B8=BA=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=AF=E7=82=B9=E5=87=BB=E7=8A=B6=E6=80=81;3.=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=A1=B5=E5=88=9B=E5=BB=BA=E7=94=A8=E6=88=B7=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=86=E7=A0=81=E6=A1=86=E8=BE=93=E5=85=A5=E5=90=AB?=
 =?UTF-8?q?=E6=9C=89".=20/=20:=20@"=E7=AD=89=E7=89=B9=E6=AE=8A=E5=AD=97?=
 =?UTF-8?q?=E7=AC=A6=E6=97=B6=E6=8F=90=E7=A4=BA=E9=94=99=E8=AF=AF=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=98=AF"=E6=9C=80=E5=B0=915=E4=BD=8D";?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/rightBox/settings/UserBox.vue | 27 +++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/components/rightBox/settings/UserBox.vue b/src/components/rightBox/settings/UserBox.vue
index 63632cfb..a3890fc2 100644
--- a/src/components/rightBox/settings/UserBox.vue
+++ b/src/components/rightBox/settings/UserBox.vue
@@ -124,7 +124,14 @@ export default {
   name: 'UserBox',
   mixins: [rightBoxMixin],
   data () {
-    const validatePin = (rule, value, callback) => { // 确认密码的二次校验
+    const validatePin = (rule, value, callback) => { // 确认密码
+      if (value.length < 5) {
+        callback(new Error(this.$t('validate.atLeastFive')))
+      } else {
+        callback()
+      }
+    }
+    const validateConfirmPin = (rule, value, callback) => { // 确认密码的二次校验
       if (value === '' && this.editObject.pin) {
         callback(new Error(this.$t('config.user.confirmPin')))
       } else if (value !== this.editObject.pin) {
@@ -147,7 +154,7 @@ export default {
     }
     const validateUserName = (rule, value, callback) => {
       let validate = true
-      const reg = /^[a-zA-Z0-9_]{2,64}$/
+      const reg = /^[a-zA-Z0-9_\u4e00-\u9fa5\u30a1-\u30f6\u3041-\u3093\uFF00-\uFFFF\u4e00-\u9fa5\u0400-\u04FF\s]{2,64}$/
       validate = reg.test(value)
       if (value.length < 2) {
         callback(new Error(this.$t('validate.atLeastTwo')))
@@ -171,12 +178,12 @@ export default {
         ],
         pin: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' },
-          { pattern: /^[a-zA-Z0-9]{5,64}$/, message: this.$t('validate.atLeastFive') }
+          { validator: validatePin, trigger: 'blur' }
         ],
         pinChange: [
-          { validator: validatePin, trigger: 'blur' },
           { required: true, message: this.$t('validate.required') },
-          { pattern: /^[a-zA-Z0-9]{5,64}$/, message: this.$t('validate.atLeastFive') }
+          { validator: validatePin, trigger: 'blur' },
+          { validator: validateConfirmPin, trigger: 'blur' }
         ],
         roleIds: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
@@ -194,7 +201,7 @@ export default {
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         pinChange: [
-          { validator: validatePin, trigger: 'blur' },
+          { validator: validateConfirmPin, trigger: 'blur' },
           { pattern: /^[a-zA-Z0-9]{5,64}$/, message: this.$t('validate.atLeastFive') }
         ],
         roleIds: [
@@ -243,6 +250,10 @@ export default {
               } else {
                 this.$message.error(res.data.msg || res.data.message)
               }
+            }).catch(err => {
+              this.blockOperation.save = false
+              let errMsg = err.response ? err.response : (err.message ? err.message : err.toString())
+              this.$message.error(_.get(errMsg, 'data.message', []))
             })
           } else {
             axios.post(this.url, this.editObject).then(res => {
@@ -253,6 +264,10 @@ export default {
               } else {
                 this.$message.error(res.data.msg || res.data.message)
               }
+            }).catch((err) => {
+              this.blockOperation.save = false
+              let errMsg = err.response ? err.response : (err.message ? err.message : err.toString())
+              this.$message.error(_.get(errMsg, 'data.message', []))
             })
           }
         } else {