Merge branch 'main_dev' into feat/account-role-manage

@@ -87,7 +87,8 @@
     const isTcpDevice = unref(props.deviceDetail)?.transportType === TransportTypeEnum.TCP;
     const isTcpDevice = unref(props.deviceDetail)?.transportType === TransportTypeEnum.TCP;
     if (commandType === CommandTypeEnum.CUSTOM) {
     if (commandType === CommandTypeEnum.CUSTOM) {
       if (isTcpDevice) {
       if (isTcpDevice) {
-        return values.tcpCommandValue;
+        const value = values.tcpCommandValue;
+        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,
     },
     },

@@ -5,7 +5,6 @@
       @register="registerDrawer"
       @register="registerDrawer"
       :showFooter="false"
       :showFooter="false"
       :title="descInfo?.title"
       :title="descInfo?.title"
-      destroyOnClose
       width="70%"
       width="70%"
     >
     >
       <div v-html="descInfo?.content"></div>
       <div v-html="descInfo?.content"></div>

@@ -76,7 +76,6 @@
         showTableSetting: true,
         showTableSetting: true,
         bordered: true,
         bordered: true,
         showIndexColumn: false,
         showIndexColumn: false,
-        canResize: false,
         actionColumn: {
         actionColumn: {
           width: 200,
           width: 200,
           title: t('routes.common.common.operation'), //操作
           title: t('routes.common.common.operation'), //操作

@@ -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,

@@ -8,7 +8,7 @@ export enum MoreActionEvent {
 export enum VisualBoardPermission {
 export enum VisualBoardPermission {
   UPDATE = 'api:yt:data_board:update:update',
   UPDATE = 'api:yt:data_board:update:update',
   DELETE = 'api:yt:data_board:delete',
   DELETE = 'api:yt:data_board:delete',
-  CREATE = '',
+  CREATE = 'api:yt:data_board:add:post',
   SHARE = 'api:yt:data_board:share',
   SHARE = 'api:yt:data_board:share',
   DETAIL = 'api:yt:data_component:list',
   DETAIL = 'api:yt:data_component:list',
 }
 }

@@ -196,7 +196,7 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
               });
               });
             }
             }
           },
           },
-          getPopupContainer: () => document.body,
+          ...createPickerSearch(),
         };
         };
       },
       },
     },
     },