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

fix: 修复下发命令为负数时无法下发及非TCP设备命令下发方式隐藏modbus选项

See merge request yunteng/thingskit-scada!99

@@ -7900,6 +7900,11 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                 })
                 })
                 const formValue = form.val(enumActionEl.FORM_FILTER)
                 const formValue = form.val(enumActionEl.FORM_FILTER)
 
 
+                if (transportType != 'TCP') {
+                    $(`#${enumActionEl.COMMAND_TYPE_EL} dl dd[lay-value="2"]`).remove()
+                    $(`#${enumActionEl.COMMAND_TYPE_EL} select option[value="2"]`).remove()
+                }
+
                 controlFormDisplay(value, formValue)
                 controlFormDisplay(value, formValue)
             })
             })
 
 
@@ -7956,6 +7961,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                 }
                 }
 
 
                 form.render('select', enumActionEl.FORM_FILTER)
                 form.render('select', enumActionEl.FORM_FILTER)
+
             } catch (error) {
             } catch (error) {
                 throw error
                 throw error
             }
             }
@@ -9459,7 +9465,8 @@ DataFormatPanel.prototype.addDataFont = function (container) {
 
 
         function proxyFn(fn) {
         function proxyFn(fn) {
             return (...args) => {
             return (...args) => {
-                const currentDataSource = getDataSourceBindValue() || {}
+                let currentDataSource = getValueOnSubmit(form.val(CONTAINER_FILTER)) || {}
+                currentDataSource = currentDataSource.dataSources || {}
                 if (currentDataSource.deviceProfileId && currentDataSource.deviceType && currentDataSource.orgId) {
                 if (currentDataSource.deviceProfileId && currentDataSource.deviceType && currentDataSource.orgId) {
                     to(ConfigurationNodeApi.updateNodeInfo({
                     to(ConfigurationNodeApi.updateNodeInfo({
                         configurationId,
                         configurationId,
@@ -16231,19 +16238,18 @@ class HandleDataInteraction {
             if (commandType == enumCommandType.MODBUS) {
             if (commandType == enumCommandType.MODBUS) {
                 value = data[enumActionEl.CUSTOM_TCP_COMMAND]
                 value = data[enumActionEl.CUSTOM_TCP_COMMAND]
                 const { method, deviceCode } = additional || {}
                 const { method, deviceCode } = additional || {}
-
                 const validate = new Validate([
                 const validate = new Validate([
                     { value: deviceCode, required: true, message: '未找到设备地址码' },
                     { value: deviceCode, required: true, message: '未找到设备地址码' },
                     { value: method, required: true, message: '未找到Modbus命令操作类型' },
                     { value: method, required: true, message: '未找到Modbus命令操作类型' },
                     { value, required: true, message: '下发值是必填项' },
                     { value, required: true, message: '下发值是必填项' },
                     ...(method == '05' ? [{ value, message: '下发类型必须为0或1', validator(value) { return value == 0 || value == 1 } }] : []),
                     ...(method == '05' ? [{ value, message: '下发类型必须为0或1', validator(value) { return value == 0 || value == 1 } }] : []),
                     ...(method == '06' ? [{ value, message: '下发类型必须为整型', validator(value) { return !isNaN(value) && Number(value) % 1 === 0 } }, { value, message: '最大值不能超过65535', validator(value) { return Number(value) <= parseInt('ffff', 16) } }] : []),
                     ...(method == '06' ? [{ value, message: '下发类型必须为整型', validator(value) { return !isNaN(value) && Number(value) % 1 === 0 } }, { value, message: '最大值不能超过65535', validator(value) { return Number(value) <= parseInt('ffff', 16) } }] : []),
-                    ...(method == '16' ? [{ value, message: '下发类型精确到两位小数', validator(value) { return /^\d+(\.\d{0,2})?$/.test(value) } }] : [])
+                    ...(method == '16' ? [{ value, message: '下发类型精确到两位小数', validator(value) { return /^-?\d+(\.\d{0,2})?$/.test(value) } }] : [])
                 ])
                 ])
 
 
                 if (method == '16') {
                 if (method == '16') {
-                    const hexValue = UseLayUi.numberToHex(value).split(' ').slice(0, 2).join('')
-                    value = [parseInt(hexValue, 16), 0]
+                    const hexValue = UseLayUi.numberToHex(value).split(' ')
+                    value = [parseInt(hexValue.slice(0, 2), 16), parseInt(hexValue.slice(2, 4), 16)]
                 }
                 }
 
 
                 if (validate.begin()) flag = true
                 if (validate.begin()) flag = true