Merge branch 'fix/device-code-range' into 'main_dev'

fix: 修复下发指令将地址码再次转为16进制值

See merge request yunteng/thingskit-scada!98

@@ -7752,8 +7752,8 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                     } else if (commandType === COMMAND_TYPE_ENUM.MODBUS) {
                         const dataSource = currentNodeData?.dataSources?.[0] || getDataSourceBindValue()
                         if (dataSource) {
-                            const additional = dataSource?.additional || {}
-                            if (dataSource?.deviceType !== 'SENDOR' && !additional?.deviceCode) {
+                            const additional = dataSource?.additional || getDataSourceBindValue()
+                            if (dataSource?.deviceType !== 'SENDOR' && !(additional?.deviceCode)) {
                                 UseLayUi.topErrorMsg('设备地址码不存在')
                                 return false
                             }
@@ -8967,7 +8967,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                         [enumDataSourceConst.ATTR_NAME]: value,
                     })
 
-                    const selected = thingsModel.find(item => item.identifier === value)
+                    const selected = thingsModel?.find(item => item.identifier === value)
 
                     if (!selected) return
                     // const type = selected?.extensionDesc?.dataType
@@ -16307,8 +16307,8 @@ class HandleDataInteraction {
             const params = {
                 crc: 'CRC_16_LOWER',
                 deviceCode: Number(deviceCode).toString(16).padStart(2, 0).toUpperCase(),
-                method: Number(method).toString(16).padStart(2, 0),
-                registerAddr: Number(registerAddress),
+                method,
+                registerAddress: Number(registerAddress),
                 registerNumber: Array.isArray(registerValue) ? 2 : 1,
                 registerValues: Array.isArray(registerValue) ? registerValue.map(item => Number(item)) : [Number(registerValue)]
             }