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

fix: 修复小数数值精度问题

See merge request yunteng/thingskit-scada!113

@@ -16273,20 +16273,28 @@ class HandleDataInteraction {
                 MODBUS: '2',
                 MODBUS: '2',
             }
             }
 
 
+            const getNumberFloatPart = (number) => {
+                number = number.toString()
+                const floatIndex = number.indexOf('.')
+                const floatPart = ~floatIndex ? `0.${number.substring(floatIndex + 1)}` : '0';
+                return floatPart
+            }
+
             if (commandType == enumCommandType.MODBUS) {
             if (commandType == enumCommandType.MODBUS) {
                 value = data[enumActionEl.CUSTOM_TCP_COMMAND]
                 value = data[enumActionEl.CUSTOM_TCP_COMMAND]
                 const { method, deviceCode, zoomFactor = 1 } = additional || {}
                 const { method, deviceCode, zoomFactor = 1 } = 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: `下发类型必须为整型,缩放因子为${zoomFactor}`, validator(value) { return !isNaN(value) && Number(value) * zoomFactor % 1 === 0 } }, { value: value * zoomFactor, message: `最大值不能超过65535,缩放因子为${zoomFactor}`, validator(value) { return Number(value) <= parseInt('ffff', 16) } }] : []),
+                    ...(method == '06' ? [{ value, message: `下发类型必须为整型,缩放因子为${zoomFactor}`, validator(value) { return !isNaN(value) && getNumberFloatPart(value) * zoomFactor % 1 === 0 } }, { value: 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(value * zoomFactor) } }] : [])
                     ...(method == '16' ? [{ value, message: '下发类型精确到两位小数', validator(value) { return /^-?\d+(\.\d{0,2})?$/.test(value * zoomFactor) } }] : [])
                 ])
                 ])
 
 
                 if (method == '06' || method == '16') {
                 if (method == '06' || method == '16') {
-                    value = value * zoomFactor
+                    value = Math.floor(value) * zoomFactor + getNumberFloatPart(value) * zoomFactor
                 }
                 }
 
 
                 if (method == '16') {
                 if (method == '16') {