From ea9a51f7b75f231bd8023c1b2420e7360c5ead13 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Mon, 7 Apr 2025 15:39:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=94=A8=E6=88=B7=E5=90=8D=E6=98=AF=E5=90=A6=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E7=9A=84=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/admin/user.ts                |  8 ++++----
 src/views/admin/system/user/form.vue | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/api/admin/user.ts b/src/api/admin/user.ts
index 212ff86..ba11da8 100644
--- a/src/api/admin/user.ts
+++ b/src/api/admin/user.ts
@@ -115,10 +115,10 @@ export function validateUsername(rule: any, value: any, callback: any, isEdit: b
 	if (isEdit) {
 		return callback()
 	}
-	const flag = new RegExp(/^([a-z\d]+?)$/).test(value)
-	if (!flag) {
-		callback(new Error("用户名支持小写英文、数字"))
-	}
+	// const flag = new RegExp(/^([a-z\d]+?)$/).test(value)
+	// if (!flag) {
+	// 	callback(new Error("用户名支持小写英文、数字"))
+	// }
 	getDetails({ username: value }).then((response) => {
 		const result = response.data
 		if (result !== null) {
diff --git a/src/views/admin/system/user/form.vue b/src/views/admin/system/user/form.vue
index c60f6de..e25012a 100644
--- a/src/views/admin/system/user/form.vue
+++ b/src/views/admin/system/user/form.vue
@@ -10,7 +10,7 @@
 				<el-row :gutter="20">
 					<el-col :span="12" class="mb20">
 						<el-form-item :label="$t('sysuser.username')" prop="username">
-							<el-input :disabled="dataForm.userId !== ''" placeholder="请输入用户名" v-model.trim="dataForm.username"></el-input>
+							<el-input :disabled="dataForm.userId !== ''" placeholder="请输入用户名" v-model.trim="dataForm.username" />
 						</el-form-item>
 					</el-col>
 					<el-col :span="12" class="mb20">
@@ -157,12 +157,12 @@ const dataRules = ref({
 		{ required: true, message: "用户名不能为空", trigger: "blur" },
 		{ min: 5, max: 60, message: "用户名称长度必须介于5-20个字符之间", trigger: "blur" },
 		{ pattern: /^[^\u4e00-\u9fa5]+$/, message: "用户名称不能包含中文", trigger: "blur" },
-		// {
-		// 	validator: (rule: any, value: any, callback: any) => {
-		// 		validateUsername(rule, value, callback, dataForm.userId !== "")
-		// 	},
-		// 	trigger: "blur",
-		// },
+		{
+			validator: (rule: any, value: any, callback: any) => {
+				validateUsername(rule, value, callback, dataForm.userId !== "")
+			},
+			trigger: "blur",
+		},
 	],
 	password: [
 		{ required: true, message: "密码不能为空", trigger: "blur" },