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

fix: 修复modbus命令下发验证下发值时未先乘缩放因子

See merge request yunteng/thingskit-scada!112

@@ -16281,10 +16281,10 @@ class HandleDataInteraction {
                     { value: method, required: true, message: '未找到Modbus命令操作类型' },
                     { value, required: true, message: '下发值是必填项' },
                     ...(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 == '16' ? [{ value, message: '下发类型精确到两位小数', validator(value) { return /^-?\d+(\.\d{0,2})?$/.test(value) } }] : [])
+                    ...(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 == '16' ? [{ value, message: '下发类型精确到两位小数', validator(value) { return /^-?\d+(\.\d{0,2})?$/.test(value * zoomFactor) } }] : [])
                 ])
-                
+
                 if (method == '06' || method == '16') {
                     value = value * zoomFactor
                 }