调度执行：修改页面bug

src/views/taskScheduling/taskFlow/index.vue

@@ -91,7 +91,7 @@
                 tooltip:'详情',
                 onClick: handleConsanguinity.bind(null, record),
                 ifShow: () => {
-                  return record.releaseStatus !== '父级'; // 这里只是实现树文件夹按钮
+                  return record.releaseStatus !== ''; // 这里只是实现树文件夹按钮
                 },
               },
               {
@@ -107,7 +107,7 @@
                 tooltip:'下线',
                 onClick: handleOnline.bind(null, record),
                  ifShow: () => {
-                  return record.releaseStatus !== '父级'; // 根据业务控制是否显示: 非enable状态的不显示启用按钮
+                  return record.releaseStatus !== ''; // 根据业务控制是否显示: 非enable状态的不显示启用按钮
                 },
               },
               {
@@ -115,7 +115,7 @@
                 tooltip:'发布',
                 onClick: apiDetail.bind(null, record),
                  ifShow: () => {
-                  return record.releaseStatus !== '父级'; // 根据业务控制是否显示: 非enable状态的不显示启用按钮
+                  return record.releaseStatus !== ''; // 根据业务控制是否显示: 非enable状态的不显示启用按钮
                 },
               },
               {
@@ -123,7 +123,7 @@
                 tooltip:'检查？',
                 onClick: handleOffline.bind(null, record),
                 ifShow: () => {
-                  return record.releaseStatus !== '父级'; // 这里只是实现树文件夹按钮
+                  return record.releaseStatus !== ''; // 这里只是实现树文件夹按钮
                 },
               },
             ]"

src/views/taskScheduling/taskFlow/mock.ts

@@ -122,7 +122,7 @@ export const tableList: any[] = [
     updateDate: '2023/07/10 10:49:38',
     businessTag: '_',
     owner: 'admin',
-    releaseStatus: '父级',
+    releaseStatus: '',
 
     task: null,
     type: 'theme',
@@ -136,7 +136,7 @@ export const tableList: any[] = [
     updateDate: '2023/07/10 10:49:38',
     businessTag: '_',
     owner: 'admin',
-    releaseStatus: '父级',
+    releaseStatus: '',
 
     task: null,
     type: 'theme',
@@ -150,7 +150,7 @@ export const tableList: any[] = [
     updateDate: '2023/07/10 10:49:38',
     businessTag: '_',
     owner: 'admin',
-    releaseStatus: '父级',
+    releaseStatus: '',
 
     task: null,
     type: 'twoLevel',
@@ -164,7 +164,7 @@ export const tableList: any[] = [
     updateDate: '2023/07/10 10:49:38',
     businessTag: '_',
     owner: 'admin',
-    releaseStatus: '父级',
+    releaseStatus: '',
 
     task: null,
     type: 'twoLevel',
@@ -178,7 +178,7 @@ export const tableList: any[] = [
     updateDate: '2023/07/10 10:49:38',
     businessTag: '_',
     owner: 'admin',
-    releaseStatus: '父级',
+    releaseStatus: '',
 
     task: null,
     type: 'twoLevel',
@@ -192,7 +192,7 @@ export const tableList: any[] = [
     updateDate: '2023/07/10 10:49:38',
     businessTag: '_',
     owner: 'admin',
-    releaseStatus: '父级',
+    releaseStatus: '',
 
     task: null,
     type: 'twoLevel',
@@ -206,7 +206,7 @@ export const tableList: any[] = [
     updateDate: '2023/07/10 10:49:38',
     businessTag: '_',
     owner: 'admin',
-    releaseStatus: '父级',
+    releaseStatus: '',
 
     task: null,
     type: 'twoLevel',
@@ -220,7 +220,7 @@ export const tableList: any[] = [
     updateDate: '2023/07/10 10:49:38',
     businessTag: '_',
     owner: 'admin',
-    releaseStatus: '父级',
+    releaseStatus: '',
 
     task: null,
     type: 'twoLevel',
@@ -234,7 +234,7 @@ export const tableList: any[] = [
     updateDate: '2023/07/10 10:49:38',
     businessTag: '_',
     owner: 'admin',
-    releaseStatus: '父级',
+    releaseStatus: '',
 
     task: null,
     type: 'twoLevel',

src/views/taskScheduling/taskFlowDesign/design.data.ts

 import { FormSchema } from '@/components/Form';
 import { BasicColumn } from '@/components/Table';
-import { TableColumn } from 'ant-design-vue';
+import {InputProps, TableColumn} from 'ant-design-vue';
 import { TreeItem } from '@/components/Tree';
 
 export const designFormSchema: FormSchema[] = [
@@ -853,12 +853,38 @@ export const taskOverallConfig: FormSchema[] = [
     slot: 'cycle',
     colProps: { lg: 24, md: 24 },
   },
-/*  {
+  {
     label: 'Cron表达式',
+    helpMessage: '0 0 0 ? * * *',
+    component: 'Input',
+    componentProps: {
+      placeholder: '0 0 0 ? * * *',
+    } as InputProps,
     field: 'cron',
-    slot: 'cron',
     colProps: { lg: 24, md: 24 },
-  },*/
+    show: ({ model }) => {
+      return model.cycle === 'Cron表达式';
+    },
+  },
+  {
+    label: '调度时间',
+    field: 'scheduleTime',
+    fields:['scheduleTime'],
+    slot:'scheduleTime',
+    colProps: { lg: 24, md: 24 },
+    show: ({ model }) => {
+      return model.cycle === '每天一次';
+    },
+  },
+  {
+    label: '事件触发器',
+    field: 'eventTrigger',
+    slot:'eventTrigger',
+    colProps: { lg: 24, md: 24 },
+    show: ({ model }) => {
+      return model.cycle === '事件触发器';
+    },
+  },
   {
     label: '自定义日历',
     field: 'calendar',
@@ -1057,81 +1083,219 @@ export const defineEvent: FormSchema[] = [
     label: '触发类型',
     field: 'triggerType',
     fields: ['saveResult'],
-    /*componentProps: {
-      options: [
-        {
-          label: '文件到达',
-          value: '文件到达',
-        },
-        {
-          label: 'SQL结果检查',
-          value: 'SQL结果检查',
-        },
-        {
-          label: '脚本自定义',
-          value: '脚本自定义',
-        },
-      ],
-    },*/
+    defaultValue: '文件到达',
     colProps: {
       span: 20,
     },
     slot:'triggerType',
   },
-/*  {
+  {
     label: '文件系统源',
     field: 'fileSystemSource',
-    component: 'Select',
+    show: ({ model }) => {
+      return model.triggerType === '文件到达';
+    },
+    slot:'fileSystemSource',
+    colProps: {
+      span: 20,
+    },
+  },
+  {
+    label: '文件路径',
+    field: 'filePath',
+    slot:'filePath',
+    show: ({ model }) => {
+      return model.triggerType === '文件到达';
+    },
+    colProps: {
+      span: 20,
+    },
+  },
+  {
+    label: '目标对象',
+    field: 'targetObject',
+    fields: ['targetObject'],
+    slot:'targetObject',
+    show: ({ model }) => {
+      return model.triggerType === '文件到达';
+    },
+    colProps: {
+      span: 20,
+    },
+  },
+  {
+    label: '超时设置',
+    field: 'timeoutSettings',
+    component: 'CheckboxGroup',
+    show: ({ model }) => {
+      return model.triggerType === '文件到达';
+    },
+    colProps: {
+      span: 20,
+    },
     componentProps: {
       options: [
         {
-          label: 'HDFS',
-          value: 'HDFS',
-        },
-        {
-          label: 'FTP',
-          value: 'FTP',
+          label: '超时失败',
+          value: '超时失败',
         },
+      ],
+    },
+  },
+  {
+    label: '保存结果',
+    field: 'saveResults',
+    fields: ['saveResults','saveResultName','saveResultObject'],
+    colProps: {
+      span: 20,
+    },
+    slot:'saveResults',
+    show: ({ model }) => {
+      return model.triggerType === '文件到达';
+    },
+  },
+
+  {
+    label: '开始时间',
+    field: 'startTime',
+    colProps: {
+      span: 20,
+    },
+    component:'TimePicker',
+    show: ({ model }) => {
+      return model.triggerType === 'SQL结果检查';
+    },
+  },
+  {
+    label: '滚动时间窗口',
+    field: 'rollingTimeWindow',
+    fields: ['timeList'],
+    colProps: {
+      span: 20,
+    },
+    slot:'rollingTimeWindow',
+    show: ({ model }) => {
+      return model.triggerType === 'SQL结果检查';
+    },
+  },
+  {
+    label: '超时设置',
+    field: 'timeoutSettingsT',
+    component: 'CheckboxGroup',
+    show: ({ model }) => {
+      return model.triggerType === 'SQL结果检查';
+    },
+    colProps: {
+      span: 20,
+    },
+    componentProps: {
+      options: [
         {
-          label: 'SFTP',
-          value: 'SFTP',
+          label: '超时失败',
+          value: '超时失败',
         },
       ],
     },
+  },
+  {
+    label: '连接',
+    field: 'connection',
+    component:'Select',
     colProps: {
       span: 20,
     },
+    componentProps: {
+      options: [
+        {value: '1', label: '192.168.11.3'},
+        {value: '2', label: '192.168.96.3'},
+        {value: '3', label: '192.168.1.32'},
+      ],
+    },
+    show: ({ model }) => {
+      return model.triggerType === 'SQL结果检查';
+    },
   },
   {
-    label: '文件路径',
-    field: 'filePath',
-    component: 'Input',
+    label: 'SQL',
+    field: 'sql',
+    component: 'InputTextArea',
+    componentProps: {
+      placeholder:'事件满足取决于当前sql返回结果是否为空，' +
+        '若无返回结果则判断事件条件未达成:此处支持引用任务流参数、工作区参数、全局参数',
+    } as InputProps,
     colProps: {
       span: 20,
     },
+    show: ({ model }) => {
+      return model.triggerType === 'SQL结果检查';
+    },
   },
   {
-    label: '目标对象',
-    field: 'targetObject',
-    component: 'Input',
+    label: '保存结果',
+    field: 'saveResultsT',
+    fields: ['saveResults','saveResultName','saveResultObject'],
+    colProps: {
+      span: 20,
+    },
+    slot:'saveResults',
+    show: ({ model }) => {
+      return model.triggerType === 'SQL结果检查';
+    },
+  },
+  {
+    label: '开始时间',
+    field: 'startTimeT',
     colProps: {
       span: 20,
     },
+    component:'TimePicker',
+    show: ({ model }) => {
+      return model.triggerType === '脚本自定义';
+    },
+  },
+  {
+    label: '滚动时间窗口',
+    field: 'rollingTimeWindowT',
+    fields: ['timeListT'],
+    colProps: {
+      span: 20,
+    },
+    slot:'rollingTimeWindowT',
+    show: ({ model }) => {
+      return model.triggerType === '脚本自定义';
+    },
   },
   {
     label: '超时设置',
-    field: 'targetObject',
-    component: 'Input',
+    field: 'timeoutSettingsTh',
+    component: 'CheckboxGroup',
+    show: ({ model }) => {
+      return model.triggerType === '脚本自定义';
+    },
     colProps: {
       span: 20,
     },
+    componentProps: {
+      options: [
+        {
+          label: '超时失败',
+          value: '超时失败',
+        },
+      ],
+    },
   },
   {
-    label: '保存结果',
-    field: 'saveResults',
-    component: 'Input',
+    label: '脚本内容',
+    field: 'scriptContent',
+    component: 'InputTextArea',
+    componentProps: {
+      placeholder:'脚本运行成功,即满足，因此判断逻辑由用户确定',
+    } as InputProps,
     colProps: {
       span: 20,
     },
-  },*/
+    show: ({ model }) => {
+      return model.triggerType === '脚本自定义';
+    },
+  },
 ];

src/views/taskScheduling/taskFlowDesign/taskConfigModel.vue

@@ -9,24 +9,6 @@
     <BasicForm @register="registerForm">
       <template #cycle="{ field, model }">
         <Select v-model:value="model[field]" :options="cycleOptions" placeholder="请选择"/>
-        <div v-if="model[field] === '每天一次'">
-          <div style="display: flex;margin: 25px 0 0 -65px">
-            <div style="width: 100px">调度时间</div>
-            <div style="display: flex;margin-left: -35px">
-            <Input/>时
-            <Input/>分
-            </div>
-          </div>
-        </div>
-        <div v-if="model[field] === 'Cron表达式'" style="margin-bottom: -15px">
-          <div style="display: flex;margin: 25px 0 0 -80px">
-            <div style="width: 100px">Cron表达式</div>
-            <div style="display: flex;margin-left: -5px;width: 100%">
-              <Input/>
-            </div>
-          </div>
-          <a-button style="padding: 0" type="link">Cron表达式</a-button>
-        </div>
         <a-button
           type="link"
           v-if="model[field] === '事件触发器'"
@@ -34,23 +16,25 @@
           style="margin-left: -15px"
         >批量调整直接下游配置
         </a-button>
-        <div v-if="model[field] === '事件触发器'" style="margin-bottom: -15px">
-          <div style="display: flex;margin: 15px 0 0 -65px">
-            <div style="width: 100px">事件定义</div>
-            <a-button @click="handleSetConfig" style="color: red;border-color: red;margin-left: -30px">定义事件
-            </a-button>
-            <a-button @click="viewLogs" style="margin-left: 20px">查看日志</a-button>
-          </div>
-          <a-button type="link" style="color: red;margin-left: -10px">
-            <Icon icon="ant-design:exclamation-circle-outlined"/>
-            请定义触发事件详情
+      </template>
+      <template #scheduleTime="{ field, model }">
+        <div style="display: flex">
+        <Input v-model:value="model[field]" style="width: 45%"/>时
+        <Input v-model:value="model['scheduleTime']" style="width: 45%"/>分
+        </div>
+      </template>
+      <template #eventTrigger="{ field, model }">
+        <div style="display: flex;">
+          <a-button @click="handleSetConfig"
+                    style="color: red;border-color: red;">定义事件
           </a-button>
+          <a-button @click="viewLogs" style="margin-left: 20px">查看日志</a-button>
         </div>
+        <a-button type="link" style="color: red;margin-left: -10px">
+          <Icon icon="ant-design:exclamation-circle-outlined"/>
+          请定义触发事件详情
+        </a-button>
       </template>
-      <!--      <template #cron="{ field, model }">
-              <Input v-model:value="model[field]"/>
-              <a-button style="padding: 0" type="link">Cron表达式</a-button>
-            </template>-->
       <template #overTime="{ field, model }">
         <CheckboxGroup :options="overTimeOptions" v-model:value="model[field]"/>
         <div v-if="model[field]" style="display: flex; width: 30%">
@@ -103,6 +87,7 @@ function viewLogs() {
 const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
   setModalProps({confirmLoading: false});
 });
+/**调度周期*/
 const cycleOptions = [
   {
     label: '每天一次',