瀏覽代碼

feat(regis):update

gemercheung 1 年之前
父節點
當前提交
5fd94b77ce

+ 2 - 0
src/util/regex.ts

@@ -0,0 +1,2 @@
+//  /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{8,16}$/
+export const globalPasswordRex = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[A-Za-z\d]{8,16}$/

+ 2 - 2
src/view/organization-add.vue

@@ -91,7 +91,7 @@ import type { FormInstance, FormRules } from "element-plus";
 // import { ElMessage } from "element-plus";
 import type { OrganizationType } from "@/request/organization";
 import { OrganizationTypeDesc } from "@/store/organization";
-
+import { globalPasswordRex } from "@/util/regex";
 import { ref, reactive, unref, watch, onMounted } from "vue";
 import { View, Hide } from "@element-plus/icons-vue";
 // import { user } from '@/store/user'
@@ -123,7 +123,7 @@ const rules = reactive<FormRules>({
   password: [
     {
       required: true,
-      pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{8,16}$/,
+      pattern: globalPasswordRex,
       message: "请输入8-16位数字、字母大小写组合",
       trigger: "blur",
     },

+ 2 - 2
src/view/organization-edit.vue

@@ -21,7 +21,7 @@ import type { OrganizationType } from "@/request/organization";
 import { OrganizationTypeDesc } from '@/store/organization'
 import { ref, reactive, unref, watchEffect } from "vue";
 import { user } from '@/store/user'
-
+import { globalPasswordRex } from "@/util/regex";
 const baseFormRef = ref<FormInstance>();
 
 const rules = reactive<FormRules>({
@@ -38,7 +38,7 @@ const rules = reactive<FormRules>({
     { required: true, pattern: /^1[3456789]\d{9}$/, message: "请输入正确手机号", trigger: "blur" },
   ],
   password: [
-    { required: true, pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[\s\S]{8,16}$/, message: "请输入8-16位数字、字母大小写组合", trigger: "blur" },
+    { required: true, pattern: globalPasswordRex, message: "请输入8-16位数字、字母大小写组合", trigger: "blur" },
     { required: true, min: 8, message: '密码太短!', trigger: "blur" },
   ],
 },)

+ 3 - 2
src/view/register/register.vue

@@ -154,6 +154,7 @@ import { ElMessage, type FormInstance, type FormRules } from "element-plus";
 import { OrganizationTypeDesc } from "@/store/organization";
 import { View, Hide } from "@element-plus/icons-vue";
 import { registerOrganization } from "@/request/organization";
+import { globalPasswordRex } from "@/util/regex";
 // import { encodePwd } from "@/util";
 import { getMsgAuthCode } from "@/request";
 
@@ -194,7 +195,7 @@ const rules = reactive<FormRules>({
   password: [
     {
       required: true,
-      pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{8,16}$/,
+      pattern: globalPasswordRex,
       message: "请输入8-16位数字、字母大小写组合",
       trigger: "blur",
     },
@@ -203,7 +204,7 @@ const rules = reactive<FormRules>({
   confirmPwd: [
     {
       required: true,
-      pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{8,16}$/,
+      pattern: globalPasswordRex,
       message: "请输入8-16位数字、字母大小写组合",
       trigger: "blur",
     },

+ 3 - 2
src/view/register/reset.vue

@@ -65,6 +65,7 @@ import {
 import { ElMessage, type FormInstance, type FormRules } from "element-plus";
 // import { OrganizationTypeDesc } from '@/store/organization';
 import { View, Hide } from '@element-plus/icons-vue';
+import { globalPasswordRex } from "@/util/regex";
 // import { registerOrganization } from '@/request/organization';
 // import { encodePwd } from "@/util";
 
@@ -108,11 +109,11 @@ const rules = reactive<FormRules>({
         { required: true, pattern: /^1[3456789]\d{9}$/, message: "请输入手机号码", trigger: "blur" },
     ],
     password: [
-        { required: true, pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{8,16}$/, message: "请输入8-16位数字、字母大小写组合", trigger: "blur" },
+        { required: true, pattern:globalPasswordRex, message: "请输入8-16位数字、字母大小写组合", trigger: "blur" },
         { required: true, min: 8, message: '密码太短!', trigger: "blur" },
     ],
     confirmPwd: [
-        { required: true, pattern: /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d]{8,16}$/, message: "请输入8-16位数字、字母大小写组合", trigger: "blur" },
+        { required: true, pattern: globalPasswordRex, message: "请输入8-16位数字、字母大小写组合", trigger: "blur" },
         { required: true, min: 8, message: '密码太短!', trigger: "blur" },
         { required: true, validator: equalToPassword, trigger: "blur" }
     ],

+ 3 - 3
src/view/users-password-edit.vue

@@ -60,7 +60,7 @@ import {
 import { ref, reactive, unref, onMounted, watchEffect } from "vue";
 import { onUnmounted } from "vue";
 const addPassFlag = ref(false)//图标显示标识
-
+import { globalPasswordRex } from "@/util/regex";
 const baseFormRef = ref<FormInstance>();
 
 const props = defineProps<{
@@ -107,11 +107,11 @@ const rules = reactive<FormRules>({
   ],
 
   password: [
-    { required: true, pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[\s\S]{8,16}$/, message: "请输入8-16位数字、字母大小写组合", trigger: "blur" },
+    { required: true, pattern: globalPasswordRex, message: "请输入8-16位数字、字母大小写组合", trigger: "blur" },
     { required: true, min: 8, message: '密码太短!', trigger: "blur" },
   ],
   confirmPwd: [
-    { required: true, pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[\s\S]{8,16}$/, message: "请输入8-16位数字、字母大小写组合", trigger: "blur" },
+    { required: true, pattern: globalPasswordRex, message: "请输入8-16位数字、字母大小写组合", trigger: "blur" },
     { required: true, min: 8, message: '密码太短!', trigger: "blur" },
     { required: true, validator: equalToPassword, trigger: "blur" }
   ]