Commit 088fef31edb1ca8331349332ae01749e49b4b48a
Merge branch 'ft' into 'main_dev'
fix: DEFECT-1567 场景联动未选择设备也新增成功了 See merge request yunteng/thingskit-front!867
Showing
2 changed files
with
4 additions
and
3 deletions
| @@ -57,7 +57,7 @@ export const formSchema: FormSchema[] = [ | @@ -57,7 +57,7 @@ export const formSchema: FormSchema[] = [ | ||
| 57 | valueField: 'fileList', | 57 | valueField: 'fileList', |
| 58 | componentProps: () => { | 58 | componentProps: () => { |
| 59 | return { | 59 | return { |
| 60 | - // listType: 'picture-card', | 60 | + listType: 'picture-card', |
| 61 | maxFileLimit: 1, | 61 | maxFileLimit: 1, |
| 62 | api: async (file: File) => { | 62 | api: async (file: File) => { |
| 63 | try { | 63 | try { |
| @@ -73,7 +73,7 @@ export const formSchema: FormSchema[] = [ | @@ -73,7 +73,7 @@ export const formSchema: FormSchema[] = [ | ||
| 73 | return {}; | 73 | return {}; |
| 74 | } | 74 | } |
| 75 | }, | 75 | }, |
| 76 | - showUploadList: true, | 76 | + // showUploadList: true, |
| 77 | onDownload(file) { | 77 | onDownload(file) { |
| 78 | console.log(file); | 78 | console.log(file); |
| 79 | }, | 79 | }, |
| @@ -91,7 +91,7 @@ export const formSchema: FormSchema[] = [ | @@ -91,7 +91,7 @@ export const formSchema: FormSchema[] = [ | ||
| 91 | component: 'Input', | 91 | component: 'Input', |
| 92 | componentProps: { | 92 | componentProps: { |
| 93 | placeholder: '请输入大屏名称', | 93 | placeholder: '请输入大屏名称', |
| 94 | - maxLength: 255, | 94 | + maxLength: 32, |
| 95 | }, | 95 | }, |
| 96 | }, | 96 | }, |
| 97 | { | 97 | { |
| @@ -119,6 +119,7 @@ | @@ -119,6 +119,7 @@ | ||
| 119 | } | 119 | } |
| 120 | if (validate.triggerType == undefined) return createMessage.error('请选择设备触发方式'); | 120 | if (validate.triggerType == undefined) return createMessage.error('请选择设备触发方式'); |
| 121 | if (validate.type1 == undefined) return createMessage.error('请选择属性触发方式'); | 121 | if (validate.type1 == undefined) return createMessage.error('请选择属性触发方式'); |
| 122 | + if (validate.device == undefined) return createMessage.error('请选择设备'); | ||
| 122 | if (validate.device == 'PART') { | 123 | if (validate.device == 'PART') { |
| 123 | if (validate.entityId == undefined) return createMessage.error('请选择设备'); | 124 | if (validate.entityId == undefined) return createMessage.error('请选择设备'); |
| 124 | } | 125 | } |