Merge branch 'ww' into 'main'

fix: BUG in teambition

See merge request huang/yun-teng-iot-front!418

 import { DeviceProfileModel } from '../../device/model/deviceModel';
 import { DeviceProfileModel } from '../../device/model/deviceModel';
 import { HistoryData } from './model';
 import { HistoryData } from './model';
 import { defHttp } from '/@/utils/http/axios';
 import { defHttp } from '/@/utils/http/axios';
+import { isString } from '/@/utils/is';
 
 
 // 获取设备配置
 // 获取设备配置
 export const getDeviceProfile = (deviceType?: string) => {
 export const getDeviceProfile = (deviceType?: string) => {
   return defHttp.get<DeviceProfileModel[]>({
   return defHttp.get<DeviceProfileModel[]>({
     url: '/device_profile/me/list',
     url: '/device_profile/me/list',
-    params: { deviceType },
+    params: { deviceType: isString(deviceType) ? deviceType : undefined },
   });
   });
 };
 };
 
 

@@ -146,17 +146,13 @@ export const step1Schemas: FormSchema[] = [
     componentProps: ({ formModel }) => {
     componentProps: ({ formModel }) => {
       const { organizationId, transportType } = formModel;
       const { organizationId, transportType } = formModel;
       return {
       return {
-        // api: async (params: Record<'transportType' | 'organizationId', string>) => {
-        //   const options = await getGatewayDevice(params);
-        //   return options.filter((item) => item.deviceType === DeviceTypeEnum.GATEWAY);
-        // },
         api: getGatewayDevice,
         api: getGatewayDevice,
         showSearch: true,
         showSearch: true,
         params: {
         params: {
           organizationId,
           organizationId,
           transportType,
           transportType,
         },
         },
-        valueField: 'id',
+        valueField: 'tbDeviceId',
         labelField: 'name',
         labelField: 'name',
       };
       };
     },
     },

@@ -170,7 +170,7 @@
               name,
               name,
               unit,
               unit,
               showHistoryDataButton: !isStructAndTextType(
               showHistoryDataButton: !isStructAndTextType(
-                dataInfo?.detail.dataType as unknown as DateTypeEnum
+                dataInfo?.detail.dataType?.type as unknown as DateTypeEnum
               ),
               ),
             };
             };
           });
           });
@@ -309,6 +309,10 @@
   .list-mode:deep(.ant-card-body) {
   .list-mode:deep(.ant-card-body) {
     padding-top: 0;
     padding-top: 0;
   }
   }
+
+  .list-mode:deep(.ant-card-head-title) {
+    height: 64px;
+  }
 </style>
 </style>
 
 
 <style>
 <style>