Merge branch 'fix/DEFECT-1653' into 'main_dev'

fix: 修复导入设备，切换选择的组织没有清空上个组织下的网关设备

See merge request yunteng/thingskit-front!927

@@ -109,7 +109,8 @@ export const basicInfoForm: FormSchema[] = [
     label: '所属组织',
     label: '所属组织',
     component: 'ApiTreeSelect',
     component: 'ApiTreeSelect',
     rules: [{ required: true, message: '所属组织为必填项' }],
     rules: [{ required: true, message: '所属组织为必填项' }],
-    componentProps: () => {
+    componentProps: ({ formModel, formActionType }) => {
+      const { setFieldsValue } = formActionType;
       return {
       return {
         maxLength: 250,
         maxLength: 250,
         placeholder: '请选择所属组织',
         placeholder: '请选择所属组织',
@@ -119,6 +120,11 @@ export const basicInfoForm: FormSchema[] = [
           return data;
           return data;
         },
         },
         getPopupContainer: () => document.body,
         getPopupContainer: () => document.body,
+        onChange(e) {
+          if (e != formModel?.[FieldsEnum.ORGANIZATION_ID]) {
+            setFieldsValue({ [FieldsEnum.GATEWAY_TB_DEVICE_ID]: null });
+          }
+        },
       };
       };
     },
     },
   },
   },
@@ -193,7 +199,12 @@ export const basicInfoForm: FormSchema[] = [
               deviceType: DeviceTypeEnum.GATEWAY,
               deviceType: DeviceTypeEnum.GATEWAY,
               organizationId,
               organizationId,
             });
             });
-            return result;
+            return result.map((item) => {
+              return {
+                ...item,
+                name: item.alias || item.name,
+              };
+            });
           } catch (error) {
           } catch (error) {
             return [];
             return [];
           }
           }