Merge branch 'fix/object-model-bool' into 'main_dev'

fix: 修复bool类型TCP Modbus设备命令值

See merge request yunteng/thingskit-scada!217

@@ -53,6 +53,26 @@ export const createModbusValueInput = (objectModel: Tsl): FormSchema => {
   const { valueRange } = specs as Specs
   const { valueRange } = specs as Specs
   const { max, min } = valueRange || {}
   const { max, min } = valueRange || {}
 
 
+  if (extensionDesc?.originalDataType === OriginalDataTypeEnum.BOOLEAN) {
+    const options = [
+      { label: '闭合', value: parseInt('FF00', 16) },
+      { label: '断开', value: parseInt('0000', 16) },
+    ]
+
+    return {
+      field: identifier,
+      label: functionName,
+      component: ComponentEnum.SELECT,
+      componentProps: () => {
+        return {
+          options,
+          placeholder: `请选择${functionName}`,
+          getPopupContainer: () => document.body,
+        }
+      },
+    }
+  }
+
   const isStringType = extensionDesc?.originalDataType === OriginalDataTypeEnum.STRING
   const isStringType = extensionDesc?.originalDataType === OriginalDataTypeEnum.STRING
   return {
   return {
     field: identifier,
     field: identifier,

 import { OriginalDataTypeEnum } from '@/enums/objectModelEnum'
 import { OriginalDataTypeEnum } from '@/enums/objectModelEnum'
 import { useParseOriginalDataType } from '@/hooks/business/useParseOriginalDataType'
 import { useParseOriginalDataType } from '@/hooks/business/useParseOriginalDataType'
 
 
+export function getBoolValueByStatus(status: boolean) {
+  return status ? parseInt('FF00', 16) : parseInt('0000', 16)
+}
+
 export function useBaseConversion() {
 export function useBaseConversion() {
   function DecTo32Float(number: number) {
   function DecTo32Float(number: number) {
     const arr = new Uint8Array(4)
     const arr = new Uint8Array(4)
@@ -143,7 +147,7 @@ export function useBaseConversion() {
     let result: number[]
     let result: number[]
 
 
     if (type === OriginalDataTypeEnum.BOOLEAN) {
     if (type === OriginalDataTypeEnum.BOOLEAN) {
-      result = [value]
+      result = [getBoolValueByStatus(!!value)]
     }
     }
     else if (type === OriginalDataTypeEnum.BITS) {
     else if (type === OriginalDataTypeEnum.BITS) {
       const { bitMask = 0 } = additional || {}
       const { bitMask = 0 } = additional || {}