Merge branch 'fix/device-import' into 'main_dev'

fix: 变更导入网关子设备导入时组织关联网关逻辑

See merge request yunteng/thingskit-front!1120

@@ -49,6 +49,7 @@ enum DeviceUrl {
   GET_DEVICE_ATTRIBUTE = '/device/attributes',
   GET_DEVICE = '/device/list',
   GET_DEVICE_RELATION = '/device/device/relation',
+  GET_GATEWAY_LIST = '/device/gateway/list',
 }
 
 /**
@@ -240,6 +241,15 @@ export const sendCommandTwoway = (params: SendCommandParams) => {
   );
 };
 
+export const getMeetTheConditionsGatewayDevice = (
+  params?: Partial<Record<'organizationId' | 'transportType', string>>
+) => {
+  return defHttp.get<DeviceRecord[]>({
+    url: DeviceUrl.GET_GATEWAY_LIST,
+    params,
+  });
+};
+
 export const getDeviceRelation = (params: { deviceId: string; isSlave: boolean }) => {
   return defHttp.get<string>({
     url: DeviceUrl.GET_DEVICE_RELATION,

 import { Options } from './type';
-import { getMeetTheConditionsDevice } from '/@/api/dataBoard';
+import { getMeetTheConditionsGatewayDevice } from '/@/api/dataBoard';
 import { queryDeviceProfileBy } from '/@/api/device/deviceManager';
 import { DeviceRecord, DeviceTypeEnum } from '/@/api/device/model/deviceModel';
 import { findDictItemByCode } from '/@/api/system/dict';
-import { getOrganizationList } from '/@/api/system/system';
-import { FormSchema } from '/@/components/Form';
+import { FormSchema, useComponentRegister } from '/@/components/Form';
 import { BasicColumn } from '/@/components/Table';
-import { copyTransFun } from '/@/utils/fnUtils';
+import { OrgTreeSelect } from '/@/views/common/OrgTreeSelect';
 import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
 import XLSX, { CellObject } from 'xlsx';
 
+useComponentRegister('OrgTreeSelect', OrgTreeSelect);
+
 export enum FieldsEnum {
   ORGANIZATION_ID = 'organizationId',
   DEVICE_TYPE = 'deviceTypeEnum',
@@ -23,6 +24,8 @@ export enum FieldsEnum {
   IS_TCP_DEVICE_PROFILE = 'isTcpDeviceProfile',
   TRANSPORT_TYPE = 'transportType',
   PRODUCTION_NAME = 'productionName',
+
+  GATEWAY_ORGANIZATION_ID = 'gatewayOrganizationId',
 }
 
 export enum DelimiterEnum {
@@ -108,30 +111,6 @@ export enum CredentialsNameEnum {
 
 export const basicInfoForm: FormSchema[] = [
   {
-    field: FieldsEnum.ORGANIZATION_ID,
-    label: '所属组织',
-    component: 'ApiTreeSelect',
-    rules: [{ required: true, message: '所属组织为必填项' }],
-    componentProps: ({ formModel, formActionType }) => {
-      const { setFieldsValue } = formActionType;
-      return {
-        maxLength: 250,
-        placeholder: '请选择所属组织',
-        api: async () => {
-          const data = (await getOrganizationList()) as unknown as Recordable[];
-          copyTransFun(data);
-          return data;
-        },
-        getPopupContainer: () => document.body,
-        onChange(e) {
-          if (e != formModel?.[FieldsEnum.ORGANIZATION_ID]) {
-            setFieldsValue({ [FieldsEnum.GATEWAY_TB_DEVICE_ID]: null });
-          }
-        },
-      };
-    },
-  },
-  {
     field: FieldsEnum.DEVICE_TYPE,
     label: '设备类型',
     component: 'ApiSelect',
@@ -150,6 +129,7 @@ export const basicInfoForm: FormSchema[] = [
             [FieldsEnum.DEVICE_TYPE_NAME]: value ? options.label : null,
             [FieldsEnum.TK_DEVICE_PROFILE_ID]: null,
             [FieldsEnum.GATEWAY_TB_DEVICE_ID]: null,
+            [FieldsEnum.ORGANIZATION_ID]: null,
           });
           clearValidate();
         },
@@ -181,6 +161,7 @@ export const basicInfoForm: FormSchema[] = [
             [FieldsEnum.GATEWAY_TB_DEVICE_ID]: null,
             [FieldsEnum.TRANSPORT_TYPE]: options?.transportType,
             [FieldsEnum.PRODUCTION_NAME]: options?.label,
+            [FieldsEnum.ORGANIZATION_ID]: null,
           });
         },
         showSearch: true,
@@ -203,30 +184,29 @@ export const basicInfoForm: FormSchema[] = [
     show: false,
   },
   {
+    field: FieldsEnum.GATEWAY_ORGANIZATION_ID,
+    label: '',
+    component: 'Input',
+    show: false,
+  },
+  {
     field: FieldsEnum.GATEWAY_TB_DEVICE_ID,
     component: 'ApiSelect',
     label: '网关设备',
     ifShow: ({ model }) => model[FieldsEnum.DEVICE_TYPE] === DeviceTypeEnum.SENSOR,
     required: true,
-    componentProps: ({ formModel }) => {
-      const organizationId = formModel[FieldsEnum.ORGANIZATION_ID];
-      const transportType = formModel[FieldsEnum.TRANSPORT_TYPE];
+    componentProps: ({ formModel, formActionType }) => {
+      const transportType: string = formModel[FieldsEnum.TRANSPORT_TYPE];
       return {
         api: async () => {
           try {
-            if (!organizationId) return;
-            const result = await getMeetTheConditionsDevice({
-              deviceType: DeviceTypeEnum.GATEWAY,
-              organizationId,
+            const result = await getMeetTheConditionsGatewayDevice({ transportType });
+            return result.map((item) => {
+              return {
+                ...item,
+                name: item.alias || item.name,
+              };
             });
-            return result
-              .map((item) => {
-                return {
-                  ...item,
-                  name: item.alias || item.name,
-                };
-              })
-              .filter((item) => item.transportType === transportType);
           } catch (error) {
             return [];
           }
@@ -239,6 +219,28 @@ export const basicInfoForm: FormSchema[] = [
           return options.label.includes(inputValue);
         },
         placeholder: '请选择网关设备',
+        onChange(_value: string, option: DeviceRecord) {
+          const { setFieldsValue } = formActionType;
+          setFieldsValue({
+            [FieldsEnum.GATEWAY_ORGANIZATION_ID]: option?.organizationId,
+            [FieldsEnum.ORGANIZATION_ID]: null,
+          });
+        },
+      };
+    },
+  },
+  {
+    field: FieldsEnum.ORGANIZATION_ID,
+    label: '所属组织',
+    component: 'OrgTreeSelect',
+    rules: [{ required: true, message: '所属组织为必填项' }],
+    componentProps: ({ formModel }) => {
+      return {
+        apiTreeSelectProps: {
+          params: {
+            organizationId: formModel?.[FieldsEnum.GATEWAY_ORGANIZATION_ID],
+          },
+        },
       };
     },
   },