Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web

src/views/email-recompose/index.vue

@@ -90,11 +90,25 @@ export default {
           {
             required: true,
             validator: (rule, value, callback) => {
-              !value
+              var lang = zzSessionStorage.getItem('lang')
-                ? callback(
+                ? zzSessionStorage.getItem('lang')
-                    new Error(this.$t('trials:researchForm:formRule:specify'))
+                : 'zh'
-                  )
+              /* eslint-disable */
-                : callback()
+              var reg1 = /^[a-zA-Z0-9_]{4,16}$/ //密码必须是8位以上、必须含有字母、数字、特殊符号
+              console.log(!reg1.test(value))
+              if (!reg1.test(value)) {
+                callback(
+                  lang === 'zh'
+                    ? new Error(
+                        '1）新建账号，用户名字符长度最小为4个字符，最大为16个字符，只可使用字母、数字、下划线；'
+                      )
+                    : new Error(
+                        'For a new account, the username must have:1) At least 4 characters;2) At most 16 characters;3)Only letters, numbers, and underscores are allowed.'
+                      )
+                )
+              } else {
+                callback()
+              }
             },
             trigger: 'blur',
           },
@@ -129,6 +143,21 @@ export default {
             },
             trigger: 'blur',
           },
+          {
+            required: true,
+            trigger: 'blur',
+            validator: (rule, value, callback) => {
+              value !== this.password.NewPassWord
+                ? callback(
+                    new Error(
+                      this.$t(
+                        'trials:researchForm:formRule:NewPassWordAndConfirmPassWord'
+                      )
+                    )
+                  )
+                : callback()
+            },
+          },
         ],
       },
       userId: null,