fix: 修复任务中心创建任务表单校验问题

@@ -133,6 +133,7 @@
         } = props.schema;
         } = props.schema;
 
 
         if (isFunction(dynamicRules)) {
         if (isFunction(dynamicRules)) {
+          console.log(dynamicRules(unref(getValues)));
           return dynamicRules(unref(getValues)) as ValidationRule[];
           return dynamicRules(unref(getValues)) as ValidationRule[];
         }
         }
 
 

 import { TaskTargetEnum, TaskTargetNameEnum, TaskTypeEnum, TaskTypeNameEnum } from '../../config';
 import { TaskTargetEnum, TaskTargetNameEnum, TaskTypeEnum, TaskTypeNameEnum } from '../../config';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { findDictItemByCode } from '/@/api/system/dict';
-import { FormSchema, useComponentRegister } from '/@/components/Form';
+import { FormSchema, Rule, useComponentRegister } from '/@/components/Form';
 import {
 import {
   DevicePicker,
   DevicePicker,
   validateDevicePicker,
   validateDevicePicker,
@@ -211,14 +211,18 @@ export const formSchemas: FormSchema[] = [
     field: FormFieldsEnum.RPC_COMMAND,
     field: FormFieldsEnum.RPC_COMMAND,
     component: 'PollCommandInput',
     component: 'PollCommandInput',
     label: '自定义数据流',
     label: '自定义数据流',
-    rules: [{ required: true, message: '请输入自定义数据流' }],
-    dynamicRules: ({ model }) =>
-      model[FormFieldsEnum.PUSH_WAY] === PushWayEnum.MQTT ? JSONEditorValidator() : [],
+    dynamicRules: ({ model }) => {
+      const rules: Rule[] = [{ required: true, message: '请输入自定义数据流' }];
+      return model[FormFieldsEnum.PUSH_WAY] === PushWayEnum.MQTT
+        ? [...rules, ...JSONEditorValidator()]
+        : rules;
+    },
     ifShow: ({ model }) => model[FormFieldsEnum.EXECUTE_CONTENT_TYPE] === TaskTypeEnum.CUSTOM,
     ifShow: ({ model }) => model[FormFieldsEnum.EXECUTE_CONTENT_TYPE] === TaskTypeEnum.CUSTOM,
     valueField: 'value',
     valueField: 'value',
     changeEvent: 'update:value',
     changeEvent: 'update:value',
-    componentProps: ({ formModel }) => {
+    componentProps: ({ formModel, formActionType }) => {
       const pushMode = Reflect.get(formModel, FormFieldsEnum.PUSH_WAY);
       const pushMode = Reflect.get(formModel, FormFieldsEnum.PUSH_WAY);
+      formActionType?.clearValidate(FormFieldsEnum.RPC_COMMAND);
       return {
       return {
         inputProps: {
         inputProps: {
           placeholder: '请输入自定义数据流',
           placeholder: '请输入自定义数据流',
@@ -232,7 +236,9 @@ export const formSchemas: FormSchema[] = [
     component: 'PollCommandInput',
     component: 'PollCommandInput',
     label: 'ModbusRTU轮询',
     label: 'ModbusRTU轮询',
     rules: [{ required: true, message: '请输入Modbus RTU 轮询指令' }],
     rules: [{ required: true, message: '请输入Modbus RTU 轮询指令' }],
-    ifShow: ({ model }) => model[FormFieldsEnum.EXECUTE_CONTENT_TYPE] === TaskTypeEnum.MODBUS_RTU,
+    ifShow: ({ model }) =>
+      model[FormFieldsEnum.EXECUTE_CONTENT_TYPE] === TaskTypeEnum.MODBUS_RTU &&
+      model[FormFieldsEnum.PUSH_WAY] === PushWayEnum.TCP,
     valueField: 'value',
     valueField: 'value',
     changeEvent: 'update:value',
     changeEvent: 'update:value',
     componentProps: () => {
     componentProps: () => {
@@ -345,6 +351,7 @@ export const formSchemas: FormSchema[] = [
     field: FormFieldsEnum.EXECUTE_TIME_INTERVAL,
     field: FormFieldsEnum.EXECUTE_TIME_INTERVAL,
     label: '间隔时间',
     label: '间隔时间',
     component: 'InputNumber',
     component: 'InputNumber',
+    rules: [{ required: true, message: '请输入间隔时间', type: 'number' }],
     ifShow: ({ model }) => model[FormFieldsEnum.EXECUTE_TIME_TYPE] === ExecuteTimeTypeEnum.POLL,
     ifShow: ({ model }) => model[FormFieldsEnum.EXECUTE_TIME_TYPE] === ExecuteTimeTypeEnum.POLL,
     componentProps: ({ formModel }) => {
     componentProps: ({ formModel }) => {
       const unit = formModel[FormFieldsEnum.POLL_UNIT];
       const unit = formModel[FormFieldsEnum.POLL_UNIT];