Commit 16e21722584474aff3bd24b0c41500ceafb23aca
Merge branch 'fix/visual-board-component-form' into 'main_dev'
fix: 修改看板新增和编辑的时候选择组织的问题 See merge request yunteng/thingskit-front!1156
Showing
2 changed files
with
6 additions
and
1 deletions
| @@ -107,6 +107,9 @@ export const formSchemas = (): FormSchema[] => { | @@ -107,6 +107,9 @@ export const formSchemas = (): FormSchema[] => { | ||
| 107 | [DataSourceField.DEVICE_ID]: null, | 107 | [DataSourceField.DEVICE_ID]: null, | 
| 108 | }); | 108 | }); | 
| 109 | }, | 109 | }, | 
| 110 | + apiTreeSelectProps: { | ||
| 111 | + params: { organizationId: location?.pathname?.split('/')?.pop() || '' }, | ||
| 112 | + }, | ||
| 110 | showCreate: false, | 113 | showCreate: false, | 
| 111 | getPopupContainer: () => document.body, | 114 | getPopupContainer: () => document.body, | 
| 112 | }; | 115 | }; | 
| @@ -157,7 +160,6 @@ export const formSchemas = (): FormSchema[] => { | @@ -157,7 +160,6 @@ export const formSchemas = (): FormSchema[] => { | ||
| 157 | }); | 160 | }); | 
| 158 | }, | 161 | }, | 
| 159 | placeholder: '请选择设备', | 162 | placeholder: '请选择设备', | 
| 160 | - getPopupContainer: () => document.body, | ||
| 161 | ...createPickerSearch(), | 163 | ...createPickerSearch(), | 
| 162 | }; | 164 | }; | 
| 163 | }, | 165 | }, | 
| @@ -88,6 +88,9 @@ export const formSchemas: FormSchema[] = [ | @@ -88,6 +88,9 @@ export const formSchemas: FormSchema[] = [ | ||
| 88 | return { | 88 | return { | 
| 89 | showCreate: false, | 89 | showCreate: false, | 
| 90 | allowClean: true, | 90 | allowClean: true, | 
| 91 | + apiTreeSelectProps: { | ||
| 92 | + params: { organizationId: location?.pathname?.split('/')?.pop() || '' }, | ||
| 93 | + }, | ||
| 91 | onChange() { | 94 | onChange() { | 
| 92 | setFieldsValue({ | 95 | setFieldsValue({ | 
| 93 | [FormFieldEnum.ACCESS_MODE]: null, | 96 | [FormFieldEnum.ACCESS_MODE]: null, |