Merge branch 'fix/attribute-distribution-price' into 'main_dev'

fix: 修改属性下发验证值时先乘缩放因子

See merge request yunteng/thingskit-front!795

@@ -138,8 +138,9 @@ const formSchemasConfig = (schemas, actionType): FormSchema[] => {
         component: 'InputNumber',
         component: 'InputNumber',
         rules: [{ required: true, message: '请输入值' }],
         rules: [{ required: true, message: '请输入值' }],
         componentProps: {
         componentProps: {
-          precision: 0,
-          placeholder: `请输入整数`,
+          formatter: (e) =>
+            `${e}`.replace(/\B(?=(\d{3})+(?!\d))/g, '').replace(/^(-)*(\d+)\.(\d\d).*$/, '$1$2.$3'),
+          placeholder: `请输入值`,
         },
         },
       },
       },
     ];
     ];

@@ -112,6 +112,15 @@
         modBUSForm.value.registerNumber = 1;
         modBUSForm.value.registerNumber = 1;
         modBUSForm.value.registerValues = [oldValue];
         modBUSForm.value.registerValues = [oldValue];
         if (unref(isShowMultiply) && unref(modBUSForm).method == '06') {
         if (unref(isShowMultiply) && unref(modBUSForm).method == '06') {
+          if (String(oldValue * unref(zoomFactorValue)).indexOf('.') > -1) {
+            createMessage.warning(`属性下发类型必须是整数,缩放因子为${unref(zoomFactorValue)}`);
+            return;
+          }
+
+          if (oldValue * unref(zoomFactorValue) > 65535) {
+            createMessage.warning(`属性下发值不能超过65535,缩放因子是${unref(zoomFactorValue)}`);
+            return;
+          }
           //bool类型的就不用去乘缩放因子了
           //bool类型的就不用去乘缩放因子了
           modBUSForm.value.registerValues = [oldValue * unref(zoomFactorValue)];
           modBUSForm.value.registerValues = [oldValue * unref(zoomFactorValue)];
         }
         }