From 8994e585d37575ef6df49f083ed23796a85a4113 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 08 十二月 2025 15:13:06 +0800
Subject: [PATCH] fix: bug
---
src/views/Permission/components/AddOrEditExternalAccountDialog.vue | 23 ++++++++++++++++++++++-
src/constants/regExp.ts | 4 ++--
2 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/src/constants/regExp.ts b/src/constants/regExp.ts
index 8c4887b..9e72126 100644
--- a/src/constants/regExp.ts
+++ b/src/constants/regExp.ts
@@ -5,10 +5,10 @@
static PasswordRegex =
// eslint-disable-next-line no-useless-escape
- /^(?![\d]+$)(?![a-z]+$)(?![A-Z]+$)(?![~`!@#$%\^&*\\|()_\-=+\\銆亄}\[\]'"<>?.,:;/]+$)[a-zA-Z\d~`!@#$%\^&*\\|()_\-=+\\銆亄}\[\]'"<>?.,:;/]{6,16}$/;
+ /^(?![\d]+$)(?![a-z]+$)(?![A-Z]+$)(?![~`!@#$%\^&*\\|()_\-=+\\銆亄}\[\]'"<>?.,:;/]+$)[a-zA-Z\d~`!@#$%\^&*\\|()_\-=+\\銆亄}\[\]'"<>?.,:;/]{8,16}$/;
static PasswordRegexNoSymbol =
// eslint-disable-next-line no-useless-escape
- /^(?![\d]+$)(?![a-z]+$)(?![A-Z]+$)[a-zA-Z\d]{6,16}$/;
+ /^(?![\d]+$)(?![a-z]+$)(?![A-Z]+$)[a-zA-Z\d]{8,16}$/;
static PasswordRegexOnlyLetterNumber =
// eslint-disable-next-line no-useless-escape
/^[a-zA-Z0-9]+$/;
diff --git a/src/views/Permission/components/AddOrEditExternalAccountDialog.vue b/src/views/Permission/components/AddOrEditExternalAccountDialog.vue
index 796ff53..d9256a7 100644
--- a/src/views/Permission/components/AddOrEditExternalAccountDialog.vue
+++ b/src/views/Permission/components/AddOrEditExternalAccountDialog.vue
@@ -52,7 +52,28 @@
v-if="!isEdit"
label="瀵嗙爜:"
prop="password"
- :check-rules="[{ message: '璇疯緭鍏ュ瘑鐮�', required: !form.id }]"
+ :check-rules="[
+ { required: !form.id, message: '璇疯緭鍏ュ瘑鐮�', trigger: 'blur' },
+ {
+ // pattern: MyRegExp.PasswordRegexNoSymbol,
+ // message: '瀵嗙爜搴旀弧瓒�6~16浣嶏紝骞跺寘鍚ぇ鍐欏瓧姣嶃�佸皬鍐欏瓧姣嶃�佹暟瀛楀叾涓殑浠绘剰涓ょ',
+ trigger: 'blur',
+ validator: (rule, value, callback) => {
+ if (isEdit) {
+ return callback();
+ } else {
+ if (!value) {
+ callback(new Error('璇疯緭鍏ュ瘑鐮�'));
+ } else if (!MyRegExp.PasswordRegexNoSymbol.test(value)) {
+ callback(
+ new Error('瀵嗙爜搴旀弧瓒�8~16浣嶏紝骞跺寘鍚ぇ鍐欏瓧姣嶃�佸皬鍐欏瓧姣嶃�佹暟瀛楀叾涓殑浠绘剰涓ょ')
+ );
+ }
+ callback();
+ }
+ },
+ },
+ ]"
>
<ProFormText
placeholder="璇疯緭鍏ュ瘑鐮�"
--
Gitblit v1.9.1