Merge branch 'fix/tcp-switch-command-send' into 'main_dev'

fix: 修复tcp开关下发命令通过modbus获取命令

See merge request yunteng/thingskit-scada!207

-import { h, render } from 'vue'
+import { h, render, unref } from 'vue'
 import { ControlComponentEnum } from '../packages/Control'
 import { ControlComponentEnum } from '../packages/Control'
+import { useGetModbusCommand } from '../components/PublicForm/components/DataEvents/CommandDeliveryModal/useGetModbusCommand'
 import { doCommandDelivery, getDeviceActive, getDeviceInfo } from '@/api/device'
 import { doCommandDelivery, getDeviceActive, getDeviceInfo } from '@/api/device'
 import type { MouseUpEventDataType, NodeDataDataSourceJsonType, NodeDataEventJsonType, SingleClickEventDataType } from '@/api/node/model'
 import type { MouseUpEventDataType, NodeDataDataSourceJsonType, NodeDataEventJsonType, SingleClickEventDataType } from '@/api/node/model'
 import { CommandWayEnum } from '@/enums/commandEnum'
 import { CommandWayEnum } from '@/enums/commandEnum'
-import { ActRangListItemTypeEnum, EventActionTypeEnum, TransportTypeEnum } from '@/enums/datasource'
+import { ActRangListItemTypeEnum, CodeTypeEnum, EventActionTypeEnum, TransportTypeEnum } from '@/enums/datasource'
 import { useMessage } from '@/hooks/web/useMessage'
 import { useMessage } from '@/hooks/web/useMessage'
 import { AttributeDeliverModal, CommandDeliveryConfirmModal, CommandDeliveryModal, ConfirmModal } from '@/core/Library/components/PublicForm/components/DataEvents/CommandDeliveryModal'
 import { AttributeDeliverModal, CommandDeliveryConfirmModal, CommandDeliveryModal, ConfirmModal } from '@/core/Library/components/PublicForm/components/DataEvents/CommandDeliveryModal'
 import type { MxCell } from '@/fitCore/types'
 import type { MxCell } from '@/fitCore/types'
@@ -76,7 +77,7 @@ export function useNodeEvent(eventJson: NodeDataEventJsonType, dataSourceJson: N
       const nodeUtils = new NodeUtils()
       const nodeUtils = new NodeUtils()
       const { way = CommandWayEnum.ONE_WAY } = data
       const { way = CommandWayEnum.ONE_WAY } = data
       const { attr, deviceId, attrInfo } = dataSourceJson
       const { attr, deviceId, attrInfo } = dataSourceJson
-      const { transportType, alias, name: deviceName } = await getDeviceInfo(dataSourceJson.deviceId) || {}// 设备信息
+      const { transportType, alias, name: deviceName, code, codeType } = await getDeviceInfo(dataSourceJson.deviceId) || {}// 设备信息
       const contentDataStore = useContentDataStoreWithOut()
       const contentDataStore = useContentDataStoreWithOut()
       const currentData = contentDataStore.contentData.find(item => item.id === cell.getId())
       const currentData = contentDataStore.contentData.find(item => item.id === cell.getId())
       if (!currentData) return
       if (!currentData) return
@@ -95,6 +96,7 @@ export function useNodeEvent(eventJson: NodeDataEventJsonType, dataSourceJson: N
         const res = rangeList.find(item => item.type === (status === ActRangListItemTypeEnum.OPEN ? ActRangListItemTypeEnum.CLOSE : ActRangListItemTypeEnum.OPEN))
         const res = rangeList.find(item => item.type === (status === ActRangListItemTypeEnum.OPEN ? ActRangListItemTypeEnum.CLOSE : ActRangListItemTypeEnum.OPEN))
         if (!res) return
         if (!res) return
         const { statusValue } = res
         const { statusValue } = res
+
         command.params = transportType === TransportTypeEnum.TCP
         command.params = transportType === TransportTypeEnum.TCP
           ? statusValue!
           ? statusValue!
           : {
           : {
@@ -104,7 +106,7 @@ export function useNodeEvent(eventJson: NodeDataEventJsonType, dataSourceJson: N
         if (operationPasswordEnable) {
         if (operationPasswordEnable) {
           const instance = h(CommandDeliveryConfirmModal)
           const instance = h(CommandDeliveryConfirmModal)
           render(instance, document.body)
           render(instance, document.body)
-          await (instance.component?.exposed as InstanceType<typeof CommandDeliveryConfirmModal>)?.open(operationPassword)
+          await (instance.component?.exposed as InstanceType<typeof CommandDeliveryConfirmModal>)?.open(operationPassword!)
         }
         }
         else {
         else {
           const instance = h(ConfirmModal)
           const instance = h(ConfirmModal)
@@ -112,6 +114,14 @@ export function useNodeEvent(eventJson: NodeDataEventJsonType, dataSourceJson: N
           await (instance.component?.exposed as InstanceType<typeof ConfirmModal>)?.open()
           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 })
         await doCommandDelivery({ way, command, deviceId })
         createMessage.success('命令下发成功')
         createMessage.success('命令下发成功')
       }
       }