简柏林 / thingskit-front · Commits

Commit 5351520befb7229bb2d11d1bc8218986a2e3106b

Authored by fengtao
1 parent 0ba3e52d

fix:DEFECT-908 租户还没有输入账号,显示用户名已存在

Inline Side-by-side
Showing 2 changed files with 8 additions and 3 deletions
@@ -76,7 +76,7 @@ export const chineseAndEnlishRule: Rule[] = [ @@ -76,7 +76,7 @@ export const chineseAndEnlishRule: Rule[] = [
76 required: true, 76 required: true,
77 validator: (_, value: string) => { 77 validator: (_, value: string) => {
78 const reg = /^[a-zA-Z\u4e00-\u9fa5]+$/; 78 const reg = /^[a-zA-Z\u4e00-\u9fa5]+$/;
79 - if (value === '') { 79 + if (value === '' || value === undefined) {
80 return Promise.reject('请输入'); 80 return Promise.reject('请输入');
81 } else if (!reg.test(value)) { 81 } else if (!reg.test(value)) {
82 return Promise.reject('格式不正确'); 82 return Promise.reject('格式不正确');
@@ -57,18 +57,21 @@ @@ -57,18 +57,21 @@
57 return f.username == values.username; 57 return f.username == values.username;
58 } 58 }
59 }); 59 });
  60 + console.log(findUserName);
60 return [ 61 return [
61 { 62 {
62 required: true, 63 required: true,
63 validator(_, value) { 64 validator(_, value) {
64 return new Promise((resolve, reject) => { 65 return new Promise((resolve, reject) => {
65 - if (value == '') { 66 + console.log(value);
  67 + if (value == '' || value === undefined) {
66 reject('请输入账号'); 68 reject('请输入账号');
67 } else if (ChineseRegexp.test(value)) { 69 } else if (ChineseRegexp.test(value)) {
68 reject('账号不能含有中文'); 70 reject('账号不能含有中文');
69 } else if (EmailRegexp.test(value)) { 71 } else if (EmailRegexp.test(value)) {
70 reject('账号不能为电子邮箱格式'); 72 reject('账号不能为电子邮箱格式');
71 - } else if (value == findUserName?.username) { 73 + } else if (findUserName && value == findUserName?.username) {
  74 + console.log(1111111111);
72 reject('账号已存在'); 75 reject('账号已存在');
73 return; 76 return;
74 } else { 77 } else {
@@ -88,6 +91,7 @@ @@ -88,6 +91,7 @@
88 component: 'Input', 91 component: 'Input',
89 componentProps: { 92 componentProps: {
90 maxLength: 255, 93 maxLength: 255,
  94 + placeholder: '请输入真实名字',
91 }, 95 },
92 rules: chineseAndEnlishRule, 96 rules: chineseAndEnlishRule,
93 }, 97 },
@@ -129,6 +133,7 @@ @@ -129,6 +133,7 @@
129 await resetFields(); 133 await resetFields();
130 isUpdate.value = !!data?.isUpdate; 134 isUpdate.value = !!data?.isUpdate;
131 tenantId.value = data?.tenantId; 135 tenantId.value = data?.tenantId;
  136 + console.log(data.judgeExistUserName);
132 isJudgeUserNameExist.value = data.judgeExistUserName; 137 isJudgeUserNameExist.value = data.judgeExistUserName;
133 if (unref(isUpdate)) { 138 if (unref(isUpdate)) {
134 await updateSchema({ field: 'username', componentProps: { disabled: true } }); 139 await updateSchema({ field: 'username', componentProps: { disabled: true } });