Merge branch 'fix/zfl' into 'perf/main_dev'

修复组态下发命令一直是单向和数据动效显示隐藏隐藏组件取值

See merge request yunteng/thingskit-scada!163

 import type { DeviceAttributeItemType, DeviceItemType, DeviceProfileItemType, OrganizationItemType, RpcCommandType, SendValue, ThingsModel, ThingsModelItemType } from './model'
 import type { DeviceAttributeItemType, DeviceItemType, DeviceProfileItemType, OrganizationItemType, RpcCommandType, SendValue, ThingsModel, ThingsModelItemType } from './model'
-import type { CommandWayEnum } from '@/enums/commandEnum'
+import { CommandWayEnum } from '@/enums/commandEnum'
 import type { DeviceTypeEnum } from '@/enums/datasource'
 import type { DeviceTypeEnum } from '@/enums/datasource'
 import { isShareMode } from '@/utils/env'
 import { isShareMode } from '@/utils/env'
 import { defHttp } from '@/utils/http'
 import { defHttp } from '@/utils/http'
@@ -15,6 +15,7 @@ enum Api {
   RPC_COMMAND = '/rpc/',
   RPC_COMMAND = '/rpc/',
   GET_DEVICE_ACTIVE = 'plugins/telemetry/DEVICE/',
   GET_DEVICE_ACTIVE = 'plugins/telemetry/DEVICE/',
   RPC_ONEWAY = '/rpc/oneway',
   RPC_ONEWAY = '/rpc/oneway',
+  RPC_TWOWAY = '/rpc/twoway',
 
 
   GEN_MODBUS_COMMAND = '/js/modbus',
   GEN_MODBUS_COMMAND = '/js/modbus',
   GET_DEVICE_DETAIL = '/device/', // 获取设备详情
   GET_DEVICE_DETAIL = '/device/', // 获取设备详情
@@ -88,9 +89,9 @@ export const getDeviceActive = (deviceId: string) => {
 }
 }
 
 
 // 命令下发
 // 命令下发
-export const sendRpcOneway = (param: SendValue | any, deviceId?: string) => {
+export const sendRpcOneway = (param: SendValue | any, deviceId?: string, way?: string) => {
   return defHttp.post({
   return defHttp.post({
-    url: `${Api.RPC_ONEWAY}/${deviceId}`,
+    url: `${way !== CommandWayEnum.TWO_WAY ? Api.RPC_ONEWAY : Api.RPC_TWOWAY}/${deviceId}`,
     data: param,
     data: param,
   },
   },
   {
   {

@@ -161,11 +161,13 @@ export interface RangeItemType {
 }
 }
 
 
 export interface BasicActDataType {
 export interface BasicActDataType {
-  deviceId: string
-  attr: string
+  deviceId?: string
+  attr?: string
   enable?: boolean
   enable?: boolean
   deviceProfileId?: string | number
   deviceProfileId?: string | number
+  deviceProfileTemplateId?: string | number
   attrInfo?: ThingsModelItemType
   attrInfo?: ThingsModelItemType
+  deviceInfo?: DeviceTypeEnum
 }
 }
 
 
 export interface FlashActDataType extends BasicActDataType {
 export interface FlashActDataType extends BasicActDataType {

@@ -79,7 +79,6 @@ const handleDeleteRow = (data: FlashActDataType) => {
 
 
 const getFieldsValue = () => {
 const getFieldsValue = () => {
   const values = getFieldsForm()
   const values = getFieldsForm()
-  const { deviceId, attr, deviceProfileId, attrInfo } = values
   const rangeList = unref(dataSource).map((item) => {
   const rangeList = unref(dataSource).map((item) => {
     return {
     return {
       ...item,
       ...item,
@@ -87,17 +86,14 @@ const getFieldsValue = () => {
     }
     }
   })
   })
   return {
   return {
-    deviceId,
-    attr,
-    deviceProfileId,
-    attrInfo,
+    ...values,
     rangeList,
     rangeList,
   } as BasicFlashActDataType
   } as BasicFlashActDataType
 }
 }
 
 
 const setFieldsValue = (list: FlashActDataType) => {
 const setFieldsValue = (list: FlashActDataType) => {
-  const { attr, deviceId, rangeList } = list || {}
-  setFieldsForm({ attr, deviceId })
+  const { rangeList } = list || {}
+  setFieldsForm(list || {})
   clearValidate()
   clearValidate()
   dataSource.value = rangeList ? rangeList?.map(item => ({ ...item, uuid: buildUUID() })) : [getInitTableRecord()]
   dataSource.value = rangeList ? rangeList?.map(item => ({ ...item, uuid: buildUUID() })) : [getInitTableRecord()]
 }
 }

@@ -128,3 +128,14 @@ defineExpose<ComponentExposeType>({
     </template>
     </template>
   </BasicTable>
   </BasicTable>
 </template>
 </template>
+
+<style lang="less" scoped>
+  .variable-image-form {
+    >:deep(.ant-row) {
+      >.ant-col {
+        @apply px-4;
+      }
+    }
+  }
+</style>
+

@@ -11,6 +11,7 @@ import { genModbusCommand, getDeviceActiveTime, getDeviceInfo, getThingsModelSer
 import { ThingsModelForm } from '@/core/Library/components/ThingsModelForm'
 import { ThingsModelForm } from '@/core/Library/components/ThingsModelForm'
 import { useMessage } from '@/hooks/web/useMessage'
 import { useMessage } from '@/hooks/web/useMessage'
 import type { StructJSON } from '@/api/device/model'
 import type { StructJSON } from '@/api/device/model'
+import { CommandWayEnum } from '@/enums/commandEnum'
 
 
 interface ServiceInfo {
 interface ServiceInfo {
   title?: string
   title?: string
@@ -19,6 +20,7 @@ interface ServiceInfo {
   transportType?: string
   transportType?: string
   callType?: string
   callType?: string
   code?: string
   code?: string
+  way?: string
 }
 }
 
 
 const visible = ref<boolean>(false)
 const visible = ref<boolean>(false)
@@ -49,6 +51,7 @@ const serviceInfo = reactive<ServiceInfo>({
   transportType: '',
   transportType: '',
   callType: '',
   callType: '',
   code: '',
   code: '',
+  way: '', // 单向还是双向
 })
 })
 
 
 const [register, { getFieldsValue, validate, setFieldsValue, updateSchema, setProps }] = useForm({ // 自定义下发值
 const [register, { getFieldsValue, validate, setFieldsValue, updateSchema, setProps }] = useForm({ // 自定义下发值
@@ -88,11 +91,12 @@ const getDeviceDetail = async (deviceId: string) => {
 }
 }
 
 
 const open = async (_data: SingleClickEventDataType) => {
 const open = async (_data: SingleClickEventDataType) => {
+  console.warn(_data, 'data')
   const { operationPassword } = _data || {}
   const { operationPassword } = _data || {}
   dataSourceJson.value = _data.deviceInfo
   dataSourceJson.value = _data.deviceInfo
   isPasswordInfo.value = operationPassword || {}
   isPasswordInfo.value = operationPassword || {}
   // commandWay-->命令下发方式
   // commandWay-->命令下发方式
-  const { commandWay, customCommand, serviceCommand, service, callType } = _data || {}
+  const { commandWay, customCommand, serviceCommand, service, callType, way } = _data || {}
   isCommandWay.value = commandWay
   isCommandWay.value = commandWay
   const { attrInfo, deviceId } = unref(dataSourceJson)
   const { attrInfo, deviceId } = unref(dataSourceJson)
   const { identifier, extensionDesc, detail, name } = attrInfo || {}// 属性信息
   const { identifier, extensionDesc, detail, name } = attrInfo || {}// 属性信息
@@ -110,6 +114,7 @@ const open = async (_data: SingleClickEventDataType) => {
   formField.value = identifier
   formField.value = identifier
   isShowActionType.value = !!actionType // 判断modBUS类型时 物模型是否填写扩展描述
   isShowActionType.value = !!actionType // 判断modBUS类型时 物模型是否填写扩展描述
   serviceInfo.callType = callType // 服务命令调用方式 是同步还是异步
   serviceInfo.callType = callType // 服务命令调用方式 是同步还是异步
+  serviceInfo.way = way || 'oneway' // 命令下发是双向还是单向
 
 
   serviceInfo.transportType = transportType
   serviceInfo.transportType = transportType
   serviceInfo.code = code
   serviceInfo.code = code
@@ -268,7 +273,7 @@ const handleSubmit = async () => {
       persistent: true,
       persistent: true,
       method: 'methodThingskit',
       method: 'methodThingskit',
       params: serviceInfo.transportType !== TransportTypeEnum.TCP && unref(isCommandWay) === CommandDeliveryWayEnum.SERVICE ? { service: unref(sendValue) } : unref(sendValue),
       params: serviceInfo.transportType !== TransportTypeEnum.TCP && unref(isCommandWay) === CommandDeliveryWayEnum.SERVICE ? { service: unref(sendValue) } : unref(sendValue),
-    }, dataSourceJson.value.deviceId)
+    }, dataSourceJson.value.deviceId, serviceInfo.way)
     createMessage.success('命令下发成功')
     createMessage.success('命令下发成功')
     visible.value = false
     visible.value = false
     isInputData.value = false
     isInputData.value = false