fix: 任务中心新增时,无论选择设备还是产品,然后切换到另一个时,选择的组织还是没有区分开

@@ -133,11 +133,26 @@ export const formSchemas: FormSchema[] = [
     label: '目标类型',
     defaultValue: TaskTargetEnum.DEVICES,
     helpMessage: ['执行任务的目标设备，可以是多个指定的设备，也可以是一个设备类型下的所有设备.'],
-    componentProps: {
-      options: [
-        { label: TaskTargetNameEnum.DEVICES, value: TaskTargetEnum.DEVICES },
-        { label: TaskTargetNameEnum.PRODUCTS, value: TaskTargetEnum.PRODUCTS },
-      ],
+    componentProps: ({ formActionType, formModel }) => {
+      const { setFieldsValue } = formActionType;
+      return {
+        options: [
+          { label: TaskTargetNameEnum.DEVICES, value: TaskTargetEnum.DEVICES },
+          { label: TaskTargetNameEnum.PRODUCTS, value: TaskTargetEnum.PRODUCTS },
+        ],
+        onChange() {
+          setFieldsValue({
+            [FormFieldsEnum.EXECUTE_TARGET_DATA]: {
+              paramsOrg: formModel[FormFieldsEnum.ORGANIZATION_ID], //传递组织id到DevicePicker组件里进行组织过滤
+              change: true,
+            },
+            [FormFieldsEnum.DEVICE_PROFILE]: {
+              paramsOrg: formModel[FormFieldsEnum.ORGANIZATION_ID], //传递组织id到DevicePicker组件里进行组织过滤
+              change: true,
+            },
+          });
+        },
+      };
     },
   },
   {

@@ -209,7 +209,9 @@
     () => {
       if (Reflect.has(props.value, 'paramsOrg')) {
         const { paramsOrg, change } = props.value;
-        updateOrgSchema(paramsOrg, change);
+        nextTick(() => {
+          updateOrgSchema(paramsOrg, change);
+        });
       }
       setValue();
     },