...
|
...
|
@@ -57,18 +57,21 @@ |
57
|
57
|
return f.username == values.username;
|
58
|
58
|
}
|
59
|
59
|
});
|
|
60
|
+ console.log(findUserName);
|
60
|
61
|
return [
|
61
|
62
|
{
|
62
|
63
|
required: true,
|
63
|
64
|
validator(_, value) {
|
64
|
65
|
return new Promise((resolve, reject) => {
|
65
|
|
- if (value == '') {
|
|
66
|
+ console.log(value);
|
|
67
|
+ if (value == '' || value === undefined) {
|
66
|
68
|
reject('请输入账号');
|
67
|
69
|
} else if (ChineseRegexp.test(value)) {
|
68
|
70
|
reject('账号不能含有中文');
|
69
|
71
|
} else if (EmailRegexp.test(value)) {
|
70
|
72
|
reject('账号不能为电子邮箱格式');
|
71
|
|
- } else if (value == findUserName?.username) {
|
|
73
|
+ } else if (findUserName && value == findUserName?.username) {
|
|
74
|
+ console.log(1111111111);
|
72
|
75
|
reject('账号已存在');
|
73
|
76
|
return;
|
74
|
77
|
} else {
|
...
|
...
|
@@ -88,6 +91,7 @@ |
88
|
91
|
component: 'Input',
|
89
|
92
|
componentProps: {
|
90
|
93
|
maxLength: 255,
|
|
94
|
+ placeholder: '请输入真实名字',
|
91
|
95
|
},
|
92
|
96
|
rules: chineseAndEnlishRule,
|
93
|
97
|
},
|
...
|
...
|
@@ -129,6 +133,7 @@ |
129
|
133
|
await resetFields();
|
130
|
134
|
isUpdate.value = !!data?.isUpdate;
|
131
|
135
|
tenantId.value = data?.tenantId;
|
|
136
|
+ console.log(data.judgeExistUserName);
|
132
|
137
|
isJudgeUserNameExist.value = data.judgeExistUserName;
|
133
|
138
|
if (unref(isUpdate)) {
|
134
|
139
|
await updateSchema({ field: 'username', componentProps: { disabled: true } });
|
...
|
...
|
|