Merge branch 'fix/product-edit-gateaway' into 'main_dev'

fix: 修复上报网关子设备bug

See merge request yunteng/thingskit-front!1398

@@ -264,13 +264,16 @@ export const getGATEWAYdevice = async (params: {
   );
   );
 };
 };
 
 
-export const getGatewayDevice = (params: Record<'organizationId' | 'transportType', string>) => {
-  const { organizationId, transportType } = params;
+export const getGatewayDevice = (
+  params: Record<'organizationId' | 'transportType' | 'gatewayId', string>
+) => {
+  const { organizationId, transportType, gatewayId } = params;
   return defHttp.get<DeviceRecord[]>({
   return defHttp.get<DeviceRecord[]>({
     url: DeviceManagerApi.GATEWAY_DEVICE,
     url: DeviceManagerApi.GATEWAY_DEVICE,
     params: {
     params: {
       organizationId,
       organizationId,
       transportType,
       transportType,
+      gatewayId,
     },
     },
   });
   });
 };
 };

@@ -297,7 +297,7 @@ export const step1Schemas: FormSchema[] = [
     component: 'ApiSelect',
     component: 'ApiSelect',
     ifShow: ({ values }) => values.deviceType === 'SENSOR',
     ifShow: ({ values }) => values.deviceType === 'SENSOR',
     componentProps: ({ formModel, formActionType }) => {
     componentProps: ({ formModel, formActionType }) => {
-      const { transportType } = formModel;
+      const { transportType, deviceType, gatewayId } = formModel;
       const { setFieldsValue } = formActionType;
       const { setFieldsValue } = formActionType;
       if (!transportType) return {};
       if (!transportType) return {};
       return {
       return {
@@ -312,6 +312,7 @@ export const step1Schemas: FormSchema[] = [
         showSearch: true,
         showSearch: true,
         params: {
         params: {
           transportType,
           transportType,
+          gatewayId: deviceType === DeviceTypeEnum.SENSOR && gatewayId ? gatewayId : null,
         },
         },
         placeholder: '请选择网关设备',
         placeholder: '请选择网关设备',
         valueField: 'tbDeviceId',
         valueField: 'tbDeviceId',