Merge remote-tracking branch 'origin/master'

src/views/admin/system/user/form.vue

@@ -10,11 +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="dataForm.username"
-							></el-input>
+							<el-input :disabled="dataForm.userId !== ''" placeholder="请输入用户名" v-model.trim="dataForm.username"></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :span="12" class="mb20">
@@ -74,9 +70,7 @@
 					<el-col :span="12" class="mb20">
 						<el-form-item :label="$t('sysuser.lockFlag')" prop="lockFlag">
 							<el-radio-group v-model="dataForm.lockFlag">
-								<el-radio :key="index" :label="item.value" border v-for="(item, index) in lock_flag"
-									>{{ item.label }}
-								</el-radio>
+								<el-radio :key="index" :label="item.value" border v-for="(item, index) in lock_flag">{{ item.label }} </el-radio>
 							</el-radio-group>
 						</el-form-item>
 					</el-col>
@@ -85,9 +79,7 @@
 			<template #footer>
 				<span class="dialog-footer">
 					<el-button @click="visible = false">{{ $t("common.cancelButtonText") }}</el-button>
-					<el-button @click="onSubmit" type="primary" :disabled="loading">{{
-						$t("common.confirmButtonText")
-					}}</el-button>
+					<el-button @click="onSubmit" type="primary" :disabled="loading">{{ $t("common.confirmButtonText") }}</el-button>
 				</span>
 			</template>
 		</el-dialog>
@@ -148,14 +140,15 @@ const dataForm = reactive({
 const dataRules = ref({
 	// 用户名校验，不能为空 、长度 5-20、不能和已有数据重复
 	username: [
-		{ required: true, message: "用户名不能为空", trigger: "blur" },
-		{ min: 5, max: 60, message: "用户名称长度必须介于 5 和 20 之间", trigger: "blur" },
-		{
-			validator: (rule: any, value: any, callback: any) => {
-				validateUsername(rule, value, callback, dataForm.userId !== "")
-			},
-			trigger: "blur",
-		},
+		// { 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",
+		// },
 	],
 	password: [
 		{ required: true, message: "密码不能为空", trigger: "blur" },
@@ -258,10 +251,10 @@ const getUserData = async (id: string) => {
 		const { data } = await getObj(id)
 		Object.assign(dataForm, data)
 		if (data.roleList) {
-			dataForm.role = data.roleList.map((item) => item.roleId)
+			dataForm.role = data.roleList.map((item: any) => item.roleId)
 		}
 		if (data.postList) {
-			dataForm.post = data.postList.map((item) => item.postId)
+			dataForm.post = data.postList.map((item: any) => item.postId)
 		}
 	} catch (err: any) {
 		useMessage().error(err.msg)