Merge branch 'fix/device-modbus-command' into 'main_dev'

fix: 修复设备属性下发输入参数为0时,寄存器值为空

See merge request yunteng/thingskit-front!798

@@ -129,7 +129,6 @@ const SingleToHexBatch = (t) => {
 
 
 const formSchemasConfig = (schemas, actionType): FormSchema[] => {
 const formSchemasConfig = (schemas, actionType): FormSchema[] => {
   const { identifier, functionName } = schemas;
   const { identifier, functionName } = schemas;
-  console.log(identifier, 'identifier', actionType, 'actionType');
   if (actionType == '06') {
   if (actionType == '06') {
     return [
     return [
       {
       {

@@ -91,11 +91,14 @@
   };
   };
 
 
   // 获取小数
   // 获取小数
-  const getFloatPart = (number): any => {
+  const getFloatPart = (number: string | number) => {
+    const isLessZero = Number(number) < 0;
     number = number.toString();
     number = number.toString();
     const floatPartStartIndex = number.indexOf('.');
     const floatPartStartIndex = number.indexOf('.');
-    const value = ~floatPartStartIndex ? `0.${number.substring(floatPartStartIndex + 1)}` : '0';
-    return value;
+    const value = ~floatPartStartIndex
+      ? `${isLessZero ? '-' : ''}0.${number.substring(floatPartStartIndex + 1)}`
+      : '0';
+    return Number(value);
   };
   };
 
 
   const { createMessage } = useMessage();
   const { createMessage } = useMessage();
@@ -139,13 +142,16 @@
         if (unref(modBUSForm).method == '16' || unref(modBUSForm).method == '10') {
         if (unref(modBUSForm).method == '16' || unref(modBUSForm).method == '10') {
           const regex = /^-?\d+(\.\d{0,2})?$/;
           const regex = /^-?\d+(\.\d{0,2})?$/;
           const values =
           const values =
-            Math.floor(oldValue) * unref(zoomFactorValue) +
+            Math.trunc(oldValue) * unref(zoomFactorValue) +
             getFloatPart(oldValue) * unref(zoomFactorValue);
             getFloatPart(oldValue) * unref(zoomFactorValue);
+
           if (!regex.test(values as any)) {
           if (!regex.test(values as any)) {
             createMessage.warning(`属性下发值精确到两位小数,缩放因子是${unref(zoomFactorValue)}`);
             createMessage.warning(`属性下发值精确到两位小数,缩放因子是${unref(zoomFactorValue)}`);
             return;
             return;
           }
           }
-          const newValue = getArray(SingleToHex(unref(isShowMultiply) ? values : oldValue));
+
+          const newValue =
+            values == 0 ? [0, 0] : getArray(SingleToHex(unref(isShowMultiply) ? values : oldValue));
           modBUSForm.value.registerValues = newValue;
           modBUSForm.value.registerValues = newValue;
           modBUSForm.value.registerNumber = 2;
           modBUSForm.value.registerNumber = 2;
           modBUSForm.value.method = '10';
           modBUSForm.value.method = '10';

@@ -20,7 +20,6 @@ export const useGenDynamicForm = () => {
     const { specs, type } = dataType;
     const { specs, type } = dataType;
     const { valueRange, step } = specs! as Partial<Specs>;
     const { valueRange, step } = specs! as Partial<Specs>;
     const { max, min } = valueRange || {};
     const { max, min } = valueRange || {};
-    console.log({ max, min });
     return {
     return {
       field: identifier,
       field: identifier,
       label: functionName,
       label: functionName,