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

pref: 优化设备导入子设备时需根据网关设备协议过滤

See merge request yunteng/thingskit-front!1046

@@ -20,6 +20,7 @@ export enum FieldsEnum {
   GATEWAY_TB_DEVICE_ID = 'gateWayTbDeviceId',
   GATEWAY_TB_DEVICE_ID = 'gateWayTbDeviceId',
   TB_DEVICE_PROFILE_ID = 'tbDeviceProfileId',
   TB_DEVICE_PROFILE_ID = 'tbDeviceProfileId',
   IS_TCP_DEVICE_PROFILE = 'isTcpDeviceProfile',
   IS_TCP_DEVICE_PROFILE = 'isTcpDeviceProfile',
+  TRANSPORT_TYPE = 'transportType',
 }
 }
 
 
 export enum DelimiterEnum {
 export enum DelimiterEnum {
@@ -150,6 +151,7 @@ export const basicInfoForm: FormSchema[] = [
           });
           });
           clearValidate();
           clearValidate();
         },
         },
+        placeholder: '请选择设备类型',
       };
       };
     },
     },
   },
   },
@@ -174,6 +176,8 @@ export const basicInfoForm: FormSchema[] = [
               ? options.transportType === TransportTypeEnum.TCP
               ? options.transportType === TransportTypeEnum.TCP
               : false,
               : false,
             [FieldsEnum.TB_DEVICE_PROFILE_ID]: value ? options.tbProfileId : null,
             [FieldsEnum.TB_DEVICE_PROFILE_ID]: value ? options.tbProfileId : null,
+            [FieldsEnum.GATEWAY_TB_DEVICE_ID]: null,
+            [FieldsEnum.TRANSPORT_TYPE]: options?.transportType,
           });
           });
         },
         },
         showSearch: true,
         showSearch: true,
@@ -191,6 +195,7 @@ export const basicInfoForm: FormSchema[] = [
     required: true,
     required: true,
     componentProps: ({ formModel }) => {
     componentProps: ({ formModel }) => {
       const organizationId = formModel[FieldsEnum.ORGANIZATION_ID];
       const organizationId = formModel[FieldsEnum.ORGANIZATION_ID];
+      const transportType = formModel[FieldsEnum.TRANSPORT_TYPE];
       return {
       return {
         api: async () => {
         api: async () => {
           try {
           try {
@@ -199,12 +204,14 @@ export const basicInfoForm: FormSchema[] = [
               deviceType: DeviceTypeEnum.GATEWAY,
               deviceType: DeviceTypeEnum.GATEWAY,
               organizationId,
               organizationId,
             });
             });
-            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) {
           } catch (error) {
             return [];
             return [];
           }
           }
@@ -216,6 +223,7 @@ export const basicInfoForm: FormSchema[] = [
         filterOption: (inputValue: string, options: Record<'label', string>) => {
         filterOption: (inputValue: string, options: Record<'label', string>) => {
           return options.label.includes(inputValue);
           return options.label.includes(inputValue);
         },
         },
+        placeholder: '请选择网关设备',
       };
       };
     },
     },
   },
   },