perf: 优化命令下发&&物模型枚举与结构体回显

-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 { FunctionTypeEnum } from '@/enums/datasource'
 import { isShareMode } from '@/utils/env'
 import { defHttp } from '@/utils/http'
 
@@ -21,6 +22,8 @@ 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 {
@@ -139,3 +142,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 { DataTypeEnum, FunctionTypeEnum, TransportTypeEnum } from '@/enums/datasource'
 
 export interface DeviceProfileItemType {
   id: string
@@ -27,6 +27,7 @@ export interface ProfileData {
 interface AdditionalInfo {
   cmdType: string
 }
+
 export interface SendValue {
   additionalInfo: AdditionalInfo
   method: string
@@ -57,7 +58,7 @@ export interface StructJSON {
 }
 
 export interface ThingsModel {
-  functionType: FunctionType
+  functionType: FunctionTypeEnum
   functionName: string
   identifier: string
   callType: any
@@ -71,7 +72,7 @@ export interface ThingsModel {
 }
 
 export interface FunctionJson {
-  dataType: DataType | DataType[]
+  dataType: DataType
   inputData?: StructJSON[]
   outputData?: StructJSON[]
   serviceCommand?: string
@@ -160,7 +161,7 @@ export interface Specs {
   min: string
   max: string
   name?: string
-  value?: string
+  value?: any
   dataType?: DataTypeEnum
 }
 
@@ -193,3 +194,23 @@ 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
+  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 { ActRangListItemTypeEnum, ActTypeEnum, AggregateTypeEnum, CommandDeliveryWayEnum, DeviceTypeEnum, EventActionTypeEnum, EventTypeEnum, SocketSubscriberEnum } from '@/enums/datasource'
 
 export enum DeleteNodeDataTypeEnum {
   DATASOURCE = 'DATASOURCE',
@@ -93,18 +93,13 @@ export interface NodeDataDataSourceJsonType {
   deviceProfileId: string
   deviceProfileTemplateId?: string
   attr: string
-  attrInfo: ThingsModelItemType
-
-  deviceType?: DeviceTypeEnum
-  transportType?: TransportTypeEnum
 
   enable: boolean
   chartOption?: ChartOptionType
   videoOption?: VideoOptionType
   alarmListOption?: AlarmListOptionType
-  deviceInfo?: DeviceInfoType
-  circularFlowMeterOption?: FlowMeterColorItemType[] // 圆形水球图数据暂定any
-  rectFlowMeterOption?: FlowMeterColorItemType[] // 方形水球图颜色配置数据暂定any
+  circularFlowMeterOption?: FlowMeterColorItemType[]
+  rectFlowMeterOption?: FlowMeterColorItemType[]
 
 }
 
@@ -128,17 +123,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 +145,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 { 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'
@@ -15,32 +15,38 @@ 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
+function getTCPModbusSchemas({ objectModelTsl, required }: { objectModelTsl: Tsl; required?: boolean }): FormSchema {
+  const { specs: tslSpecs, extensionDesc } = objectModelTsl
+  const { dataType } = tslSpecs
   const { specs, type } = dataType || {}
   const { valueRange, length = 10240 } = specs! as Specs
   const { max = Number.MAX_SAFE_INTEGER, min = Number.MIN_SAFE_INTEGER } = valueRange || {}
+  const { actionType } = extensionDesc || {}
 
   function createInputNumber({
     identifier,
     functionName,
-  }: StructJSON): FormSchema {
+  }: Tsl): FormSchema {
     return {
       field: identifier,
       label: functionName,
@@ -54,7 +60,7 @@ function getTCPModbusSchemas({ structJson, required, actionType }: { structJson:
     }
   }
 
-  const createInput = ({ identifier, functionName }: StructJSON): FormSchema => {
+  const createInput = ({ identifier, functionName }: Tsl): FormSchema => {
     return {
       field: identifier,
       label: functionName,
@@ -74,24 +80,23 @@ function getTCPModbusSchemas({ structJson, required, actionType }: { structJson:
     } as FormSchema
   }
 
-  return type === DataTypeEnum.STRING ? createInput(structJson) : createInputNumber(structJson)
+  return type === DataTypeEnum.STRING ? createInput(objectModelTsl) : createInputNumber(objectModelTsl)
 }
 
-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.codeType === CodeTypeEnum.MODBUS_RTU && deviceInfo.code) {
+    schemas.push(getTCPModbusSchemas({ required: true, 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 +105,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 { nextTick, ref, toRaw, unref } from 'vue'
 import type { AttributeDeliverModalOpenParamsType } from './AttributeDeliverModal.config'
 import { createFormSchemas } from './AttributeDeliverModal.config'
-import { useGetModbusCommand } from './useGetModbusCommand'
+import { useCommandDeliver } from './useCommadDeliver'
 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 { DataTypeEnum } from '@/enums/datasource'
 
 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 { setup, getDeviceInfo, getObjectModelTsl, doCommandDeliver } = useCommandDeliver()
+
+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
+  await setup({ deviceId, deviceProfileId, attr, callType: way })
+
+  nextTick(() => {
+    const schemas = createFormSchemas({ operationPasswordInfo, deviceInfo: toRaw(unref(getDeviceInfo)!), objectModelTsl: toRaw(unref(getObjectModelTsl)!) })
+    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
-
-    if (isString) return value
-
-    const { getModbusCommand, validateCanGetCommand } = useGetModbusCommand()
-    if (!validateCanGetCommand(unref(currentDataSourceJson)!.attrInfo.extensionDesc, unref(currentDataSourceJson)!.deviceInfo?.code).flag) return
-
-    const res = await getModbusCommand(value as unknown as number, unref(currentDataSourceJson)!.attrInfo.extensionDesc!, unref(currentDataSourceJson)!.deviceInfo!.code!)
-    return res
-  }
+  const isStructJSON = unref(getObjectModelTsl)?.specs.dataType.type === DataTypeEnum.STRUCT
+  const identifier = unref(getObjectModelTsl)!.identifier
+  await doCommandDeliver(isStructJSON ? result : result[identifier])
 }
 
 const handleOk = async () => {
   await validate()
-  const result = await getResult()
-  if (!result) return
-  unref(resolveFn)?.(result)
+  await getResult()
   visible.value = false
   resetFields()
 }
@@ -73,7 +53,7 @@ defineExpose({ open })
 
 <template>
   <Modal
-    v-model:open="visible" title="属性下发" ok-text="确认" :width="400" cancel-text="取消" @cancel="handleCancel"
+    v-model:open="visible" :title="`属性下发 / ${getDeviceInfo?.alias || getDeviceInfo?.name}`" ok-text="确认" :width="400" cancel-text="取消" @cancel="handleCancel"
     @ok="handleOk"
   >
     <BasicForm @register="register" />

-<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 { nextTick, ref, unref } from 'vue'
+import { computed, nextTick, ref, unref } from 'vue'
+import { Icon } from '@iconify/vue'
+import { useCommandDeliver } from './useCommadDeliver'
 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'
 
-const resolveFn = ref<Fn>()
+interface SwitchCommandDeliveryModalParamsType {
+  operationPasswordInfo?: OperationPasswordDataType
+  dataSourceJson: NodeDataDataSourceJsonType
+  eventBindData: SingleClickEventDataType
+  sendValue: any
+}
 
 const visible = ref(false)
 
+const currentOperationPasswordInfo = ref<OperationPasswordDataType>()
+
+const currendSendValue = ref()
+
 const [register, { resetFields, validate, setProps }] = useForm({
   showActionButtonGroup: false,
   layout: FormLayoutEnum.VERTICAL,
@@ -18,7 +30,7 @@ const createFormSchemas = (password: string): FormSchema[] => {
     {
       field: 'password',
       component: ComponentEnum.INPUT_PAWSSWORD,
-      label: '',
+      label: '操作密码',
       required: true,
       rules: [{
         validator(_rule, value) {
@@ -33,21 +45,27 @@ const createFormSchemas = (password: string): FormSchema[] => {
   ]
 }
 
-const open = async (pwd: string) => {
-  visible.value = true
-  return new Promise((resolve) => {
-    resolveFn.value = resolve
+const getHasEnableOperationPassword = computed(() => !!(unref(currentOperationPasswordInfo)?.checked && unref(currentOperationPasswordInfo)?.value))
+
+const { setup, doCommandDeliver, getDeviceInfo } = useCommandDeliver()
 
-    nextTick(() => {
-      setProps({ schemas: createFormSchemas(pwd) })
-    })
+const open = async ({ operationPasswordInfo, dataSourceJson, eventBindData, sendValue }: SwitchCommandDeliveryModalParamsType) => {
+  visible.value = true
+  currentOperationPasswordInfo.value = operationPasswordInfo
+  currendSendValue.value = sendValue
+  const { deviceId, deviceProfileId, attr } = unref(dataSourceJson)
+  const { way } = eventBindData
+  await setup({ deviceId, deviceProfileId, attr, callType: way })
+  nextTick(() => {
+    unref(getHasEnableOperationPassword) && setProps({ schemas: createFormSchemas(operationPasswordInfo!.value!) })
   })
 }
 
 const handlerOk = async () => {
-  await validate()
-  unref(resolveFn)?.(true)
-  resetFields()
+  if (unref(getHasEnableOperationPassword))
+    await validate()
+  await doCommandDeliver(unref(currendSendValue))
+  if (unref(getHasEnableOperationPassword)) resetFields()
   visible.value = false
 }
 
@@ -56,10 +74,27 @@ defineExpose({ open })
 
 <template>
   <Modal
-    v-model:open="visible" :width="300" ok-text="确认" cancel-text="取消"
-    title="操作密码"
+    v-model:open="visible"
+    :title="`属性下发 / ${getDeviceInfo?.alias || getDeviceInfo?.name}`"
+    :width="300"
+    ok-text="确认"
+    cancel-text="取消"
+    destroy-on-close
     @ok="handlerOk"
   >
-    <BasicForm @register="register" />
+    <!-- <template #title>
+      <div v-if="getHasEnableOperationPassword" />
+      <div v-else 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> -->
+    <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 { Tsl } 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'
+import { DataTypeEnum } from '@/enums/datasource'
+
+export enum FormFieldsEnum {
+  CUSTOM_COMMAND = 'customCommand',
+  OPERATION_PASSWORD = 'password',
+
+  SERVICE_COMMAND = 'serviceCommand',
+}
+
 export const formSchemas: FormSchema[] = [
   {
     field: 'sendValue',
@@ -10,219 +22,122 @@ 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
+export const getModbusSchemas = (objectModelTsl: Tsl): FormSchema[] => {
+  const { functionName, identifier, specs } = objectModelTsl
+  const { type } = specs.dataType!
+  const HEX_MAX_VALUE = Number(0xffff)
 
-    else
-      t += c
+  const _formSchema: FormSchema = {
+    field: identifier,
+    label: functionName,
+    component: ComponentEnum.INPUT_NUMBER,
   }
-  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
+  const getIntSchema = () => {
+    return Object.assign(_formSchema, {
+      required: true,
+      componentProps: {
+        min: 0,
+        max: HEX_MAX_VALUE,
+        precision: 2,
+        placeholder: '请输入正数',
+      },
+    } as Partial<FormSchema>)
   }
-  else {
-    s = 1
 
-    t = 0 - t
+  const getBoolSchema = () => {
+    return Object.assign(_formSchema, {
+      required: true,
+      componentProps: {
+        min: 0,
+        max: 1,
+        precision: 0,
+        placeholder: '请输入0或1',
+      },
+    } as Partial<FormSchema>)
   }
-  m = t.toString(2)
 
-  if (m >= 1) {
-    if (m.indexOf('.') === -1)
-      m = `${m}.0`
-
-    e = m.indexOf('.') - 1
-  }
-  else {
-    e = 1 - m.indexOf('1')
+  const getDoubleSchema = () => {
+    return Object.assign(_formSchema, {
+      required: true,
+      componentProps: {
+        placeholder: '请输入数字',
+        precision: 2,
+        max: HEX_MAX_VALUE,
+      },
+    } as Partial<FormSchema>)
   }
-  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)
-    }
+  const getStringSchema = () => {
+    return Object.assign(_formSchema, {
+      component: ComponentEnum.INPUT,
+      required: true,
+      rules: [{ validator: validateTCPCustomCommand }],
+      componentProps: {
+        placeholder: '请输入自定义命令',
+      },
+    } as Partial<FormSchema>)
   }
-  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[] = []
+  const schemasMap: Partial<Record<DataTypeEnum, Fn<any, FormSchema>>> = {
+    [DataTypeEnum.NUMBER_INT]: getIntSchema,
+    [DataTypeEnum.BOOL]: getBoolSchema,
+    [DataTypeEnum.NUMBER_DOUBLE]: getDoubleSchema,
+    [DataTypeEnum.STRING]: getStringSchema,
+  }
 
-  for (let i = 0; i < a.length; i++)
-    r[i] = SingleToHex(a[i])
+  const schemas = schemasMap[type as DataTypeEnum]?.()
 
-  return r.join('\r\n')
+  return [schemas!]
 }
 
-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, getModbusSchemas, getOperationPasswordSchemas, getTcpCustomCommandSchemas } from './config.ts'
+import { useCommandDeliver } from './useCommadDeliver'
+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 { CommandDeliveryWayEnum, TransportTypeEnum } from '@/enums/datasource'
 import { ThingsModelForm } from '@/core/Library/components/ThingsModelForm'
-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
+import type { DeviceItemType, Tsl } from '@/api/device/model'
+import { useProductsStoreWithOut } from '@/store/modules/products'
+import { useJsonParse } from '@/hooks/business/useJSONParse'
+import { CommandCallWayEnum, CommandWayEnum } from '@/enums/commandEnum'
+
+interface OpenParamsType {
+  dataSource: NodeDataDataSourceJsonType
+  eventBindData: SingleClickEventDataType
+  operationPasswordInfo?: OperationPasswordDataType
 }
 
-const visible = ref<boolean>(false)
+const thingsModelElRef = ref<InstanceType<typeof ThingsModelForm>>()
 
-const { createMessage } = useMessage()
-const loading = ref<boolean>(false)
-
-const dataSourceJson = ref<any>({})
-const thingsModelElRef = ref()
-
-const isInputData = ref<boolean>(false)// 判断使用那个表单  true: 用封装的表单  false：用自己写的表单
-
-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),
+    })
+  })
+}
+
+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 })
+}
+
+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)
+  })
 }
 
-// 获取设备信息
-const getDeviceDetail = async (deviceId: string) => {
-  return await getDeviceInfo(deviceId)
+function handleOpenModbusCommandModal(objectModelTsl: Tsl) {
+  const { setProps } = customCommandFormAction
+  setProps({ schemas: getModbusSchemas(objectModelTsl) })
 }
 
-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 })
-    }
-  }
+const { setup, getDeviceInfo, getObjectModelTsl, doCommandDeliver } = useCommandDeliver()
+
+const open = async ({ eventBindData, operationPasswordInfo, dataSource }: OpenParamsType) => {
+  const { deviceId, deviceProfileId, attr } = dataSource
+  const { commandWay, callType, way, service } = eventBindData
+  const { checked, value: operationPassword } = operationPasswordInfo || {}
+  configuration.commandDeliveryWay = commandWay!
+
+  setModalProps({
+    open: true,
+    loading: true,
+  })
+
+  await setup({
+    deviceId,
+    deviceProfileId,
+    attr,
+    commandDeliverWay: commandWay,
+    callType: configuration.commandDeliveryWay === CommandDeliveryWayEnum.SERVICE
+      ? callType === CommandCallWayEnum.SYNC
+        ? CommandWayEnum.TWO_WAY
+        : CommandWayEnum.ONE_WAY
+      : way,
+    serviceIdentifier: service,
+  })
+
+  if (checked && operationPassword)
+    handleHasOperationPassword(operationPasswordInfo!)
+
+  if (commandWay === CommandDeliveryWayEnum.CUSTOM)
+    handleOpenCustomCommandModal(toRaw(unref(getDeviceInfo)!), eventBindData)
+  else if (commandWay === CommandDeliveryWayEnum.SERVICE)
+    handleOpenServiceCommandModal(toRaw(unref(getDeviceInfo)!), eventBindData)
+  else if (commandWay === CommandDeliveryWayEnum.MODBUS)
+    handleOpenModbusCommandModal(toRaw(unref(getObjectModelTsl)!))
+
+  setModalProps({
+    loading: false,
+    title: `参数设置 / ${unref(getDeviceInfo)?.alias || unref(getDeviceInfo)?.name}`,
+  })
+}
+
+function handleGetCustomCommand() {
+  const res = customCommandFormAction.getFieldsValue()
+  const command = res[FormFieldsEnum.CUSTOM_COMMAND]
+  return unref(getDeviceInfo)?.transportType === TransportTypeEnum.TCP ? command : useJsonParse(command).value
+}
+
+function handleGetServiceCommand() {
+  const res = unref(thingsModelElRef)!.getFieldsValue()
+
+  return unref(getDeviceInfo)?.transportType === TransportTypeEnum.TCP ? res[FormFieldsEnum.SERVICE_COMMAND] : res
 }
 
-const error = () => {
-  // createMessage.error('下发指令失败')
-  return false
+function handleGetModbusCommand() {
+  const res = customCommandFormAction.getFieldsValue()
+  const identifier = unref(getObjectModelTsl)!.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
-    }
-  }
-
-  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()
-  }
-  finally {
-    loading.value = false
-  }
+  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()
+
+  await doCommandDeliver(res)
+  closeModal()
 }
 
 const handleCancel = () => {
-  visible.value = false
-  isInputData.value = false
+  closeModal()
+  Object.assign(configuration, getDefaultConfiguration())
 }
 
 defineExpose({
@@ -295,28 +171,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 { computed, ref, unref } from 'vue'
+import { useGetModbusCommand } from './useGetModbusCommand'
+import { CodeTypeEnum, CommandDeliveryWayEnum, CommandTypeEnum, DataTypeEnum, TransportTypeEnum } from '@/enums/datasource'
+import type { DeviceItemType, RpcCommandType, Tsl } from '@/api/device/model'
+import { getDeviceActive, getDeviceInfo, sendRpcOneway } from '@/api/device'
+import { useProductsStoreWithOut } from '@/store/modules/products'
+import { CommandMethodEnum, CommandWayEnum } from '@/enums/commandEnum'
+import { useMessage } from '@/hooks/web/useMessage'
+
+interface UseCommandDeliverParamsType {
+  deviceProfileId: string
+  deviceId: string
+  attr: string
+  callType?: CommandWayEnum
+  commandDeliverWay?: CommandDeliveryWayEnum
+  serviceIdentifier?: string
+}
+
+/**
+ * @description 命令下发流程
+ * - TCP设备(下发命令为String):
+ *  > - Modbus类型(INT,DOUBLE,BOOL,TEXT):
+ *    >> 1. 验证设备是否绑定地址码与物模型是否绑定寄存器地址
+ *    >> 2. 物模型类型为INT,DOUBLE,BOOL: 调用接口生成Modbus命令
+ *        >>> 1. 数据类型为INT,DOUBLE时需要进行乘以缩放因子后验证值是否为整型与浮点型
+ *        >>> 2. 数据类型为INT,DOUBLE缩放处理后进行HEX转码
+ *        >>> 3. DOUBLE类型寄存器个数为2
+ *        >>> 4. BOOL类型值为0与1
+ *    >> 3. 物模型类型为TEXT: 输入值为自定义Modbus命令
+ *    >> 4. 物模型类型为服务: 服务命令为下发值
+ *  > - 自定义类型: 输入值为Modubs命令
+ * - 非TCP设备(下发命令为(Object), {[identifier]: value}):
+ *  > - 自定义命令下发: JSON格式命令下发
+ *  > - 属性下发与服务下发:
+ *    >> -
+ *
+ * @returns
+ */
+export function useCommandDeliver(params?: UseCommandDeliverParamsType) {
+  const deviceInfo = ref<DeviceItemType>()
+  const objectModelTsl = ref<Nullable<Tsl>>(null)
+  const { createMessage } = useMessage()
+
+  const configuration: Partial<UseCommandDeliverParamsType> = {
+    deviceId: undefined,
+    deviceProfileId: undefined,
+    attr: undefined,
+  }
+
+  const getDeviceInfoById = async () => {
+    const res = await getDeviceInfo(configuration.deviceId!)
+    deviceInfo.value = res
+  }
+
+  const getObjectModelTslByIdWithIdentifier = () => {
+    const productStore = useProductsStoreWithOut()
+    const { deviceProfileId, attr } = configuration
+    objectModelTsl.value = productStore.getObjectModelByIdWithIdentifier(deviceProfileId!, attr!)
+  }
+
+  const setup = async (params?: UseCommandDeliverParamsType) => {
+    Object.assign(configuration, params || {})
+    const { deviceId, deviceProfileId, attr } = configuration
+    if (!deviceId || !deviceProfileId || !attr) return
+    getObjectModelTslByIdWithIdentifier()
+    await getDeviceInfoById()
+  }
+
+  if (params && params.deviceId && params.deviceProfileId && params.attr) setup()
+
+  const getCommand = async (command: any) => {
+    const { commandDeliverWay, serviceIdentifier } = configuration
+
+    const isTcpDevice = unref(deviceInfo)?.transportType === TransportTypeEnum.TCP
+
+    // 指定下发命令方式
+    if (commandDeliverWay) {
+      if (commandDeliverWay === CommandDeliveryWayEnum.CUSTOM) return command
+
+      if (commandDeliverWay === CommandDeliveryWayEnum.SERVICE && serviceIdentifier) {
+        return isTcpDevice
+          ? command
+          : {
+              [serviceIdentifier]: command,
+            }
+      }
+    }
+
+    const isTCPModbusDevice = isTcpDevice && unref(deviceInfo)?.codeType === CodeTypeEnum.MODBUS_RTU
+    const identifier = unref(objectModelTsl)!.identifier
+
+    if (!isTCPModbusDevice) {
+      return {
+        [identifier]: command,
+      }
+    }
+    else {
+      const isString = objectModelTsl.value?.specs.dataType.type === DataTypeEnum.STRING
+
+      if (isString) return command
+
+      const { extensionDesc } = unref(objectModelTsl)!
+      const { code } = unref(deviceInfo)!
+
+      const { getModbusCommand, validateCanGetCommand } = useGetModbusCommand()
+      if (!validateCanGetCommand(extensionDesc, code).flag) return
+
+      const res = await getModbusCommand(command as number, extensionDesc!, code)
+      return res
+    }
+  }
+
+  async function doCommandDeliver(command: any) {
+    const { callType = CommandWayEnum.ONE_WAY, commandDeliverWay } = configuration
+
+    if (callType === CommandWayEnum.TWO_WAY) {
+      const res = await getDeviceActive(unref(deviceInfo)!.tbDeviceId!)
+      const [firstItem] = res
+      const { value } = firstItem
+
+      if (!value) {
+        createMessage.warning('设备不在线')
+        return Promise.reject(Error('设备不在线'))
+      }
+    }
+
+    const res = await getCommand(command)
+
+    const rpcCommandParams: RpcCommandType = {
+      additionalInfo: {
+        cmdType:
+          unref(commandDeliverWay) === CommandDeliveryWayEnum.SERVICE
+            ? CommandTypeEnum.SERVICE
+            : CommandTypeEnum.API,
+      },
+      persistent: true,
+      method: CommandMethodEnum.THINGSKIT,
+      params: res,
+    }
+
+    await sendRpcOneway(rpcCommandParams, unref(deviceInfo)?.tbDeviceId, callType)
+    createMessage.success('命令下发成功')
+  }
+
+  return {
+    getDeviceInfo: computed(() => unref(deviceInfo)),
+    getObjectModelTsl: computed(() => unref(objectModelTsl)),
+    setup,
+    getCommand,
+    doCommandDeliver,
+  }
+}

-import { SingleToHex, getArray } from './config'
 import { type GenModbusCommandType, genModbusCommand } from '@/api/device'
 import type { ExtensionDesc } from '@/api/device/model'
+import { ModbusCRCEnum } from '@/enums/commandEnum'
 import { TCPObjectModelActionTypeEnum } from '@/enums/objectModelEnum'
 import { useMessage } from '@/hooks/web/useMessage'
 
+export 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)
+}
+
+export 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
+}
+
+export 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()
+}
+
+export 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')
+}
+
+export 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')
+}
+
+export 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 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
+}
+
 const getFloatPart = (number: string | number) => {
   const isLessZero = Number(number) < 0
   number = number.toString()
@@ -21,8 +166,9 @@ export function useGetModbusCommand() {
 
   const getModbusCommand = async (value: number, extensionDesc: ExtensionDesc, deviceAddressCode: string) => {
     const { registerAddress, actionType, zoomFactor } = extensionDesc as Required<ExtensionDesc>
+
     const params: GenModbusCommandType = {
-      crc: 'CRC_16_LOWER',
+      crc: ModbusCRCEnum.CRC_16_LOWER,
       registerNumber: 1,
       deviceCode: deviceAddressCode,
       registerAddress,
@@ -41,7 +187,7 @@ export function useGetModbusCommand() {
       }
 
       if (value * zoomFactor > REGISTER_MAX_VALUE) {
-        createMessage.warning(`属性下发值不能超过${REGISTER_MAX_VALUE},缩放因子是${zoomFactor}`)
+        createMessage.warning(`属性下发值不能超过${REGISTER_MAX_VALUE},缩放因子为${zoomFactor}`)
         return
       }
 
@@ -54,7 +200,7 @@ export function useGetModbusCommand() {
         + getFloatPart(value) * zoomFactor
 
       if (!regex.test(values.toString())) {
-        createMessage.warning(`属性下发值精确到两位小数,缩放因子是${zoomFactor}`)
+        createMessage.warning(`属性下发值精确到两位小数,缩放因子为${zoomFactor}`)
         return
       }
 

@@ -9,6 +9,8 @@ import { CommandDeliveryWayEnum, CommandDeliveryWayNameEnum, DeviceTypeEnum, Eve
 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'
 
 export enum FormFieldsEnum {
   ACTION_TYPE = 'actionType',
@@ -36,14 +38,15 @@ export enum FormFieldsNameEnum {
 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 || {}
+  const { deviceProfileId, deviceId } = dataSourceJson || {}
   // transportType:判断是什么类型的设备 code:设备地址码  deviceType:设备类型
   let codeType: string | null = ''
-  const { transportType, deviceType, codeType: deviceCodeType } = deviceInfo || {}
+  const { transportType, deviceType, codeType: deviceCodeType } = unref(getDeviceInfo) || {}
   codeType = deviceCodeType || (deviceId ? contentDataStore.diveceDetailMap?.[deviceId]?.codeType : null)
   const isTemplate = contentDataStore.isTemplate // 判断是否是模板
+
   return [
     {
       field: 'eventName',
@@ -68,7 +71,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 +95,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,
     },
@@ -187,20 +188,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 +221,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 +239,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'
@@ -32,9 +32,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,7 +62,6 @@ 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
           },
           filterOption: (inputValue: string, option: DeviceItemType) => {
@@ -93,26 +91,11 @@ export const formSchemas = (componentKey?: string): FormSchema[] => {
           },
           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
@@ -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 { DataTypeEnum, TransportTypeEnum } from '@/enums/datasource'
+
+export enum FormFieldsEnum {
+  SERVICE_COMMAND = 'serviceCommand',
+}
 
 export const getFormSchemas = ({ structJSON: structJson, required, transportType }: { structJSON: StructJSON[]; required?: boolean; transportType?: string }): FormSchema[] => {
   const createInputNumber = ({
@@ -120,10 +125,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 +140,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'
 
-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

@@ -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, CommandWayEnum } from '@/enums/commandEnum'
+import { ActRangListItemTypeEnum, CommandTypeEnum, 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,
+  }
+}

@@ -57,9 +57,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 } = dataSourceJson || {}
   await nextTick()
-  unref(dataSourceElRef)?.setFieldsValue({ deviceId, attr, deviceProfileId, attrInfo, deviceProfileTemplateId, deviceInfo })
+  unref(dataSourceElRef)?.setFieldsValue({ deviceId, attr, deviceProfileId, deviceProfileTemplateId })
   setFieldsValue({ ...chartOption })
 }
 

@@ -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 } = dataSourceJson || {}
   await nextTick()
-  unref(dataSourceElRef)?.setFieldsValue({ deviceId, attr, deviceProfileId, attrInfo, deviceInfo, deviceProfileTemplateId })
+  unref(dataSourceElRef)?.setFieldsValue({ deviceId, attr, deviceProfileId, deviceProfileTemplateId })
   setFieldsValue({ ...chartOption })
 }
 

@@ -33,9 +33,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 } = dataSourceJson || {}
   await nextTick()
-  unref(dataSourceElRef)?.setFieldsValue({ deviceId, attr, deviceProfileId, deviceProfileTemplateId, attrInfo, deviceInfo })
+  unref(dataSourceElRef)?.setFieldsValue({ deviceId, attr, deviceProfileId, deviceProfileTemplateId })
   setFieldsValue({ ...chartOption })
 }
 

@@ -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)

@@ -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)
     if (isNull(latestValue)) return
+    latestValue = useObjectModelValue(deviceProfileId, attr, 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 { DataTypeEnum } from '@/enums/datasource'
+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
+  }
+}
+
+export function useObjectModelValue(deviceProfileId: string, attr: string, value: any) {
+  const productsStore = useProductsStoreWithOut()
+
+  const result = productsStore.getObjectModelByIdWithIdentifier(deviceProfileId, attr)
+  if (!result)
+    return value
+
+  return getValueByType(result.specs.dataType.type as DataTypeEnum, value, result.specs.dataType)
+}

@@ -7,3 +7,16 @@ export enum CommandWayNameEnum {
   ONE_WAY = '单向',
   TWO_WAY = '双向',
 }
+
+export enum CommandCallWayEnum {
+  SYNC = 'SYNC',
+  ASYNC = 'ASYNC',
+}
+
+export enum CommandMethodEnum {
+  THINGSKIT = 'methodThingskit',
+}
+
+export enum ModbusCRCEnum {
+  CRC_16_LOWER = 'CRC_16_LOWER',
+}

@@ -244,11 +244,7 @@ export enum ContentDataFieldsEnum {
   ACCESS_MODE = 'accessMode',
   VIDEO_FLAG = 'videoComponentFlag',
 
-  ATTR_INFO = 'attrInfo',
-  DEVICE_INFO = 'deviceInfo',
-  TRANSPORT_TYPE = 'transportType',
   CODE_TYPE = 'codeType',
-  DEVICE_ADDITIONAL_INFO = 'deviceAdditionalInfo',
 }
 
 export enum ContentDataFieldsNameEnum {
@@ -261,10 +257,6 @@ export enum ContentDataFieldsNameEnum {
   ACCESS_MODE = 'ACCESS_MODE',
   VIDEO_URL = '视频地址',
 
-  ATTR_INFO = '物模型属性详情',
-  DEVICE_INFO = '设备详情',
-  TRANSPORT_TYPE = '传输协议',
-  DEVICE_ADDITIONAL_INFO = '设备额外信息',
 }
 
 export enum VariableImageSourceEnum {
@@ -289,7 +281,7 @@ export enum CommandDeliveryWayNameEnum {
   MODBUS = 'MODBUS',
 }
 
-export enum FunctionType {
+export enum FunctionTypeEnum {
   PROPERTIES = 'properties',
   EVENTS = 'events',
   SERVICE = 'services',

+import { defineStore } from 'pinia'
+import { store } from '..'
+import type { ProductsDetailWithThingsModelType, Tsl } from '@/api/device/model'
+
+interface ProductsStoreType {
+  products: Record<string, ProductsDetailWithThingsModelType>
+}
+
+export const useProductsStore = defineStore('app-products', {
+  state: (): ProductsStoreType => {
+    return {
+      products: {},
+    }
+  },
+  actions: {
+    setProducts(products: Record<string, ProductsDetailWithThingsModelType>) {
+      this.products = products
+    },
+
+    getProductDetailById(id: string) {
+      return this.products[id]
+    },
+
+    getObjectModelsById(id: string) {
+      return this.products[id]
+    },
+
+    getObjectModelByIdWithIdentifier(id: string, identifier: string): Nullable<Tsl> {
+      const product = this.getObjectModelsById(id)
+      if (!product) return null
+      return product.tsl.filter(item => item.identifier === identifier)[0]
+    },
+  },
+})
+
+export function useProductsStoreWithOut() {
+  return useProductsStore(store)
+}

@@ -61,6 +61,8 @@ declare global {
 
     useLightboxModeService: Fn
 
+    useProduct: Fn
+
     useAuth: Fn
   }
 }