Commit 368dfefbab2d594a3276ee80b27df63fafd0163f
1 parent
b2fe73a6
fix: 任务中心新增时,无论选择设备还是产品,然后切换到另一个时,选择的组织还是没有区分开
Showing
2 changed files
with
23 additions
and
6 deletions
@@ -133,11 +133,26 @@ export const formSchemas: FormSchema[] = [ | @@ -133,11 +133,26 @@ export const formSchemas: FormSchema[] = [ | ||
133 | label: '目标类型', | 133 | label: '目标类型', |
134 | defaultValue: TaskTargetEnum.DEVICES, | 134 | defaultValue: TaskTargetEnum.DEVICES, |
135 | helpMessage: ['执行任务的目标设备,可以是多个指定的设备,也可以是一个设备类型下的所有设备.'], | 135 | helpMessage: ['执行任务的目标设备,可以是多个指定的设备,也可以是一个设备类型下的所有设备.'], |
136 | - componentProps: { | ||
137 | - options: [ | ||
138 | - { label: TaskTargetNameEnum.DEVICES, value: TaskTargetEnum.DEVICES }, | ||
139 | - { label: TaskTargetNameEnum.PRODUCTS, value: TaskTargetEnum.PRODUCTS }, | ||
140 | - ], | 136 | + componentProps: ({ formActionType, formModel }) => { |
137 | + const { setFieldsValue } = formActionType; | ||
138 | + return { | ||
139 | + options: [ | ||
140 | + { label: TaskTargetNameEnum.DEVICES, value: TaskTargetEnum.DEVICES }, | ||
141 | + { label: TaskTargetNameEnum.PRODUCTS, value: TaskTargetEnum.PRODUCTS }, | ||
142 | + ], | ||
143 | + onChange() { | ||
144 | + setFieldsValue({ | ||
145 | + [FormFieldsEnum.EXECUTE_TARGET_DATA]: { | ||
146 | + paramsOrg: formModel[FormFieldsEnum.ORGANIZATION_ID], //传递组织id到DevicePicker组件里进行组织过滤 | ||
147 | + change: true, | ||
148 | + }, | ||
149 | + [FormFieldsEnum.DEVICE_PROFILE]: { | ||
150 | + paramsOrg: formModel[FormFieldsEnum.ORGANIZATION_ID], //传递组织id到DevicePicker组件里进行组织过滤 | ||
151 | + change: true, | ||
152 | + }, | ||
153 | + }); | ||
154 | + }, | ||
155 | + }; | ||
141 | }, | 156 | }, |
142 | }, | 157 | }, |
143 | { | 158 | { |
@@ -209,7 +209,9 @@ | @@ -209,7 +209,9 @@ | ||
209 | () => { | 209 | () => { |
210 | if (Reflect.has(props.value, 'paramsOrg')) { | 210 | if (Reflect.has(props.value, 'paramsOrg')) { |
211 | const { paramsOrg, change } = props.value; | 211 | const { paramsOrg, change } = props.value; |
212 | - updateOrgSchema(paramsOrg, change); | 212 | + nextTick(() => { |
213 | + updateOrgSchema(paramsOrg, change); | ||
214 | + }); | ||
213 | } | 215 | } |
214 | setValue(); | 216 | setValue(); |
215 | }, | 217 | }, |