diff --git a/src/components/common/code-mirror.vue b/src/components/common/code-mirror.vue index 1aa6d9d..3ff35a5 100644 --- a/src/components/common/code-mirror.vue +++ b/src/components/common/code-mirror.vue @@ -4,6 +4,7 @@ import CodeMirror from 'vue-codemirror6'; import { oneDark } from '@codemirror/theme-one-dark'; import { json } from '@codemirror/lang-json'; import { javascript } from '@codemirror/lang-javascript'; +import { useBoolean } from '@sa/hooks'; import { useThemeStore } from '@/store/modules/theme'; defineOptions({ @@ -39,6 +40,8 @@ const themeStore = useThemeStore(); const nodeExpression = ref(props.modelValue); +const { bool: visible, setTrue: openModal } = useBoolean(); + const codeLang = computed(() => { switch (props.lang) { case 'json': @@ -116,16 +119,42 @@ watch( diff --git a/src/components/workflow/modules/drawer/start-drawer.vue b/src/components/workflow/modules/drawer/start-drawer.vue index 54086c7..9987df6 100644 --- a/src/components/workflow/modules/drawer/start-drawer.vue +++ b/src/components/workflow/modules/drawer/start-drawer.vue @@ -52,7 +52,8 @@ const store = useWorkflowStore(); let title: string = ''; const drawer = ref(false); const form = ref({ - wfContexts: [] + wfContexts: [], + notifyIds: [] }); const groupNameList = ref([]); @@ -221,7 +222,7 @@ const rules: Record = { - + diff --git a/src/service/api/workflow.ts b/src/service/api/workflow.ts index 94d35bd..4e69bb4 100644 --- a/src/service/api/workflow.ts +++ b/src/service/api/workflow.ts @@ -18,6 +18,15 @@ export function fetchTriggerWorkflow(id: string) { }); } +/** trigger workflow */ +export function fetchTriggerWorkflowParams(data: Api.Workflow.WorkflowTriggerParams) { + return request({ + url: '/workflow/trigger', + method: 'post', + data + }); +} + /** get namespace list */ export function fetchGetWorkflowNameList(params?: Api.Workflow.WorkflowNameSearchParams) { return request({ diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts index e596766..e47ddc6 100644 --- a/src/typings/api.d.ts +++ b/src/typings/api.d.ts @@ -920,6 +920,11 @@ declare namespace Api { executorTimeout: number; }>; + type WorkflowTriggerParams = { + workflowId?: string; + tmpWfContext?: string; + }; + /** workflow search params */ type WorkflowSearchParams = CommonType.RecordNullable< Pick & CommonSearchParams diff --git a/src/views/workflow/task/index.vue b/src/views/workflow/task/index.vue index 96d8c64..48088bc 100644 --- a/src/views/workflow/task/index.vue +++ b/src/views/workflow/task/index.vue @@ -1,12 +1,9 @@ + + + +