Merge branch 'main_dev' into 'main'

Main dev

See merge request yunteng/thingskit-scada!224

-import type { AlarmStatusEnum } from '@/enums/datasource'
+import type { AlarmStatusEnum } from '@/enums/alarmEnum'
 
 /**
  * 告警列表

-import type { DeviceActiveType, DeviceAttributeItemType, DeviceItemType, DeviceProfileItemType, OrganizationItemType, RpcCommandType, SendValue, ThingsModel, ThingsModelItemType } from './model'
+import type { DeviceActiveType, DeviceAttributeItemType, DeviceItemType, DeviceProfileItemType, OrganizationItemType, ProductsDetailWithThingsModelType, RpcCommandType, SendValue, ThingsModel, ThingsModelItemType } from './model'
 import { CommandWayEnum } from '@/enums/commandEnum'
-import type { DeviceTypeEnum } from '@/enums/datasource'
+import type { DeviceTypeEnum } from '@/enums/deviceEnum'
+import { FunctionTypeEnum } from '@/enums/objectModelEnum'
 import { isShareMode } from '@/utils/env'
 import { defHttp } from '@/utils/http'
 
@@ -13,7 +14,7 @@ enum Api {
   GET_THINGS_MODEL_SERVICES = '/things_model/get_services/',
 
   RPC_COMMAND = '/rpc/',
-  GET_DEVICE_ACTIVE = 'plugins/telemetry/DEVICE/',
+  GET_DEVICE_ACTIVE = '/plugins/telemetry/DEVICE/',
   RPC_ONEWAY = '/rpc/oneway',
   RPC_TWOWAY = '/rpc/twoway',
 
@@ -21,6 +22,9 @@ enum Api {
   GET_DEVICE_DETAIL = '/device/', // 获取设备详情
 
   GET_LIST_BY_CONFIGURATION_ID = '/configuration/center/getListByConfigurationId',
+
+  GET_PRODUCTS_DETAIL_WITH_THINGS_MODEL = '/things_model/batch/get_tsl',
+
 }
 
 export interface GenModbusCommandType {
@@ -30,6 +34,7 @@ export interface GenModbusCommandType {
   registerAddress: number
   registerNumber?: number
   registerValues?: number[]
+  hexByteOrderEnum?: string
 }
 
 export const getDeviceProfile = (deviceType?: DeviceTypeEnum) => {
@@ -125,6 +130,17 @@ export const getDeviceActiveTime = (entityId: string) => {
   )
 }
 
+export const getDeviceTelemetryValue = (params: { entityId: string; keys: string }) => {
+  return defHttp.get({
+    url: `${Api.GET_DEVICE_ACTIVE}${params.entityId}/values/timeseries`,
+    params: {
+      keys: params.keys,
+    },
+  }, {
+    joinPrefix: false,
+  })
+}
+
 // 获取设备详情
 export const getDeviceInfo = (deviceId: string) => {
   return defHttp.get<DeviceItemType>(
@@ -139,3 +155,13 @@ export const getListByConfigurationId = (configurationId: string) => {
     url: `${Api.GET_LIST_BY_CONFIGURATION_ID}?configurationId=${configurationId}`,
   })
 }
+
+export const getProductsDetailWithThingsModel = ({ deviceProfileIds, functionTypeEnum }: { deviceProfileIds: string[]; functionTypeEnum?: FunctionTypeEnum | 'all' }) => {
+  return defHttp.post<ProductsDetailWithThingsModelType[]>({
+    url: Api.GET_PRODUCTS_DETAIL_WITH_THINGS_MODEL,
+    data: {
+      deviceProfileIds,
+      functionTypeEnum: functionTypeEnum || FunctionTypeEnum.PROPERTIES,
+    },
+  })
+}

-import type { DataTypeEnum, FunctionType, TransportTypeEnum } from '@/enums/datasource'
+import type { CommandCallWayEnum } from '@/enums/commandEnum'
+import type { TCPProtocolTypeEnum, TransportTypeEnum } from '@/enums/deviceEnum'
+import type { DataTypeEnum, ExtendDescOperationTypeEnum, FunctionTypeEnum, OriginalDataTypeEnum } from '@/enums/objectModelEnum'
 
 export interface DeviceProfileItemType {
   id: string
@@ -27,6 +29,7 @@ export interface ProfileData {
 interface AdditionalInfo {
   cmdType: string
 }
+
 export interface SendValue {
   additionalInfo: AdditionalInfo
   method: string
@@ -40,6 +43,7 @@ export interface Configuration {
 
 export interface TransportConfiguration {
   type: string
+  protocol: TCPProtocolTypeEnum
 }
 
 export interface ProvisionConfiguration {
@@ -57,7 +61,7 @@ export interface StructJSON {
 }
 
 export interface ThingsModel {
-  functionType: FunctionType
+  functionType: FunctionTypeEnum
   functionName: string
   identifier: string
   callType: any
@@ -71,7 +75,7 @@ export interface ThingsModel {
 }
 
 export interface FunctionJson {
-  dataType: DataType | DataType[]
+  dataType: DataType
   inputData?: StructJSON[]
   outputData?: StructJSON[]
   serviceCommand?: string
@@ -115,6 +119,10 @@ export interface DeviceItemType {
   deviceType: string
   alarmStatus: number
   enable: boolean
+  deviceProfile: {
+    transportType: TransportTypeEnum
+    profileData: ProfileData
+  }
 
   transportType: TransportTypeEnum
 }
@@ -134,10 +142,14 @@ export interface ThingsModelItemType {
 }
 
 export interface ExtensionDesc {
-  zoomFactor?: number
-  actionType?: string
-  dataType: string
-  registerAddress: number
+  writeOnly?: boolean
+  bitMask?: number
+  operationType: ExtendDescOperationTypeEnum
+  originalDataType: OriginalDataTypeEnum
+  registerAddress: string
+  scaling?: number
+  valueRange?: Record<'min' | 'max', number>
+  registerCount?: number
 }
 
 export interface Detail {
@@ -145,7 +157,7 @@ export interface Detail {
 }
 
 export interface DataType {
-  type: string
+  type: DataTypeEnum
   specs: Specs | StructJSON[]
   specsList: Specs[]
 }
@@ -160,8 +172,9 @@ export interface Specs {
   min: string
   max: string
   name?: string
-  value?: string
+  value?: any
   dataType?: DataTypeEnum
+  step?: number
 }
 
 export interface ValueRange {
@@ -193,3 +206,25 @@ export interface DeviceActiveType {
   lastUpdateTs: number
   value: boolean
 }
+
+export interface ProductsDetailWithThingsModelType {
+  id: string
+  name: string
+  transportType: string
+  deviceType: string
+  tsl: Tsl[]
+}
+
+export interface Tsl {
+  functionName: string
+  identifier: string
+  accessMode: string
+  functionType: FunctionTypeEnum
+  callType: CommandCallWayEnum
+  specs: {
+    dataType: DataType
+  }
+  extensionDesc?: ExtensionDesc
+  inputData?: StructJSON[]
+  outputData?: StructJSON[]
+}

 import type { ThingsModelItemType } from '@/api/device/model'
 import type { ImageSelectorDataType } from '@/core/Library/components/ImageSelector'
-import type { CommandWayEnum } from '@/enums/commandEnum'
-import type { ActRangListItemTypeEnum, ActTypeEnum, AggregateTypeEnum, CommandDeliveryWayEnum, DeviceTypeEnum, EventActionTypeEnum, EventTypeEnum, SocketSubscriberEnum, TransportTypeEnum } from '@/enums/datasource'
+import type { CommandDeliveryWayEnum, CommandWayEnum } from '@/enums/commandEnum'
+import type { ActRangListItemTypeEnum, ActTypeEnum, AggregateTypeEnum, EventActionTypeEnum, EventTypeEnum, SocketSubscriberEnum } from '@/enums/datasource'
+import type { DeviceTypeEnum } from '@/enums/deviceEnum'
 
 export enum DeleteNodeDataTypeEnum {
   DATASOURCE = 'DATASOURCE',
@@ -67,6 +68,8 @@ export interface VideoOptionType {
   orgId: string
   videoComponentFlag: boolean
   videoUrl: string
+  channelId?: string
+  deviceId?: string
 }
 
 export interface AlarmListOptionType {
@@ -92,19 +95,15 @@ export interface NodeDataDataSourceJsonType {
   deviceId: string
   deviceProfileId: string
   deviceProfileTemplateId?: string
-  attr: string
-  attrInfo: ThingsModelItemType
-
-  deviceType?: DeviceTypeEnum
-  transportType?: TransportTypeEnum
+  attr: string | string[]
+  deviceName?: string
 
   enable: boolean
   chartOption?: ChartOptionType
   videoOption?: VideoOptionType
   alarmListOption?: AlarmListOptionType
-  deviceInfo?: DeviceInfoType
-  circularFlowMeterOption?: FlowMeterColorItemType[] // 圆形水球图数据暂定any
-  rectFlowMeterOption?: FlowMeterColorItemType[] // 方形水球图颜色配置数据暂定any
+  circularFlowMeterOption?: FlowMeterColorItemType[]
+  rectFlowMeterOption?: FlowMeterColorItemType[]
 
 }
 
@@ -128,17 +127,12 @@ export interface DoubleClickEventDataType {
   openPage?: string
   enable: boolean
   service?: string
+
   serviceCommand?: Recordable
   way?: CommandWayEnum
   customCommand?: string
-  deviceInfo?: DeviceInfoType
   commandWay?: CommandDeliveryWayEnum
   callType?: string
-  operationPassword?: {
-    label: string
-    value: string | number
-    checked: boolean
-  }
 }
 
 export interface SingleClickEventDataType extends DoubleClickEventDataType { }
@@ -155,7 +149,7 @@ export interface NodeDataEventJsonType {
   [EventTypeEnum.SINGLE]: SingleClickEventDataType
   [EventTypeEnum.DOWN]: MouseDownEventDataType
   [EventTypeEnum.UP]: MouseUpEventDataType
-  [EventTypeEnum.OPERATION_PASSWORD]: OperationPasswordDataType
+  [EventTypeEnum.OPERATION_PASSWORD]?: OperationPasswordDataType
 }
 
 export interface RangeItemType {

+import type { VideoChannelPlayAddressType, VideoItemRecordType } from './model'
 import { defHttp } from '@/utils/http'
 
 enum Api {
   GET_VIDEO_LIST = '/video',
   STREAMING_PLAY_GET_URL = '/video/url',
+  GET_VIDEO_ALL_LIST = '/video/list',
   RTSP_CLOSEFLV = '/rtsp.closeFlv',
+  GET_VIDEO_CONTROL_START = '/video/control/start',
+  GET_VIDEO_CONTROL_STOP = '/video/control/stop',
 }
 
 // 获取视频组件--->频流
 export const getVideoList = (organizationId?: string) => {
-  return defHttp.get({
+  return defHttp.get<{ items: VideoItemRecordType[] }>({
     url: Api.GET_VIDEO_LIST,
     params: {
       organizationId,
@@ -35,3 +39,21 @@ export const closeFlvPlay = (url: string, browserId: string) => {
   })
 }
 
+export const getVideoControlStart = ({
+  deviceId,
+  channelId,
+}: Record<'deviceId' | 'channelId', string>) => {
+  return defHttp.get<VideoChannelPlayAddressType>(
+    {
+      url: `${Api.GET_VIDEO_CONTROL_START}/${deviceId}/${channelId}`,
+      timeout: 30 * 1000,
+    },
+    {},
+  )
+}
+export const getCameraList = (params: Record<'organizationId', string>) => {
+  return defHttp.get<{ data: VideoItemRecordType[] }>({
+    url: Api.GET_VIDEO_ALL_LIST,
+    params,
+  })
+}

+export interface VideoItemRecordType {
+  id: string
+  creator: string
+  createTime: string
+  name: string
+  enabled: boolean
+  tenantId: string
+  sn: string
+  organizationId: string
+  organizationName: string
+  status: boolean
+  accessMode: number
+  playProtocol: number
+  params: Params
+  videoUrl: string
+}
+
+export interface Params {
+  channelNo: string
+  deviceId: string
+}
+
+export interface VideoChannelPlayAddressType {
+  code: number
+  message: string
+  data: Data
+}
+
+export interface Data {
+  app: string
+  stream: string
+  ip: any
+  flv: string
+  https_flv: string
+  ws_flv: string
+  wss_flv: string
+  fmp4: string
+  https_fmp4: string
+  ws_fmp4: string
+  wss_fmp4: string
+  hls: string
+  https_hls: string
+  ws_hls: string
+  wss_hls: string
+  ts: string
+  https_ts: string
+  ws_ts: string
+  wss_ts: any
+  rtmp: string
+  rtmps: string
+  rtsp: string
+  rtsps: string
+  rtc: string
+  rtcs: string
+  mediaServerId: string
+  tracks: Track[]
+  startTime: any
+  endTime: any
+  progress: number
+}
+
+export interface Track {
+  channels: number
+  codecId: number
+  codecIdName: any
+  codecType: number
+  ready: boolean
+  sampleBit: number
+  sampleRate: number
+  fps: number
+  height: number
+  width: number
+}

@@ -2,7 +2,9 @@ import type { FormSchema } from '@/components/Form'
 import { ComponentEnum } from '@/components/Form/src/enum'
 import type { BasicColumn } from '@/components/Table'
 import type { CommandWayEnum } from '@/enums/commandEnum'
-import { ActTypeEnum, type CodeTypeEnum, type ContentDataFieldsEnum, type DeviceTypeEnum } from '@/enums/datasource'
+import { ActTypeEnum, type ContentDataFieldsEnum } from '@/enums/datasource'
+import type { DeviceTypeEnum, TCPProtocolTypeEnum } from '@/enums/deviceEnum'
+
 export enum TableColumnFieldEnum {
   DEVICE_ID = 'deviceId',
   WAY = 'way',
@@ -15,7 +17,7 @@ export interface TableRecordItemType {
   [TableColumnFieldEnum.WAY]?: Nullable<CommandWayEnum>
   [TableColumnFieldEnum.COMMAND]?: Nullable<string | Recordable>
   [ContentDataFieldsEnum.DEVICE_TYPE]?: Nullable<DeviceTypeEnum>
-  [ContentDataFieldsEnum.CODE_TYPE]?: Nullable<CodeTypeEnum>
+  [ContentDataFieldsEnum.CODE_TYPE]?: Nullable<TCPProtocolTypeEnum>
 }
 
 export const getFormSchemas = (): FormSchema[] => {

-import type { Specs, StructJSON } from '@/api/device/model'
-import type { NodeDataDataSourceJsonType } from '@/api/node/model'
+import type { DeviceItemType, Specs, StructJSON, Tsl } from '@/api/device/model'
+import type { NodeDataDataSourceJsonType, OperationPasswordDataType, SingleClickEventDataType } from '@/api/node/model'
 import { type FormSchema, useComponentRegister } from '@/components/Form'
 import { ComponentEnum } from '@/components/Form/src/enum'
-import { ThingsModelForm, validateTCPCustomCommand } from '@/core/Library/components/ThingsModelForm'
+import { ThingsModelForm } from '@/core/Library/components/ThingsModelForm'
 import { getFormSchemas } from '@/core/Library/components/ThingsModelForm/config'
-import { CodeTypeEnum, DataTypeEnum, TransportTypeEnum } from '@/enums/datasource'
-import { TCPObjectModelActionTypeEnum } from '@/enums/objectModelEnum'
+import { TCPProtocolTypeEnum, TransportTypeEnum } from '@/enums/deviceEnum'
+import { DataTypeEnum, OriginalDataTypeEnum } from '@/enums/objectModelEnum'
 
 useComponentRegister(ComponentEnum.THINGS_MODEL_FORM, ThingsModelForm)
 
@@ -15,83 +15,106 @@ export enum FormFieldsEnum {
 }
 
 export interface AttributeDeliverModalOpenParamsType {
-  title?: string
-  operationPassword?: string
-  operationPasswordEnable?: boolean
+  operationPasswordInfo?: OperationPasswordDataType
   dataSourceJson: NodeDataDataSourceJsonType
+  eventBindData: SingleClickEventDataType
 }
 
-function getStructJsonFromDataSourceJson(dataSourceJson: NodeDataDataSourceJsonType): StructJSON {
-  const { attrInfo } = dataSourceJson
-  const { identifier, name, detail } = attrInfo || {}
+export interface CreateFormSchemasParamsType {
+  deviceInfo: DeviceItemType
+  objectModelTsl: Tsl
+  operationPasswordInfo?: OperationPasswordDataType
+}
+
+function getStructJsonFromDataSourceJson(objectModelTsl: Tsl): StructJSON {
+  const { identifier, functionName, specs } = objectModelTsl || {}
   return {
-    functionName: name,
+    functionName,
     identifier,
-    dataType: detail.dataType,
+    dataType: specs.dataType,
   }
 }
 
-function getTCPModbusSchemas({ structJson, required, actionType }: { structJson: StructJSON; required?: boolean; actionType: string }): FormSchema {
-  const { dataType } = structJson
-  const { specs, type } = dataType || {}
-  const { valueRange, length = 10240 } = specs! as Specs
-  const { max = Number.MAX_SAFE_INTEGER, min = Number.MIN_SAFE_INTEGER } = valueRange || {}
+const validateDouble = (value: number, min?: number | string, max?: number | string) => {
+  min = Number(min) ?? Number.MIN_SAFE_INTEGER
+  max = Number(max) ?? Number.MAX_SAFE_INTEGER
 
-  function createInputNumber({
-    identifier,
-    functionName,
-  }: StructJSON): FormSchema {
-    return {
-      field: identifier,
-      label: functionName,
-      component: ComponentEnum.INPUT_NUMBER,
-      required,
-      componentProps: {
-        max: actionType === TCPObjectModelActionTypeEnum.BOOL ? 1 : max,
-        min: actionType === TCPObjectModelActionTypeEnum.BOOL ? 0 : min,
-        precision: actionType === TCPObjectModelActionTypeEnum.BOOL ? 0 : 2,
-      },
-    }
+  return {
+    flag: value < min || value > max,
+    message: `取值范围在${min}~${max}之间`,
   }
+}
+
+export const createModbusValueInput = (objectModel: Tsl): FormSchema => {
+  const { identifier, functionName, extensionDesc } = objectModel
+
+  const { dataType } = objectModel.specs || {}
+  const { specs } = dataType || {}
+  const { valueRange } = specs as Specs
+  const { max, min } = valueRange || {}
+
+  if (extensionDesc?.originalDataType === OriginalDataTypeEnum.BOOLEAN) {
+    const options = [
+      { label: '闭合', value: parseInt('FF00', 16) },
+      { label: '断开', value: parseInt('0000', 16) },
+    ]
 
-  const createInput = ({ identifier, functionName }: StructJSON): FormSchema => {
     return {
       field: identifier,
       label: functionName,
-      component: ComponentEnum.INPUT,
-      rules: [
-        {
-          required,
-          message: `${functionName}是必填项`,
-        },
-        {
-          validator: validateTCPCustomCommand,
-        },
-      ],
-      componentProps: {
-        maxLength: length,
+      component: ComponentEnum.SELECT,
+      componentProps: () => {
+        return {
+          options,
+          placeholder: `请选择${functionName}`,
+          getPopupContainer: () => document.body,
+        }
       },
-    } as FormSchema
+    }
   }
 
-  return type === DataTypeEnum.STRING ? createInput(structJson) : createInputNumber(structJson)
+  const isStringType = extensionDesc?.originalDataType === OriginalDataTypeEnum.STRING
+  return {
+    field: identifier,
+    label: functionName,
+    component: isStringType ? ComponentEnum.INPUT : ComponentEnum.INPUT_NUMBER,
+    rules: isStringType
+      ? []
+      : [
+          {
+            type: 'number',
+            validator: (_rule, value) => {
+              const { flag, message } = validateDouble(value, min, max)
+              if (flag)
+                return Promise.reject(Error(`${functionName}${message}`))
+
+              return Promise.resolve(value)
+            },
+          },
+        ],
+    componentProps: {
+      // max: max ?? Number.MAX_SAFE_INTEGER,
+      // min: min ?? Number.MIN_SAFE_INTEGER,
+      placeholder: `请输入${functionName}`,
+      precision: 0,
+    },
+  }
 }
 
-export const createFormSchemas = ({ operationPassword, operationPasswordEnable, dataSourceJson }: AttributeDeliverModalOpenParamsType): FormSchema[] => {
+export const createFormSchemas = ({ operationPasswordInfo, objectModelTsl, deviceInfo }: CreateFormSchemasParamsType): FormSchema[] => {
   const schemas: FormSchema[] = []
 
-  const { deviceInfo } = dataSourceJson
-  if (deviceInfo?.transportType === TransportTypeEnum.TCP && deviceInfo.codeType === CodeTypeEnum.MODBUS_RTU && dataSourceJson.deviceInfo?.codeType) {
-    schemas.push(getTCPModbusSchemas({ required: true, structJson: getStructJsonFromDataSourceJson(dataSourceJson), actionType: dataSourceJson.deviceInfo?.codeType }))
+  if (deviceInfo?.transportType === TransportTypeEnum.TCP && deviceInfo.deviceProfile?.profileData?.transportConfiguration?.protocol === TCPProtocolTypeEnum.MODBUS_RTU) {
+    schemas.push(createModbusValueInput(objectModelTsl))
   }
   else {
-    const isStructType = dataSourceJson.attrInfo?.detail?.dataType?.type === DataTypeEnum.STRUCT
+    const isStructType = objectModelTsl.specs.dataType.type === DataTypeEnum.STRUCT
     schemas.push(
-      ...getFormSchemas({ structJSON: isStructType ? dataSourceJson?.attrInfo?.detail?.dataType?.specs as StructJSON[] || [] : [getStructJsonFromDataSourceJson(dataSourceJson)], required: !isStructType }),
+      ...getFormSchemas({ structJSON: isStructType ? objectModelTsl.specs.dataType.specs as StructJSON[] || [] : [getStructJsonFromDataSourceJson(objectModelTsl)], required: !isStructType }),
     )
   }
 
-  if (operationPassword && operationPasswordEnable) {
+  if (operationPasswordInfo?.value && operationPasswordInfo.checked) {
     schemas.unshift({
       field: FormFieldsEnum.PASSWORD,
       label: '操作密码',
@@ -100,7 +123,7 @@ export const createFormSchemas = ({ operationPassword, operationPasswordEnable,
       rules: [
         {
           validator(_rule, value) {
-            if (value && value !== operationPassword) return Promise.reject(new Error('操作密码不正确'))
+            if (value && value !== operationPasswordInfo.value) return Promise.reject(new Error('操作密码不正确'))
             return Promise.resolve()
           },
         },

 <script setup lang="ts">
 import { Modal } from 'ant-design-vue'
-import { nextTick, ref, unref } from 'vue'
-import type { AttributeDeliverModalOpenParamsType } from './AttributeDeliverModal.config'
-import { createFormSchemas } from './AttributeDeliverModal.config'
-import { useGetModbusCommand } from './useGetModbusCommand'
+import { nextTick, ref, toRaw, unref } from 'vue'
+import { type AttributeDeliverModalOpenParamsType, createFormSchemas } from './AttributeDeliverModal.config'
 import { BasicForm, useForm } from '@/components/Form'
 import { FormLayoutEnum } from '@/components/Form/src/enum'
-import type { NodeDataDataSourceJsonType } from '@/api/node/model'
-import { CodeTypeEnum, DataTypeEnum, TransportTypeEnum } from '@/enums/datasource'
-
-const resolveFn = ref<Fn>()
+import type { DeviceItemType, Tsl } from '@/api/device/model'
+import { useProductsStore } from '@/store/modules/products'
+import { getDeviceInfo } from '@/api/device'
+import type { CommandWayEnum } from '@/enums/commandEnum'
+import { useCommandDelivery } from '@/hooks/business/useCommandDelivery'
+import { DataTypeEnum } from '@/enums/objectModelEnum'
+import { useMessage } from '@/hooks/web/useMessage'
 
 const visible = ref(false)
 
-const password = ref()
-
-const currentDataSourceJson = ref<NodeDataDataSourceJsonType>()
-
 const [register, { getFieldsValue, resetFields, validate, setProps, clearValidate }] = useForm({
   layout: FormLayoutEnum.VERTICAL,
   showActionButtonGroup: false,
 })
 
-const open = async ({ title, operationPassword, operationPasswordEnable, dataSourceJson }: AttributeDeliverModalOpenParamsType) => {
+const deviceInfo = ref<DeviceItemType>()
+const objectModelTsl = ref<Tsl>()
+const productsStore = useProductsStore()
+const commandWay = ref<CommandWayEnum>()
+
+const open = async ({ operationPasswordInfo, dataSourceJson, eventBindData }: AttributeDeliverModalOpenParamsType) => {
   visible.value = true
-  password.value = operationPassword
-  currentDataSourceJson.value = dataSourceJson
-  return new Promise((resolve) => {
-    resolveFn.value = resolve
-    nextTick(() => {
-      setProps({ schemas: createFormSchemas({ title, operationPassword, operationPasswordEnable, dataSourceJson }) })
-    })
+  const { deviceId, deviceProfileId, attr } = dataSourceJson
+  const { way } = eventBindData
+  commandWay.value = way
+  objectModelTsl.value = productsStore.getObjectModelByIdWithIdentifier(deviceProfileId, attr as string)!
+  deviceInfo.value = await getDeviceInfo(deviceId)
+
+  nextTick(() => {
+    const schemas = createFormSchemas({ operationPasswordInfo, deviceInfo: toRaw(unref(deviceInfo)!), objectModelTsl: toRaw(unref(objectModelTsl)!) })
+    setProps({ schemas })
   })
 }
 
 async function getResult() {
-  const result = getFieldsValue()
-  const isTCPModbusDevice = unref(currentDataSourceJson)?.deviceInfo?.transportType === TransportTypeEnum.TCP && unref(currentDataSourceJson)?.deviceInfo?.codeType === CodeTypeEnum.MODBUS_RTU
-  const isStructJSON = unref(currentDataSourceJson)?.attrInfo?.detail?.dataType?.type === DataTypeEnum.STRUCT
-  const attrKey = unref(currentDataSourceJson)!.attr
-  if (!isTCPModbusDevice) { return isStructJSON ? result : result[attrKey] }
-  else {
-    const value = result[attrKey]
-    const isString = unref(currentDataSourceJson)?.attrInfo?.detail?.dataType?.type === DataTypeEnum.STRING
+  let value = getFieldsValue()
+  const { doCommandDelivery } = useCommandDelivery()
 
-    if (isString) return value
+  const isStructJSON = unref(objectModelTsl)?.specs.dataType.type === DataTypeEnum.STRUCT
+  const identifier = unref(objectModelTsl)!.identifier
+  value = isStructJSON ? value : value[identifier]
 
-    const { getModbusCommand, validateCanGetCommand } = useGetModbusCommand()
-    if (!validateCanGetCommand(unref(currentDataSourceJson)!.attrInfo.extensionDesc, unref(currentDataSourceJson)!.deviceInfo?.code).flag) return
+  await doCommandDelivery({
+    objectModel: unref(objectModelTsl),
+    deviceDetail: unref(deviceInfo),
+    value,
+  })
 
-    const res = await getModbusCommand(value as unknown as number, unref(currentDataSourceJson)!.attrInfo.extensionDesc!, unref(currentDataSourceJson)!.deviceInfo!.code!)
-    return res
-  }
+  const { createMessage } = useMessage()
+  createMessage.success('命令下发成功')
 }
 
 const handleOk = async () => {
   await validate()
-  const result = await getResult()
-  if (!result) return
-  unref(resolveFn)?.(result)
+  await getResult()
   visible.value = false
   resetFields()
 }
@@ -73,7 +73,7 @@ defineExpose({ open })
 
 <template>
   <Modal
-    v-model:open="visible" title="属性下发" ok-text="确认" :width="400" cancel-text="取消" @cancel="handleCancel"
+    v-model:open="visible" :title="`属性下发 / ${deviceInfo?.alias || deviceInfo?.name}`" ok-text="确认" :width="400" cancel-text="取消" @cancel="handleCancel"
     @ok="handleOk"
   >
     <BasicForm @register="register" />

-<script setup lang="ts">
-import { Modal } from 'ant-design-vue'
-import { nextTick, ref, unref } from 'vue'
-import { BasicForm, type FormSchema, useForm } from '@/components/Form'
-import { ComponentEnum, FormLayoutEnum } from '@/components/Form/src/enum'
-
-const resolveFn = ref<Fn>()
-
-const visible = ref(false)
-
-const [register, { resetFields, validate, setProps }] = useForm({
-  showActionButtonGroup: false,
-  layout: FormLayoutEnum.VERTICAL,
-})
-
-const createFormSchemas = (password: string): FormSchema[] => {
-  return [
-    {
-      field: 'password',
-      component: ComponentEnum.INPUT_PAWSSWORD,
-      label: '',
-      required: true,
-      rules: [{
-        validator(_rule, value) {
-          if (value && value !== password) return Promise.reject(new Error('操作密码不正确'))
-          return Promise.resolve()
-        },
-      }],
-      componentProps: {
-        placeholder: '请输入操作密码',
-      },
-    },
-  ]
-}
-
-const open = async (pwd: string) => {
-  visible.value = true
-  return new Promise((resolve) => {
-    resolveFn.value = resolve
-
-    nextTick(() => {
-      setProps({ schemas: createFormSchemas(pwd) })
-    })
-  })
-}
-
-const handlerOk = async () => {
-  await validate()
-  unref(resolveFn)?.(true)
-  resetFields()
-  visible.value = false
-}
-
-defineExpose({ open })
-</script>
-
-<template>
-  <Modal
-    v-model:open="visible" :width="300" ok-text="确认" cancel-text="取消"
-    title="操作密码"
-    @ok="handlerOk"
-  >
-    <BasicForm @register="register" />
-  </Modal>
-</template>

-<script setup lang="ts">
-import { Icon } from '@iconify/vue'
-import { Modal } from 'ant-design-vue'
-import { ref, unref } from 'vue'
-
-const visible = ref(false)
-
-const resolveFn = ref<Fn>()
-
-const rejectFn = ref<Fn>()
-
-const open = async () => {
-  visible.value = true
-  return new Promise((resolve, reject) => {
-    resolveFn.value = resolve
-    rejectFn.value = reject
-  })
-}
-
-const handleOk = () => {
-  unref(resolveFn)?.()
-  visible.value = false
-}
-
-const handleCancel = () => {
-  unref(rejectFn)?.()
-  visible.value = false
-}
-
-defineExpose({ open })
-</script>
-
-<template>
-  <Modal v-model:open="visible" :width="400" ok-text="确认" cancel-text="取消" @ok="handleOk" @cancel="handleCancel">
-    <template #title>
-      <div class="flex">
-        <span><Icon icon="ant-design:exclamation-circle-filled" class="text-yellow-300 text-xl" /></span>
-        <span class="font-bold ml-2">提示</span>
-      </div>
-    </template>
-    <div class="ml-5">
-      是否确认此操作?
-    </div>
-  </Modal>
-</template>

+<script setup lang="ts">
+import { Modal } from 'ant-design-vue'
+import { computed, nextTick, ref, unref } from 'vue'
+import { Icon } from '@iconify/vue'
+import { BasicForm, type FormSchema, useForm } from '@/components/Form'
+import { ComponentEnum, FormLayoutEnum } from '@/components/Form/src/enum'
+import type { NodeDataDataSourceJsonType, OperationPasswordDataType, SingleClickEventDataType } from '@/api/node/model'
+import type { DoCommandDeliverParamsType } from '@/hooks/business/useCommandDelivery'
+import { useCommandDelivery } from '@/hooks/business/useCommandDelivery'
+import { CommandDeliveryWayEnum } from '@/enums/commandEnum'
+import { useProductsStore } from '@/store/modules/products'
+import { getDeviceInfo } from '@/api/device'
+import { TransportTypeEnum } from '@/enums/deviceEnum'
+import { useMessage } from '@/hooks/web/useMessage'
+
+interface SwitchCommandDeliveryModalParamsType {
+  operationPasswordInfo?: OperationPasswordDataType
+  dataSourceJson: NodeDataDataSourceJsonType
+  eventBindData: SingleClickEventDataType
+  sendValue: any
+}
+
+const visible = ref(false)
+
+const currentOperationPasswordInfo = ref<OperationPasswordDataType>()
+
+const [register, { resetFields, validate, setProps }] = useForm({
+  showActionButtonGroup: false,
+  layout: FormLayoutEnum.VERTICAL,
+})
+
+const createFormSchemas = (password: string): FormSchema[] => {
+  return [
+    {
+      field: 'password',
+      component: ComponentEnum.INPUT_PAWSSWORD,
+      label: '操作密码',
+      required: true,
+      rules: [{
+        validator(_rule, value) {
+          if (value && value !== password) return Promise.reject(new Error('操作密码不正确'))
+          return Promise.resolve()
+        },
+      }],
+      componentProps: {
+        placeholder: '请输入操作密码',
+      },
+    },
+  ]
+}
+
+const productsStore = useProductsStore()
+
+const getHasEnableOperationPassword = computed(() => !!(unref(currentOperationPasswordInfo)?.checked && unref(currentOperationPasswordInfo)?.value))
+
+const currentParams = ref<SwitchCommandDeliveryModalParamsType>()
+const open = async (params: SwitchCommandDeliveryModalParamsType) => {
+  const { operationPasswordInfo } = params
+  visible.value = true
+  currentParams.value = params
+  currentOperationPasswordInfo.value = operationPasswordInfo
+
+  nextTick(() => {
+    unref(getHasEnableOperationPassword) && setProps({ schemas: createFormSchemas(operationPasswordInfo!.value!) })
+  })
+}
+
+const handlerOk = async () => {
+  if (unref(getHasEnableOperationPassword))
+    await validate()
+  const { doCommandDelivery } = useCommandDelivery()
+
+  const { sendValue, eventBindData, dataSourceJson } = unref(currentParams)!
+  const { way, commandWay } = eventBindData
+  const { deviceProfileId, attr, deviceId } = dataSourceJson
+
+  const deviceDetail = await getDeviceInfo(deviceId)
+
+  const doCommandParams: DoCommandDeliverParamsType = {
+    value: sendValue,
+    identifier: attr as string,
+    deviceDetail,
+    deviceProfileId,
+    way,
+  }
+
+  if (commandWay === CommandDeliveryWayEnum.CUSTOM) {
+    doCommandParams.penetration = true
+  }
+  else if (commandWay === CommandDeliveryWayEnum.SERVICE) {
+    const { service } = eventBindData
+    doCommandParams.objectModel = productsStore.getObjectModelByIdWithIdentifier(deviceProfileId, service!)!
+    doCommandParams.value = deviceDetail?.transportType === TransportTypeEnum.TCP ? doCommandParams.value : { [doCommandParams.objectModel.identifier]: doCommandParams.value }
+  }
+
+  await doCommandDelivery(doCommandParams)
+
+  const { createMessage } = useMessage()
+  createMessage.success('命令下发成功')
+
+  if (unref(getHasEnableOperationPassword)) resetFields()
+  visible.value = false
+}
+
+defineExpose({ open })
+</script>
+
+<template>
+  <Modal v-model:open="visible" :width="300" ok-text="确认" cancel-text="取消" destroy-on-close @ok="handlerOk">
+    <BasicForm v-if="getHasEnableOperationPassword" @register="register" />
+    <div v-else class="flex items-center">
+      <Icon icon="ant-design:exclamation-circle-filled" class="text-yellow-300 text-xl" />
+      <span class="ml-2">
+        是否确认此操作?
+      </span>
+    </div>
+  </Modal>
+</template>

 import { ComponentEnum } from '@/components/Form/src/enum'
 import type { FormSchema } from '@/components/Form'
-import type { StructJSON } from '@/api/device/model'
+import type { OperationPasswordDataType } from '@/api/node/model'
+import { validateTCPCustomCommand } from '@/core/Library/components/ThingsModelForm'
+import { JSONEditorValidator } from '@/components/CodeEditor/src/JSONEditor'
+
+export enum FormFieldsEnum {
+  CUSTOM_COMMAND = 'customCommand',
+  OPERATION_PASSWORD = 'password',
+
+  SERVICE_COMMAND = 'serviceCommand',
+}
+
 export const formSchemas: FormSchema[] = [
   {
     field: 'sendValue',
@@ -10,219 +20,53 @@ export const formSchemas: FormSchema[] = [
   },
 ]
 
-const InsertString = (t: any, c: any, n: any) => {
-  const r: string | number[] = []
-
-  for (let i = 0; i * 2 < t.length; i++)
-    r.push(t.substr(i * 2, n))
-
-  return r.join(c)
-}
-const FillString = (t: any, c: any, n: any, b: any) => {
-  if (t === '' || c.length !== 1 || n <= t.length)
-    return t
-
-  const l = t.length
-
-  for (let i = 0; i < n - l; i++) {
-    if (b === true)
-      t = c + t
-
-    else
-      t += c
-  }
-  return t
-}
-const SingleToHex = (t: any) => {
-  if (t === '')
-    return ''
-
-  t = parseFloat(t)
-
-  if (isNaN(t) === true)
-    return 'Error'
-
-  if (t === 0)
-    return '00000000'
-
-  let s, e, m
-
-  if (t > 0) {
-    s = 0
-  }
-  else {
-    s = 1
-
-    t = 0 - t
-  }
-  m = t.toString(2)
-
-  if (m >= 1) {
-    if (m.indexOf('.') === -1)
-      m = `${m}.0`
-
-    e = m.indexOf('.') - 1
-  }
-  else {
-    e = 1 - m.indexOf('1')
-  }
-  if (e >= 0)
-    m = m.replace('.', '')
-
-  else
-    m = m.substring(m.indexOf('1'))
-
-  if (m.length > 24)
-    m = m.substr(0, 24)
-
-  else
-    m = FillString(m, '0', 24, false)
-
-  m = m.substring(1)
-
-  e = (e + 127).toString(2)
-
-  e = FillString(e, '0', 8, true)
-
-  let r = parseInt(s + e + m, 2).toString(16)
-
-  r = FillString(r, '0', 8, true)
-
-  return InsertString(r, ' ', 2).toUpperCase()
-}
-
-const FormatHex = (t: any, n: any, ie: any) => {
-  const r: string[] = []
-
-  let s = ''
-
-  let c = 0
-
-  for (let i = 0; i < t.length; i++) {
-    if (t.charAt(i) !== ' ') {
-      s += t.charAt(i)
-
-      c += 1
-
-      if (c === n) {
-        r.push(s)
-
-        s = ''
-
-        c = 0
-      }
-    }
-    if (ie === false) {
-      if (i === t.length - 1 && s !== '')
-        r.push(s)
-    }
-  }
-  return r.join('\n')
-}
-const FormatHexBatch = (t: any, n: any, ie: any) => {
-  const a = t.split('\n')
-
-  const r: string[] = []
-
-  for (let i = 0; i < a.length; i++)
-    r[i] = FormatHex(a[i], n, ie)
-
-  return r.join('\n')
-}
-const SingleToHexBatch = (t: any) => {
-  const a = t.split('\n')
-
-  const r: string[] = []
-
-  for (let i = 0; i < a.length; i++)
-    r[i] = SingleToHex(a[i])
-
-  return r.join('\r\n')
-}
-
-const formSchemasConfig = (schemas: StructJSON, actionType: any): FormSchema[] => {
-  const { identifier, functionName } = schemas
-  if (actionType === '06') {
-    return [
-      {
-        field: identifier,
-        label: functionName,
-        component: ComponentEnum.INPUT_NUMBER,
-        rules: [{ required: true, message: '请输入正数' }],
-        componentProps: {
-          min: 0,
-          formatter: (e: any) => {
-            const value = `${e}`.replace('-', '').replace(/^(-)*(\d+)\.(\d\d).*$/, '$1$2.$3')
-            return value
+export const getOperationPasswordSchemas = (operationPasswordInfo: OperationPasswordDataType): FormSchema[] => {
+  return [
+    {
+      field: FormFieldsEnum.OPERATION_PASSWORD,
+      label: '操作密码',
+      component: ComponentEnum.INPUT_PAWSSWORD,
+      required: true,
+      rules: [
+        {
+          validator(_rule, value: string) {
+            if (value !== operationPasswordInfo.value)
+              return Promise.reject(Error('操作密码不正确'))
+            return Promise.resolve()
           },
-          placeholder: '请输入正数',
         },
+      ],
+      componentProps: {
+        placeholder: '请输入操作密码',
+        max: 120,
+        autocomplete: 'cc-number',
       },
-    ]
-  }
-  else if (actionType === '05') {
-    return [
-      {
-        field: identifier,
-        label: functionName,
-        component: ComponentEnum.INPUT_NUMBER,
-        rules: [{ required: true, message: '请输入值' }],
-        componentProps: {
-          min: 0,
-          max: 1,
-          precision: 0,
-          placeholder: '请输入0或1',
-        },
-      },
-    ]
-  }
-  else {
-    return [
-      {
-        field: identifier,
-        label: functionName,
-        component: ComponentEnum.INPUT_NUMBER,
-        rules: [{ required: true, message: '请输入值' }],
-        componentProps: {
-          placeholder: '请输入数字',
-          formatter: (e: any) =>
-            `${e}`.replace(/\B(?=(\d{3})+(?!\d))/g, '').replace(/^(-)*(\d+)\.(\d\d).*$/, '$1$2.$3'),
-        },
-      },
-    ]
-  }
+    },
+  ]
 }
 
-const getArray = (values: any) => {
-  const str = values.replace(/\s+/g, '')
-  const array: any = []
-
-  for (let i = 0; i < str.length; i += 4) {
-    const chunk = parseInt(str.substring(i, i + 4), 16)
-    array.push(chunk)
-  }
-  return array
+export const getTcpCustomCommandSchemas = (): FormSchema[] => {
+  return [
+    {
+      field: FormFieldsEnum.CUSTOM_COMMAND,
+      label: '自定义命令',
+      component: ComponentEnum.INPUT,
+      required: true,
+      rules: [{ validator: validateTCPCustomCommand }],
+    },
+  ]
 }
 
-// 获取小数
-const getFloatPart = (number: string | number) => {
-  const isLessZero = Number(number) < 0
-  number = number.toString()
-  const floatPartStartIndex = number.indexOf('.')
-  const value = ~floatPartStartIndex
-    ? `${isLessZero ? '-' : ''}0.${number.substring(floatPartStartIndex + 1)}`
-    : '0'
-  return Number(value)
+export const getJSONCommandSchemas = (): FormSchema[] => {
+  return [
+    {
+      field: FormFieldsEnum.CUSTOM_COMMAND,
+      label: '自定义命令',
+      component: ComponentEnum.JSON_EDITOR,
+      required: true,
+      changeEvent: 'update:value',
+      rules: JSONEditorValidator(),
+    },
+  ]
 }
 
-export {
-  InsertString,
-  FillString,
-  SingleToHex,
-  FormatHex,
-  FormatHexBatch,
-  SingleToHexBatch,
-  formSchemasConfig,
-  getArray,
-  getFloatPart,
-}

 export { default as CommandDeliveryModal } from './index.vue'
-export { default as CommandDeliveryConfirmModal } from './CommandDeliveryConfirmModal.vue'
-export { default as ConfirmModal } from './ConfirmModal.vue'
+export { default as SwitchCommandDeliveryModal } from './SwitchCommandDeliveryModal.vue'
 export { default as AttributeDeliverModal } from './AttributeDeliverModal.vue'

 <script setup lang="ts">
-import { nextTick, reactive, ref, unref } from 'vue'
+import { nextTick, reactive, ref, toRaw, unref } from 'vue'
 import { Button } from 'ant-design-vue'
-import { SingleToHex, formSchemas, formSchemasConfig, getArray, getFloatPart } from './config.ts'
-import { BasicModal } from '@/components/Modal'
-import type { SingleClickEventDataType } from '@/api/node/model'
+import { FormFieldsEnum, formSchemas, getJSONCommandSchemas, getOperationPasswordSchemas, getTcpCustomCommandSchemas } from './config.ts'
+import { createModbusValueInput } from './AttributeDeliverModal.config'
+import { BasicModal, useModalInner } from '@/components/Modal'
+import type { NodeDataDataSourceJsonType, OperationPasswordDataType, SingleClickEventDataType } from '@/api/node/model'
 import { BasicForm, useForm } from '@/components/Form'
-import { ComponentEnum, FormLayoutEnum } from '@/components/Form/src/enum'
-import { CommandDeliveryWayEnum, CommandTypeEnum, TransportTypeEnum } from '@/enums/datasource'
-import { genModbusCommand, getDeviceActiveTime, getDeviceInfo, getThingsModelServices, sendRpcOneway } from '@/api/device'
+import { FormLayoutEnum } from '@/components/Form/src/enum'
 import { ThingsModelForm } from '@/core/Library/components/ThingsModelForm'
+import type { DeviceItemType, Tsl } from '@/api/device/model'
+import { useProductsStore, useProductsStoreWithOut } from '@/store/modules/products'
+import { useJsonParse } from '@/hooks/business/useJSONParse'
+import { CommandDeliveryWayEnum } from '@/enums/commandEnum'
+import { TransportTypeEnum } from '@/enums/deviceEnum'
+import { getDeviceInfo } from '@/api/device'
+import type { DoCommandDeliverParamsType } from '@/hooks/business/useCommandDelivery'
+import { useCommandDelivery } from '@/hooks/business/useCommandDelivery'
 import { useMessage } from '@/hooks/web/useMessage'
-import type { StructJSON } from '@/api/device/model'
-
-interface ServiceInfo {
-  title?: string
-  serviceCommand?: Object
-  inputData?: []
-  transportType?: string
-  callType?: string
-  code?: string
-  way?: string
-}
-
-const visible = ref<boolean>(false)
 
-const { createMessage } = useMessage()
-const loading = ref<boolean>(false)
-
-const dataSourceJson = ref<any>({})
-const thingsModelElRef = ref()
+interface OpenParamsType {
+  dataSource: NodeDataDataSourceJsonType
+  eventBindData: SingleClickEventDataType
+  operationPasswordInfo?: OperationPasswordDataType
+}
 
-const isInputData = ref<boolean>(false)// 判断使用那个表单  true: 用封装的表单  false：用自己写的表单
+const thingsModelElRef = ref<InstanceType<typeof ThingsModelForm>>()
 
-const zoomFactorValue = ref<number>(1) // 缩放因子
-const isShowMultiply = ref<boolean>(false) // 只有tcp --> int和double类型才相乘缩放因子
-const isShowActionType = ref<boolean>(true) // 判断设备属性标识符为modBus时没有填写扩展描述
-const isShowModBUS = ref<boolean>(false) // 用于判断标识符类型是否时自定义还是modBUS
-const modBUSForm = ref<any>({})
-const formField = ref('') // 存一个表单取值的field
-const isCommandWay = ref<undefined | string>('') // 存取命令下发方式的值
-const deviceTitle = ref<string | undefined>()// 设备名称
+const getDefaultConfiguration = () => ({
+  modalVisible: false,
+  commandDeliveryWay: CommandDeliveryWayEnum.CUSTOM,
+  operationPasswordEnable: false,
+})
 
-const isPasswordInfo = ref<{ checked?: boolean; value?: string | number; label?: string }>({})// 是否需要操作密码才进行命令下发
+const configuration = reactive(getDefaultConfiguration())
 
-const serviceInfo = reactive<ServiceInfo>({
-  title: '',
-  serviceCommand: {},
-  inputData: [],
-  transportType: '',
-  callType: '',
-  code: '',
-  way: '', // 单向还是双向
-})
+const [registerModal, { setModalProps, closeModal }] = useModalInner()
 
-const [register, { getFieldsValue, validate, setFieldsValue, updateSchema, setProps }] = useForm({ // 自定义下发值
-  schemas: formSchemas,
+// 操作密码
+const [registerPassword, operationPasswordFormAction] = useForm({
   showActionButtonGroup: false,
   layout: FormLayoutEnum.VERTICAL,
   labelWidth: 110,
 })
 
-const [registerPassword, { getFieldsValue: getPasswordValue, validate: validatePassword }] = useForm({ // 操作密码
-  schemas: [{
-    field: 'password',
-    label: '操作密码',
-    component: ComponentEnum.INPUT_PAWSSWORD,
-    required: true,
-    componentProps: {
-      placeholder: '请输入操作密码',
-      max: 120,
-    },
-  }],
+// 自定义下发值
+const [register, customCommandFormAction] = useForm({
+  schemas: formSchemas,
   showActionButtonGroup: false,
   layout: FormLayoutEnum.VERTICAL,
-  labelWidth: 110,
 })
 
-const getServiceInfo = async (deviceProfileId: string, service?: string, serviceCommand?: Recordable) => {
-  isInputData.value = true
-  const functionJson: any = await getThingsModelServices(deviceProfileId)
-  serviceInfo.inputData = functionJson.filter((item: any) => item.identifier === service)?.[0].functionJson.inputData
-  serviceInfo.title = functionJson[0].functionName
-  serviceInfo.serviceCommand = serviceCommand
+function handleHasOperationPassword(operationPasswordInfo: OperationPasswordDataType) {
+  configuration.operationPasswordEnable = true
+  nextTick(() => {
+    operationPasswordFormAction.setProps({
+      schemas: getOperationPasswordSchemas(operationPasswordInfo),
+    })
+  })
 }
 
-// 获取设备信息
-const getDeviceDetail = async (deviceId: string) => {
-  return await getDeviceInfo(deviceId)
+function handleOpenCustomCommandModal(deviceInfo: DeviceItemType, eventBindData: SingleClickEventDataType) {
+  const { transportType } = deviceInfo
+
+  const { setProps, setFieldsValue } = customCommandFormAction
+  if (transportType === TransportTypeEnum.TCP)
+    setProps({ schemas: getTcpCustomCommandSchemas() })
+  else
+    setProps({ schemas: getJSONCommandSchemas() })
+
+  setFieldsValue({ [FormFieldsEnum.CUSTOM_COMMAND]: eventBindData.customCommand })
 }
 
-const open = async (_data: SingleClickEventDataType) => {
-  const { operationPassword } = _data || {}
-  dataSourceJson.value = _data.deviceInfo
-  isPasswordInfo.value = operationPassword || {}
-  // commandWay-->命令下发方式
-  const { commandWay, customCommand, serviceCommand, service, callType, way } = _data || {}
-  isCommandWay.value = commandWay
-  const { attrInfo, deviceId } = unref(dataSourceJson)
-  const { identifier, extensionDesc, detail, name } = attrInfo || {}// 属性信息
-  const { dataType } = detail || {}
-  const { type } = dataType || {}
-
-  const { code, transportType, deviceProfileId, alias, name: deviceName } = await getDeviceDetail(deviceId) || {}// 设备信息
-  deviceTitle.value = alias || deviceName// 产品名称
-  const { registerAddress, actionType, zoomFactor } = extensionDesc || {} // 获取扩展描述内容
-
-  const schemas = [{ dataType, identifier, functionName: name } as StructJSON]
-
-  zoomFactorValue.value = zoomFactor ? Number(zoomFactor) : 1
-  isShowMultiply.value = !!(type === 'INT' || type === 'DOUBLE')
-  formField.value = identifier
-  isShowActionType.value = !!actionType // 判断modBUS类型时 物模型是否填写扩展描述
-  serviceInfo.callType = callType // 服务命令调用方式 是同步还是异步
-  serviceInfo.way = way || 'oneway' // 命令下发是双向还是单向
-
-  serviceInfo.transportType = transportType
-  serviceInfo.code = code
-
-  visible.value = true
-
-  if (transportType === TransportTypeEnum.TCP) {
-    if (commandWay === CommandDeliveryWayEnum.SERVICE) { // 判断命令下发方式是服务或者自定义调用 服务调用用封装的组件 自定义和modbus就用输入框
-      getServiceInfo(deviceProfileId, service, serviceCommand)
-    }
-    else if (commandWay === CommandDeliveryWayEnum.CUSTOM) { // 自定义
-      await nextTick()
-      updateSchema([
-        {
-          field: 'sendValue',
-          required: true,
-          label: '自定义下发值',
-          component: ComponentEnum.INPUT,
-        },
-      ])
-      setFieldsValue({ sendValue: customCommand })
-    }
-    else { // modBus调用
-      isShowModBUS.value = true
-      modBUSForm.value = {
-        crc: 'CRC_16_LOWER',
-        deviceCode: code,
-        method: actionType === '16' ? '10' : actionType,
-        registerAddress,
-        registerNumber: 1,
-        registerValues: [],
-      }
-      await nextTick()
-      setProps({ schemas: formSchemasConfig(schemas[0], actionType) })
-    }
-  }
-  else {
-    isShowModBUS.value = false
-
-    // 命令下发方式是服务或则自定义调用
-    if (commandWay === CommandDeliveryWayEnum.SERVICE) { getServiceInfo(deviceProfileId, service, serviceCommand) }
-
-    else if (commandWay === CommandDeliveryWayEnum.CUSTOM) {
-      await nextTick()
-      updateSchema([
-        {
-          field: 'sendValue',
-          component: ComponentEnum.JSON_EDITOR,
-          changeEvent: 'update:value',
-          label: '自定义下发值',
-          required: true,
-        },
-      ])
-      setFieldsValue({ sendValue: customCommand })
-    }
-  }
+function handleOpenServiceCommandModal(deviceInfo: DeviceItemType, eventBindData: SingleClickEventDataType) {
+  const { service, serviceCommand = {} } = eventBindData
+
+  const productsStore = useProductsStoreWithOut()
+
+  const tsl = productsStore.getObjectModelByIdWithIdentifier(deviceInfo.deviceProfileId, service!)
+  unref(thingsModelElRef)?.setProps({ inputData: tsl?.inputData, transportType: deviceInfo.transportType, title: tsl?.functionName })
+
+  nextTick(() => {
+    unref(thingsModelElRef)?.setFieldsValue(serviceCommand)
+  })
+}
+
+function handleOpenModbusCommandModal(objectModelTsl: Tsl) {
+  const { setProps } = customCommandFormAction
+  setProps({ schemas: [createModbusValueInput(objectModelTsl)] })
 }
 
-const error = () => {
-  // createMessage.error('下发指令失败')
-  return false
+const deviceInfo = ref<DeviceItemType>()
+const objectModelTsl = ref<Tsl>()
+const currentParams = ref<OpenParamsType>()
+const productsStore = useProductsStore()
+
+const open = async (params: OpenParamsType) => {
+  const { eventBindData, operationPasswordInfo, dataSource } = params
+  const { deviceId, deviceProfileId, attr } = dataSource
+  const { commandWay } = eventBindData
+  const { checked, value: operationPassword } = operationPasswordInfo || {}
+  configuration.commandDeliveryWay = commandWay!
+  currentParams.value = params
+  deviceInfo.value = await getDeviceInfo(deviceId)
+  objectModelTsl.value = productsStore.getObjectModelByIdWithIdentifier(deviceProfileId, attr as string)!
+  setModalProps({
+    open: true,
+    loading: true,
+  })
+
+  if (checked && operationPassword)
+    handleHasOperationPassword(operationPasswordInfo!)
+
+  await nextTick()
+
+  if (commandWay === CommandDeliveryWayEnum.CUSTOM)
+    handleOpenCustomCommandModal(toRaw(unref(deviceInfo)!), eventBindData)
+  else if (commandWay === CommandDeliveryWayEnum.SERVICE)
+    handleOpenServiceCommandModal(toRaw(unref(deviceInfo)!), eventBindData)
+  else if (commandWay === CommandDeliveryWayEnum.MODBUS)
+    handleOpenModbusCommandModal(toRaw(unref(objectModelTsl)!))
+
+  setModalProps({
+    loading: false,
+    title: `参数设置 / ${unref(deviceInfo)?.alias || unref(deviceInfo)?.name}`,
+  })
+}
+
+function handleGetCustomCommand() {
+  const res = customCommandFormAction.getFieldsValue()
+  const command = res[FormFieldsEnum.CUSTOM_COMMAND]
+  return unref(deviceInfo)?.transportType === TransportTypeEnum.TCP ? command : useJsonParse(command).value
+}
+
+function handleGetServiceCommand() {
+  const res = unref(thingsModelElRef)!.getFieldsValue()
+  return unref(deviceInfo)?.transportType === TransportTypeEnum.TCP ? res[FormFieldsEnum.SERVICE_COMMAND] : res
+}
+
+function handleGetModbusCommand() {
+  const res = customCommandFormAction.getFieldsValue()
+  const identifier = unref(objectModelTsl)!.identifier
+  return res[identifier]
 }
 
 const handleSubmit = async () => {
-  unref(isPasswordInfo)?.checked && await validatePassword()// 操作密码
-  !unref(isInputData) && await validate()
-  unref(isInputData) && await unref(thingsModelElRef).validate()
-
-  if (unref(isPasswordInfo)?.checked) {
-    const { password } = getPasswordValue()
-    if (unref(isPasswordInfo)?.value !== password) {
-      createMessage.warning('操作密码不正确')
-      return
-    }
-  }
-  if (serviceInfo.callType === 'SYNC') { // 服务命令调用方式 是同步 需要调用设备是否在线才能下发
-    const res = await getDeviceActiveTime(dataSourceJson.value.deviceId)
-    const { value } = res?.[0] || {}
-    if (!value) {
-      createMessage.error('当前设备不在线')
-      return
-    }
+  if (configuration.operationPasswordEnable) await operationPasswordFormAction.validate()
+  configuration.commandDeliveryWay === CommandDeliveryWayEnum.SERVICE ? await unref(thingsModelElRef)?.validate() : await customCommandFormAction.validate()
+
+  const res
+    = configuration.commandDeliveryWay === CommandDeliveryWayEnum.CUSTOM
+      ? handleGetCustomCommand()
+      : configuration.commandDeliveryWay === CommandDeliveryWayEnum.MODBUS
+        ? handleGetModbusCommand()
+        : handleGetServiceCommand()
+
+  const { doCommandDelivery } = useCommandDelivery()
+
+  const { eventBindData, dataSource } = unref(currentParams)!
+  const { deviceProfileId } = dataSource
+  const { commandWay, way } = eventBindData
+
+  const params: DoCommandDeliverParamsType = {
+    value: res,
+    deviceDetail: unref(deviceInfo),
+    objectModel: unref(objectModelTsl),
+    way,
   }
 
-  const sendValue = ref({})
-  try {
-    loading.value = true
-    if (unref(isShowModBUS)) {
-      if (!unref(isShowActionType)) {
-        createMessage.warning('当前物模型扩展描述没有填写')
-        return
-      }
-
-      if (!serviceInfo.code) {
-        createMessage.error('当前缺少设备地址码')
-        return
-      }
-      const oldValue = getFieldsValue()[unref(formField)]
-      modBUSForm.value.registerNumber = 1
-      modBUSForm.value.registerValues = [oldValue]
-
-      if (unref(isShowMultiply) && unref(modBUSForm).method === '06') {
-        const newValue
-          = Math.trunc(oldValue) * unref(zoomFactorValue)
-          + getFloatPart(oldValue) * unref(zoomFactorValue)
-        if (newValue % 1 !== 0) {
-          createMessage.warning(`属性下发类型必须是整数,缩放因子为${unref(zoomFactorValue)}`)
-          return
-        }
-
-        if (oldValue * unref(zoomFactorValue) > 65535) {
-          createMessage.warning(`属性下发值不能超过65535,缩放因子是${unref(zoomFactorValue)}`)
-          return
-        }
-        // bool类型的就不用去乘缩放因子了
-        modBUSForm.value.registerValues = [newValue]
-      }
-
-      if (unref(modBUSForm).method === '16' || unref(modBUSForm).method === '10') {
-        const regex = /^-?\d+(\.\d{0,2})?$/
-        const values
-          = Math.trunc(oldValue) * unref(zoomFactorValue)
-          + getFloatPart(oldValue) * unref(zoomFactorValue)
-
-        if (!regex.test(values as any)) {
-          createMessage.warning(`属性下发值精确到两位小数,缩放因子是${unref(zoomFactorValue)}`)
-          return
-        }
-
-        const newValue
-          = values === 0 ? [0, 0] : getArray(SingleToHex(unref(isShowMultiply) ? values : oldValue))
-        modBUSForm.value.registerValues = newValue
-        modBUSForm.value.registerNumber = 2
-        modBUSForm.value.method = '10'
-      }
-      sendValue.value = await genModbusCommand(unref(modBUSForm))
-    }
-    else {
-      if (unref(isInputData)) {
-        const values = serviceInfo.transportType === TransportTypeEnum.TCP ? Object.values(unref(thingsModelElRef)?.getFieldsValue()).join('').replace(/\s/g, '') : unref(thingsModelElRef)?.getFieldsValue()
-        sendValue.value = values
-      }
-      else {
-        const values = serviceInfo.transportType === TransportTypeEnum.TCP ? getFieldsValue().sendValue : JSON.parse(getFieldsValue().sendValue) || {}
-        sendValue.value = values
-      }
-    }
-    await sendRpcOneway({
-      additionalInfo: {
-        cmdType:
-          unref(isCommandWay) === CommandDeliveryWayEnum.SERVICE
-            ? CommandTypeEnum.SERVICE
-            : CommandTypeEnum.API,
-      },
-      persistent: true,
-      method: 'methodThingskit',
-      params: serviceInfo.transportType !== TransportTypeEnum.TCP && unref(isCommandWay) === CommandDeliveryWayEnum.SERVICE ? { service: unref(sendValue) } : unref(sendValue),
-    }, dataSourceJson.value.deviceId, serviceInfo.callType ? serviceInfo.callType === 'SYNC' ? 'twoway' : 'oneway' : serviceInfo.way)
-    createMessage.success('命令下发成功')
-    visible.value = false
-    isInputData.value = false
-  }
-  catch (msg) {
-    console.error(msg)
-    return error()
+  if (commandWay === CommandDeliveryWayEnum.CUSTOM) {
+    params.penetration = true
   }
-  finally {
-    loading.value = false
+  else if (commandWay === CommandDeliveryWayEnum.SERVICE) {
+    const { service } = eventBindData
+    params.objectModel = productsStore.getObjectModelByIdWithIdentifier(deviceProfileId, service!)!
+    params.value = unref(deviceInfo)?.transportType === TransportTypeEnum.TCP ? params.value : { [params.objectModel.identifier]: params.value }
   }
+
+  await doCommandDelivery(params)
+  const { createMessage } = useMessage()
+  createMessage.success('命令下发成功')
+  closeModal()
 }
 
 const handleCancel = () => {
-  visible.value = false
-  isInputData.value = false
+  closeModal()
+  Object.assign(configuration, getDefaultConfiguration())
 }
 
 defineExpose({
@@ -295,28 +193,15 @@ defineExpose({
 </script>
 
 <template>
-  <BasicModal
-    v-model:open="visible" :title="`参数设置-${deviceTitle}`" :destroy-on-close="true" :confirm-loading="loading"
-    :ok-button-props="{ type: 'primary' }" @ok="handleSubmit" @cancel="handleCancel"
-  >
-    <BasicForm v-if="isPasswordInfo?.checked" @register="registerPassword" />
-    <BasicForm v-if="!isInputData" @register="register" />
-    <ThingsModelForm
-      v-else ref="thingsModelElRef" v-model:value="serviceInfo.serviceCommand" :title="serviceInfo.title"
-      :input-data="serviceInfo.inputData || []" :transport-type="serviceInfo.transportType"
-    />
+  <BasicModal :destroy-on-close="true" @register="registerModal" @ok="handleSubmit" @cancel="handleCancel">
+    <BasicForm v-if="configuration.operationPasswordEnable" @register="registerPassword" />
+    <BasicForm v-if="configuration.commandDeliveryWay !== CommandDeliveryWayEnum.SERVICE" @register="register" />
+    <ThingsModelForm v-if="configuration.commandDeliveryWay === CommandDeliveryWayEnum.SERVICE" ref="thingsModelElRef" />
     <template #footer>
-      <Button
-        style="background-color: #ffffff;
-        border-color: #d9d9d9;
-        box-shadow: 0 2px 0 rgba(0, 0, 0, 0.02);" @click="handleCancel"
-      >
+      <Button @click="handleCancel">
         取消
       </Button>
-      <Button
-        type="primary" :loading="loading"
-        style="background: #1677ff !important; box-shadow: 0 2px 0 rgba(5, 145, 255, 0.1)" @click="handleSubmit"
-      >
+      <Button type="primary" @click="handleSubmit">
         确定
       </Button>
     </template>

+import { unref } from 'vue'
+import { DataTypeEnum, OriginalDataTypeEnum } from '@/enums/objectModelEnum'
+import type { FormSchema } from '@/components/Form'
+import type { DataType, DeviceItemType, Specs, StructJSON, Tsl } from '@/api/device/model'
+import { ComponentEnum } from '@/components/Form/src/enum'
+import { TCPProtocolTypeEnum } from '@/enums/deviceEnum'
+
+export interface BasicCreateFormParams {
+  identifier: string
+  functionName: string
+  dataType: DataType
+}
+
+const validateDouble = (value: number, min?: number | string, max?: number | string) => {
+  min = Number(min) ?? Number.MIN_SAFE_INTEGER
+  max = Number(max) ?? Number.MAX_SAFE_INTEGER
+
+  return {
+    flag: value < min || value > max,
+    message: `取值范围在${min}~${max}之间`,
+  }
+}
+
+export const useGenerateFormSchemasByObjectModel = () => {
+  const createInputNumber = ({
+    identifier,
+    functionName,
+    dataType,
+  }: BasicCreateFormParams): FormSchema => {
+    const { specs, type } = dataType
+    const { valueRange, step } = specs! as Partial<Specs>
+    const { max, min } = valueRange || {}
+    return {
+      field: identifier,
+      label: functionName,
+      component: 'InputNumber',
+      rules: [
+        {
+          type: 'number',
+          trigger: 'change',
+          validator: (_rule, value) => {
+            const { flag, message } = validateDouble(value, min, max)
+            if (flag)
+              return Promise.reject(Error(`${functionName}${message}`))
+
+            return Promise.resolve(value)
+          },
+        },
+      ],
+      componentProps: {
+        max: max ?? Number.MAX_SAFE_INTEGER,
+        min: min ?? Number.MIN_SAFE_INTEGER,
+        step,
+        placeholder: `请输入${functionName}`,
+        precision: type === DataTypeEnum.NUMBER_INT ? 0 : 2,
+      },
+    } as FormSchema
+  }
+
+  const createInput = ({
+    identifier,
+    functionName,
+    dataType,
+  }: BasicCreateFormParams): FormSchema => {
+    const { specs } = dataType
+    const { length = 10240 } = specs! as Partial<Specs>
+    return {
+      field: identifier,
+      label: functionName,
+      component: 'Input',
+      rules: [
+        {
+          type: 'string',
+          trigger: 'change',
+          validator: (_rule, value) => {
+            if (value?.length > length)
+              return Promise.reject(Error(`${functionName}数据长度应该小于${length}`))
+
+            return Promise.resolve(value)
+          },
+        },
+      ],
+      componentProps: {
+        maxLength: length,
+        placeholder: `请输入${functionName}`,
+      },
+    } as FormSchema
+  }
+
+  const createSelect = ({
+    identifier,
+    functionName,
+    dataType,
+  }: BasicCreateFormParams): FormSchema => {
+    const { specs } = dataType
+    const { boolClose, boolOpen } = specs! as Partial<Specs>
+    return {
+      field: identifier,
+      label: functionName,
+      component: ComponentEnum.SELECT,
+      componentProps: {
+        options: [
+          { label: `${boolClose}-0`, value: 0 },
+          { label: `${boolOpen}-1`, value: 1 },
+        ],
+        placeholder: `请选择${functionName}`,
+        getPopupContainer: () => document.body,
+      },
+    }
+  }
+
+  const createEnumSelect = ({
+    identifier,
+    functionName,
+    dataType,
+  }: BasicCreateFormParams): FormSchema => {
+    const { specsList } = dataType
+    return {
+      field: identifier,
+      label: functionName,
+      component: ComponentEnum.SELECT,
+      componentProps: {
+        options: specsList?.map(item => ({ label: item.name, value: item.value })),
+        placeholder: `请选择${functionName}`,
+        getPopupContainer: () => document.body,
+      },
+    }
+  }
+
+  const createModbusValueInput = (objectModel: Tsl): FormSchema => {
+    const { identifier, functionName, extensionDesc } = objectModel
+
+    const { dataType } = objectModel.specs || {}
+    const { specs } = dataType || {}
+    const { valueRange } = specs as Specs
+    const { max, min } = valueRange || {}
+
+    const isStringType = extensionDesc?.originalDataType === OriginalDataTypeEnum.STRING
+    return {
+      field: identifier,
+      label: functionName,
+      component: isStringType ? ComponentEnum.INPUT : ComponentEnum.INPUT_NUMBER,
+      rules: isStringType
+        ? []
+        : [
+            {
+              type: 'number',
+              validator: (_rule, value) => {
+                const { flag, message } = validateDouble(value, min, max)
+                if (flag)
+                  return Promise.reject(Error(`${functionName}${message}`))
+
+                return Promise.resolve(value)
+              },
+            },
+          ],
+      componentProps: {
+        max: max ?? Number.MAX_SAFE_INTEGER,
+        min: min ?? Number.MIN_SAFE_INTEGER,
+        placeholder: `请输入${functionName}`,
+        precision: 0,
+      },
+    }
+  }
+
+  const schemaMethod: Partial<Record<DataTypeEnum, (...args: any[]) => FormSchema>> = {
+    [DataTypeEnum.BOOL]: createSelect,
+    [DataTypeEnum.NUMBER_DOUBLE]: createInputNumber,
+    [DataTypeEnum.NUMBER_INT]: createInputNumber,
+    [DataTypeEnum.STRING]: createInput,
+    [DataTypeEnum.ENUM]: createEnumSelect,
+  }
+
+  const getFormByObjectModel = (
+    objectModel: Tsl,
+    deviceDetail: DeviceItemType,
+  ): FormSchema[] => {
+    const { functionName, identifier, specs } = objectModel
+
+    const isTCPModbusProduct
+      = unref(deviceDetail).deviceProfile?.profileData?.transportConfiguration?.protocol
+      === TCPProtocolTypeEnum.MODBUS_RTU
+
+    const { dataType } = specs
+    const { type } = dataType || {}
+
+    if (isTCPModbusProduct)
+      return [createModbusValueInput(objectModel)]
+
+    if (type === DataTypeEnum.STRUCT) {
+      return (dataType?.specs as StructJSON[]).map((item) => {
+        const { functionName, identifier, dataType } = item
+        const { type } = dataType || {}
+
+        return schemaMethod[type!]?.({ identifier, functionName, dataType })
+      }) as FormSchema[]
+    }
+
+    const result = schemaMethod[type!]?.({ identifier, functionName, dataType: dataType! })
+    return result ? [result] : []
+  }
+
+  return { getFormByObjectModel }
+}

-import { SingleToHex, getArray } from './config'
-import { type GenModbusCommandType, genModbusCommand } from '@/api/device'
-import type { ExtensionDesc } from '@/api/device/model'
-import { TCPObjectModelActionTypeEnum } from '@/enums/objectModelEnum'
-import { useMessage } from '@/hooks/web/useMessage'
-
-const getFloatPart = (number: string | number) => {
-  const isLessZero = Number(number) < 0
-  number = number.toString()
-  const floatPartStartIndex = number.indexOf('.')
-  const value = ~floatPartStartIndex
-    ? `${isLessZero ? '-' : ''}0.${number.substring(floatPartStartIndex + 1)}`
-    : '0'
-  return Number(value)
-}
-
-const REGISTER_MAX_VALUE = Number(0xffff)
-
-export function useGetModbusCommand() {
-  const { createMessage } = useMessage()
-
-  const getModbusCommand = async (value: number, extensionDesc: ExtensionDesc, deviceAddressCode: string) => {
-    const { registerAddress, actionType, zoomFactor } = extensionDesc as Required<ExtensionDesc>
-    const params: GenModbusCommandType = {
-      crc: 'CRC_16_LOWER',
-      registerNumber: 1,
-      deviceCode: deviceAddressCode,
-      registerAddress,
-      method: actionType,
-      registerValues: [value],
-    }
-
-    if (actionType === TCPObjectModelActionTypeEnum.INT) {
-      const newValue
-        = Math.trunc(value) * zoomFactor
-        + getFloatPart(value) * zoomFactor
-
-      if (newValue % 1 !== 0) {
-        createMessage.warning(`属性下发类型必须是整数,缩放因子为${zoomFactor}`)
-        return
-      }
-
-      if (value * zoomFactor > REGISTER_MAX_VALUE) {
-        createMessage.warning(`属性下发值不能超过${REGISTER_MAX_VALUE},缩放因子是${zoomFactor}`)
-        return
-      }
-
-      params.registerValues = [newValue]
-    }
-    else if (actionType === TCPObjectModelActionTypeEnum.DOUBLE) {
-      const regex = /^-?\d+(\.\d{0,2})?$/
-      const values
-        = Math.trunc(value) * zoomFactor
-        + getFloatPart(value) * zoomFactor
-
-      if (!regex.test(values.toString())) {
-        createMessage.warning(`属性下发值精确到两位小数,缩放因子是${zoomFactor}`)
-        return
-      }
-
-      const newValue
-        = values === 0 ? [0, 0] : getArray(SingleToHex(values))
-      params.registerValues = newValue
-      params.registerNumber = 2
-      params.method = '10'
-    }
-
-    return await genModbusCommand(params)
-  }
-
-  /**
-   *
-   * @param extensionDesc 物模型拓展描述符
-   * @param deviceAddressCode 设备地址码
-   */
-  const validateCanGetCommand = (extensionDesc?: ExtensionDesc, deviceAddressCode?: string, createValidateMessage = true) => {
-    const result = { flag: true, message: '' }
-    if (!extensionDesc) {
-      result.flag = false
-      result.message = '当前物模型扩展描述没有填写'
-    }
-
-    if (!deviceAddressCode) {
-      result.flag = false
-      result.message = '当前设备未绑定设备地址码'
-    }
-
-    if (result.message && createValidateMessage)
-      createMessage.warning(result.message)
-
-    return result
-  }
-
-  return {
-    getModbusCommand,
-    validateCanGetCommand,
-  }
-}

@@ -6,7 +6,7 @@ import { JSONEditor } from '@/components/CodeEditor/src/JSONEditor'
 import { BasicModal, useModalInner } from '@/components/Modal'
 import { useMessage } from '@/hooks/web/useMessage'
 import { useJsonParse } from '@/hooks/business/useJSONParse'
-import { TransportTypeEnum } from '@/enums/datasource'
+import { TransportTypeEnum } from '@/enums/deviceEnum'
 
 const emit = defineEmits(['register', 'editComplete'])
 

@@ -2,8 +2,9 @@ import type { FormSchema } from '@/components/Form'
 import { ComponentEnum } from '@/components/Form/src/enum'
 import type { BasicColumn } from '@/components/Table'
 import type { CommandWayEnum } from '@/enums/commandEnum'
-import type { CodeTypeEnum, ContentDataFieldsEnum, DeviceTypeEnum, TransportTypeEnum } from '@/enums/datasource'
+import type { ContentDataFieldsEnum } from '@/enums/datasource'
 import { EventActionTypeEnum, EventActionTypeNameEnum, EventTypeEnum, EventTypeNameEnum } from '@/enums/datasource'
+import type { DeviceTypeEnum, TCPProtocolTypeEnum } from '@/enums/deviceEnum'
 
 export enum TableColumnFieldEnum {
   DEVICE_ID = 'deviceId',
@@ -18,9 +19,8 @@ export interface TableRecordItemType {
   [TableColumnFieldEnum.WAY]?: Nullable<CommandWayEnum>
   [TableColumnFieldEnum.COMMAND]?: Nullable<string | Recordable>
   [ContentDataFieldsEnum.DEVICE_TYPE]?: Nullable<DeviceTypeEnum>
-  [ContentDataFieldsEnum.CODE_TYPE]?: Nullable<CodeTypeEnum>
+  [ContentDataFieldsEnum.CODE_TYPE]?: Nullable<TCPProtocolTypeEnum>
   [ContentDataFieldsEnum.DEVICE_PROFILE_ID]: Nullable<string>
-  [ContentDataFieldsEnum.TRANSPORT_TYPE]?: Nullable<TransportTypeEnum>
 }
 
 export const getFormSchemas = (event: EventTypeEnum): FormSchema[] => {

@@ -4,11 +4,14 @@ import { usePublicFormContext } from '../../../usePublicFormContext'
 import { getThingsModelServices } from '@/api/device'
 import { type FormSchema } from '@/components/Form'
 import { ComponentEnum } from '@/components/Form/src/enum'
-import { CommandWayEnum, CommandWayNameEnum } from '@/enums/commandEnum'
-import { CommandDeliveryWayEnum, CommandDeliveryWayNameEnum, DeviceTypeEnum, EventActionTypeEnum, EventActionTypeNameEnum, EventTypeEnum, EventTypeNameEnum, TransportTypeEnum } from '@/enums/datasource'
+import { CommandDeliveryWayEnum, CommandDeliveryWayNameEnum, CommandWayEnum, CommandWayNameEnum } from '@/enums/commandEnum'
+import { EventActionTypeEnum, EventActionTypeNameEnum, EventTypeEnum, EventTypeNameEnum } from '@/enums/datasource'
 import type { ThingsModel } from '@/api/device/model'
 import { PackageCategoryEnum } from '@/core/Library/enum'
-import { useContentDataStoreWithOut } from '@/store/modules/contentData'
+import { validateTCPCustomCommand } from '@/core/Library/components/ThingsModelForm'
+import { JSONEditorValidator } from '@/components/CodeEditor/src/JSONEditor'
+import { DeviceTypeEnum, TCPProtocolTypeEnum, TransportTypeEnum } from '@/enums/deviceEnum'
+import { useProductsStoreWithOut } from '@/store/modules/products'
 
 export enum FormFieldsEnum {
   ACTION_TYPE = 'actionType',
@@ -33,17 +36,14 @@ export enum FormFieldsNameEnum {
   SERVICE = '服务',
 }
 
-const contentDataStore = useContentDataStoreWithOut()
-
 export const getFormSchemas = (event: EventTypeEnum): FormSchema[] => {
-  const { getNodeData, getCellInfo } = usePublicFormContext()
+  const { getNodeData, getCellInfo, getDeviceInfo } = usePublicFormContext()
   const { dataSourceJson } = unref(getNodeData) || {}
-  const { deviceProfileId, deviceInfo, deviceId } = dataSourceJson || {}
-  // transportType:判断是什么类型的设备 code:设备地址码  deviceType:设备类型
-  let codeType: string | null = ''
-  const { transportType, deviceType, codeType: deviceCodeType } = deviceInfo || {}
-  codeType = deviceCodeType || (deviceId ? contentDataStore.diveceDetailMap?.[deviceId]?.codeType : null)
-  const isTemplate = contentDataStore.isTemplate // 判断是否是模板
+  const { deviceProfileId } = dataSourceJson || {}
+  const productsStore = useProductsStoreWithOut()
+  const detail = productsStore.getProductDetailById(deviceProfileId!)
+  const { transportType } = unref(getDeviceInfo) || detail || {}
+
   return [
     {
       field: 'eventName',
@@ -68,7 +68,6 @@ export const getFormSchemas = (event: EventTypeEnum): FormSchema[] => {
         const options: DefaultOptionType[] = [
           { label: EventActionTypeNameEnum.OPEN_LINK, value: EventActionTypeEnum.OPEN_LINK },
           { label: EventActionTypeNameEnum.OPEN_PAGE, value: EventActionTypeEnum.OPEN_PAGE },
-
         ]
 
         if (unref(getCellInfo).category.toUpperCase() === PackageCategoryEnum.CONTROL)
@@ -93,7 +92,6 @@ export const getFormSchemas = (event: EventTypeEnum): FormSchema[] => {
       field: FormFieldsEnum.OPEN_LINK,
       label: '链接',
       component: ComponentEnum.INPUT,
-      // dynamicDisabled: () => !deviceProfileId,
       required: true,
       ifShow: ({ model }) => model[FormFieldsEnum.ACTION_TYPE] === EventActionTypeEnum.OPEN_LINK,
     },
@@ -115,39 +113,30 @@ export const getFormSchemas = (event: EventTypeEnum): FormSchema[] => {
       component: ComponentEnum.SELECT,
       required: true,
       ifShow: ({ model }) => model[FormFieldsEnum.ACTION_TYPE] === EventActionTypeEnum.PARAMS_SETTING,
+      defaultValue: CommandDeliveryWayEnum.CUSTOM,
       componentProps: ({ formActionType }) => {
         function getOptions() {
           const options = [
             { label: CommandDeliveryWayNameEnum.CUSTOM, value: CommandDeliveryWayEnum.CUSTOM },
           ]
 
-          const serviceOption = { label: CommandDeliveryWayNameEnum.SERVICE, value: CommandDeliveryWayEnum.SERVICE }
-          const modbusOption = { label: CommandDeliveryWayNameEnum.MODBUS, value: CommandDeliveryWayEnum.MODBUS }
-
-          function setOptions() {
-            // 是模板的话选择不到设备标识符类型所以就判断为放开自定义命令
-            if (isTemplate) {
-              if (transportType !== TransportTypeEnum.TCP)
-                options.push(serviceOption)
-              return
-            }
-
-            if (transportType !== TransportTypeEnum.TCP && deviceType === DeviceTypeEnum.SENSOR) {
-              // 判断不是TCP但是是网关子
-              options.push(serviceOption)
-              return
-            }
+          const isTCPDevice = unref(getDeviceInfo)?.transportType === TransportTypeEnum.TCP
+          const isTCPModbusDevice = isTCPDevice && unref(getDeviceInfo)?.deviceProfile?.profileData?.transportConfiguration?.protocol === TCPProtocolTypeEnum.MODBUS_RTU
 
-            if (deviceType !== DeviceTypeEnum.SENSOR)
-              options.push(serviceOption)
+          // TCP 自定义设备 自定义
+          if (isTCPDevice && !isTCPModbusDevice && unref(getDeviceInfo)?.deviceType === DeviceTypeEnum.SENSOR)
+            return options
 
-            if (transportType !== TransportTypeEnum.TCP) return
-
-            if (codeType !== CommandDeliveryWayEnum.CUSTOM)
-              options.push(modbusOption)
+          // TCP Modbus设备 自定义&Modbus
+          if (isTCPModbusDevice) {
+            const modbusOption = { label: CommandDeliveryWayNameEnum.MODBUS, value: CommandDeliveryWayEnum.MODBUS }
+            options.push(modbusOption)
+            return options
           }
 
-          setOptions()
+          // 其他 自定义&服务
+          options.push({ label: CommandDeliveryWayNameEnum.SERVICE, value: CommandDeliveryWayEnum.SERVICE })
+
           return options
         }
 
@@ -187,20 +176,16 @@ export const getFormSchemas = (event: EventTypeEnum): FormSchema[] => {
       component: ComponentEnum.JSON_EDITOR,
       changeEvent: 'update:value',
       required: true,
+      rules: JSONEditorValidator(),
       ifShow: ({ model }) => transportType !== TransportTypeEnum.TCP && model[FormFieldsEnum.ACTION_TYPE] === EventActionTypeEnum.PARAMS_SETTING && model[FormFieldsEnum.COMMAND_WAY] === CommandDeliveryWayEnum.CUSTOM,
-      componentProps: () => {
-        return {}
-      },
     },
     {
       field: FormFieldsEnum.CUSTOM_COMMAND,
       label: FormFieldsNameEnum.COMMAND,
       component: ComponentEnum.INPUT,
       required: true,
+      rules: [{ validator: validateTCPCustomCommand }],
       ifShow: ({ model }) => transportType === TransportTypeEnum.TCP && model[FormFieldsEnum.ACTION_TYPE] === EventActionTypeEnum.PARAMS_SETTING && model[FormFieldsEnum.COMMAND_WAY] === CommandDeliveryWayEnum.CUSTOM,
-      componentProps: () => {
-        return {}
-      },
     },
     {
       field: FormFieldsEnum.SERVICE,
@@ -224,7 +209,6 @@ export const getFormSchemas = (event: EventTypeEnum): FormSchema[] => {
             const service = formModel[FormFieldsEnum.SERVICE]
             if (service) {
               const thingsModel = unref(options).find(item => item.identifier === service) || null
-              // if (thingsModel)
               formModel[FormFieldsEnum.THINGS_MODEL] = thingsModel
             }
           },
@@ -243,15 +227,8 @@ export const getFormSchemas = (event: EventTypeEnum): FormSchema[] => {
       component: ComponentEnum.THINGS_MODEL_FORM,
       ifShow: ({ model }) => model[FormFieldsEnum.THINGS_MODEL] && model[FormFieldsEnum.COMMAND_WAY] === CommandDeliveryWayEnum.SERVICE,
       changeEvent: 'update:value',
-      colSlot: 'serviceCommand',
+      slot: 'serviceCommand',
     },
-    // {
-    //   field: 'deviceInfo',
-    //   label: '设备属性数据',
-    //   component: ComponentEnum.INPUT,
-    //   defaultValue: dataSourceJson,
-    //   ifShow: false,
-    // },
     {
       field: 'transportType',
       label: '',

-import { toRaw, unref } from 'vue'
+import { unref } from 'vue'
 import { getDeviceAttributes, getListByConfigurationId, getListByDeviceProfileIds } from '@/api/device'
 import type { DeviceItemType, ThingsModelItemType } from '@/api/device/model'
 import type { FormSchema } from '@/components/Form'
 import { ComponentEnum } from '@/components/Form/src/enum'
-import { ContentDataFieldsEnum, ContentDataFieldsNameEnum, DataTypeEnum } from '@/enums/datasource'
+import { ContentDataFieldsEnum, ContentDataFieldsNameEnum } from '@/enums/datasource'
 import { useContentDataStoreWithOut } from '@/store/modules/contentData'
 import type { ProductAndDevice } from '@/api/content/model'
 import { ControlComponentEnum } from '@/core/Library/packages/Control'
 import { useParseParams } from '@/core/LoadData'
+import { DataTypeEnum } from '@/enums/objectModelEnum'
 
 const contentDataStore = useContentDataStoreWithOut()
 export const formSchemas = (componentKey?: string): FormSchema[] => {
@@ -32,9 +33,8 @@ export const formSchemas = (componentKey?: string): FormSchema[] => {
         return {
           options: (unref(contentDataStore.getProductAndDevice) || []).map((item: ProductAndDevice) => ({ label: item.profileName || item.name, value: item.profileId, transportType: item?.transportType, deviceType: item?.deviceType })),
           placeholder: '请选择产品',
-          onSelect(value: string, option: any) {
+          onSelect(value: string) {
             formModel[ContentDataFieldsEnum.DEVICE_PROFILE_ID] = value
-            formModel[ContentDataFieldsEnum.DEVICE_INFO] = value && option ? { transportType: option.transportType, deviceType: option.deviceType, codeType: option?.codeType, deviceName: null } : null
           },
           getPopupContainer: () => document.body,
         }
@@ -63,8 +63,8 @@ export const formSchemas = (componentKey?: string): FormSchema[] => {
           fieldNames: { label: 'name', value: 'tbDeviceId' },
           onSelect(value: string, option: DeviceItemType) {
             formModel[ContentDataFieldsEnum.DEVICE_PROFILE_ID] = value ? option.deviceProfileId : null
-            formModel[ContentDataFieldsEnum.DEVICE_INFO] = value && option ? { code: option.code, transportType: option.transportType, deviceType: option.deviceType, deviceProfileId: option.deviceProfileId, deviceName: option.alias || option.name || null, codeType: option?.codeType } : null
             formModel[ContentDataFieldsEnum.ATTR] = null
+            formModel[ContentDataFieldsEnum.DEVICE_NAME] = value ? option.alias || option.name : ''
           },
           filterOption: (inputValue: string, option: DeviceItemType) => {
             return option.alias?.includes?.(inputValue) || option.name?.includes?.(inputValue)
@@ -73,6 +73,12 @@ export const formSchemas = (componentKey?: string): FormSchema[] => {
       },
     },
     {
+      field: ContentDataFieldsEnum.DEVICE_NAME,
+      label: ContentDataFieldsNameEnum.deviceName,
+      component: ComponentEnum.INPUT,
+      ifShow: false,
+    },
+    {
       field: ContentDataFieldsEnum.ATTR,
       label: ContentDataFieldsNameEnum.ATTR,
       component: ComponentEnum.API_SELECT,
@@ -83,36 +89,22 @@ export const formSchemas = (componentKey?: string): FormSchema[] => {
           showSearch: true,
           api: async (params: string) => {
             if (!deviceProfileId) return []
-            const options = await getDeviceAttributes(params)
+            let options = await getDeviceAttributes(params)
             if (componentKey === ControlComponentEnum.SWITCH) { // 开关只返回bool
-              return options.filter((item) => {
+              options = options.filter((item) => {
                 return item.detail.dataType.type === DataTypeEnum.BOOL
               })
             }
+
             return options
           },
           params: deviceProfileId,
           fieldNames: { label: 'name', value: 'identifier' },
-          onSelect(value: string, option: ThingsModelItemType) {
-            formModel[ContentDataFieldsEnum.ATTR_INFO] = value && option ? toRaw(unref(option)) : null
-          },
           filterOption: (inputValue: string, option: ThingsModelItemType) => {
             return option.name.includes(inputValue)
           },
         }
       },
     },
-    {
-      field: ContentDataFieldsEnum.ATTR_INFO,
-      label: ContentDataFieldsNameEnum.ATTR_INFO,
-      component: ComponentEnum.INPUT,
-      ifShow: false,
-    },
-    {
-      field: ContentDataFieldsEnum.DEVICE_INFO,
-      label: ContentDataFieldsNameEnum.DEVICE_INFO,
-      component: ComponentEnum.INPUT,
-      ifShow: false,
-    },
   ]
 }

@@ -12,5 +12,4 @@ export interface ComponentExposeType {
   getFieldsValue: () => any
   setFieldsValue: (value: any) => void
   validate: () => Promise<RuleError | any>
-  updateSchema?: any
 }

@@ -58,7 +58,7 @@ const getEventJson = (): NodeDataEventJsonType => {
 
   Object.keys(status).forEach((key) => {
     if (eventJson[key as EventTypeEnum])
-      eventJson[key as EventTypeEnum].enable = status[key as EventTypeEnum]
+      eventJson[key as EventTypeEnum]!.enable = status[key as EventTypeEnum]
   })
 
   return eventJson
@@ -111,7 +111,7 @@ const handleSave = async () => {
     if (operationPassword.checked)
       await validatePassword()
     if (contentDataStore.getIsTemplate)// 判断组态是不是模板
-      dataSourceJson = { ...value, deviceProfileId: value?.deviceProfileTemplateId, deviceId: null }
+      dataSourceJson = { ...value, deviceProfileId: value?.deviceProfileTemplateId, deviceId: null, deviceName: null }
     await saveNodeAllData({ dataSourceJson, eventJson: { ...eventJson, OPERATION_PASSWORD: unref(getCellInfo).category === PackageCategoryEnum.CONTROL ? operationPassword : undefined }, actJson })
     createMessage.success('操作成功')
     savePageContent()
@@ -190,7 +190,7 @@ createPublicFormContext(nodeDataActinType)
           </div>
         </Checkbox>
         <Form>
-          <FormItem :validate-status="getValidateStatus(operationPassword.value)">
+          <FormItem :validate-status="getValidateStatus(operationPassword.value!)">
             <InputPassword
               v-model:value="operationPassword.value" class="mt-1" :disabled="!operationPassword.checked"
               placeholder="请输入操作密码"

+import { validateTCPCustomCommand } from '.'
 import type { Specs, StructJSON } from '@/api/device/model'
 import { type FormSchema } from '@/components/Form'
 import { ComponentEnum } from '@/components/Form/src/enum'
-import { DataTypeEnum } from '@/enums/datasource'
+import { TransportTypeEnum } from '@/enums/deviceEnum'
+import { DataTypeEnum } from '@/enums/objectModelEnum'
+
+export enum FormFieldsEnum {
+  SERVICE_COMMAND = 'serviceCommand',
+}
 
 export const getFormSchemas = ({ structJSON: structJson, required, transportType }: { structJSON: StructJSON[]; required?: boolean; transportType?: string }): FormSchema[] => {
   const createInputNumber = ({
@@ -120,10 +126,11 @@ export const getFormSchemas = ({ structJSON: structJson, required, transportType
 
   const createTCPServiceCommandInput = ({ serviceCommand }: StructJSON): FormSchema => {
     return {
-      field: 'serviceCommand',
+      field: FormFieldsEnum.SERVICE_COMMAND,
       label: '服务命令',
       component: ComponentEnum.INPUT,
       required,
+      rules: [{ validator: validateTCPCustomCommand }],
       componentProps: {
         defaultValue: serviceCommand,
       },
@@ -134,8 +141,12 @@ export const getFormSchemas = ({ structJSON: structJson, required, transportType
   for (const item of structJson) {
     const { dataType } = item
     const { type } = dataType || {}
-    if (transportType === 'TCP')
-      schemas.push(createTCPServiceCommandInput(item))
+
+    if (transportType === TransportTypeEnum.TCP) {
+      item.serviceCommand && schemas.push(createTCPServiceCommandInput(item))
+      break
+    }
+
     if (type === DataTypeEnum.BOOL)
       schemas.push(createSelect(item))
     else if (type === DataTypeEnum.ENUM)

 <script setup lang="ts">
 import { Card } from 'ant-design-vue'
-import { computed, nextTick, reactive, unref, watch } from 'vue'
-import type { ComponentExposeType } from '../PublicForm'
+import { computed, nextTick, reactive, ref, unref, watch } from 'vue'
 import { getFormSchemas } from './config'
 import { ThingsModelForm } from '.'
 import type { StructJSON } from '@/api/device/model'
 import { BasicForm, useForm } from '@/components/Form'
-import { DataTypeEnum } from '@/enums/datasource'
 import { FormLabelAlignEnum, FormLayoutEnum } from '@/components/Form/src/enum'
+import { deepMerge } from '@/utils'
+import { DataTypeEnum } from '@/enums/objectModelEnum'
 
-const props = withDefaults(defineProps<{
-  value: Recordable
+interface ThingsModelFormPropsType {
+  value?: Recordable
   inputData?: StructJSON[]
   required?: boolean
   title?: string
   transportType?: string
-}>(), {
+}
+
+const props = withDefaults(defineProps<ThingsModelFormPropsType>(), {
   inputData: () => [],
   required: true,
 })
 
+const propsRef = ref<Partial<ThingsModelFormPropsType>>({})
+
+const getProps = computed<ThingsModelFormPropsType>(() => ({ ...props, ...unref(propsRef) }))
+
 const thingsModelFormListElMap = reactive<Record<string, { el: InstanceType<typeof ThingsModelForm>; structJSON: StructJSON }>>({})
 
 const [register, formActionType] = useForm({
-  schemas: getFormSchemas({ structJSON: props.inputData || [], required: props.required, transportType: props.transportType }),
+  schemas: getFormSchemasByProps(),
   showActionButtonGroup: false,
+  name: Math.random().toString(16).substring(2),
   labelWidth: 100,
   labelAlign: FormLabelAlignEnum.RIGHT,
   layout: FormLayoutEnum.HORIZONTAL,
 })
 
 const getStructFormItem = computed(() => {
-  const { inputData } = props
-  return inputData.filter(item => item.dataType?.type === DataTypeEnum.STRUCT)
+  const { inputData } = unref(getProps)
+  return (inputData || []).filter(item => item.dataType?.type === DataTypeEnum.STRUCT)
 })
 
 const setFormElRef = (el: InstanceType<typeof ThingsModelForm>, structJSON: StructJSON) => {
@@ -68,11 +75,7 @@ const validate = async () => {
     await thingsModelFormListElMap[key].el.validate()
 }
 
-const updateSchema = (value: Recordable) => {
-  return formActionType.updateSchema(value)
-}
-
-watch(() => props.value,
+watch(() => unref(getProps).value,
   async (value) => {
     await nextTick()
     formActionType.setFieldsValue(value || {})
@@ -80,25 +83,31 @@ watch(() => props.value,
   { immediate: true },
 )
 
+function getFormSchemasByProps() {
+  return getFormSchemas({ structJSON: unref(getProps).inputData || [], required: unref(getProps).required, transportType: unref(getProps).transportType })
+}
+
 watch(
-  () => props.inputData,
+  () => unref(getProps).inputData,
   (value) => {
-    if (value && value.length) {
-      const schemas = getFormSchemas({ structJSON: props.inputData || [], required: props.required, transportType: props.transportType })
-      formActionType.setProps({ schemas })
-    }
+    if (value && value.length)
+      formActionType.setProps({ schemas: getFormSchemasByProps() })
   })
 
-defineExpose<ComponentExposeType>({
+function setProps(props: Partial<ThingsModelFormPropsType>) {
+  propsRef.value = deepMerge(unref(propsRef) || {}, props) as any
+}
+
+defineExpose({
   getFieldsValue,
   setFieldsValue,
   validate,
-  updateSchema,
+  setProps,
 })
 </script>
 
 <template>
-  <Card class="!border-2 !border-dashed" :title="title">
+  <Card class="!border-2 !border-dashed" :title="getProps.title">
     <BasicForm class="things-model-form" @register="register">
       <template v-for="item in getStructFormItem" #[item.identifier]="{ model, field }" :key="item.identifier">
         <ThingsModelForm

@@ -6,3 +6,10 @@ export function useLatestMessageValue(message: SubscriptionData, attr: string) {
   const [ts, latestValue = null] = lateset || []
   return { ts, latestValue }
 }
+
+export function useLatestMultipleMessageValue(message: SubscriptionData, attr: string[], Fn: (attribute: string, value: any, timespan: number) => void) {
+  attr.forEach((item) => {
+    const [ts = null, latestValue = null] = message[item][0] || []
+    Fn(item, ts, latestValue)
+  })
+}

@@ -7,6 +7,8 @@ import { CellAttributeKeyEnum } from '@/enums/cellAttributeEnum'
 import { useContentDataStoreWithOut } from '@/store/modules/contentData'
 import { useMessage } from '@/hooks/web/useMessage'
 import { MessageEnum } from '@/enums/messageEnum'
+import type { DeviceItemType } from '@/api/device/model'
+import { getDeviceInfo } from '@/api/device'
 
 interface UseNodeDataParamsType {
   cell: MxCell
@@ -35,9 +37,9 @@ export function useNodeData({ cell, immediate = true }: UseNodeDataParamsType) {
   const { createMessage } = useMessage()
 
   const nodeData = ref<NodeDataType>()
+  const deviceInfo = ref<DeviceItemType>()
 
   const contentDataStore = useContentDataStoreWithOut()
-  // const contentId = window.DrawApp.configurationContentId!
   const { configurationId } = useParseParams()
 
   const getCellID = () => {
@@ -64,9 +66,15 @@ export function useNodeData({ cell, immediate = true }: UseNodeDataParamsType) {
     }
   })
 
+  const getDeviceDetail = async () => {
+    if (!unref(nodeData)?.dataSourceJson?.deviceId) return
+    deviceInfo.value = await getDeviceInfo(unref(nodeData)!.dataSourceJson.deviceId)
+  }
+
   const getNodeAllData = async () => {
     const result = await doGetNodeBindData(basicNodeBindData(ActionType.GET))
     nodeData.value = result || getDefaultNodeData()
+    await getDeviceDetail()
     return result
   }
 
@@ -79,6 +87,8 @@ export function useNodeData({ cell, immediate = true }: UseNodeDataParamsType) {
     const result = await doSaveNodeAllData(Object.assign(data, basicNodeBindData(ActionType.SAVE)))
     removeCellSourceAttribute(cell)
     nodeData.value = result || getDefaultNodeData()
+
+    await getDeviceDetail()
     return result
   }
 
@@ -123,6 +133,7 @@ export function useNodeData({ cell, immediate = true }: UseNodeDataParamsType) {
   })
 
   return {
+    getDeviceInfo: computed(() => unref(deviceInfo)),
     getNodeData: computed(() => unref(nodeData)),
     getCellInfo,
     getNodeAllData,

-import { h, render, unref } from 'vue'
+import { h, render, toRaw, unref } from 'vue'
 import { ControlComponentEnum } from '../packages/Control'
-import { useGetModbusCommand } from '../components/PublicForm/components/DataEvents/CommandDeliveryModal/useGetModbusCommand'
-import { doCommandDelivery, getDeviceActive, getDeviceInfo } from '@/api/device'
+import { doCommandDelivery, getDeviceActive } from '@/api/device'
 import type { MouseUpEventDataType, NodeDataDataSourceJsonType, NodeDataEventJsonType, SingleClickEventDataType } from '@/api/node/model'
-import { CommandWayEnum } from '@/enums/commandEnum'
-import { ActRangListItemTypeEnum, CodeTypeEnum, EventActionTypeEnum, TransportTypeEnum } from '@/enums/datasource'
+import { CommandMethodEnum, CommandTypeEnum, CommandWayEnum } from '@/enums/commandEnum'
+import { ActRangListItemTypeEnum, EventActionTypeEnum } from '@/enums/datasource'
 import { useMessage } from '@/hooks/web/useMessage'
-import { AttributeDeliverModal, CommandDeliveryConfirmModal, CommandDeliveryModal, ConfirmModal } from '@/core/Library/components/PublicForm/components/DataEvents/CommandDeliveryModal'
+import { AttributeDeliverModal, CommandDeliveryModal, SwitchCommandDeliveryModal } from '@/core/Library/components/PublicForm/components/DataEvents/CommandDeliveryModal'
 import type { MxCell } from '@/fitCore/types'
 import { NodeUtils } from '@/hooks/business/useNodeUtils'
 import { useContentDataStoreWithOut } from '@/store/modules/contentData'
-import type { RpcCommandType } from '@/api/device/model'
 
 export function useNodeEvent(eventJson: NodeDataEventJsonType, dataSourceJson: NodeDataDataSourceJsonType, cell: MxCell) {
   const { createMessage } = useMessage()
 
+  /**
+   * @description 多命令下发
+   * @param data
+   * @returns
+   */
   const handlerCommandDelivery = async (data: MouseUpEventDataType) => {
     try {
       const promiseList: (() => Promise<any>)[] = []
@@ -34,8 +37,8 @@ export function useNodeEvent(eventJson: NodeDataEventJsonType, dataSourceJson: N
             way,
             deviceId,
             command: {
-              additionalInfo: { cmdType: 'API' },
-              method: 'methodThingskit',
+              additionalInfo: { cmdType: CommandTypeEnum.API },
+              method: CommandMethodEnum.THINGSKIT,
               params: command,
               persistent: true,
             },
@@ -51,11 +54,19 @@ export function useNodeEvent(eventJson: NodeDataEventJsonType, dataSourceJson: N
     }
   }
 
+  /**
+   * @description 打开链接
+   * @param data
+   */
   const handleOpenLink = (data: SingleClickEventDataType) => {
     const { openLink } = data
     window.open(openLink)
   }
 
+  /**
+   * @description 跳转页面
+   * @param data
+   */
   const handleSwitchPage = (data: SingleClickEventDataType) => {
     const { openPage } = data
     const pages = window.DrawApp.pages
@@ -64,75 +75,36 @@ export function useNodeEvent(eventJson: NodeDataEventJsonType, dataSourceJson: N
       window.DrawApp.selectPage(openPageFile)
   }
 
-  const handleParamsSetting = async (_data: SingleClickEventDataType) => {
-    const deviceInfo = dataSourceJson
-
+  const handleParamsSetting = async (data: SingleClickEventDataType) => {
     const instance = h(CommandDeliveryModal)
     render(instance, document.body);
-    (instance.component?.exposed as InstanceType<typeof CommandDeliveryModal>)?.open({ ..._data, deviceInfo, operationPassword: eventJson?.OPERATION_PASSWORD })
+    (instance.component?.exposed as InstanceType<typeof CommandDeliveryModal>)?.open({ dataSource: toRaw(unref(dataSourceJson)), eventBindData: data, operationPasswordInfo: eventJson.OPERATION_PASSWORD })
   }
 
   const handleAttributeDelivery = async (data: SingleClickEventDataType) => {
     try {
       const nodeUtils = new NodeUtils()
-      const { way = CommandWayEnum.ONE_WAY } = data
-      const { attr, deviceId, attrInfo } = dataSourceJson
-      const { transportType, alias, name: deviceName, code, codeType } = await getDeviceInfo(dataSourceJson.deviceId) || {}// 设备信息
-      const contentDataStore = useContentDataStoreWithOut()
-      const currentData = contentDataStore.contentData.find(item => item.id === cell.getId())
-      if (!currentData) return
-      const { actJson, eventJson } = currentData
-      const { value: operationPassword, checked: operationPasswordEnable } = eventJson.OPERATION_PASSWORD
+      const operationPasswordInfo = toRaw(unref(eventJson.OPERATION_PASSWORD))
 
-      const command: RpcCommandType = {
-        additionalInfo: { cmdType: 'API' },
-        method: 'methodThingskit',
-        params: {},
-        persistent: true,
-      }
       if (nodeUtils.getNodeComponentKey(cell) === ControlComponentEnum.SWITCH) {
+        const contentDataStore = useContentDataStoreWithOut()
+        const currentData = contentDataStore.contentData.find(item => item.id === cell.getId())
+        if (!currentData) return
+        const { actJson } = currentData
         const { rangeList } = actJson.STATUS_SETTING
         const status = cell.getAttribute('SWITCH_STATUS')
         const res = rangeList.find(item => item.type === (status === ActRangListItemTypeEnum.OPEN ? ActRangListItemTypeEnum.CLOSE : ActRangListItemTypeEnum.OPEN))
         if (!res) return
         const { statusValue } = res
 
-        command.params = transportType === TransportTypeEnum.TCP
-          ? statusValue!
-          : {
-              [attr]: statusValue,
-            }
-
-        if (operationPasswordEnable) {
-          const instance = h(CommandDeliveryConfirmModal)
-          render(instance, document.body)
-          await (instance.component?.exposed as InstanceType<typeof CommandDeliveryConfirmModal>)?.open(operationPassword!)
-        }
-        else {
-          const instance = h(ConfirmModal)
-          render(instance, document.body)
-          await (instance.component?.exposed as InstanceType<typeof ConfirmModal>)?.open()
-        }
-
-        if (transportType === TransportTypeEnum.TCP && codeType === CodeTypeEnum.MODBUS_RTU) {
-          const { validateCanGetCommand, getModbusCommand } = useGetModbusCommand()
-          if (!validateCanGetCommand(unref(dataSourceJson).attrInfo.extensionDesc, code).flag) return
-          const res = await getModbusCommand(statusValue!, unref(dataSourceJson).attrInfo.extensionDesc!, code)
-          if (!res) return
-          command.params = res
-        }
-
-        await doCommandDelivery({ way, command, deviceId })
-        createMessage.success('命令下发成功')
+        const instance = h(SwitchCommandDeliveryModal)
+        render(instance, document.body)
+        await (instance.component?.exposed as InstanceType<typeof SwitchCommandDeliveryModal>)?.open({ operationPasswordInfo, eventBindData: toRaw(unref(data)), dataSourceJson: toRaw(unref(dataSourceJson)), sendValue: statusValue }!)
       }
       else {
         const instance = h(AttributeDeliverModal)
-        render(instance, document.body)
-        const value = await (instance.component?.exposed as InstanceType<typeof AttributeDeliverModal>)?.open({ title: `${alias || deviceName}-${attrInfo.name}`, operationPassword, operationPasswordEnable, dataSourceJson }) as string
-        command.params = transportType === TransportTypeEnum.TCP ? value : { [attr]: value }
-        if (!command.params) return
-        await doCommandDelivery({ way, command, deviceId })
-        createMessage.success('命令下发成功')
+        render(instance, document.body);
+        (instance.component?.exposed as InstanceType<typeof AttributeDeliverModal>)?.open({ dataSourceJson, operationPasswordInfo, eventBindData: data })
       }
     }
     catch (error) {

+import type { ConfigurationContentType } from '@/api/content/model'
+import { getProductsDetailWithThingsModel } from '@/api/device'
+import { useProductsStoreWithOut } from '@/store/modules/products'
+
+export function useProduct() {
+  const getAllDeviceProfileIds = async (contentData: ConfigurationContentType) => {
+    const deviceProfileIds = contentData.productAndDevice?.map(item => item.profileId) || []
+    const result = await getProductsDetailWithThingsModel({ deviceProfileIds, functionTypeEnum: 'all' })
+    const productsStore = useProductsStoreWithOut()
+    productsStore.setProducts(result.reduce((prev, next) => ({ ...prev, [next.id]: next }), {}))
+  }
+
+  return {
+    getAllDeviceProfileIds,
+  }
+}

@@ -8,8 +8,10 @@ import { ComponentEnum } from '@/components/Form/src/enum'
 import { useContentDataStoreWithOut } from '@/store/modules/contentData'
 import { DateFormatEnum } from '@/enums/timeEnum'
 import type { BasicColumn } from '@/components/Table'
-import { AlarmStatusEnum, type CodeTypeEnum, type ContentDataFieldsEnum } from '@/enums/datasource'
+import { type ContentDataFieldsEnum } from '@/enums/datasource'
 import { useParseParams } from '@/core/LoadData'
+import type { TCPProtocolTypeEnum } from '@/enums/deviceEnum'
+import { AlarmStatusEnum } from '@/enums/alarmEnum'
 
 export const tableColumns: BasicColumn[] = [
   {
@@ -27,7 +29,7 @@ export const tableColumns: BasicColumn[] = [
 export interface TableRecordItemType {
   uuid: string
   [TableColumnFieldEnum.DEVICE_ID]?: Nullable<string>
-  [ContentDataFieldsEnum.CODE_TYPE]?: Nullable<CodeTypeEnum>
+  [ContentDataFieldsEnum.CODE_TYPE]?: Nullable<TCPProtocolTypeEnum>
 }
 
 export const AlarmColorMap = {

@@ -8,8 +8,8 @@ import type { AlarmListItemType } from '@/api/alarm/model'
 import type { CreateComponentType } from '@/core/Library/types'
 import { useContentDataStore } from '@/store/modules/contentData'
 import { isLightboxMode, isShareMode } from '@/utils/env'
-import { AlarmStatusColorEnum, AlarmStatusEnum, AlarmStatusNameEnum } from '@/enums/datasource'
 import { formatToDateTime } from '@/utils/dateUtil'
+import { AlarmStatusColorEnum, AlarmStatusNameEnum } from '@/enums/alarmEnum'
 
 const props = defineProps<{
   config: CreateComponentType
@@ -67,7 +67,7 @@ onMounted(async () => {
       useIntervalFn(initFetchAlarmList, (initOptions.polling || 30) * 1000)
   }
   else {
-    const statusList = Object.values(AlarmStatusEnum)
+    const statusList = Object.values(AlarmStatusNameEnum)
     Object.assign(initOptions, {
       scroll: false,
       interval: 0,

@@ -75,6 +75,15 @@ const init = () => {
   videoPlayInstance.value = videoJs(unref(videoPlayEl)!, unref(getOptions), () => {
     emit('ready', unref(videoPlayInstance))
   })
+
+  unref(videoPlayInstance)?.on('timeupdate', () => {
+    if (!unref(videoPlayInstance)) return
+
+    const differTime = unref(videoPlayInstance)!.buffered().end(0) - unref(videoPlayInstance)!.currentTime()
+
+    if (differTime > 10)
+      init()
+  })
 }
 
 const customInit = (getOptionsFn: (optios: VideoJsPlayerOptions) => VideoJsPlayerOptions) => {

@@ -2,7 +2,7 @@
 import { Button, Divider } from 'ant-design-vue'
 import { nextTick, onMounted, ref, unref } from 'vue'
 import { getOrganization } from '@/api/device'
-import { getVideoList } from '@/api/video'
+import { getCameraList } from '@/api/video'
 import { BasicForm, useForm } from '@/components/Form'
 import { ComponentEnum, FormLayoutEnum } from '@/components/Form/src/enum'
 import { ContentDataFieldsEnum, ContentDataFieldsNameEnum } from '@/enums/datasource'
@@ -13,6 +13,8 @@ import { createPublicFormContext } from '@/core/Library/components/PublicForm/us
 import type { NodeDataDataSourceJsonType, VideoOptionType } from '@/api/node/model'
 import { useMessage } from '@/hooks/web/useMessage'
 import { useSavePageContent } from '@/core/Library/hook/useSavePageContent'
+import { VideoAccessModeEnum } from '@/enums/videoEnum'
+import type { VideoItemRecordType } from '@/api/video/model'
 
 const props = defineProps<ConfigComponentProps>()
 const { organizationId } = useParseParams()
@@ -20,6 +22,23 @@ const nodeDataActinType = useNodeData({ cell: props.cell!, immediate: false })
 
 const { getNodeData, getNodeAllData, saveNodeAllData } = nodeDataActinType
 
+enum VideoFormFieldsEnum {
+  VIDEO_ID = 'id',
+  VIDEO_URL = 'videoUrl',
+  ACCESS_MODE = 'accessMode',
+  VIDEO_FLAG = 'videoComponentFlag',
+  CHANNEL_ID = 'channelId',
+  DEVICE_ID = 'deviceId',
+}
+
+enum VideoFormFieldsNameEnum {
+  VIDEO_ID = '视频流',
+  ACCESS_MODE = 'ACCESS_MODE',
+  VIDEO_URL = '视频地址',
+  CHANNEL_ID = '通道号',
+  DEVICE_ID = '设备id',
+}
+
 const loading = ref(false)
 
 const [register, { getFieldsValue, validate, setFieldsValue }] = useForm({
@@ -36,45 +55,67 @@ const [register, { getFieldsValue, validate, setFieldsValue }] = useForm({
           labelField: 'name',
           valueField: 'id',
           onChange() {
-            formModel[ContentDataFieldsEnum.VIDEO_ID] = null
+            formModel[VideoFormFieldsEnum.VIDEO_ID] = null
+            formModel[VideoFormFieldsEnum.CHANNEL_ID] = null
+            formModel[VideoFormFieldsEnum.DEVICE_ID] = null
           },
         }
       },
     },
     {
-      field: ContentDataFieldsEnum.VIDEO_ID,
-      label: ContentDataFieldsNameEnum.VIDEO_ID,
+      field: VideoFormFieldsEnum.VIDEO_ID,
+      label: VideoFormFieldsNameEnum.VIDEO_ID,
       component: ComponentEnum.API_SELECT,
+      required: true,
       componentProps: ({ formModel }) => {
         return {
-          api: getVideoList,
-          params: formModel[ContentDataFieldsEnum.ORG_ID],
-
+          api: async (params: Record<'organizationId', string>) => {
+            if (!params.organizationId) return []
+            return await getCameraList(params)
+          },
+          params: {
+            organizationId: formModel[ContentDataFieldsEnum.ORG_ID],
+          },
           fieldNames: { label: 'name', value: 'id' },
-          resultField: 'items',
-          onSelect(value: string, option: any) {
-            formModel[ContentDataFieldsEnum.ACCESS_MODE] = value && option ? option.accessMode : null
-            formModel[ContentDataFieldsEnum.VIDEO_URL] = value && option ? option.videoUrl : null
-            formModel[ContentDataFieldsEnum.VIDEO_FLAG] = true
+          resultField: 'data',
+          onSelect(_: string, option: VideoItemRecordType) {
+            const accessMode = option?.accessMode
+            formModel[VideoFormFieldsEnum.ACCESS_MODE] = accessMode
+            formModel[VideoFormFieldsEnum.VIDEO_URL] = option?.videoUrl
+            formModel[VideoFormFieldsEnum.CHANNEL_ID] = accessMode === VideoAccessModeEnum.GBT28181 ? option?.params?.channelNo : null
+            formModel[VideoFormFieldsEnum.DEVICE_ID] = accessMode === VideoAccessModeEnum.GBT28181 ? option?.params?.deviceId : null
+            formModel[VideoFormFieldsEnum.VIDEO_FLAG] = true
           },
         }
       },
     },
     {
-      field: ContentDataFieldsEnum.ACCESS_MODE,
-      label: ContentDataFieldsNameEnum.ACCESS_MODE,
+      field: VideoFormFieldsEnum.ACCESS_MODE,
+      label: VideoFormFieldsNameEnum.ACCESS_MODE,
+      component: ComponentEnum.INPUT,
+      ifShow: false,
+    },
+    {
+      field: VideoFormFieldsEnum.DEVICE_ID,
+      label: VideoFormFieldsNameEnum.DEVICE_ID,
       component: ComponentEnum.INPUT,
       ifShow: false,
     },
     {
-      field: ContentDataFieldsEnum.VIDEO_URL,
-      label: ContentDataFieldsNameEnum.VIDEO_URL,
+      field: VideoFormFieldsEnum.CHANNEL_ID,
+      label: VideoFormFieldsNameEnum.CHANNEL_ID,
       component: ComponentEnum.INPUT,
       ifShow: false,
     },
     {
-      field: ContentDataFieldsEnum.VIDEO_FLAG,
-      label: ContentDataFieldsEnum.VIDEO_FLAG,
+      field: VideoFormFieldsEnum.VIDEO_URL,
+      label: VideoFormFieldsNameEnum.VIDEO_URL,
+      component: ComponentEnum.INPUT,
+      ifShow: false,
+    },
+    {
+      field: VideoFormFieldsEnum.VIDEO_FLAG,
+      label: VideoFormFieldsEnum.VIDEO_FLAG,
       component: ComponentEnum.INPUT,
       ifShow: false,
     },
@@ -130,9 +171,10 @@ createPublicFormContext(nodeDataActinType)
 
 <style lang="less" scoped>
 .form-container {
+  @apply text-sm;
+
+  :deep(.ant-divider) {
     @apply text-sm;
-    :deep(.ant-divider) {
-      @apply text-sm;
-    }
   }
+}
 </style>

 <script setup lang="ts">
+import { Spin } from 'ant-design-vue'
 import { computed, nextTick, onMounted, onUnmounted, ref, toRaw, unref } from 'vue'
 import 'video.js/dist/video-js.css'
 
 import type { VideoJsPlayerOptions } from 'video.js'
 import { BasicVideoPlay } from './component/index.ts'
-import { getVideoTypeByUrl, isRtspProtocol, useFingerprint } from './component/config'
+import { VideoPlayerType, getVideoTypeByUrl, isRtspProtocol, useFingerprint } from './component/config'
 
 import { getJwtToken, getShareJwtToken } from '@/utils/auth'
 import { isLightboxMode, isShareMode } from '@/utils/env'
 import type { CreateComponentType } from '@/core/Library/types'
-import { closeFlvPlay, getFlvPlayUrl, getStreamingPlayUrl } from '@/api/video'
+import { closeFlvPlay, getFlvPlayUrl, getStreamingPlayUrl, getVideoControlStart } from '@/api/video'
 import { useContentDataStore } from '@/store/modules/contentData'
+import { VideoAccessModeEnum } from '@/enums/videoEnum'
 
 const props = defineProps<{
   config: CreateComponentType
@@ -20,6 +22,7 @@ const props = defineProps<{
 // 获取节点数据
 const contentDataStore = useContentDataStore()
 const { getResult } = useFingerprint()
+const loading = ref(false)
 
 const getOptions = computed<VideoJsPlayerOptions>(() => {
   const { config } = props || {}
@@ -46,45 +49,58 @@ const playSource = ref<Record<'src' | 'type', string>>(
 
 // 数据绑定获取的url
 const handleGetVideoPlay = async () => {
-  const { dataSourceJson } = unref(videoConfig)[0] || {}
-  const { videoOption } = dataSourceJson || {}
-  const { id, accessMode, videoUrl } = videoOption || {}
-  let type = getVideoTypeByUrl(videoUrl!)
-  let playUrl = videoUrl
-
-  // 判断是否是流媒体播放
-  if (accessMode === 1 && id) {
-    const { data: { url } = { url: '' } } = await getStreamingPlayUrl(id!)
-    playUrl = url
-    playUrl && (type = getVideoTypeByUrl(playUrl!))
-  }
+  try {
+    loading.value = true
+    const { dataSourceJson } = unref(videoConfig)[0] || {}
+    const { videoOption } = dataSourceJson || {}
+    const { id, accessMode, videoUrl, deviceId, channelId } = videoOption || {}
+    let type = getVideoTypeByUrl(videoUrl!)
+    let playUrl = videoUrl
+    // 判断是否是流媒体播放
+    if (accessMode === VideoAccessModeEnum.Streaming && id) {
+      const { data: { url } = { url: '' } } = await getStreamingPlayUrl(id!)
+      playUrl = url
+      playUrl && (type = getVideoTypeByUrl(playUrl!))
+    }
+    else if (accessMode === VideoAccessModeEnum.GBT28181 && deviceId && channelId) {
+      const {
+        data: { flv },
+      } = await getVideoControlStart({ channelId, deviceId })
 
-  // 判断是否是rtsp播放
-  if (isRtspProtocol(videoUrl!)) {
-    const result = await getResult()
-    const { visitorId } = result
-    playUrl = getFlvPlayUrl(playUrl!, visitorId)
-    withToken.value = true
-  }
+      playUrl = flv
+      type = VideoPlayerType.flv
+    }
 
-  playSource.value = {
-    src: playUrl!,
-    type,
-  }
+    // 判断是否是rtsp播放
+    if (isRtspProtocol(videoUrl!)) {
+      const result = await getResult()
+      const { visitorId } = result
+      playUrl = getFlvPlayUrl(playUrl!, visitorId)
+      withToken.value = true
+    }
 
-  const instance = unref(basicVideoPlayEl)?.customInit((options) => {
-    if (unref(withToken)) {
-      (options as any).flvjs.config.headers = {
-        'X-Authorization': `Bearer ${isShareMode() ? getShareJwtToken() : getJwtToken()}`,
-      }
+    playSource.value = {
+      src: playUrl!,
+      type,
     }
-    return {
-      ...options,
-      sources: [toRaw(unref(playSource))],
-    } as VideoJsPlayerOptions
-  })
 
-  instance?.play()
+    const instance = unref(basicVideoPlayEl)?.customInit((options) => {
+      if (unref(withToken)) {
+        (options as any).flvjs.config.headers = {
+          'X-Authorization': `Bearer ${isShareMode() ? getShareJwtToken() : getJwtToken()}`,
+        }
+      }
+      return {
+        ...options,
+        sources: [toRaw(unref(playSource))],
+      } as VideoJsPlayerOptions
+    })
+
+    instance?.play()
+  }
+  finally {
+    loading.value = false
+  }
 }
 
 // 默认播放
@@ -126,23 +142,21 @@ onUnmounted(async () => {
 
 <template>
   <div class="w-full h-full flex justify-center items-center">
-    <!-- <Spin :spinning="loading" wrapper-class-name="video-spin" class="w-full h-full"> -->
-    <BasicVideoPlay
-      ref="basicVideoPlayEl"
-      :options="getOptions"
-      :with-token="withToken"
-      :immediate-init-on-mounted="false"
-    />
-    <!-- </Spin> -->
+    <Spin :spinning="loading">
+      <BasicVideoPlay
+        ref="basicVideoPlayEl" :options="getOptions" :with-token="withToken"
+        :immediate-init-on-mounted="false"
+      />
+    </Spin>
   </div>
 </template>
 
 <style lang="less" scoped>
 .video-spin {
-    @apply w-full h-full;
+  @apply w-full h-full;
 
-    :deep(.ant-spin-container) {
-      @apply w-full h-full;
-    }
+  :deep(.ant-spin-container) {
+    @apply w-full h-full;
   }
+}
 </style>

@@ -34,7 +34,7 @@ const handleSubmit = async () => {
     const formValues = unref(dataSourceFormRef)?.getFieldsValue()
     let dataSourceJson = formValues
     if (contentDataStore.getIsTemplate)
-      dataSourceJson = { ...formValues, deviceProfileId: formValues?.deviceProfileTemplateId, deviceId: null }
+      dataSourceJson = { ...formValues, deviceProfileId: formValues?.deviceProfileTemplateId, deviceId: null, deviceName: null }
 
     saveNodeAllData({ dataSourceJson: { ...dataSourceJson, circularFlowMeterOption: unref(colorConfig) } })
     createMessage.success('保存成功~')

@@ -9,6 +9,7 @@ import { useOnMessage } from '@/core/Library/hook/useOnMessage'
 import type { NodeDataDataSourceJsonType } from '@/api/node/model'
 import { useLatestMessageValue } from '@/core/Library/hook/useLatestMessageValue'
 import { useContentDataStore } from '@/store/modules/contentData'
+import { useProductsStore } from '@/store/modules/products'
 
 const props = defineProps<{
   config: CreateComponentType
@@ -24,6 +25,8 @@ const chartElRef = ref<Nullable<HTMLDivElement>>()
 
 const chartInstance = ref<Nullable<ECharts>>()
 
+const productsStore = useProductsStore()
+
 function initChartInstance() {
   const { dataSourceJson } = unref(getCurrentNodeData) || {}
   const { circularFlowMeterOption } = dataSourceJson || {}
@@ -34,13 +37,13 @@ function initChartInstance() {
 const { onMessage } = useOnMessage({
   onReceiveDataSourceMessage(commandSource, message) {
     const { data } = commandSource
-    const { deviceInfo, attrInfo } = data || {}
-    const { deviceName } = deviceInfo || {}
-    const { attr } = data as NodeDataDataSourceJsonType
-    const { latestValue } = useLatestMessageValue(message.data, attr)
+    const { attr, deviceName, deviceProfileId } = data as NodeDataDataSourceJsonType
+
+    const { functionName } = productsStore.getObjectModelByIdWithIdentifier(deviceProfileId, (attr) as string) || {}
+    const { latestValue } = useLatestMessageValue(message.data, (attr as string))
     unref(chartInstance)?.setOption({
       title: {
-        text: `${deviceName || ''}-${attrInfo.name || ''}`,
+        text: `${deviceName || ''} - ${functionName || ''}`,
       },
       series: [{
         data: getSetValue(Number(latestValue)),

@@ -3,7 +3,8 @@ import { Button, Divider } from 'ant-design-vue'
 import { nextTick, onMounted, ref, unref } from 'vue'
 import { formSchemas } from '../config'
 import { ChartComponentEnum } from '..'
-import { DataSourceForm } from '@/core/Library/components/PublicForm/components/DataSourceForm'
+import { DataSourceForm } from '../component/index'
+// import { DataSourceForm } from '@/core/Library/components/PublicForm/components/DataSourceForm'
 
 import { BasicForm, useForm } from '@/components/Form'
 import { FormLayoutEnum } from '@/components/Form/src/enum'
@@ -44,9 +45,9 @@ const handleSubmit = async () => {
     const values = getFieldsValue()
     let dataSourceJson = value
     if (contentDataStore.getIsTemplate)
-      dataSourceJson = { ...value, deviceProfileId: value?.deviceProfileTemplateId, deviceId: null }
+      dataSourceJson = { ...value, deviceProfileId: value?.deviceProfileTemplateId, deviceId: null, deviceName: null }
 
-    await saveNodeAllData({ dataSourceJson: { ...dataSourceJson, chartOption: { ...values } } })
+    await saveNodeAllData({ dataSourceJson: { ...dataSourceJson, attr: typeof value.attr == 'string' ? [value.attr] : value.attr, chartOption: { ...values } } })
     savePageContent()
     createMessage.success('操作成功~')
   }
@@ -57,9 +58,9 @@ const handleSubmit = async () => {
 
 const handleSetFormValues = async () => {
   const { dataSourceJson } = unref(getNodeData) || {}
-  const { deviceId, attr, chartOption, deviceProfileId, deviceProfileTemplateId, attrInfo, deviceInfo } = dataSourceJson || {}
+  const { deviceId, attr, chartOption, deviceProfileId, deviceProfileTemplateId, deviceName } = dataSourceJson || {}
   await nextTick()
-  unref(dataSourceElRef)?.setFieldsValue({ deviceId, attr, deviceProfileId, attrInfo, deviceProfileTemplateId, deviceInfo })
+  unref(dataSourceElRef)?.setFieldsValue({ deviceId, attr, deviceName, deviceProfileId, deviceProfileTemplateId })
   setFieldsValue({ ...chartOption })
 }
 

+import type { EChartsOption } from 'echarts'
 import { isLightboxMode } from '@/utils/env'
-
-const data = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
-const seriesList = [
-  { value: 120, name: '123', itemStyle: { color: '#5470c6' } },
-  { value: 150, name: '456', itemStyle: { color: '#5470c6' } },
-  { value: 40, name: '789', itemStyle: { color: '#5470c6' } },
-  { value: 139, name: '111', itemStyle: { color: '#5470c6' } },
-  { value: 130, name: '222', itemStyle: { color: '#5470c6' } },
-  { value: 125, name: '333', itemStyle: { color: '#5470c6' } },
-  { value: 110, name: '444', itemStyle: { color: '#5470c6' } },
-]
-export const defaultOption = {
-  color: ['#3398DB'],
-  tooltip: {
-    // 提示框
-    trigger: 'item',
-    confine: true,
-    axisPointer: {
-      type: 'shadow',
+export const defaultOption = (): EChartsOption => {
+  return {
+    tooltip: {
     },
-  },
-  xAxis: {
-    type: 'category',
-    data: isLightboxMode() ? [] : data,
-    axisTick: {
-      alignWithLabel: true,
+    calculable: true,
+    xAxis:
+      {
+        type: 'category',
+        // prettier-ignore
+        data: isLightboxMode() ? [] : ['Jan', 'Feb', 'Mar', 'Apr', 'May'],
+      },
+
+    legend: {
+      top: '8%',
+      left: 'center',
+      data: [''],
     },
-  },
-  grid: {
-    top: '10%',
-    left: '10%',
-    bottom: '10%',
-  },
-  yAxis: {
-    type: 'value',
-  },
-  series: [
-    {
-      name: '',
-      type: 'bar',
-      barWidth: '60%',
-      data: isLightboxMode () ? [] : seriesList,
+
+    grid: {
+      top: '25%',
+      left: '6%',
+      right: '10%',
+      bottom: '8%',
+      containLabel: true,
     },
-  ],
+    yAxis:
+      {
+        type: 'value',
+      },
+    series: [
+      {
+        name: 'Rainfall',
+        type: isLightboxMode() ? 'line' : 'bar',
+        data: isLightboxMode()
+          ? []
+          : [
+              25.6, 76.7, 42.0, 27.0, 23.2,
+            ],
+      },
+      {
+        name: 'Evaporation',
+        type: 'bar',
+        data: isLightboxMode()
+          ? []
+          : [
+              28.7, 32.6, 70.7, 29.0, 26.4,
+            ],
+      },
+    ],
+  }
 }

 <script lang="ts" setup>
-import { computed, onMounted, onUnmounted, ref, unref } from 'vue'
+import { computed, onMounted, onUnmounted, ref, toRaw, unref } from 'vue'
 import { init } from 'echarts'
 import type { ECharts, EChartsOption } from 'echarts'
 import { defaultOption } from './index.config'
@@ -10,6 +10,7 @@ import { SocketSubscriberEnum } from '@/enums/datasource'
 import type { SubscriptionData } from '@/core/websocket/type/message'
 import { formatToDateTime } from '@/utils/dateUtil'
 import type { CommandSource } from '@/core/websocket/processor'
+import { useProductsStore } from '@/store/modules/products'
 
 const props = defineProps<{
   config: CreateComponentType
@@ -21,40 +22,80 @@ const chartElRef = ref<Nullable<HTMLDivElement>>()
 
 const chartInstance = ref<Nullable<ECharts>>()
 
+const seriesData = ref<any>([])
+const XAxisData = ref<any>([])
+const titleATTR = ref<string[] | any>([])
+
 function initChartInstance() {
   chartInstance.value = init(unref(chartElRef))
-  chartInstance.value.setOption(defaultOption)
+  chartInstance.value.setOption(defaultOption())
 }
 
+const productsStore = useProductsStore()
+
 const handleHistoryData = (commandSource: CommandSource, message: SubscriptionData) => {
   const { data } = commandSource
-  const { attrInfo, deviceInfo, attr } = data as NodeDataDataSourceJsonType
-  const { deviceName } = deviceInfo || {}
+  const { attr, deviceName } = data as NodeDataDataSourceJsonType as any
 
-  const historyData = message[attr]
-  const xAxisData: string[] = []
-  const seriesData: number[] = []
+  attr.forEach((item: any) => { // 得到所有时间
+    XAxisData.value.push(...message[item].map((item1) => {
+      const [ts] = item1
+      return ts
+    }))
+  })
+  XAxisData.value = Array.from(new Set(XAxisData.value)).sort((a: any, b: any) => a - b)// 去重获取到的时间
+  // 初始化有几个柱
+  seriesData.value.forEach((item: any) => {
+    item.data = unref(XAxisData).map((time: any) => ({ name: time, value: '' }))
+  })
 
-  for (const item of historyData) {
-    const [ts, value] = item
-    xAxisData.push(formatToDateTime(ts))
-    seriesData.push(value)
-  }
+  // 跟每个柱添加数据
+  seriesData.value.forEach((item: any) => {
+    item.data.forEach((item1: any) => {
+      message[item.attribute].forEach((messageItem) => {
+        const [ts, value] = messageItem
+        if (item1.name === ts)
+          item1.value = value || ''
+          // item1.name = formatToDateTime(item1.name)
+      })
+    })
+  })
 
   unref(chartInstance)?.setOption({
     title: {
-      text: `${deviceName || ''}-${attrInfo.name || ''}`,
+      text: `${deviceName || ''}`,
+    },
+    xAxis: [
+      {
+        type: 'category',
+        data: toRaw(unref(XAxisData.value.map((item: string | number) => formatToDateTime(item)))),
+      },
+    ],
+    legend: {
+      data: unref(titleATTR),
     },
-    xAxis: { data: xAxisData },
-    series: { data: seriesData },
+    series: toRaw(unref(seriesData).map((item: { type: string; name: string; data: any; attribute: string }) => {
+      const { type, name, data } = item
+      return {
+        type,
+        name,
+        data: data.map((item: any) => item.value),
+      }
+    })),
   } as EChartsOption)
 }
 
 const { onMessage } = useOnMessage({
   onReceiveDataSourceMessage(commandSource, message) {
     const { data } = commandSource
-    const { chartOption } = data as NodeDataDataSourceJsonType
+    const { chartOption, attr, deviceProfileId } = data as NodeDataDataSourceJsonType
     const { queryType } = chartOption || {}
+    if (!seriesData.value.length) {
+      (attr as string[]).forEach((item: string) => {
+        titleATTR.value.push(productsStore.getObjectModelByIdWithIdentifier(deviceProfileId, item)?.functionName)
+        seriesData.value.push({ attribute: item, data: [], type: 'bar', name: productsStore.getObjectModelByIdWithIdentifier(deviceProfileId, item)?.functionName })
+      })
+    }
 
     if (queryType === SocketSubscriberEnum.HISTORY_CMDS)
       handleHistoryData(commandSource, message.data)

@@ -42,7 +42,7 @@ const handleSubmit = async () => {
     const values = getFieldsValue()
     let dataSourceJson = value
     if (contentDataStore.getIsTemplate)
-      dataSourceJson = { ...value, deviceProfileId: value?.deviceProfileTemplateId, deviceId: null }
+      dataSourceJson = { ...value, deviceProfileId: value?.deviceProfileTemplateId, deviceId: null, deviceName: null }
 
     await saveNodeAllData({ dataSourceJson: { ...dataSourceJson, chartOption: values } })
     createMessage.success('操作成功～')
@@ -55,9 +55,9 @@ const handleSubmit = async () => {
 
 const handleSetFormValues = async () => {
   const { dataSourceJson } = unref(getNodeData) || {}
-  const { deviceId, attr, chartOption, deviceProfileId, attrInfo, deviceProfileTemplateId, deviceInfo } = dataSourceJson || {}
+  const { deviceId, attr, chartOption, deviceProfileId, deviceProfileTemplateId, deviceName } = dataSourceJson || {}
   await nextTick()
-  unref(dataSourceElRef)?.setFieldsValue({ deviceId, attr, deviceProfileId, attrInfo, deviceInfo, deviceProfileTemplateId })
+  unref(dataSourceElRef)?.setFieldsValue({ deviceId, attr, deviceProfileId, deviceName, deviceProfileTemplateId })
   setFieldsValue({ ...chartOption })
 }
 

@@ -10,6 +10,7 @@ import type { CommandSource } from '@/core/websocket/processor'
 import type { NodeDataDataSourceJsonType } from '@/api/node/model'
 import type { SubscriptionUpdateMsg } from '@/core/websocket/type/message'
 import { useContentDataStore } from '@/store/modules/contentData'
+import { useProductsStore } from '@/store/modules/products'
 
 const props = defineProps<{
   config: CreateComponentType
@@ -23,6 +24,8 @@ const chartInstance = ref<Nullable<ECharts>>()
 
 const contentDataStore = useContentDataStore()
 
+const productsStore = useProductsStore()
+
 function initChartInstance() {
   chartInstance.value = init(unref(chartElRef))
   const currentNodeData = unref(contentDataStore.getCurrentNodeDataById(props.config))
@@ -36,17 +39,16 @@ onMounted(() => {
 
 const onReceiveDataSourceMessage = (commandSource: CommandSource, message: SubscriptionUpdateMsg) => {
   const { data } = commandSource
-  const { deviceInfo, attrInfo } = data || {}
-  const { deviceName } = deviceInfo || {}
-  const { attr } = data as NodeDataDataSourceJsonType
-  const { latestValue } = useLatestMessageValue(message.data, attr)
+  const { attr, deviceName, deviceProfileId } = data as NodeDataDataSourceJsonType
+  const { functionName } = productsStore.getObjectModelByIdWithIdentifier(deviceProfileId, (attr) as string) || {}
+  const { latestValue } = useLatestMessageValue(message.data, (attr as string))
   unref(chartInstance)?.setOption({
     series: [{
       data: [{ value: latestValue }],
 
     }],
     title: {
-      text: `${deviceName || ''}-${attrInfo.name || ''}`,
+      text: `${deviceName || ''}- ${functionName || ''} `,
     },
   } as EChartsOption)
 }

@@ -3,7 +3,9 @@ import { Button, Divider } from 'ant-design-vue'
 import { nextTick, onMounted, ref, unref } from 'vue'
 import { formSchemas } from '../config'
 import { ChartComponentEnum } from '..'
-import { DataSourceForm } from '@/core/Library/components/PublicForm/components/DataSourceForm'
+
+import { DataSourceForm } from '../component/index'
+// import { DataSourceForm } from '@/core/Library/components/PublicForm/components/DataSourceForm'
 
 import { BasicForm, useForm } from '@/components/Form'
 import { FormLayoutEnum } from '@/components/Form/src/enum'
@@ -33,9 +35,9 @@ const dataSourceElRef = ref<Nullable<InstanceType<typeof DataSourceForm>>>()
 
 const handleSetFormValues = async () => {
   const { dataSourceJson } = unref(getNodeData) || {}
-  const { deviceId, attr, chartOption, deviceProfileId, deviceProfileTemplateId, attrInfo, deviceInfo } = dataSourceJson || {}
+  const { deviceId, attr, chartOption, deviceProfileId, deviceProfileTemplateId, deviceName } = dataSourceJson || {}
   await nextTick()
-  unref(dataSourceElRef)?.setFieldsValue({ deviceId, attr, deviceProfileId, deviceProfileTemplateId, attrInfo, deviceInfo })
+  unref(dataSourceElRef)?.setFieldsValue({ deviceId, attr, deviceProfileId, deviceProfileTemplateId, deviceName })
   setFieldsValue({ ...chartOption })
 }
 
@@ -52,9 +54,9 @@ const handleSubmit = async () => {
     const values = getFieldsValue()
     let dataSourceJson = value
     if (contentDataStore.getIsTemplate)
-      dataSourceJson = { ...value, deviceProfileId: value?.deviceProfileTemplateId, deviceId: null }
+      dataSourceJson = { ...value, deviceProfileId: value?.deviceProfileTemplateId, deviceId: null, deviceName: null }
 
-    saveNodeAllData({ dataSourceJson: { ...dataSourceJson, chartOption: { ...values } } })
+    saveNodeAllData({ dataSourceJson: { ...dataSourceJson, attr: typeof value.attr == 'string' ? [value.attr] : value.attr, chartOption: { ...values } } })
     createMessage.success('操作成功~')
     savePageContent()
   }

@@ -3,31 +3,38 @@ import { isLightboxMode } from '@/utils/env'
 
 export const getDefaultOption = (): EChartsOption => {
   return {
+
     tooltip: {
-      trigger: 'item',
-      confine: true,
+    },
+    legend: {
+      top: '10%',
+      left: 'center',
+      data: [''],
     },
     grid: {
-      left: '3%',
-      right: '4%',
-      bottom: '3%',
+      top: '30%',
+      left: '6%',
+      right: '10%',
+      bottom: '8%',
       containLabel: true,
     },
-    dataset: {
-      source: isLightboxMode()
+    xAxis: {
+      type: 'category',
+    },
+    yAxis: {
+      type: 'value',
+      boundaryGap: [0, '100%'],
+    },
+    series: [{
+      type: 'line',
+      name: '温度',
+      data: isLightboxMode()
         ? []
         : [
-            ['product', '2015', '2016', '2017'],
-            ['Matcha Latte', 43.3, 85.8, 93.7],
-            ['Milk Tea', 83.1, 73.4, 55.1],
-            ['Cheese Cocoa', 86.4, 65.2, 82.5],
-            ['Walnut Brownie', 72.4, 53.9, 39.1],
-          ],
-    },
-    xAxis: { type: 'category' },
-    yAxis: {},
-    series: [
-      { type: 'line' },
-    ],
+            ['Matcha Latte', 43.3],
+            ['Milk Tea', 83.1],
+            ['Cheese Cocoa', 86.4],
+            ['Walnut Brownie', 72.4]],
+    }],
   }
 }

 <script lang="ts" setup>
-import { computed, onMounted, onUnmounted, ref, unref } from 'vue'
-import type { DatasetComponentOption, ECharts, EChartsOption } from 'echarts'
+import { computed, onMounted, onUnmounted, ref, toRaw, unref } from 'vue'
+import type { ECharts, EChartsOption } from 'echarts'
 import { init } from 'echarts'
 import { getDefaultOption } from './index.config'
 import type { CreateComponentType, RenderComponentExposeType } from '@/core/Library/types'
@@ -9,8 +9,12 @@ import type { NodeDataDataSourceJsonType } from '@/api/node/model'
 import type { SubscriptionData } from '@/core/websocket/type/message'
 import { SocketSubscriberEnum } from '@/enums/datasource'
 import { formatToDateTime } from '@/utils/dateUtil'
-import { useLatestMessageValue } from '@/core/Library/hook/useLatestMessageValue'
 import type { CommandSource } from '@/core/websocket/processor'
+import { useLatestMultipleMessageValue } from '@/core/Library/hook/useLatestMessageValue'
+import { useProductsStore } from '@/store/modules/products'
+interface IList {
+  time: string | number
+}
 
 const props = defineProps<{
   config: CreateComponentType
@@ -22,67 +26,131 @@ const chartElRef = ref<Nullable<HTMLDivElement>>()
 
 const chartInstance = ref<Nullable<ECharts>>()
 
+const maxLength = ref<number>(20)
+
+const timeList = ref<number[] | string[] | any>([])// 存储XAxis的值
+const seriesData = ref<any>([])// 存储series的值
+const titleATTR = ref<string[] | any>([])
+
+const productsStore = useProductsStore()
+
 function initChartInstance() {
   chartInstance.value = init(unref(chartElRef))
   chartInstance.value.setOption(getDefaultOption())
 }
 
-const handleHistoryData = (message: SubscriptionData, attr: string) => {
-  const data = message[attr]
-  const xAxisData: string[] = []
-  const seriesData: number[] = []
+const handleHistoryData = (commandSource: CommandSource, message: SubscriptionData, attr: string[] | string) => {
+  const { data } = commandSource || {}
+  const { deviceName } = data as NodeDataDataSourceJsonType
 
-  for (const item of data) {
-    const [ts, value] = item
-    xAxisData.push(formatToDateTime(ts))
-    seriesData.push(value)
-  }
+  (attr as string[]).forEach((item) => {
+    timeList.value.push(...message[item].map((item1) => {
+      const [ts] = item1
+      return ts
+    }))
+  })
+  timeList.value = Array.from(new Set(timeList.value))?.sort((a: any, b: any) => a - b)// 去重获取到的时间
+  seriesData.value.forEach((item: any) => {
+    item.data = unref(timeList).map((time: any) => ({ name: time, value: null }))
+  })
 
+  seriesData.value.forEach((item: any) => {
+    item.data.forEach((item1: any) => {
+      message[item.attribute].forEach((messageItem) => {
+        const [ts, value] = messageItem
+        if (item1.name === ts) {
+          item1.value = value || undefined
+          item1.name = formatToDateTime(item1.name)
+        }
+      })
+    })
+  })
   unref(chartInstance)?.setOption({
-    xAxis: { data: xAxisData },
-    series: { data: seriesData },
+    title: {
+      text: `${deviceName || ''}`,
+    },
+    xAxis: {
+      data: toRaw(unref(timeList.value.map((item: string | number) => formatToDateTime(item)))),
+    },
+    legend: {
+      data: unref(titleATTR),
+    } as any,
+    series: toRaw(
+      unref(seriesData).map((item: { type: string; name: string; data: any }) => {
+        const { type, name, data } = item
+        return {
+          type,
+          name,
+          data,
+        }
+      }),
+    ),
   } as EChartsOption)
 }
 
-function sliceData(data: any[], maxLength = 20) {
-  if (data.length > maxLength)
-    return data.slice(1)
-  return data
-}
+// const contentDataStore = useContentDataStoreWithOut()
 
-const handlerTimeSeriesData = (commandSource: CommandSource, message: SubscriptionData, attr: string) => {
+const handlerTimeSeriesData = (commandSource: CommandSource, message: SubscriptionData, attr: string[] | string) => {
   const { data } = commandSource
-  const { attrInfo, deviceInfo } = data as NodeDataDataSourceJsonType
-  const { deviceName } = deviceInfo || {}
-  const { ts, latestValue } = useLatestMessageValue(message, attr)
-  const option = unref(chartInstance)?.getOption() as EChartsOption
-  const oldDataset = (option.dataset as DatasetComponentOption[])?.[0].source as Recordable[]
-  oldDataset.push({
-    ts: formatToDateTime(ts),
-    [attr]: latestValue,
+  const { deviceName } = data as NodeDataDataSourceJsonType
+  const list: IList | any = {}// 记录时间
+  useLatestMultipleMessageValue(message, attr as any, (attribute, timespan, value) => {
+    list.time = timespan || list.time
+    seriesData.value.forEach((item: any) => {
+      if (item.attribute === attribute) {
+        item.data.push({
+          name: formatToDateTime(list.time),
+          value: value || undefined,
+        })
+      }
+      if (item.data.length > unref(maxLength))
+        item.data.shift()
+    })
   })
+  list.time && timeList.value.push(formatToDateTime(list.time))
+  if (unref(timeList).length > unref(maxLength))
+    timeList.value.shift()
 
   unref(chartInstance)?.setOption({
     title: {
-      text: `${deviceName || ''}-${attrInfo.name || ''}`,
+      text: `${deviceName || ''}`,
     },
-    dataset: {
-      dimensions: ['ts', attr],
-      source: sliceData(oldDataset),
+    xAxis: {
+      data: toRaw(unref(timeList)),
     },
+    legend: {
+      data: unref(titleATTR),
+    } as any,
+    series: toRaw(
+      unref(seriesData).map((item: { type: string; name: string; data: any }) => {
+        const { type, name, data } = item
+        return {
+          type,
+          name,
+          data,
+        }
+      }),
+    ),
   } as EChartsOption)
 }
 
 const { onMessage } = useOnMessage({
   onReceiveDataSourceMessage(commandSource, message) {
     const { data } = commandSource
-    const { chartOption, attr } = data as NodeDataDataSourceJsonType
+    const { chartOption, attr, deviceProfileId } = data as NodeDataDataSourceJsonType
     const { queryType } = chartOption || {}
+    if (!seriesData.value.length) {
+      (attr as string[]).forEach((item: string) => {
+        titleATTR.value.push(productsStore.getObjectModelByIdWithIdentifier(deviceProfileId, item)?.functionName)
+
+        seriesData.value.push({ attribute: item, data: [], type: 'line', name: productsStore.getObjectModelByIdWithIdentifier(deviceProfileId, item)?.functionName })
+      })
+    }
 
     if (queryType === SocketSubscriberEnum.TS_SUB_CMDS)
       handlerTimeSeriesData(commandSource, message.data, attr)
     else if (queryType === SocketSubscriberEnum.HISTORY_CMDS)
-      handleHistoryData(message.data, attr)
+      handleHistoryData(commandSource, message.data, attr)
   },
 })
 

@@ -34,7 +34,7 @@ const handleSubmit = async () => {
     const formValues = unref(dataSourceFormRef)?.getFieldsValue()
     let dataSourceJson = formValues
     if (contentDataStore.getIsTemplate)
-      dataSourceJson = { ...formValues, deviceProfileId: formValues?.deviceProfileTemplateId, deviceId: null }
+      dataSourceJson = { ...formValues, deviceProfileId: formValues?.deviceProfileTemplateId, deviceId: null, deviceName: null }
 
     await saveNodeAllData({ dataSourceJson: { ...dataSourceJson, rectFlowMeterOption: unref(colorConfig) } })
     createMessage.success('保存成功')

@@ -9,6 +9,7 @@ import { useOnMessage } from '@/core/Library/hook/useOnMessage'
 import type { NodeDataDataSourceJsonType } from '@/api/node/model'
 import { useLatestMessageValue } from '@/core/Library/hook/useLatestMessageValue'
 import { useContentDataStore } from '@/store/modules/contentData'
+import { useProductsStore } from '@/store/modules/products'
 
 const props = defineProps<{
   config: CreateComponentType
@@ -22,6 +23,8 @@ const getCellBounds = computed(() => props.config.cellBounds || { width: 300, he
 
 const chartElRef = ref<Nullable<HTMLDivElement>>()
 
+const productsStore = useProductsStore()
+
 const chartInstance = ref<Nullable<ECharts>>()
 
 function initChartInstance() {
@@ -34,13 +37,12 @@ function initChartInstance() {
 const { onMessage } = useOnMessage({
   onReceiveDataSourceMessage(commandSource, message) {
     const { data } = commandSource
-    const { deviceInfo, attrInfo } = data || {}
-    const { deviceName } = deviceInfo || {}
-    const { attr } = data as NodeDataDataSourceJsonType
-    const { latestValue } = useLatestMessageValue(message.data, attr)
+    const { attr, deviceName, deviceProfileId } = data as NodeDataDataSourceJsonType
+    const { functionName } = productsStore.getObjectModelByIdWithIdentifier(deviceProfileId, (attr as string)) || {}
+    const { latestValue } = useLatestMessageValue(message.data, (attr as string))
     unref(chartInstance)?.setOption({
       title: {
-        text: `${deviceName || ''}-${attrInfo.name || ''}`,
+        text: `${deviceName || ''} - ${functionName || ''}`,
       },
       series: [{
         data: getSetValue(Number(latestValue)),

@@ -7,6 +7,7 @@ import type { CreateComponentType, RenderComponentExposeType } from '@/core/Libr
 import type { NodeDataDataSourceJsonType } from '@/api/node/model'
 import { useLatestMessageValue } from '@/core/Library/hook/useLatestMessageValue'
 import { useOnMessage } from '@/core/Library/hook/useOnMessage'
+import { useProductsStore } from '@/store/modules/products'
 
 const props = defineProps<{
   config: CreateComponentType
@@ -18,6 +19,8 @@ const chartElRef = ref<Nullable<HTMLDivElement>>()
 
 const chartInstance = ref<Nullable<ECharts>>()
 
+const productsStore = useProductsStore()
+
 function initChartInstance() {
   chartInstance.value = init(unref(chartElRef))
   chartInstance.value.setOption(getDefaultOption)
@@ -26,13 +29,12 @@ function initChartInstance() {
 const { onMessage } = useOnMessage({
   onReceiveDataSourceMessage(commandSource, message) {
     const { data } = commandSource
-    const { deviceInfo, attrInfo } = (data || {}) as NodeDataDataSourceJsonType
-    const { deviceName } = deviceInfo || {}
-    const { attr } = data as NodeDataDataSourceJsonType
-    const { latestValue } = useLatestMessageValue(message.data, attr)
+    const { attr, deviceName, deviceProfileId } = data as NodeDataDataSourceJsonType
+    const { functionName } = productsStore.getObjectModelByIdWithIdentifier(deviceProfileId, (attr as string)) || {}
+    const { latestValue } = useLatestMessageValue(message.data, (attr as string))
     unref(chartInstance)?.setOption({
       title: {
-        text: `${deviceName || ''}-${attrInfo.name || ''}`,
+        text: `${deviceName || ''} - ${functionName || ''}`,
       },
       series: [{
         data: [{

+import { unref } from 'vue'
+import { getDeviceAttributes, getListByConfigurationId, getListByDeviceProfileIds } from '@/api/device'
+import type { DeviceItemType, ThingsModelItemType } from '@/api/device/model'
+import type { FormSchema } from '@/components/Form'
+import { ComponentEnum } from '@/components/Form/src/enum'
+import { ContentDataFieldsEnum, ContentDataFieldsNameEnum } from '@/enums/datasource'
+import { useContentDataStoreWithOut } from '@/store/modules/contentData'
+import type { ProductAndDevice } from '@/api/content/model'
+import { ControlComponentEnum } from '@/core/Library/packages/Control'
+import { useParseParams } from '@/core/LoadData'
+import { DataTypeEnum } from '@/enums/objectModelEnum'
+
+const contentDataStore = useContentDataStoreWithOut()
+export const formSchemas = (componentKey?: string): FormSchema[] => {
+  const isTemplate = contentDataStore.isTemplate // 判断是否是模板组态
+  const isTemplateLink = contentDataStore.getIsTemplateLink
+  const params = useParseParams()
+  const { configurationId } = params
+  return [
+    {
+      field: ContentDataFieldsEnum.DEVICE_PROFILE_ID,
+      label: ContentDataFieldsNameEnum.DEVICE_PROFILE_ID,
+      component: ComponentEnum.INPUT,
+      ifShow: false,
+    },
+    {
+      field: ContentDataFieldsEnum.DEVICE_PROFILE_TEMPLATE_ID, // 模板产品id
+      label: ContentDataFieldsNameEnum.DEVICE_PROFILE_ID,
+      component: ComponentEnum.API_SELECT,
+      ifShow: !!isTemplate,
+      required: !!isTemplate,
+      componentProps: ({ formModel }) => {
+        return {
+          options: (unref(contentDataStore.getProductAndDevice) || []).map((item: ProductAndDevice) => ({ label: item.profileName || item.name, value: item.profileId, transportType: item?.transportType, deviceType: item?.deviceType })),
+          placeholder: '请选择产品',
+          onSelect(value: string) {
+            formModel[ContentDataFieldsEnum.DEVICE_PROFILE_ID] = value
+            formModel[ContentDataFieldsEnum.ATTR] = []
+          },
+          getPopupContainer: () => document.body,
+        }
+      },
+    },
+    {
+      field: ContentDataFieldsEnum.DEVICE_ID,
+      label: ContentDataFieldsNameEnum.DEVICE_ID,
+      component: ComponentEnum.API_SELECT,
+      ifShow: !isTemplate,
+      required: !isTemplate,
+      componentProps: ({ formModel }) => {
+        const organizationId = window.useParseParams().organizationId
+        if (!organizationId) return
+        return {
+          showSearch: true,
+          api: async (params: Recordable) => {
+            if (isTemplateLink) return await getListByConfigurationId(configurationId!)
+            return await getListByDeviceProfileIds(params)
+          },
+          params: {
+            deviceProfileIds: unref(contentDataStore.getProductIds),
+            organizationId,
+          },
+          aliasField: 'alias',
+          fieldNames: { label: 'name', value: 'tbDeviceId' },
+          onSelect(value: string, option: DeviceItemType) {
+            formModel[ContentDataFieldsEnum.DEVICE_PROFILE_ID] = value ? option.deviceProfileId : null
+            formModel[ContentDataFieldsEnum.ATTR] = []
+            formModel[ContentDataFieldsEnum.DEVICE_NAME] = value ? option.alias || option.name : ''
+          },
+          filterOption: (inputValue: string, option: DeviceItemType) => {
+            return option.alias?.includes?.(inputValue) || option.name?.includes?.(inputValue)
+          },
+        }
+      },
+    },
+    {
+      field: ContentDataFieldsEnum.DEVICE_NAME,
+      label: ContentDataFieldsNameEnum.deviceName,
+      component: ComponentEnum.INPUT,
+      ifShow: false,
+    },
+    {
+      field: ContentDataFieldsEnum.ATTR,
+      label: ContentDataFieldsNameEnum.ATTR,
+      component: ComponentEnum.API_SELECT,
+      required: true,
+      componentProps: ({ formModel }) => {
+        const deviceProfileId = isTemplate ? formModel[ContentDataFieldsEnum.DEVICE_PROFILE_TEMPLATE_ID] : formModel[ContentDataFieldsEnum.DEVICE_PROFILE_ID]
+        return {
+          showSearch: true,
+          mode: 'multiple',
+          api: async (params: string) => {
+            if (!deviceProfileId) return []
+            const options = await getDeviceAttributes(params)
+            if (componentKey === ControlComponentEnum.SWITCH) { // 开关只返回bool
+              return options.filter((item) => {
+                return item.detail.dataType.type === DataTypeEnum.BOOL
+              })
+            }
+            return options
+          },
+          params: deviceProfileId,
+          fieldNames: { label: 'name', value: 'identifier' },
+          filterOption: (inputValue: string, option: ThingsModelItemType) => {
+            return option.name.includes(inputValue)
+          },
+        }
+      },
+    },
+  ]
+}

+export { default as DataSourceForm } from './index.vue'

+<script setup lang="ts">
+import { computed, unref } from 'vue'
+import type { RuleError } from 'ant-design-vue/lib/form/interface'
+import { formSchemas } from './config'
+import { FormLayoutEnum } from '@/components/Form/src/enum'
+import { BasicForm, useForm } from '@/components/Form'
+
+export interface ComponentExposeType {
+  getFieldsValue: () => any
+  setFieldsValue: (value: any) => void
+  validate: () => Promise<RuleError | any>
+}
+
+const props = defineProps<{ componentKey?: string }>()
+defineEmits(['fieldValueChange'])
+
+const getComponentKey = computed(() => {
+  return props.componentKey
+})
+
+const [registerForm, formActionType] = useForm({
+  schemas: formSchemas(unref(getComponentKey)),
+  showActionButtonGroup: false,
+  layout: FormLayoutEnum.HORIZONTAL,
+  labelWidth: 70,
+})
+
+const getFieldsValue = () => {
+  return formActionType.getFieldsValue()
+}
+
+const validate = async () => {
+  return await formActionType.validate()
+}
+
+const setFieldsValue = (value: Recordable) => {
+  formActionType.setFieldsValue(value)
+  formActionType.clearValidate()
+}
+
+defineExpose<ComponentExposeType>({
+  getFieldsValue,
+  setFieldsValue,
+  validate,
+})
+</script>
+
+<template>
+  <BasicForm @register="registerForm" @field-value-change="$emit('fieldValueChange')" />
+</template>

 <script lang="ts" setup>
 import { computed, ref, unref } from 'vue'
+import { isNullOrUnDef } from '@wry-smile/utils-is'
 import type { RenderComponentExposeType, RenderComponentProps } from '@/core/Library/types'
 import { useLatestMessageValue } from '@/core/Library/hook/useLatestMessageValue'
 import { NodeUtils } from '@/hooks/business/useNodeUtils'
@@ -25,6 +26,10 @@ const onReceiveDataSourceMessage = (_commandSource: CommandSource, message: Subs
   const cell = nodeUtils.getCellById(node)
   if (!cell) return
   const { latestValue } = useLatestMessageValue(message.data, attr!)
+
+  if (isNullOrUnDef(latestValue))
+    return
+
   const flag = rangeList.find(item => item.statusValue?.toString() === latestValue?.toString())
 
   if (flag) {

@@ -8,6 +8,7 @@ import { useContentDataStoreWithOut } from '@/store/modules/contentData'
 import { useUserStoreWithOut } from '@/store/modules/user'
 import { useMessage } from '@/hooks/web/useMessage'
 import { MessageEnum } from '@/enums/messageEnum'
+import { useProduct } from '@/core/Library/hook/useProduct'
 
 export function useContentData() {
   const contentDataStore = useContentDataStoreWithOut()
@@ -46,6 +47,9 @@ export function useContentData() {
     const result = mode === PageModeEnum.SHARE ? await shareModeBootstrap() : await getContent()
 
     if (result) {
+      const { getAllDeviceProfileIds } = useProduct()
+      await getAllDeviceProfileIds(result)
+
       const { productAndDevice, nodelist, isTemplate, templateId } = result
       if (nodelist) contentDataStore.saveContentData(nodelist)
       if (isTemplate) contentDataStore.setIsTemplate(isTemplate)

@@ -84,11 +84,13 @@ export class DataDynamicEffectHandler {
     if (flag) {
       const nodeEl = this.nodeUtils.getNodesForCells([cell])
       const { type } = record!
+
       if (type === ActRangListItemTypeEnum.SHOW) {
         nodeEl.forEach((node) => {
           node.classList.add(ActAnimationName.VISIBLE)
           node.classList.remove(ActAnimationName.HIDDEN)
         })
+        this.nodeUtils.updateCellValue(cell, record?.title ? record.title : latestValue)
       }
       else if (type === ActRangListItemTypeEnum.HIDDEN) {
         nodeEl.forEach((node) => {

@@ -2,6 +2,7 @@ import { isNull } from 'lodash-es'
 import type { App } from 'vue'
 import type { SubscriptionUpdateMsg } from '../type/message'
 import { DataDynamicEffectHandler } from './dataDynamicEffectHandler'
+import { useObjectModelValue } from './useObjectModelValue'
 import type { CommandSource, LightboxModeWebsocketService } from '.'
 import type { ActTypeEnum } from '@/enums/datasource'
 import { DataSourceTypeEnum } from '@/enums/datasource'
@@ -52,10 +53,13 @@ export class MessageHandler {
 
   defaultHandler(commandSource: CommandSource, message: SubscriptionUpdateMsg) {
     const { data, node } = commandSource
-    const { attr } = data as NodeDataDataSourceJsonType
-    const { latestValue } = useLatestMessageValue(message.data, attr)
+    const { attr, deviceProfileId } = data as NodeDataDataSourceJsonType
+
+    let { latestValue } = useLatestMessageValue(message.data, attr as string)
     if (isNull(latestValue)) return
+    latestValue = useObjectModelValue(deviceProfileId, attr as string, latestValue)
     const cell = this.nodeUtils.getCellById(node)
+
     const cellValue = cell.getValue() as Element
     cellValue.setAttribute('label', latestValue)
     this.nodeUtils.updateCellValue(cell, cellValue)

+import type { DataType, Specs, StructJSON } from '@/api/device/model'
+import { TransportTypeEnum } from '@/enums/deviceEnum'
+import { DataTypeEnum } from '@/enums/objectModelEnum'
+import { useJsonParse } from '@/hooks/business/useJSONParse'
+import { useProductsStoreWithOut } from '@/store/modules/products'
+
+function getBoolTypeValue(value: number, Specs: Specs) {
+  const { boolOpen, boolClose } = Specs
+
+  return Number(value) ? boolOpen : boolClose
+}
+
+function getEnumTypeValue(value: number, specsList: Specs[]) {
+  const res = specsList.find(item => item.value === Number(value))
+
+  return res?.name
+}
+
+function getStructTypeValue(value: string, specs: StructJSON[]): string {
+  const res = useJsonParse(value).value
+
+  function generateStruct(specs: StructJSON[], value: Recordable) {
+    if (!value) return {}
+
+    return specs.reduce((prev, next) => {
+      return {
+        ...prev,
+        [next.functionName]: getValueByType(next.dataType!.type, value[next.identifier], next.dataType!),
+      }
+    }, {})
+  }
+
+  return JSON.stringify(generateStruct(specs, res))
+}
+
+function getValueByType(type: string, value: any, dataType: DataType) {
+  switch (type) {
+    case DataTypeEnum.BOOL:
+      return getBoolTypeValue(value, dataType.specs as Specs)
+    case DataTypeEnum.STRUCT:
+      return getStructTypeValue(value, dataType.specs as StructJSON[])
+    case DataTypeEnum.ENUM:
+      return getEnumTypeValue(value, dataType.specsList as Specs[])
+    default:
+      return value
+  }
+}
+
+function getModbusDeviceValueByType(value: any, dataType: DataType) {
+  if (dataType.type === DataTypeEnum.BOOL && dataType.specsList && dataType.specsList.length)
+    return getEnumTypeValue(value, dataType.specsList as Specs[])
+
+  return value
+}
+
+export function useObjectModelValue(deviceProfileId: string, attr: string, value: any) {
+  const productsStore = useProductsStoreWithOut()
+
+  const result = productsStore.getObjectModelByIdWithIdentifier(deviceProfileId, attr)
+  if (!result)
+    return value
+
+  const products = productsStore.getProductDetailById(deviceProfileId)
+  const isTCPModbus = products.transportType === TransportTypeEnum.TCP && result.extensionDesc?.originalDataType
+
+  return isTCPModbus ? getModbusDeviceValueByType(value, result.specs.dataType) : getValueByType(result.specs.dataType.type as DataTypeEnum, value, result.specs.dataType)
+}

+export enum AlarmStatusEnum {
+  CLEARED_UN_ACK = 'CLEARED_UNACK',
+  ACTIVE_UN_ACK = 'ACTIVE_UNACK',
+  CLEARED_ACK = 'CLEARED_ACK',
+  ACTIVE_ACK = 'ACTIVE_ACK',
+}
+
+export enum AlarmStatusColorEnum {
+  CLEARED_UNACK = 'red',
+  ACTIVE_UNACK = 'orange',
+  CLEARED_ACK = 'cyan',
+  ACTIVE_ACK = 'green',
+}
+
+export enum AlarmStatusNameEnum {
+  CLEARED_UNACK = '清除未确认',
+  ACTIVE_UNACK = '激活未确认',
+  CLEARED_ACK = '清除已确认',
+  ACTIVE_ACK = '激活已确认',
+}

@@ -7,3 +7,41 @@ export enum CommandWayNameEnum {
   ONE_WAY = '单向',
   TWO_WAY = '双向',
 }
+
+export enum CommandCallWayEnum {
+  SYNC = 'SYNC',
+  ASYNC = 'ASYNC',
+}
+
+export enum CommandTypeEnum {
+  CUSTOM = 0,
+  SERVICE = 1,
+  ATTRIBUTE = 2,
+  API = 'api',
+}
+
+export enum CommandTypeNameEnum {
+  CUSTOM = '自定义',
+  SERVICE = '服务',
+  ATTRIBUTE = '属性',
+}
+
+export enum CommandDeliveryWayEnum {
+  CUSTOM = 'CUSTOM',
+  SERVICE = 'SERVICE',
+  MODBUS = 'MODBUS',
+}
+
+export enum CommandDeliveryWayNameEnum {
+  CUSTOM = '自定义命令',
+  SERVICE = '服务调用',
+  MODBUS = 'MODBUS',
+}
+
+export enum CommandMethodEnum {
+  THINGSKIT = 'methodThingskit',
+}
+
+export enum ModbusCRCEnum {
+  CRC_16_LOWER = 'CRC_16_LOWER',
+}

@@ -64,50 +64,6 @@ export enum ActTypeNameEnum {
   VARIABLE_IMAGE = '变量图片',
 }
 
-export enum DeviceTypeEnum {
-  /**
-   * @description 网关设备
-   */
-  GATEWAY = 'GATEWAY',
-
-  /**
-   * @description 直连设备
-   */
-  DIRECT_CONNECTION = 'DIRECT_CONNECTION',
-
-  /**
-   * @description 网关子设备
-   */
-  SENSOR = 'SENSOR',
-}
-
-export enum DeviceTypeNameEnum {
-  /**
-   * @description 网关设备
-   */
-  GATEWAY = '网关设备',
-
-  /**
-   * @description 直连设备
-   */
-  DIRECT_CONNECTION = '直连设备',
-
-  /**
-   * @description 网关子设备
-   */
-  SENSOR = '网关子设备',
-}
-
-export enum TransportTypeEnum {
-  MQTT = 'MQTT',
-  TCP = 'TCP',
-}
-
-export enum CodeTypeEnum {
-  CUSTOM = 'CUSTOM',
-  MODBUS_RTU = 'MODBUS_RTU',
-}
-
 export enum EventTypeEnum {
   /**
    * @description 鼠标抬起
@@ -238,17 +194,9 @@ export enum ContentDataFieldsEnum {
   DEVICE_ID = 'deviceId',
   ORG_ID = 'orgId',
   ATTR = 'attr',
-  VIDEO_FILTER = 'videoFilter',
-  VIDEO_ID = 'id',
-  VIDEO_URL = 'videoUrl',
-  ACCESS_MODE = 'accessMode',
-  VIDEO_FLAG = 'videoComponentFlag',
-
-  ATTR_INFO = 'attrInfo',
-  DEVICE_INFO = 'deviceInfo',
-  TRANSPORT_TYPE = 'transportType',
+  DEVICE_NAME = 'deviceName',
+
   CODE_TYPE = 'codeType',
-  DEVICE_ADDITIONAL_INFO = 'deviceAdditionalInfo',
 }
 
 export enum ContentDataFieldsNameEnum {
@@ -257,14 +205,7 @@ export enum ContentDataFieldsNameEnum {
   ORG_ID = '组织',
   DEVICE_ID = '设备',
   ATTR = '属性',
-  VIDEO_ID = '视频流',
-  ACCESS_MODE = 'ACCESS_MODE',
-  VIDEO_URL = '视频地址',
-
-  ATTR_INFO = '物模型属性详情',
-  DEVICE_INFO = '设备详情',
-  TRANSPORT_TYPE = '传输协议',
-  DEVICE_ADDITIONAL_INFO = '设备额外信息',
+  deviceName = '设备名称',
 }
 
 export enum VariableImageSourceEnum {
@@ -277,46 +218,6 @@ export enum VariableImageSourceNameEnum {
   GALLERY = '图库图形',
 }
 
-export enum CommandDeliveryWayEnum {
-  CUSTOM = 'CUSTOM',
-  SERVICE = 'SERVICE',
-  MODBUS = 'MODBUS',
-}
-
-export enum CommandDeliveryWayNameEnum {
-  CUSTOM = '自定义命令',
-  SERVICE = '服务调用',
-  MODBUS = 'MODBUS',
-}
-
-export enum FunctionType {
-  PROPERTIES = 'properties',
-  EVENTS = 'events',
-  SERVICE = 'services',
-}
-
-export enum AssessMode {
-  READ = 'r',
-  WRITE = 'w',
-}
-
-export enum CommandTypeEnum {
-  SERVICE = 1,
-  API = 'API',
-}
-
-/**
- * 新增参数 动态显示表单
- */
-export enum DataTypeEnum {
-  NUMBER_INT = 'INT',
-  NUMBER_DOUBLE = 'DOUBLE',
-  STRING = 'TEXT',
-  STRUCT = 'STRUCT',
-  BOOL = 'BOOL',
-  ENUM = 'ENUM',
-}
-
 export enum AggregateTypeEnum {
   MIN = 'MIN',
   MAX = 'MAX',
@@ -339,24 +240,3 @@ export enum SocketSubscriberEnum {
   HISTORY_CMDS = 'historyCmds',
 }
 
-export enum AlarmStatusEnum {
-  CLEARED_UN_ACK = 'CLEARED_UNACK',
-  ACTIVE_UN_ACK = 'ACTIVE_UNACK',
-  CLEARED_ACK = 'CLEARED_ACK',
-  ACTIVE_ACK = 'ACTIVE_ACK',
-}
-
-export enum AlarmStatusColorEnum {
-  CLEARED_UNACK = 'red',
-  ACTIVE_UNACK = 'orange',
-  CLEARED_ACK = 'cyan',
-  ACTIVE_ACK = 'green',
-}
-
-export enum AlarmStatusNameEnum {
-  CLEARED_UNACK = '清除未确认',
-  ACTIVE_UNACK = '激活未确认',
-  CLEARED_ACK = '清除已确认',
-  ACTIVE_ACK = '激活已确认',
-}
-

+export enum DeviceTypeEnum {
+  /**
+   * @description 网关设备
+   */
+  GATEWAY = 'GATEWAY',
+
+  /**
+   * @description 直连设备
+   */
+  DIRECT_CONNECTION = 'DIRECT_CONNECTION',
+
+  /**
+   * @description 网关子设备
+   */
+  SENSOR = 'SENSOR',
+}
+
+export enum DeviceTypeNameEnum {
+  /**
+   * @description 网关设备
+   */
+  GATEWAY = '网关设备',
+
+  /**
+   * @description 直连设备
+   */
+  DIRECT_CONNECTION = '直连设备',
+
+  /**
+   * @description 网关子设备
+   */
+  SENSOR = '网关子设备',
+}
+
+export enum TransportTypeEnum {
+  DEFAULT = 'DEFAULT',
+  MQTT = 'MQTT',
+  COAP = 'COAP',
+  LWM2M = 'LWM2M',
+  SNMP = 'SNMP',
+  TCP = 'TCP',
+}
+
+export enum TCPProtocolTypeEnum {
+  CUSTOM = 'CUSTOM',
+  MODBUS_RTU = 'MODBUS_RTU',
+}
+
+export enum TCPProtocolTypeNameEnum {
+  CUSTOM = '自定义',
+  MODBUS_RTU = 'MODBUS_RTU',
+}

 /**
- * @description TCP物模型拓展描述符数据格式
+ * 新增参数 动态显示表单
  */
-export enum TCPObjectModelActionTypeEnum {
-  BOOL = '05',
-  INT = '06',
-  DOUBLE = '16',
+export enum DataTypeEnum {
+  NUMBER_INT = 'INT',
+  NUMBER_DOUBLE = 'DOUBLE',
+  STRING = 'TEXT',
+  STRUCT = 'STRUCT',
+  BOOL = 'BOOL',
+  ENUM = 'ENUM',
+}
+
+export enum FunctionTypeEnum {
+  PROPERTIES = 'properties',
+  EVENTS = 'events',
+  SERVICE = 'services',
+}
+
+export enum ObjectModelAccessModeEnum {
+  READ = 'r',
+  READ_AND_WRITE = 'rw',
+}
+
+export enum OriginalDataTypeEnum {
+  INT16_AB = 'INT16_AB',
+  INT16_BA = 'INT16_BA',
+  UINT16_AB = 'UINT16_AB',
+  UINT16_BA = 'UINT16_BA',
+  INT32_AB_CD = 'INT32_AB_CD',
+  INT32_CD_AB = 'INT32_CD_AB',
+  INT32_BA_DC = 'INT32_BA_DC',
+  INT32_DC_BA = 'INT32_DC_BA',
+  UINT32_AB_CD = 'UINT32_AB_CD',
+  UINT32_CD_AB = 'UINT32_CD_AB',
+  UINT32_BA_DC = 'UINT32_BA_DC',
+  UINT32_DC_BA = 'UINT32_DC_BA',
+  FLOAT_AB_CD = 'FLOAT_AB_CD',
+  FLOAT_CD_AB = 'FLOAT_CD_AB',
+  FLOAT_BA_DC = 'FLOAT_BA_DC',
+  FLOAT_DC_BA = 'FLOAT_DC_BA',
+  DOUBLE = 'DOUBLE',
+  STRING = 'STRING',
+  BOOLEAN = 'BOOLEAN',
+  BITS = 'BITS',
+}
+
+export enum OriginalDataTypeNameEnum {
+  INT16_AB = '16位有符号整数AB',
+  INT16_BA = '16位有符号整数BA',
+  UINT16_AB = '16位无符号整数AB',
+  UINT16_BA = '16位无符号整数BA',
+  INT32_AB_CD = '32位有符号整数AB_CD',
+  INT32_CD_AB = '32位有符号整数CD_AB',
+  INT32_BA_DC = '32位有符号整数BA_DC',
+  INT32_DC_BA = '32位有符号整数DC_BA',
+  UINT32_AB_CD = '32位无符号整数AB_CD',
+  UINT32_CD_AB = '32位无符号整数CD_AB',
+  UINT32_BA_DC = '32位无符号整数BA_DC',
+  UINT32_DC_BA = '32位无符号整数DC_BA',
+  FLOAT_AB_CD = '单精度浮点型AB_CD',
+  FLOAT_CD_AB = '单精度浮点型CD_AB',
+  FLOAT_BA_DC = '单精度浮点型BA_DC',
+  FLOAT_DC_BA = '单精度浮点型DC_BA',
+  DOUBLE = '双精度浮点型',
+  STRING = '字符串',
+  BOOLEAN = '布尔型',
+  BITS = '位',
+}
+
+export enum ExtendDescOperationTypeEnum {
+  INPUT_STATUS_R_02 = 'inputStatus_r_02',
+  COIL_STATUS_R_01 = 'coilStatus_r_01',
+  COIL_STATUS_RW_01_05 = 'coilStatus_rw_01_05',
+  COIL_STATUS_RW_01_0F = 'coilStatus_rw_01_0F',
+  COIL_STATUS_W_05 = 'coilStatus_w_05',
+  COIL_STATUS_W_0F = 'coilStatus_w_0F',
+  HOLDING_REGISTER_R_03 = 'holdingRegister_r_03',
+  HOLDING_REGISTER_RW_03_06 = 'holdingRegister_rw_03_06',
+  HOLDING_REGISTER_RW_03_10 = 'holdingRegister_rw_03_10',
+  HOLDING_REGISTER_W_06 = 'holdingRegister_w_06',
+  HOLDING_REGISTER_W_10 = 'holdingRegister_w_10',
+  INPUT_REGISTER_R_04 = 'inputRegister_r_04',
+}
+
+export enum ExtendDescOperationTypeNameEnum {
+  INPUT_STATUS_R_02 = '离散量输入(只读,0x02)',
+  COIL_STATUS_R_01 = '线圈状态(只读,0x01)',
+  COIL_STATUS_RW_01_05 = '线圈状态(读写,读取使用0x01,写入使用0x05)',
+  COIL_STATUS_RW_01_0F = '线圈状态(读写,读取使用0x01,写入使用0x0F)',
+  COIL_STATUS_W_05 = '线圈状态(只写,0x05)',
+  COIL_STATUS_W_0F = '线圈状态(只写,0x0F)',
+  HOLDING_REGISTER_R_03 = '保持寄存器(只读,0x03)',
+  HOLDING_REGISTER_RW_03_06 = '保持寄存器(读写,读取使用0x03,写入使用0x06)',
+  HOLDING_REGISTER_RW_03_10 = '保持寄存器(读写,读取使用0x03,写入使用0x10)',
+  HOLDING_REGISTER_W_06 = '保持寄存器(只写,0x06)',
+  HOLDING_REGISTER_W_10 = '保持寄存器(只写,0x10)',
+  INPUT_REGISTER_R_04 = '输入寄存器(只读,0x04)',
 }

+export enum VideoAccessModeEnum {
+  ManuallyEnter = 0,
+  Streaming = 1,
+  GBT28181 = 2,
+}

+import { OriginalDataTypeEnum } from '@/enums/objectModelEnum'
+import { useParseOriginalDataType } from '@/hooks/business/useParseOriginalDataType'
+
+export function getBoolValueByStatus(status: boolean) {
+  return status ? parseInt('FF00', 16) : parseInt('0000', 16)
+}
+
+export function useBaseConversion() {
+  function DecTo32Float(number: number) {
+    const arr = new Uint8Array(4)
+    const view = new DataView(arr.buffer)
+    view.setFloat32(0, +number)
+    return arr
+  }
+
+  function DecTo64Double(number: number) {
+    const arr = new Uint8Array(8)
+    const view = new DataView(arr.buffer)
+    view.setFloat64(0, +number)
+    return arr
+  }
+
+  function arrToBase(toBase: number, arr: Uint8Array) {
+    let result = ''
+    for (let i = 0; i < arr.length; i++)
+      result += (256 + arr[i]).toString(toBase).substring(1).toUpperCase()
+
+    return result
+  }
+
+  function DecTo16Uint(number: number) {
+    const arr = new Uint8Array(2)
+    const view = new DataView(arr.buffer)
+    view.setUint16(0, +number)
+    return arr
+  }
+
+  function DecTo16Int(number: number) {
+    const arr = new Uint8Array(2)
+    const view = new DataView(arr.buffer)
+    view.setInt16(0, +number)
+    return arr
+  }
+
+  function DecTo32Uint(number: number) {
+    const arr = new Uint8Array(4)
+    const view = new DataView(arr.buffer)
+    view.setUint32(0, +number)
+    return arr
+  }
+
+  function DecTo32Int(number: number) {
+    const arr = new Uint8Array(4)
+    const view = new DataView(arr.buffer)
+    view.setInt32(0, +number)
+    return arr
+  }
+
+  function DecToBinaryByType(type: OriginalDataTypeEnum, number: number) {
+    switch (type) {
+      case OriginalDataTypeEnum.INT16_AB:
+      case OriginalDataTypeEnum.INT16_BA:
+        return arrToBase(2, DecTo16Int(number))
+
+      case OriginalDataTypeEnum.UINT16_AB:
+      case OriginalDataTypeEnum.UINT16_BA:
+        return arrToBase(2, DecTo16Uint(number))
+
+      case OriginalDataTypeEnum.INT32_AB_CD:
+      case OriginalDataTypeEnum.INT32_CD_AB:
+      case OriginalDataTypeEnum.INT32_BA_DC:
+      case OriginalDataTypeEnum.INT32_DC_BA:
+        return arrToBase(2, DecTo32Int(number))
+
+      case OriginalDataTypeEnum.UINT32_AB_CD:
+      case OriginalDataTypeEnum.UINT32_CD_AB:
+      case OriginalDataTypeEnum.UINT32_BA_DC:
+      case OriginalDataTypeEnum.UINT32_DC_BA:
+        return arrToBase(2, DecTo32Uint(number))
+
+      case OriginalDataTypeEnum.FLOAT_AB_CD:
+      case OriginalDataTypeEnum.FLOAT_CD_AB:
+      case OriginalDataTypeEnum.FLOAT_BA_DC:
+      case OriginalDataTypeEnum.FLOAT_DC_BA:
+        return arrToBase(2, DecTo32Float(number))
+
+      case OriginalDataTypeEnum.DOUBLE:
+        return arrToBase(2, DecTo64Double(number))
+    }
+  }
+
+  function SplitStringToGroupByItemLength(
+    value: string,
+    itemLength = 8,
+    ignoreLessThan = false,
+  ): string[] {
+    const reg = new RegExp(`.{${ignoreLessThan ? '' : '1,'}${itemLength}}`, 'g')
+    return value.match(reg) || []
+  }
+
+  function ExchangeByteOrder(binary: string, order: string) {
+    const group = SplitStringToGroupByItemLength(binary)
+
+    const BASE_ORDER = {
+      A: 0,
+      B: 1,
+      C: 2,
+      D: 3,
+    }
+
+    const array: string[] = Array.from({ length: binary.length / 8 })
+
+    order
+      .split('')
+      .forEach((bytePosition, index) => (array[index] = group[BASE_ORDER[bytePosition as keyof typeof BASE_ORDER] as number]))
+
+    return array.join('')
+  }
+
+  function ByteToHex(binary: string) {
+    const group = SplitStringToGroupByItemLength(binary, 16)
+    return group.map(byte => parseInt(byte, 2).toString(16))
+  }
+
+  function ByteToDec(binary: string) {
+    const group = SplitStringToGroupByItemLength(binary, 16)
+    return group.map(byte => parseInt(byte, 2))
+  }
+
+  function StringToHEXBuffer(string: string | number) {
+    return string
+      .toString()
+      .split('')
+      .map(string => string.charCodeAt(0).toString(16))
+      .reverse()
+  }
+
+  function getRegisterValueByOriginalDataType(
+    value: number,
+    type: OriginalDataTypeEnum,
+    additional?: { bitMask?: number; registerNumber?: number },
+  ) {
+    const { exchangeSortFlag } = useParseOriginalDataType(type)
+    // eslint-disable-next-line no-console
+    console.groupCollapsed('Modbus Debug')
+
+    let result: number[]
+
+    if (type === OriginalDataTypeEnum.BOOLEAN) {
+      result = [getBoolValueByStatus(!!value)]
+    }
+    else if (type === OriginalDataTypeEnum.BITS) {
+      const { bitMask = 0 } = additional || {}
+      const binaryArray = Array.from({ length: 16 }, () => 0)
+      binaryArray[15 - bitMask] = value
+      result = [parseInt(binaryArray.join(''), 2)]
+    }
+    else if (type === OriginalDataTypeEnum.STRING) {
+      let buffer = StringToHEXBuffer(value)
+      const { registerNumber = 0 } = additional || {}
+
+      if (buffer.length < registerNumber * 2) {
+        buffer = [
+          ...Array.from({ length: registerNumber * 2 - buffer.length }, () => '00'),
+          ...buffer,
+        ]
+      }
+
+      result = SplitStringToGroupByItemLength(buffer.join(''), 4).map(hex => parseInt(hex, 16))
+    }
+    else {
+      // eslint-disable-next-line no-console
+      console.table({ input: value, sort: exchangeSortFlag, type })
+
+      let binary = DecToBinaryByType(type, value)!
+
+      // eslint-disable-next-line no-console
+      console.table({ beforeExchange: binary })
+
+      if (exchangeSortFlag) binary = ExchangeByteOrder(binary, exchangeSortFlag)
+      result = ByteToDec(binary)
+
+      // eslint-disable-next-line no-console
+      console.table({
+        afterEchange: binary,
+        dec: result.toString(),
+        hex: ByteToHex(binary).toString(),
+      })
+    }
+
+    // eslint-disable-next-line no-console
+    console.groupEnd()
+
+    return result
+  }
+
+  return {
+    DecToBinaryByType,
+    ByteToDec,
+    ByteToHex,
+    ExchangeByteOrder,
+    SplitStringToGroupByItemLength,
+    getRegisterValueByOriginalDataType,
+    StringToHEXBuffer,
+  }
+}

+import { ref } from 'vue'
+import { isFunction } from '@wry-smile/utils-is'
+import { useMessage } from '../web/useMessage'
+import { useCoverModbusCommand } from './useCoverModbusCommand'
+import {
+  TCPProtocolTypeEnum,
+  TransportTypeEnum,
+} from '@/enums/deviceEnum'
+import { FunctionTypeEnum } from '@/enums/objectModelEnum'
+import { CommandCallWayEnum, CommandMethodEnum, CommandTypeEnum, CommandWayEnum } from '@/enums/commandEnum'
+import type { DeviceItemType, DeviceProfileItemType, RpcCommandType, Tsl } from '@/api/device/model'
+import { getDeviceActive, getDeviceInfo, doCommandDelivery as rpcCommandApi } from '@/api/device'
+import { useProductsStoreWithOut } from '@/store/modules/products'
+
+interface SetupType {
+  entityId: string
+  transportType: TransportTypeEnum
+  isTCPModbus: boolean
+  deviceCode: string | undefined
+  deviceDetail: DeviceItemType
+  objectModel: Tsl | undefined
+  identifier: string
+}
+
+export interface DoCommandDeliverParamsType {
+  value: any
+  deviceDetail?: DeviceItemType
+  deviceId?: string
+  identifier?: string
+  objectModel?: Tsl
+  deviceProfileId?: string
+  deviceProfileDetail?: DeviceProfileItemType
+  way?: CommandWayEnum
+  cmdType?: CommandTypeEnum
+  transportType?: TransportTypeEnum
+  penetration?: boolean
+
+  beforeFetch?: (
+    rpcCommand: RpcCommandType,
+    setup: SetupType
+  ) => RpcCommandType | Promise<RpcCommandType>
+}
+
+export function useCommandDelivery() {
+  const loading = ref(false)
+  async function doSetup(params: DoCommandDeliverParamsType) {
+    let { deviceDetail, identifier, deviceProfileId, objectModel, transportType } = params
+    const { deviceId, deviceProfileDetail } = params
+
+    const entityId = deviceId || deviceDetail?.tbDeviceId
+    if (!entityId)
+      throw new Error('not found entityId')
+
+    identifier = identifier || objectModel?.identifier
+
+    if (!identifier)
+      throw new Error('not found identifier')
+
+    transportType = transportType || (deviceDetail?.transportType as TransportTypeEnum)
+
+    if (
+      !transportType
+      || (transportType === TransportTypeEnum.TCP && !deviceDetail)
+      || !deviceDetail?.deviceProfile
+    ) {
+      deviceDetail = await getDeviceInfo(entityId)
+      transportType = deviceDetail.transportType as TransportTypeEnum
+    }
+
+    const isTCPModbus
+      = transportType === TransportTypeEnum.TCP
+      && deviceDetail?.deviceProfile?.profileData?.transportConfiguration?.protocol
+      === TCPProtocolTypeEnum.MODBUS_RTU
+
+    if (isTCPModbus && !objectModel?.extensionDesc) {
+      deviceProfileId = deviceDetail.deviceProfileId || deviceProfileId || deviceProfileDetail?.id
+      if (!deviceProfileId)
+        throw new Error('not found deviceProfile')
+
+      const productStore = useProductsStoreWithOut()
+      objectModel = productStore.getObjectModelByIdWithIdentifier(deviceProfileId!, identifier)!
+    }
+
+    const deviceCode = deviceDetail.code
+    return {
+      entityId,
+      transportType,
+      isTCPModbus,
+      deviceCode,
+      deviceDetail,
+      objectModel,
+      identifier,
+    }
+  }
+
+  async function doCommandDelivery(params: DoCommandDeliverParamsType) {
+    try {
+      loading.value = true
+
+      const setupResult = await doSetup(params)
+
+      const { entityId, transportType, isTCPModbus, deviceCode, objectModel, identifier }
+        = setupResult
+
+      let command = params.value
+
+      let rpcCommand: RpcCommandType = {
+        persistent: true,
+        method: CommandMethodEnum.THINGSKIT,
+        additionalInfo: {
+          cmdType: params.cmdType ?? CommandTypeEnum.API,
+        },
+        params: command,
+      }
+
+      let way = params.way ?? CommandWayEnum.ONE_WAY
+
+      if (!params.penetration) {
+        if (transportType === TransportTypeEnum.TCP) {
+          command = params.value
+          if (isTCPModbus) {
+            const { doCoverCommand } = useCoverModbusCommand()
+            command = await doCoverCommand(params.value, objectModel!, deviceCode, entityId)
+          }
+        }
+        else {
+          command = {
+            [identifier]: command,
+          }
+        }
+
+        if (objectModel?.functionType === FunctionTypeEnum.SERVICE) {
+          rpcCommand.additionalInfo.cmdType = CommandTypeEnum.SERVICE
+          way
+            = objectModel.callType === CommandCallWayEnum.ASYNC
+              ? CommandWayEnum.ONE_WAY
+              : CommandWayEnum.TWO_WAY
+        }
+
+        rpcCommand.params = command
+      }
+
+      const sendApi = rpcCommandApi
+
+      if (params.beforeFetch && isFunction(params.beforeFetch))
+        rpcCommand = await params.beforeFetch(rpcCommand, setupResult)
+
+      if (way === CommandWayEnum.TWO_WAY) {
+        const result = await getDeviceActive(entityId)
+        const [firsetItem] = result || []
+
+        if (!firsetItem.value) {
+          const { createMessage } = useMessage()
+          const message = '当前设备不在线'
+          createMessage.warning(message)
+          throw Error(message)
+        }
+      }
+      await sendApi({ way, deviceId: entityId, command: rpcCommand })
+    }
+    finally {
+      loading.value = false
+    }
+  }
+
+  return {
+    loading,
+    doCommandDelivery,
+  }
+}