Merge branch 'fix_add_transporttype' into 'main_dev'

fix: 修复批量处理产品，选择分配产品时，mqtt分配到TCP设备后，TCP数据错误

See merge request yunteng/thingskit-front!1200

@@ -5,10 +5,13 @@ import { isString } from '/@/utils/is';
 import { OrderByEnum } from '/@/views/device/localtion/cpns/TimePeriodForm/config';
 
 // 获取设备配置
-export const getDeviceProfile = (deviceType?: string) => {
+export const getDeviceProfile = ({ deviceType, transportType }) => {
   return defHttp.get<DeviceProfileModel[]>({
     url: '/device_profile/me/list',
-    params: { deviceType: isString(deviceType) ? deviceType : undefined },
+    params: {
+      deviceType: isString(deviceType) ? deviceType : undefined,
+      transportType: isString(transportType) ? transportType : undefined,
+    },
   });
 };
 

@@ -5,12 +5,20 @@ enum FormFieldsEnum {
   DEVICE_TYPE = 'deviceType',
   SOURCE_DEVICE_PROFILE_ID = 'sourceDeviceProfileName',
   TARGET_DEVICE_PROFILE_ID = 'deviceProfileId',
+  TRANSPORT_TYPE = 'transportType',
 }
 
 export type FormGetFiledValueResultType = Record<FormFieldsEnum, string>;
 
 export const formSchemas: FormSchema[] = [
   {
+    field: FormFieldsEnum.TRANSPORT_TYPE,
+    component: 'Input',
+    label: '协议类型',
+    dynamicDisabled: true,
+    show: false,
+  },
+  {
     field: FormFieldsEnum.SOURCE_DEVICE_PROFILE_ID,
     component: 'Input',
     label: '源产品',
@@ -28,10 +36,15 @@ export const formSchemas: FormSchema[] = [
     component: 'ApiSelect',
     label: '目标产品',
     required: true,
-    componentProps: ({ formModel }) => {
+    componentProps: ({ formModel, formActionType }) => {
+      const { getFieldsValue } = formActionType;
+      const { transportType } = getFieldsValue();
       return {
         api: getDeviceProfile,
-        params: formModel[FormFieldsEnum.DEVICE_TYPE],
+        params: {
+          deviceType: formModel[FormFieldsEnum.DEVICE_TYPE],
+          transportType,
+        },
         labelField: 'name',
         valueField: 'tbProfileId',
         placeholder: '请选择目标产品',

 export { default as BatchUpdateProductModal } from './index.vue';
 
 export type BatchUpdateProductModalParamsType = ModalParamsType<
-  Record<'sourceDeviceProfileName' | 'deviceType', string> & Record<'deviceIds', string[]>
+  Record<'sourceDeviceProfileName' | 'deviceType', string> &
+    Record<'deviceIds', string[]> &
+    Record<'deviceProfile', Recordable>
 >;

@@ -21,7 +21,10 @@
     async ({ record }: BatchUpdateProductModalParamsType) => {
       resetFields();
       deviceIds.value = record.deviceIds;
-      setFieldsValue(record);
+      setFieldsValue({
+        ...record,
+        transportType: record?.deviceProfile?.transportType,
+      });
     }
   );
 

@@ -577,6 +577,7 @@
         sourceDeviceProfileName: firstItem.deviceProfile.name,
         deviceType: firstItem.deviceType,
         deviceIds: rows.map((item) => item.tbDeviceId),
+        deviceProfile: firstItem.deviceProfile,
       },
     } as BatchUpdateProductModalParamsType);
   };