Merge branch 'feat/tcp-product-thingsmodel-add-zoom-factory' into 'main_dev'

fix: 修复输入参数为0时,无法生成modbus指令

See merge request yunteng/thingskit-scada!116

@@ -16274,34 +16274,35 @@ class HandleDataInteraction {
             }
             }
 
 
             const getNumberFloatPart = (number) => {
             const getNumberFloatPart = (number) => {
+                const isLessZero = number < 0
                 number = number.toString()
                 number = number.toString()
                 const floatIndex = number.indexOf('.')
                 const floatIndex = number.indexOf('.')
                 const floatPart = ~floatIndex ? `0.${number.substring(floatIndex + 1)}` : '0';
                 const floatPart = ~floatIndex ? `0.${number.substring(floatIndex + 1)}` : '0';
-                return Number(floatPart)
+                return isLessZero ? -Number(floatPart) : Number(floatPart)
             }
             }
 
 
             if (commandType == enumCommandType.MODBUS) {
             if (commandType == enumCommandType.MODBUS) {
-                value = Number(data[enumActionEl.CUSTOM_TCP_COMMAND])
+                value = data[enumActionEl.CUSTOM_TCP_COMMAND]
 
 
                 let { method, deviceCode, zoomFactor } = additional || {}
                 let { method, deviceCode, zoomFactor } = additional || {}
                 zoomFactor = zoomFactor ? zoomFactor : 1
                 zoomFactor = zoomFactor ? zoomFactor : 1
+
                 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: '下发值不是一个数字', validator(value) { return !isNaN(value) } },
-                    { value, required: true, message: '下发值是必填项' },
+                    { value, message: '下发值不是一个数字', validator(value) { return value.toString().trim() && !isNaN(value) } },
                     ...(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: `下发类型必须为整型,缩放因子为${zoomFactor}`, validator(value) { return !isNaN(value) && getNumberFloatPart(value) * zoomFactor % 1 === 0 } }, { value: Number(value) * zoomFactor, message: `最大值不能超过65535,缩放因子为${zoomFactor}`, validator(value) { return Number(value) <= parseInt('ffff', 16) } }] : []),
+                    ...(method == '06' ? [{ value, message: `下发类型必须为整型,缩放因子为${zoomFactor}`, validator(value) { return !isNaN(value) && getNumberFloatPart(Number(value)) * zoomFactor % 1 === 0 } }, { value: Number(value) * zoomFactor, message: `最大值不能超过65535,缩放因子为${zoomFactor}`, validator(value) { return Number(value) <= parseInt('ffff', 16) } }] : []),
                     ...(method == '16' ? [{ value, message: '下发类型精确到两位小数', validator(value) { return /^-?\d+(\.\d{0,2})?$/.test(Math.floor(Number(value)) * zoomFactor + getNumberFloatPart(Number(value)) * zoomFactor) } }] : [])
                     ...(method == '16' ? [{ value, message: '下发类型精确到两位小数', validator(value) { return /^-?\d+(\.\d{0,2})?$/.test(Math.floor(Number(value)) * zoomFactor + getNumberFloatPart(Number(value)) * zoomFactor) } }] : [])
                 ])
                 ])
-
+                
                 if (method == '06' || method == '16') {
                 if (method == '06' || method == '16') {
-                    value = Math.floor(value) * zoomFactor + getNumberFloatPart(value) * zoomFactor
+                    value = Math.trunc(value) * zoomFactor + getNumberFloatPart(value) * zoomFactor
                 }
                 }
 
 
                 if (method == '16') {
                 if (method == '16') {
                     const hexValue = UseLayUi.numberToHex(value).split(' ').join('')
                     const hexValue = UseLayUi.numberToHex(value).split(' ').join('')
-                    value = [parseInt(hexValue.slice(0, 4), 16), parseInt(hexValue.slice(4, 8), 16)]
+                    value = value ? [parseInt(hexValue.slice(0, 4), 16), parseInt(hexValue.slice(4, 8), 16)] : [0, 0]
                 }
                 }
 
 
                 if (validate.begin()) flag = true
                 if (validate.begin()) flag = true
@@ -17316,7 +17317,8 @@ class Validate {
     begin() {
     begin() {
         for (const rule of this.list) {
         for (const rule of this.list) {
             const { required, value, message, validator } = rule
             const { required, value, message, validator } = rule
-            if (required && !value) {
+
+            if (required && (value === null || value === undefined || value === '')) {
                 UseLayUi.topErrorMsg(message)
                 UseLayUi.topErrorMsg(message)
                 return false
                 return false
             }
             }