diff --git a/packages/cron-input/src/components/cron-input.vue b/packages/cron-input/src/components/cron-input.vue index 1436bbb..db832af 100644 --- a/packages/cron-input/src/components/cron-input.vue +++ b/packages/cron-input/src/components/cron-input.vue @@ -40,7 +40,7 @@ defineExpose({ diff --git a/packages/work-flow/src/api/index.ts b/packages/work-flow/src/api/index.ts index c12e395..639d8a5 100644 --- a/packages/work-flow/src/api/index.ts +++ b/packages/work-flow/src/api/index.ts @@ -39,6 +39,14 @@ export function fetchAddWorkflow(data: Flow.NodeDataType) { }); } +export function fetchUpdateWorkflow(data: Flow.NodeDataType) { + return request({ + url: `/workflow`, + method: 'put', + data + }); +} + export function fetchWorkflowInfo(id: string) { return request({ url: `/workflow/${id}`, diff --git a/packages/work-flow/src/common/editable-input.vue b/packages/work-flow/src/common/editable-input.vue new file mode 100644 index 0000000..e874ff1 --- /dev/null +++ b/packages/work-flow/src/common/editable-input.vue @@ -0,0 +1,60 @@ + + + + + diff --git a/packages/work-flow/src/components/callback-node.vue b/packages/work-flow/src/components/callback-node.vue index 87ae2d2..697cac4 100644 --- a/packages/work-flow/src/components/callback-node.vue +++ b/packages/work-flow/src/components/callback-node.vue @@ -156,7 +156,7 @@ const getClass = (item: Flow.ConditionNodeType) => { diff --git a/packages/work-flow/src/constants/business.ts b/packages/work-flow/src/constants/business.ts index 282bdac..f460b71 100644 --- a/packages/work-flow/src/constants/business.ts +++ b/packages/work-flow/src/constants/business.ts @@ -44,8 +44,8 @@ export const triggerTypeRecord: Record = { export const triggerTypeOptions = transformRecordToOption(triggerTypeRecord); export const workFlowNodeStatusRecord: Record = { - 0: '关闭', - 1: '开启' + 0: 'snail.enum.workFlowNodeStatus.close', + 1: 'snail.enum.workFlowNodeStatus.open' }; export const workFlowNodeStatusOptions = transformRecordToOption(workFlowNodeStatusRecord); diff --git a/packages/work-flow/src/drawer/start-drawer.vue b/packages/work-flow/src/drawer/start-drawer.vue index e4b5d66..d155e38 100644 --- a/packages/work-flow/src/drawer/start-drawer.vue +++ b/packages/work-flow/src/drawer/start-drawer.vue @@ -7,9 +7,10 @@ import { $t } from '../locales'; import { fetchGroupNameList } from '../api'; import { isNotNull } from '../utils/common'; import { useFlowStore } from '../stores'; +import EditableInput from '../common/editable-input.vue'; defineOptions({ - name: 'StartDetail' + name: 'StartDrawer' }); interface Props { @@ -49,6 +50,9 @@ watch( () => props.modelValue, val => { form.value = val; + if (val.triggerType === 2) { + form.value.triggerInterval = Number(val.triggerInterval); + } if (val.workflowName) { title = val.workflowName; } else if (val.groupName) { @@ -92,7 +96,7 @@ const typeChange = (value: number) => { if (value === 1) { form.value.triggerInterval = '* * * * * ?'; } else if (value === 2) { - form.value.triggerInterval = '60'; + form.value.triggerInterval = 60; } }; @@ -116,10 +120,10 @@ const rules: Record = {