Merge branch 'fix/DEFECT-1475' into 'main_dev'

属性下发时int和double相乘缩放因子

See merge request yunteng/thingskit-front!789

@@ -30,7 +30,9 @@
   const modBUSForm = ref<any>({});
   const modBUSForm = ref<any>({});
   const isShowModBUS = ref<Boolean>(false); //用于判断标识符类型是否时自定义还是modBUS
   const isShowModBUS = ref<Boolean>(false); //用于判断标识符类型是否时自定义还是modBUS
   const isShowActionType = ref<Boolean>(true); //判断设备属性标识符为modBus时没有填写扩展描述
   const isShowActionType = ref<Boolean>(true); //判断设备属性标识符为modBus时没有填写扩展描述
-  const formField = ref('');
+  const formField = ref(''); //存一个表单取值的field
+  const zoomFactorValue = ref<number>(1); //缩放因子
+  const isShowMultiply = ref<Boolean>(false); // 只有tcp --> int和double类型才相乘缩放因子
 
 
   const [register] = useModalInner(async (params: ModalParamsType<DeviceModelOfMatterAttrs>) => {
   const [register] = useModalInner(async (params: ModalParamsType<DeviceModelOfMatterAttrs>) => {
     const { record } = params;
     const { record } = params;
@@ -39,8 +41,11 @@
     const { type } = dataType || {};
     const { type } = dataType || {};
     const { codeType, deviceProfile } = deviceDetail || {};
     const { codeType, deviceProfile } = deviceDetail || {};
     const { transportType } = deviceProfile || {};
     const { transportType } = deviceProfile || {};
-    const { registerAddress, actionType } = extensionDesc || {};
+    const { registerAddress, actionType, zoomFactor } = extensionDesc || {}; //获取扩展描述内容
+
     formField.value = identifier;
     formField.value = identifier;
+    zoomFactorValue.value = zoomFactor ? Number(zoomFactor) : 1;
+    isShowMultiply.value = type == 'INT' || type == 'DOUBLE' ? true : false;
 
 
     let schemas = [{ dataType: dataType, identifier, functionName: name } as StructJSON];
     let schemas = [{ dataType: dataType, identifier, functionName: name } as StructJSON];
 
 
@@ -60,7 +65,7 @@
       modBUSForm.value = {
       modBUSForm.value = {
         crc: 'CRC_16_LOWER',
         crc: 'CRC_16_LOWER',
         deviceCode: '01',
         deviceCode: '01',
-        method: actionType,
+        method: actionType == '16' ? '10' : actionType,
         registerAddress,
         registerAddress,
         registerNumber: 1,
         registerNumber: 1,
         registerValues: [],
         registerValues: [],
@@ -104,11 +109,17 @@
         if (!flag) return;
         if (!flag) return;
 
 
         const oldValue = getFieldsValue()[unref(formField)];
         const oldValue = getFieldsValue()[unref(formField)];
-        modBUSForm.value.registerValues = [oldValue];
         modBUSForm.value.registerNumber = 1;
         modBUSForm.value.registerNumber = 1;
+        modBUSForm.value.registerValues = [oldValue];
+        if (unref(isShowMultiply) && unref(modBUSForm).method == '06') {
+          //bool类型的就不用去乘缩放因子了
+          modBUSForm.value.registerValues = [oldValue * unref(zoomFactorValue)];
+        }
 
 
-        if (unref(modBUSForm).method == '16') {
-          const newValue = getArray(SingleToHex(oldValue));
+        if (unref(modBUSForm).method == '16' || unref(modBUSForm).method == '10') {
+          const newValue = getArray(
+            SingleToHex(unref(isShowMultiply) ? oldValue * unref(zoomFactorValue) : oldValue)
+          );
           modBUSForm.value.registerValues = newValue;
           modBUSForm.value.registerValues = newValue;
           modBUSForm.value.registerNumber = 2;
           modBUSForm.value.registerNumber = 2;
           modBUSForm.value.method = '10';
           modBUSForm.value.method = '10';