Commit c3607d8c594d51e7068a82918f124b61a139e34a

Authored by fengtao
2 parents 88244ae5 dec40da9

fix:检查修复了之前字段有些验证失效问题,修复了账号管理的租户管理员用户名需要显示已经存在问题,修复组织管理默认展开,修复了消息模板邮件里面的有些字段为数组问题

@@ -41,6 +41,7 @@ export const formSchema: FormSchema[] = [ @@ -41,6 +41,7 @@ export const formSchema: FormSchema[] = [
41 label: '', 41 label: '',
42 component: 'Input', 42 component: 'Input',
43 componentProps: { 43 componentProps: {
  44 + maxLength: 255,
44 placeholder: '请输入设备名称', 45 placeholder: '请输入设备名称',
45 maxLength: 255, 46 maxLength: 255,
46 }, 47 },
@@ -56,6 +56,7 @@ export const searchFormSchema: FormSchema[] = [ @@ -56,6 +56,7 @@ export const searchFormSchema: FormSchema[] = [
56 component: 'Input', 56 component: 'Input',
57 colProps: { span: 6 }, 57 colProps: { span: 6 },
58 componentProps: { 58 componentProps: {
  59 + maxLength: 36,
59 placeholder: '请输入联系人姓名', 60 placeholder: '请输入联系人姓名',
60 maxLength: 36, 61 maxLength: 36,
61 }, 62 },
@@ -91,7 +91,6 @@ export const alarmSearchSchemas: FormSchema[] = [ @@ -91,7 +91,6 @@ export const alarmSearchSchemas: FormSchema[] = [
91 component: 'Input', 91 component: 'Input',
92 colProps: { span: 6 }, 92 colProps: { span: 6 },
93 componentProps: { 93 componentProps: {
94 - placeholder: '请输入告警类型',  
95 maxLength: 36, 94 maxLength: 36,
96 }, 95 },
97 }, 96 },
@@ -72,19 +72,6 @@ export const formSchema: FormSchema[] = [ @@ -72,19 +72,6 @@ export const formSchema: FormSchema[] = [
72 maxLength: 255, 72 maxLength: 255,
73 placeholder: '请输入配置名称', 73 placeholder: '请输入配置名称',
74 }, 74 },
75 - dynamicRules: () => {  
76 - return [  
77 - {  
78 - required: true,  
79 - validator: (_, value) => {  
80 - if (String(value).length > 255) {  
81 - return Promise.reject('字数不超过255个字');  
82 - }  
83 - return Promise.resolve();  
84 - },  
85 - },  
86 - ];  
87 - },  
88 }, 75 },
89 { 76 {
90 field: 'messageType', 77 field: 'messageType',
@@ -136,19 +123,7 @@ export const formSchema: FormSchema[] = [ @@ -136,19 +123,7 @@ export const formSchema: FormSchema[] = [
136 maxLength: 36, 123 maxLength: 36,
137 placeholder: '请输入accessKeySecret', 124 placeholder: '请输入accessKeySecret',
138 }, 125 },
139 - dynamicRules: () => {  
140 - return [  
141 - {  
142 - required: true,  
143 - validator: (_, value) => {  
144 - if (String(value).length > 36) {  
145 - return Promise.reject('字数不超过36个字');  
146 - }  
147 - return Promise.resolve();  
148 - },  
149 - },  
150 - ];  
151 - }, 126 +
152 ifShow: ({ values }) => isMessage(Reflect.get(values, 'messageType')), 127 ifShow: ({ values }) => isMessage(Reflect.get(values, 'messageType')),
153 }, 128 },
154 { 129 {
@@ -159,7 +134,7 @@ export const formSchema: FormSchema[] = [ @@ -159,7 +134,7 @@ export const formSchema: FormSchema[] = [
159 component: 'Input', 134 component: 'Input',
160 componentProps: { 135 componentProps: {
161 maxLength: 36, 136 maxLength: 36,
162 - placeholder: '请输入服务器地址', 137 + placeholder: '请输入accessKeySecret',
163 }, 138 },
164 139
165 ifShow: ({ values }) => isEmail(Reflect.get(values, 'messageType')), 140 ifShow: ({ values }) => isEmail(Reflect.get(values, 'messageType')),
@@ -187,19 +162,6 @@ export const formSchema: FormSchema[] = [ @@ -187,19 +162,6 @@ export const formSchema: FormSchema[] = [
187 maxLength: 255, 162 maxLength: 255,
188 placeholder: '请输入用户名', 163 placeholder: '请输入用户名',
189 }, 164 },
190 - dynamicRules: () => {  
191 - return [  
192 - {  
193 - required: true,  
194 - validator: (_, value) => {  
195 - if (String(value).length > 255) {  
196 - return Promise.reject('字数不超过255个字');  
197 - }  
198 - return Promise.resolve();  
199 - },  
200 - },  
201 - ];  
202 - },  
203 165
204 ifShow: ({ values }) => isEmail(Reflect.get(values, 'messageType')), 166 ifShow: ({ values }) => isEmail(Reflect.get(values, 'messageType')),
205 }, 167 },
@@ -54,7 +54,6 @@ export const searchFormSchema: FormSchema[] = [ @@ -54,7 +54,6 @@ export const searchFormSchema: FormSchema[] = [
54 colProps: { span: 6 }, 54 colProps: { span: 6 },
55 componentProps: { 55 componentProps: {
56 maxLength: 36, 56 maxLength: 36,
57 - placeholder: '请输入发送手机',  
58 }, 57 },
59 }, 58 },
60 { 59 {