chore(platform): update the model when modelList loaded

DevCloudFE · Mar 6, 2023 · 2350eb0 · 2350eb0
1 parent adb5f33
commit 2350eb0
Showing 1 changed file with 18 additions and 21 deletions.
diff --git a/packages/platform/src/app/routes/list/standard-table/DeviceModal.tsx b/packages/platform/src/app/routes/list/standard-table/DeviceModal.tsx
@@ -38,22 +38,25 @@ function DeviceModal(props: AppDeviceModalProps, ref: React.ForwardedRef<OpenSet
     setVisible(true);
     setDevice(device);
 
-    form.reset(device ? { name: device.name, model: device.model } : undefined);
+    form.reset(device ? { name: device.name } : undefined);
     updateForm();
 
-    if (isUndefined(modelList)) {
-      modelApi.list().subscribe({
-        next: (res) => {
-          setModelList(
-            res.resources.map((model) => ({
-              label: model.name,
-              value: model.name,
-              disabled: model.disabled,
-            }))
-          );
-        },
-      });
-    }
+    setModelList(undefined);
+    modelApi.list().subscribe({
+      next: (res) => {
+        setModelList(
+          res.resources.map((model) => ({
+            label: model.name,
+            value: model.name,
+            disabled: model.disabled,
+          }))
+        );
+        if (device) {
+          form.patchValue({ model: device.model });
+          updateForm();
+        }
+      },
+    });
   });
 
   useImperativeHandle(ref, () => open, [open]);
@@ -88,13 +91,7 @@ function DeviceModal(props: AppDeviceModalProps, ref: React.ForwardedRef<OpenSet
             </DForm.Item>
             <DForm.Item dFormControls={{ model: 'Please select model!' }} dLabel="Model">
               {({ model }) => (
-                <DSelect
-                  dFormControl={modelList ? model : undefined}
-                  dList={modelList ?? []}
-                  dLoading={isUndefined(modelList)}
-                  dPlaceholder="Model"
-                  dClearable
-                />
+                <DSelect dFormControl={model} dList={modelList ?? []} dLoading={isUndefined(modelList)} dPlaceholder="Model" dClearable />
               )}
             </DForm.Item>
           </DForm.Group>