Merge remote-tracking branch 'origin/fix/zfl' into perf/main_dev

@@ -2,6 +2,7 @@ import type { NodeDataType } from '@/api/node/model'
 
 export interface ProductAndDevice {
   name: string
+  profileName?: string
   profileId: string
   deviceList: {
     deviceId: string

@@ -86,7 +86,13 @@ export interface NodeDataDataSourceJsonType {
   chartOption?: ChartOptionType
   videoOption?: VideoOptionType
   alarmListOption?: AlarmListOptionType
-
+  deviceInfo?: {
+    code?: string
+    transportType?: string
+    deviceType?: string
+    deviceProfileId?: string
+    label?: string
+  }
   circularFlowMeterOption?: FlowMeterOptionType// 圆形水球图数据暂定any
   additional?: any// 圆形水球图颜色配置数据暂定any
   rectFlowMeterOption?: FlowMeterOptionType// 方形水球图颜色配置数据暂定any

@@ -25,9 +25,7 @@ export const formSchemas = (componentKey?: string): FormSchema[] => {
       required: !!isTemplate,
       componentProps: ({ formModel }) => {
         return {
-          options: (unref(contentDataStore.getProductAndDevice) || []).map((item: ProductAndDevice) => ({ label: item.name, value: item.profileId })),
-          // labelField: 'name',
-          // valueField: 'profileId',
+          options: (unref(contentDataStore.getProductAndDevice) || []).map((item: ProductAndDevice) => ({ label: item.profileName || item.name, value: item.profileId })),
           placeholder: '请选择产品',
           onSelect(value: string) {
             formModel[ContentDataFieldsEnum.DEVICE_PROFILE_ID] = value