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

fix: 修复modbus命令下发参数名调整

See merge request yunteng/thingskit-front!756

@@ -59,8 +59,8 @@ export interface GenModbusCommandType {
   crc: string;
   crc: string;
   deviceCode: string;
   deviceCode: string;
   method: string;
   method: string;
-  registerAddr: string;
-  registerNum?: number;
+  registerAddress: string;
+  registerNumber?: number;
   registerValues?: number[];
   registerValues?: number[];
 }
 }
 
 

@@ -11,7 +11,7 @@ export enum FormFieldsEnum {
   // 功能码
   // 功能码
   METHOD = 'method',
   METHOD = 'method',
   // 寄存器地址
   // 寄存器地址
-  REGISTER_ADDR = 'registerAddr',
+  REGISTER_ADDRESS = 'registerAddress',
   // 数据校验算法
   // 数据校验算法
   CRC = 'crc',
   CRC = 'crc',
   // 线圈个数
   // 线圈个数
@@ -135,7 +135,7 @@ export const formSchemas: FormSchema[] = [
     },
     },
   },
   },
   {
   {
-    field: FormFieldsEnum.REGISTER_ADDR,
+    field: FormFieldsEnum.REGISTER_ADDRESS,
     label: '起始寄存器地址',
     label: '起始寄存器地址',
     component: 'RegisterAddressInput',
     component: 'RegisterAddressInput',
     valueField: 'value',
     valueField: 'value',

@@ -14,21 +14,21 @@ const registerInfo = (record: ModbusCommandValueType): Partial<GenModbusCommandT
   } = record;
   } = record;
   switch (method) {
   switch (method) {
     case FunctionCodeEnum.READ_COIL_STATE_01 || FunctionCodeEnum.READ_INPUT_STATE_02:
     case FunctionCodeEnum.READ_COIL_STATE_01 || FunctionCodeEnum.READ_INPUT_STATE_02:
-      return { registerNum: coilNumber };
+      return { registerNumber: coilNumber };
     case FunctionCodeEnum.READ_KEEP_REGISTER_03 || FunctionCodeEnum.READ_INPUT_REGISTER_04:
     case FunctionCodeEnum.READ_KEEP_REGISTER_03 || FunctionCodeEnum.READ_INPUT_REGISTER_04:
-      return { registerNum: registerNumber };
+      return { registerNumber };
     case FunctionCodeEnum.WRITE_SINGLE_COIL_REGISTER_05:
     case FunctionCodeEnum.WRITE_SINGLE_COIL_REGISTER_05:
       return { registerValues: [coilValue] };
       return { registerValues: [coilValue] };
     case FunctionCodeEnum.WRITE_SINGLE_KEEP_COIL_REGISTER_06:
     case FunctionCodeEnum.WRITE_SINGLE_KEEP_COIL_REGISTER_06:
       return { registerValues: [registerValue] };
       return { registerValues: [registerValue] };
     case FunctionCodeEnum.WRITE_MULTIPLE_COIL_STATE_15:
     case FunctionCodeEnum.WRITE_MULTIPLE_COIL_STATE_15:
       return {
       return {
-        registerNum: coilNumber,
+        registerNumber: coilNumber,
         registerValues: coilValues.map((item) => (item.value ? 1 : 0)),
         registerValues: coilValues.map((item) => (item.value ? 1 : 0)),
       };
       };
     case FunctionCodeEnum.WRITE_MULTIPLE_KEEP_REGISTER_16:
     case FunctionCodeEnum.WRITE_MULTIPLE_KEEP_REGISTER_16:
       return {
       return {
-        registerNum: registerNumber,
+        registerNumber,
         registerValues: registerValues.map((item) => item.value),
         registerValues: registerValues.map((item) => item.value),
       };
       };
     default:
     default:
@@ -37,12 +37,12 @@ const registerInfo = (record: ModbusCommandValueType): Partial<GenModbusCommandT
 };
 };
 
 
 export const composeModbusModalData = (record: ModbusCommandValueType): GenModbusCommandType => {
 export const composeModbusModalData = (record: ModbusCommandValueType): GenModbusCommandType => {
-  const { crc, deviceCode, method, registerAddr } = record;
+  const { crc, deviceCode, method, registerAddress } = record;
   return {
   return {
     crc,
     crc,
     deviceCode,
     deviceCode,
     method: Number(method).toString(16).padStart(2, '0').toUpperCase(),
     method: Number(method).toString(16).padStart(2, '0').toUpperCase(),
-    registerAddr,
+    registerAddress,
     ...registerInfo(record),
     ...registerInfo(record),
   };
   };
 };
 };