Merge branch 'fix/board-datasource-copy' into 'main_dev'

fix: 修改看板控制组件问题

See merge request yunteng/thingskit-front!807

@@ -46,11 +46,8 @@
     const value = target.checked;
     const { option } = props.config || {};
 
-    const { values, isModbusCommand, sendValue } = await getSendValues(
-      option,
-      unref(getDesign),
-      value
-    );
+    const { values, isModbusCommand, sendValue } =
+      (await getSendValues(option, unref(getDesign), value)) || {};
 
     const flag = await sendCommand(values, isModbusCommand ? sendValue : value, isModbusCommand);
     if (flag) currentValue.value = value;

@@ -51,51 +51,8 @@
   const handleChange = async () => {
     const { option } = props.config || {};
 
-    const { values, isModbusCommand, sendValue } = await getSendValues(
-      option,
-      unref(getDesign),
-      unref(checked)
-    );
-
-    // const { values, sendValue, isModbusCommand } = getSendValues(
-    //   values,
-    //   unref(getDesign),
-    //   unref(checked)
-    // );
-    // const isModbusCommand = ref<boolean>(false); //判断是否是TCP设备-> 且设备标识符是modeBUs，切选择是下发命令类型是属性
-    // const { extensionDesc, commandType, codeType, deviceCode, customCommand } =
-    //   unref(getDesign) || {};
-    // const { registerAddress, actionType } = extensionDesc || {};
-    // const { openCommand, closeCommand, transportType } = customCommand || {};
-    // const modBUS = ref<any>({});
-    // const sendValue = ref();
-    // console.log(transportType, 'transportType', codeType, 'codeType');
-    // //判断是不是TCP类型设备
-    // if (transportType === TransportTypeEnum.TCP) {
-    //   if (
-    //     //判断TCP下发类型是否是自定义还是服务
-    //     commandType === CommandTypeEnum.CUSTOM.toString() ||
-    //     commandType == CommandTypeEnum.SERVICE.toString()
-    //   ) {
-    //     values.customCommand.command = unref(checked) ? openCommand : closeCommand;
-    //   }
-    //   if (
-    //     //判断命令下发类型是不是属性
-    //     commandType === CommandTypeEnum.ATTRIBUTE.toString() &&
-    //     codeType === TaskTypeEnum.MODBUS_RTU
-    //   ) {
-    //     isModbusCommand.value = true;
-    //     modBUS.value = {
-    //       crc: 'CRC_16_LOWER',
-    //       deviceCode: deviceCode,
-    //       method: actionType == '16' ? '10' : actionType,
-    //       registerAddress,
-    //       registerNumber: 1,
-    //       registerValues: [Number(unref(checked))],
-    //     };
-    //     sendValue.value = await genModbusCommand(unref(modBUS));
-    //   }
-    // }
+    const { values, isModbusCommand, sendValue } =
+      (await getSendValues(option, unref(getDesign), unref(checked))) || {};
 
     const flag = await sendCommand(
       values,

@@ -46,11 +46,8 @@
     const value = target.checked;
     const { option } = props.config || {};
 
-    const { values, isModbusCommand, sendValue } = await getSendValues(
-      option,
-      unref(getDesign),
-      value
-    );
+    const { values, isModbusCommand, sendValue } =
+      (await getSendValues(option, unref(getDesign), value)) || {};
 
     const flag = await sendCommand(values, isModbusCommand ? sendValue : value, isModbusCommand);
     flag ? (currentValue.value = value) : (target.checked = !value);

@@ -32,6 +32,10 @@
         transportType: value.transportType,
         service: value.service,
         command: value.command,
+        openService: value.openService,
+        closeService: value.closeService,
+        openCommand: value.openCommand,
+        closeCommand: value.closeCommand,
         commandType: value.commandType,
       },
     };
@@ -44,6 +48,10 @@
       ...record,
       transportType: customCommand?.transportType || (record as Recordable).transportType,
       service: customCommand?.service || (record as Recordable).service,
+      openService: customCommand?.openService || (record as Recordable).openService,
+      closeService: customCommand?.closeService || (record as Recordable).closeService,
+      openCommand: customCommand?.openCommand || (record as Recordable).openCommand,
+      closeCommand: customCommand?.closeCommand || (record as Recordable).closeCommand,
       command: customCommand?.command || (record as Recordable).command,
       commandType: customCommand?.commandType || (record as Recordable).command,
     } as unknown as Partial<CommonDataSourceBindValueType>);

@@ -9,6 +9,10 @@
   import { useReceiveValue } from '../../../hook/useReceiveValue';
   import { DataFetchUpdateFn } from '../../../hook/socket/useSocket.type';
   import { useDataFetch } from '../../../hook/socket/useSocket';
+  import { TaskTypeEnum } from '/@/views/task/center/config';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { SingleToHex } from '/@/views/device/list/cpns/tabs/ObjectModelCommandDeliveryModal/config';
+  import { genModbusCommand } from '/@/api/task';
 
   const props = defineProps<{
     config: ComponentPropsConfigType<typeof option>;
@@ -23,7 +27,17 @@
 
   const getDesign = computed(() => {
     const { option, persetOption } = props.config;
-    const { componentInfo, attribute, attributeRename, attributeName } = option;
+    const {
+      componentInfo,
+      attribute,
+      attributeRename,
+      attributeName,
+      commandType,
+      extensionDesc,
+      codeType,
+      deviceCode,
+      customCommand,
+    } = option;
     const {
       controlBarColor: persetControlBarColor,
       fonColor: persetFontColor,
@@ -37,6 +51,11 @@
       fontColor: fontColor ?? persetFontColor,
       minNumber: minNumber ?? persetMinNumber,
       maxNumber: maxNumber ?? persetMaxNumber,
+      extensionDesc: extensionDesc ? JSON.parse(extensionDesc) : {},
+      commandType,
+      codeType,
+      deviceCode,
+      customCommand,
     };
   });
 
@@ -59,9 +78,98 @@
     sliderValue.value = afterValue.value; //这一步是因为当我们是点击不是拖动时候，会让值更新不了，所以需要赋值一次
   };
 
+  const { createMessage } = useMessage();
+
+  // 获取小数
+  const getFloatPart = (number: string | number) => {
+    const isLessZero = Number(number) < 0;
+    number = number.toString();
+    const floatPartStartIndex = number.indexOf('.');
+    const value = ~floatPartStartIndex
+      ? `${isLessZero ? '-' : ''}0.${number.substring(floatPartStartIndex + 1)}`
+      : '0';
+    return Number(value);
+  };
+
+  const getArray = (values) => {
+    const str = values.replace(/\s+/g, '');
+    const array: any = [];
+
+    for (let i = 0; i < str.length; i += 4) {
+      const chunk = parseInt(str.substring(i, i + 4), 16);
+      array.push(chunk);
+    }
+    return array;
+  };
+
+  const getSendValue = async (value: number) => {
+    const { extensionDesc, codeType, deviceCode, customCommand } = unref(getDesign) || {};
+    const { transportType } = customCommand || {};
+    const { registerAddress, actionType, zoomFactor } = extensionDesc || {};
+    const newZoomValue = zoomFactor ? Number(zoomFactor) : 1;
+    if (transportType == 'TCP' && codeType == TaskTypeEnum.MODBUS_RTU) {
+      if (!deviceCode) {
+        createMessage.warning('当前设备没有设置地址码');
+        return;
+      }
+      const modbusForm = ref({
+        crc: 'CRC_16_LOWER',
+        deviceCode: deviceCode,
+        method: actionType == '16' ? '10' : actionType,
+        registerAddress,
+        registerNumber: 1,
+        registerValues: [value],
+      }) as any;
+      if (!actionType) {
+        createMessage.warning('当前物模型扩展描述没有填写');
+        return;
+      }
+      if (actionType == '06') {
+        const newValue = Math.trunc(value) * newZoomValue + getFloatPart(value) * newZoomValue;
+        if (newValue % 1 != 0) {
+          createMessage.warning(`值必须是整数,缩放因子为${unref(newZoomValue)}`);
+          return;
+        }
+
+        if (newValue > 65535) {
+          createMessage.warning(`值不能超过65535,缩放因子是${unref(newZoomValue)}`);
+          return;
+        }
+        modbusForm.value.registerValues = [newValue];
+      }
+      if (actionType == '05') {
+        if (Number(value) != 0 || Number(value) != 1) {
+          createMessage.warning(`当前物模型仅支持值为0和1`);
+          return;
+        }
+      }
+      if (actionType == '16' || actionType == '10') {
+        const regex = /^-?\d+(\.\d{0,2})?$/;
+        const values =
+          Math.trunc(value) * unref(newZoomValue) + getFloatPart(value) * unref(newZoomValue);
+        if (!regex.test(values as any)) {
+          createMessage.warning(`值精确到两位小数,缩放因子是${unref(newZoomValue)}`);
+          return;
+        }
+        const newValue = values == 0 ? [0, 0] : getArray(SingleToHex(values));
+        modbusForm.value.registerValues = newValue;
+        modbusForm.value.registerNumber = 2;
+        modbusForm.value.method = '10';
+      }
+      const sendValue = await genModbusCommand(unref(modbusForm));
+      return sendValue;
+    }
+  };
+
   const handleBlur = async () => {
     if (unref(oldSliderValue) !== unref(sliderValue)) {
-      const flag = await sendCommand(props.config.option, unref(sliderValue));
+      const { codeType, customCommand } = unref(getDesign) || {};
+      const { transportType } = customCommand || {};
+      const sendValue = ref<any>(unref(sliderValue));
+      if (transportType == 'TCP' && codeType == TaskTypeEnum.MODBUS_RTU) {
+        sendValue.value = await getSendValue(unref(sliderValue));
+      }
+      const flag = await sendCommand(props.config.option, unref(sendValue), true);
       flag
         ? ((sliderValue.value = unref(sliderValue)),
           (oldSliderValue.value = sliderValue.value),

@@ -101,11 +101,8 @@
       mode,
       widthPx,
     } as DataSource;
-    const { values, isModbusCommand, sendValue } = await getSendValues(
-      data,
-      unref(getDesign).dataSource[index],
-      checked
-    );
+    const { values, isModbusCommand, sendValue } =
+      (await getSendValues(data, unref(getDesign).dataSource[index], checked)) || {};
 
     const flag = await sendCommand(values, isModbusCommand ? sendValue : checked, isModbusCommand);
     if (!flag) controlList.value[index].checked = !checked;

@@ -3,6 +3,19 @@ import { TransportTypeEnum } from '/@/views/device/profiles/components/Transport
 import { CommandTypeEnum } from '/@/views/rule/linkedge/config/config.data';
 import { TaskTypeEnum } from '/@/views/task/center/config';
 import { genModbusCommand } from '/@/api/task';
+import { useMessage } from '/@/hooks/web/useMessage';
+import { SingleToHex } from '/@/views/device/list/cpns/tabs/ObjectModelCommandDeliveryModal/config';
+
+const getArray = (values) => {
+  const str = values.replace(/\s+/g, '');
+  const array: any = [];
+
+  for (let i = 0; i < str.length; i += 4) {
+    const chunk = parseInt(str.substring(i, i + 4), 16);
+    array.push(chunk);
+  }
+  return array;
+};
 
 export const getSendValues = async (option, getDesign, checked) => {
   const values: any = option;
@@ -12,6 +25,8 @@ export const getSendValues = async (option, getDesign, checked) => {
   const { openCommand, closeCommand, transportType } = customCommand || {};
   const modBUS = ref<any>({});
   const sendValue = ref();
+
+  const { createMessage } = useMessage();
   //判断是不是TCP类型设备
   if (transportType === TransportTypeEnum.TCP) {
     if (
@@ -22,10 +37,18 @@ export const getSendValues = async (option, getDesign, checked) => {
       values.customCommand.command = checked ? openCommand : closeCommand;
     }
     if (
-      //判断命令下发类型是不是属性
+      //判断命令下发类型是不是属性 且是modbus
       commandType === CommandTypeEnum.ATTRIBUTE.toString() &&
       codeType === TaskTypeEnum.MODBUS_RTU
     ) {
+      if (!deviceCode) {
+        createMessage.warning('当前设备没有设置地址码');
+        return;
+      }
+      if (!actionType) {
+        createMessage.warning('当前物模型扩展描述没有填写');
+        return;
+      }
       isModbusCommand.value = true;
       modBUS.value = {
         crc: 'CRC_16_LOWER',
@@ -35,6 +58,14 @@ export const getSendValues = async (option, getDesign, checked) => {
         registerNumber: 1,
         registerValues: [Number(checked)],
       };
+
+      if (actionType == '16' || actionType == '10') {
+        const newValue = Number(checked) == 0 ? [0, 0] : getArray(SingleToHex(Number(checked)));
+        modBUS.value.registerValues = newValue;
+        modBUS.value.registerNumber = 2;
+        modBUS.value.method = '10';
+      }
+
       sendValue.value = await genModbusCommand(unref(modBUS));
     }
   }

@@ -364,9 +364,10 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
                   });
                 }
 
+                // 选择控制组件4的时候只能选择属性且是（int double类型）
                 if (unref(selectWidgetKeys).componentKey == 'LateralNumericalControl') {
                   setFieldsValue({
-                    [DataSourceField.COMMAND_TYPE]: 2,
+                    [DataSourceField.COMMAND_TYPE]: CommandTypeEnum.ATTRIBUTE.toString(),
                   });
                   return option.filter(
                     (item) =>