Commit ee4eedb59ac015ddbd71c84e76fc421275acd735
Merge branch 'sqy_dev' into 'main'
fix:[DEFECT-308]修改平台图片不超过2M,注释场景联动详情模板 See merge request huang/yun-teng-iot-front!195
Showing
2 changed files
with
13 additions
and
13 deletions
| @@ -271,17 +271,17 @@ export const trigger_condition_schema: FormSchema[] = [ | @@ -271,17 +271,17 @@ export const trigger_condition_schema: FormSchema[] = [ | ||
| 271 | slot: 'operationType', | 271 | slot: 'operationType', |
| 272 | colProps: { span: 6 }, | 272 | colProps: { span: 6 }, |
| 273 | }, | 273 | }, |
| 274 | - { | ||
| 275 | - field: 'detail', | ||
| 276 | - label: '', | ||
| 277 | - component: 'InputTextArea', | ||
| 278 | - componentProps: { | ||
| 279 | - placeholder: '请输入详情', | ||
| 280 | - }, | ||
| 281 | - colProps: { | ||
| 282 | - span: 13, | ||
| 283 | - }, | ||
| 284 | - }, | 274 | + // { |
| 275 | + // field: 'detail', | ||
| 276 | + // label: '', | ||
| 277 | + // component: 'InputTextArea', | ||
| 278 | + // componentProps: { | ||
| 279 | + // placeholder: '请输入详情', | ||
| 280 | + // }, | ||
| 281 | + // colProps: { | ||
| 282 | + // span: 13, | ||
| 283 | + // }, | ||
| 284 | + // }, | ||
| 285 | ]; | 285 | ]; |
| 286 | // !!!----------------------------------------------------^_^------------------------------------------------------------!!! | 286 | // !!!----------------------------------------------------^_^------------------------------------------------------------!!! |
| 287 | enum ActionEnum { | 287 | enum ActionEnum { |
| @@ -221,9 +221,9 @@ | @@ -221,9 +221,9 @@ | ||
| 221 | if (!isJpgOrPng) { | 221 | if (!isJpgOrPng) { |
| 222 | createMessage.error('只能上传图片文件!'); | 222 | createMessage.error('只能上传图片文件!'); |
| 223 | } | 223 | } |
| 224 | - const isLt2M = (file.size as number) / 1024 / 1024 < 5; | 224 | + const isLt2M = (file.size as number) / 1024 / 1024 < 2; |
| 225 | if (!isLt2M) { | 225 | if (!isLt2M) { |
| 226 | - createMessage.error('图片大小不能超过5MB!'); | 226 | + createMessage.error('图片大小不能超过2MB!'); |
| 227 | } | 227 | } |
| 228 | return isJpgOrPng && isLt2M; | 228 | return isJpgOrPng && isLt2M; |
| 229 | }; | 229 | }; |