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

fix: TCP Modbus bool类型物模型取值范围变更

See merge request yunteng/thingskit-front!1224

 import { useParseOriginalDataType } from './useParseOriginalDataType';
 import { useParseOriginalDataType } from './useParseOriginalDataType';
 import { OriginalDataTypeEnum } from '/@/enums/objectModelEnum';
 import { OriginalDataTypeEnum } from '/@/enums/objectModelEnum';
 
 
+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);
@@ -146,7 +150,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.STRING) {
     } else if (type === OriginalDataTypeEnum.STRING) {
       let buffer = StringToHEXBuffer(value);
       let buffer = StringToHEXBuffer(value);
       const { registerNumber = 0 } = additional || {};
       const { registerNumber = 0 } = additional || {};

@@ -14,7 +14,7 @@ import {
   TransportTypeEnum,
   TransportTypeEnum,
 } from '/@/enums/deviceEnum';
 } from '/@/enums/deviceEnum';
 import { FunctionTypeEnum } from '/@/enums/objectModelEnum';
 import { FunctionTypeEnum } from '/@/enums/objectModelEnum';
-import { isFunction } from '/@/utils/is';
+import { isFunction, isNullOrUnDef } from '/@/utils/is';
 import { getDeviceActiveTime } from '/@/api/alarm/position';
 import { getDeviceActiveTime } from '/@/api/alarm/position';
 import { useMessage } from '../web/useMessage';
 import { useMessage } from '../web/useMessage';
 
 
@@ -152,7 +152,7 @@ export function useCommandDelivery() {
           rpcCommand,
           rpcCommand,
           setupResult
           setupResult
         );
         );
-        rpcCommand = _rpcCommand;
+        !isNullOrUnDef(rpcCommand) && (rpcCommand = _rpcCommand);
         if (_way) way = _way;
         if (_way) way = _way;
       }
       }
 
 

@@ -135,6 +135,26 @@ export const useGenerateFormSchemasByObjectModel = () => {
     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: name,
+        component: 'Select',
+        componentProps: () => {
+          return {
+            options,
+            placeholder: `请选择${name}`,
+            getPopupContainer: () => document.body,
+          };
+        },
+      };
+    }
+
     const isStringType = extensionDesc?.originalDataType === OriginalDataTypeEnum.STRING;
     const isStringType = extensionDesc?.originalDataType === OriginalDataTypeEnum.STRING;
     return {
     return {
       field: identifier,
       field: identifier,

@@ -68,10 +68,13 @@ export const UINT32_VALUE_RANGE = {
 };
 };
 
 
 function getValueRangeFromOriginDataType(
 function getValueRangeFromOriginDataType(
-  originalDataType?: OriginalDataTypeEnum
+  originalDataType?: OriginalDataTypeEnum,
+  type: 'range' | 'defaultValue' = 'range'
 ): Record<'min' | 'max', number> {
 ): Record<'min' | 'max', number> {
   switch (originalDataType) {
   switch (originalDataType) {
     case OriginalDataTypeEnum.BOOLEAN:
     case OriginalDataTypeEnum.BOOLEAN:
+      return type === 'defaultValue' ? BOOL_DEFAULT_VALUE_RANGE : UINT16_VALUE_RANGE;
+
     case OriginalDataTypeEnum.BITS:
     case OriginalDataTypeEnum.BITS:
       return BOOL_DEFAULT_VALUE_RANGE;
       return BOOL_DEFAULT_VALUE_RANGE;
 
 
@@ -216,7 +219,8 @@ export const getExtendDescFormSchemas = (): FormSchema[] => {
             const { setFieldsValue } = formActionType;
             const { setFieldsValue } = formActionType;
             setFieldsValue({
             setFieldsValue({
               [FormFieldsEnum.VALUE_RANGE]: getValueRangeFromOriginDataType(
               [FormFieldsEnum.VALUE_RANGE]: getValueRangeFromOriginDataType(
-                value as OriginalDataTypeEnum
+                value as OriginalDataTypeEnum,
+                'defaultValue'
               ),
               ),
             });
             });
           },
           },