Commit affbc8c2736d8be840d1b52c97ad07d24ec60016
Merge branch 'ft' into 'main_dev'
fix: DEFECT-1592 限制邮件主题长度不超过64 See merge request yunteng/thingskit-front!879
Showing
3 changed files
with
10 additions
and
8 deletions
... | ... | @@ -91,7 +91,7 @@ export const formSchema: FormSchema[] = [ |
91 | 91 | valueField: 'fileList', |
92 | 92 | componentProps: () => { |
93 | 93 | return { |
94 | - // listType: 'picture-card', | |
94 | + listType: 'picture-card', | |
95 | 95 | maxFileLimit: 1, |
96 | 96 | api: async (file: File) => { |
97 | 97 | try { |
... | ... | @@ -110,10 +110,10 @@ export const formSchema: FormSchema[] = [ |
110 | 110 | onPreview: (fileList: FileItem) => { |
111 | 111 | createImgPreview({ imageList: [fileList.url!] }); |
112 | 112 | }, |
113 | - showUploadList: { | |
114 | - showDownloadIcon: true, | |
115 | - showRemoveIcon: true, | |
116 | - }, | |
113 | + // showUploadList: { | |
114 | + // showDownloadIcon: true, | |
115 | + // showRemoveIcon: true, | |
116 | + // }, | |
117 | 117 | }; |
118 | 118 | }, |
119 | 119 | }, | ... | ... |
... | ... | @@ -103,7 +103,9 @@ |
103 | 103 | const value = { |
104 | 104 | ['触发属性']: findName, |
105 | 105 | ['触发条件']: `${findLogin}${curr.value.logicValue}`, |
106 | - ['触发值']: `${curr.value.realValue}${findAttribute.detail?.dataType?.specs?.unit?.key}`, | |
106 | + ['触发值']: `${curr.value.realValue}${ | |
107 | + findAttribute.detail?.dataType?.specs?.unit?.key ?? '' | |
108 | + }`, | |
107 | 109 | }; |
108 | 110 | const data = { |
109 | 111 | [item.name]: value, | ... | ... |
... | ... | @@ -60,7 +60,7 @@ |
60 | 60 | span: 12, |
61 | 61 | }, |
62 | 62 | componentProps: { |
63 | - maxLength: 255, | |
63 | + maxLength: 64, | |
64 | 64 | placeholder: '请输入邮件主题', |
65 | 65 | }, |
66 | 66 | }, |
... | ... | @@ -72,7 +72,7 @@ |
72 | 72 | colProps: { |
73 | 73 | span: 12, |
74 | 74 | }, |
75 | - rules: [...emailRule, { required: true ,message:'主送人不能为空'}], | |
75 | + rules: [...emailRule, { required: true, message: '主送人不能为空' }], | |
76 | 76 | componentProps: { |
77 | 77 | maxLength: 255, |
78 | 78 | placeholder: '请输入主送', | ... | ... |