Merge branch 'cherry-pick-d23423e2' into 'main_dev'

fix:设备批量导入产品类型错误

See merge request yunteng/thingskit-front!1109

@@ -48,8 +48,8 @@
     }
     }
   };
   };
 
 
-  const insertDeviceTypeName = (
-    deviceTypeName: string,
+  const insertProductionName = (
+    productionName: string,
     fileParseValue: UploadFileParseValue,
     fileParseValue: UploadFileParseValue,
     columns: Record<'type', string>[]
     columns: Record<'type', string>[]
   ): { file: string; columns: Record<'type', string>[] } => {
   ): { file: string; columns: Record<'type', string>[] } => {
@@ -58,11 +58,11 @@
 
 
     const csvArray = content.map((item) => header.map((key) => item[key]) as string[]);
     const csvArray = content.map((item) => header.map((key) => item[key]) as string[]);
     for (const item of csvArray) {
     for (const item of csvArray) {
-      item.splice(insertIndex, 0, deviceTypeName);
+      item.splice(insertIndex, 0, productionName);
     }
     }
 
 
     const _header = [...header];
     const _header = [...header];
-    _header.splice(insertIndex, 0, deviceTypeName);
+    _header.splice(insertIndex, 0, productionName);
     csvArray.unshift(_header);
     csvArray.unshift(_header);
     const file = csvArray.map((item) => item.join(DelimiterEnum.COMMA)).join('\n');
     const file = csvArray.map((item) => item.join(DelimiterEnum.COMMA)).join('\n');
 
 
@@ -80,14 +80,14 @@
       tkDeviceProfileId,
       tkDeviceProfileId,
       organizationId,
       organizationId,
       deviceTypeEnum,
       deviceTypeEnum,
-      deviceTypeName,
+      productionName,
       gateWayTbDeviceId,
       gateWayTbDeviceId,
       tbDeviceProfileId,
       tbDeviceProfileId,
       isTcpDeviceProfile,
       isTcpDeviceProfile,
     } = basicInfo;
     } = basicInfo;
 
 
-    const { file, columns } = insertDeviceTypeName(
-      deviceTypeName,
+    const { file, columns } = insertProductionName(
+      productionName,
       fileParseValue,
       fileParseValue,
       columnConfiguration
       columnConfiguration
     );
     );

@@ -22,6 +22,7 @@ export enum FieldsEnum {
   TB_DEVICE_PROFILE_ID = 'tbDeviceProfileId',
   TB_DEVICE_PROFILE_ID = 'tbDeviceProfileId',
   IS_TCP_DEVICE_PROFILE = 'isTcpDeviceProfile',
   IS_TCP_DEVICE_PROFILE = 'isTcpDeviceProfile',
   TRANSPORT_TYPE = 'transportType',
   TRANSPORT_TYPE = 'transportType',
+  PRODUCTION_NAME = 'productionName',
 }
 }
 
 
 export enum DelimiterEnum {
 export enum DelimiterEnum {
@@ -171,7 +172,7 @@ export const basicInfoForm: FormSchema[] = [
         placeholder: '请选择产品',
         placeholder: '请选择产品',
         params: { deviceType },
         params: { deviceType },
         getPopupContainer: () => document.body,
         getPopupContainer: () => document.body,
-        onChange(value: string, options: DeviceRecord) {
+        onChange(value: string, options: DeviceRecord & Record<'label', string>) {
           setFieldsValue({
           setFieldsValue({
             [FieldsEnum.IS_TCP_DEVICE_PROFILE]: value
             [FieldsEnum.IS_TCP_DEVICE_PROFILE]: value
               ? options.transportType === TransportTypeEnum.TCP
               ? options.transportType === TransportTypeEnum.TCP
@@ -179,6 +180,7 @@ export const basicInfoForm: FormSchema[] = [
             [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.GATEWAY_TB_DEVICE_ID]: null,
             [FieldsEnum.TRANSPORT_TYPE]: options?.transportType,
             [FieldsEnum.TRANSPORT_TYPE]: options?.transportType,
+            [FieldsEnum.PRODUCTION_NAME]: options?.label,
           });
           });
         },
         },
         showSearch: true,
         showSearch: true,
@@ -195,6 +197,12 @@ export const basicInfoForm: FormSchema[] = [
     show: false,
     show: false,
   },
   },
   {
   {
+    field: FieldsEnum.PRODUCTION_NAME,
+    label: '',
+    component: 'Input',
+    show: false,
+  },
+  {
     field: FieldsEnum.GATEWAY_TB_DEVICE_ID,
     field: FieldsEnum.GATEWAY_TB_DEVICE_ID,
     component: 'ApiSelect',
     component: 'ApiSelect',
     label: '网关设备',
     label: '网关设备',

@@ -26,6 +26,7 @@ export type BasicInfoRecord = Record<
   | 'deviceTypeName'
   | 'deviceTypeName'
   | 'gateWayTbDeviceId'
   | 'gateWayTbDeviceId'
   | 'gateWayTkDeviceId'
   | 'gateWayTkDeviceId'
+  | 'productionName'
   | 'tbDeviceProfileId',
   | 'tbDeviceProfileId',
   string
   string
 > &
 > &