diff --git a/src/components/page/PageLabel.vue b/src/components/page/PageLabel.vue index 8a8173f..14b32f7 100644 --- a/src/components/page/PageLabel.vue +++ b/src/components/page/PageLabel.vue @@ -148,13 +148,17 @@ async function handleStart(label: Pick) { labelId: label.id, planId: label.planId, }) + let needJump = true try { - await noteCreate.open() + const form = await noteCreate.open() + if (form.direct) + needJump = false } catch (error) { return } - router.push('/record/timer') + if (needJump) + router.push('/record/timer') } async function handleGridChange(items: number[], list: GridList) { diff --git a/src/hooks/useFormModal.ts b/src/hooks/useFormModal.ts index ef962af..9f0ffbe 100644 --- a/src/hooks/useFormModal.ts +++ b/src/hooks/useFormModal.ts @@ -88,6 +88,7 @@ export function useFormModal< await modal.open() await promise.open() + return model.value } const unwatchSource = watchDeep(() => source(model.value, modalValue.value), (v) => {