Merge branch 'perf/command-delivery' into 'main_dev'

perf: 优化任务列表与物模型TCP命令移除空白字符

See merge request yunteng/thingskit-front!1299

@@ -26,7 +26,7 @@
   import { CommandDeliveryFormFieldType, CommandFieldsEnum, CommandSchemas } from './config';
   import { CommandDeliveryFormFieldType, CommandFieldsEnum, CommandSchemas } from './config';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { DeviceRecord } from '/@/api/device/model/deviceModel';
   import { DeviceRecord } from '/@/api/device/model/deviceModel';
-  import { CommandDeliveryWayEnum, TCPProtocolTypeEnum } from '/@/enums/deviceEnum';
+  import { CommandDeliveryWayEnum } from '/@/enums/deviceEnum';
   import { CommandTypeEnum, RPCCommandMethodEnum, TransportTypeEnum } from '/@/enums/deviceEnum';
   import { CommandTypeEnum, RPCCommandMethodEnum, TransportTypeEnum } from '/@/enums/deviceEnum';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { getDeviceActiveTime } from '/@/api/alarm/position';
   import { getDeviceActiveTime } from '/@/api/alarm/position';
@@ -88,13 +88,7 @@
     if (commandType === CommandTypeEnum.CUSTOM) {
     if (commandType === CommandTypeEnum.CUSTOM) {
       if (isTcpDevice) {
       if (isTcpDevice) {
         const value = values.tcpCommandValue;
         const value = values.tcpCommandValue;
-        if (
-          unref(props.deviceDetail).deviceProfile.profileData.transportConfiguration.protocol ===
-          TCPProtocolTypeEnum.MODBUS_RTU
-        ) {
-          return value?.replaceAll(/\s/g, '');
-        }
-        return value;
+        return value?.replaceAll(/\s/g, '');
       }
       }
       return parseStringToJSON(values.commandValue!).json;
       return parseStringToJSON(values.commandValue!).json;
     } else {
     } else {

@@ -130,7 +130,11 @@ function handleServiceType(
     functionJson: {
     functionJson: {
       inputData:
       inputData:
         transportType === TransportTypeEnum.TCP
         transportType === TransportTypeEnum.TCP
-          ? [{ [FormFieldsEnum.SERVICE_COMMAND]: serviceCommand } as unknown as StructJSON]
+          ? [
+              {
+                [FormFieldsEnum.SERVICE_COMMAND]: serviceCommand?.replaceAll(/\s/g, ''),
+              } as unknown as StructJSON,
+            ]
           : inputData,
           : inputData,
       outputData,
       outputData,
     },
     },

@@ -14,6 +14,7 @@ import { dateUtil } from '/@/utils/dateUtil';
 import { ProductPicker, validateProductPicker } from '../ProductPicker';
 import { ProductPicker, validateProductPicker } from '../ProductPicker';
 import { useGlobSetting } from '/@/hooks/setting';
 import { useGlobSetting } from '/@/hooks/setting';
 import { TransportTypeEnum } from '/@/enums/deviceEnum';
 import { TransportTypeEnum } from '/@/enums/deviceEnum';
+import { validateTCPCustomCommand } from '/@/components/Form/src/components/ThingsModelForm';
 
 
 useComponentRegister('DevicePicker', DevicePicker);
 useComponentRegister('DevicePicker', DevicePicker);
 useComponentRegister('ProductPicker', ProductPicker);
 useComponentRegister('ProductPicker', ProductPicker);
@@ -218,7 +219,7 @@ export const formSchemas: FormSchema[] = [
       const rules: Rule[] = [{ required: true, message: '请输入自定义数据流' }];
       const rules: Rule[] = [{ required: true, message: '请输入自定义数据流' }];
       return model[FormFieldsEnum.PUSH_WAY] === PushWayEnum.MQTT
       return model[FormFieldsEnum.PUSH_WAY] === PushWayEnum.MQTT
         ? [...rules, ...JSONEditorValidator()]
         ? [...rules, ...JSONEditorValidator()]
-        : rules;
+        : [...rules, { validator: validateTCPCustomCommand }];
     },
     },
     ifShow: ({ model }) => model[FormFieldsEnum.EXECUTE_CONTENT_TYPE] === TaskTypeEnum.CUSTOM,
     ifShow: ({ model }) => model[FormFieldsEnum.EXECUTE_CONTENT_TYPE] === TaskTypeEnum.CUSTOM,
     valueField: 'value',
     valueField: 'value',

@@ -95,7 +95,8 @@ export const composeData = (result: Required<FormValueType>): CreateTaskRecordTy
     targetType,
     targetType,
     executeContent: {
     executeContent: {
       pushContent: {
       pushContent: {
-        rpcCommand: pushWay === PushWayEnum.MQTT ? JSON.parse(rpcCommand) : rpcCommand,
+        rpcCommand:
+          pushWay === PushWayEnum.TCP ? rpcCommand.replaceAll(/\s/g, '') : JSON.parse(rpcCommand),
       },
       },
       pushWay,
       pushWay,
       type: executeContentType,
       type: executeContentType,