From f88981628f4f24ffd856d6580dcb8f72d8bfbf00 Mon Sep 17 00:00:00 2001
From: hanaTsuk1 <101488209+hanaTsuk1@users.noreply.github.com>
Date: Sat, 8 Jun 2024 10:31:55 +0800
Subject: [PATCH] =?UTF-8?q?label=E9=A1=B5=E7=9B=B4=E6=8E=A5=E5=BD=95?=
 =?UTF-8?q?=E5=85=A5=E8=B7=B3=E8=BD=AC=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page/PageLabel.vue | 8 ++++++--
 src/hooks/useFormModal.ts         | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/page/PageLabel.vue b/src/components/page/PageLabel.vue
index 8a8173f9..14b32f7b 100644
--- a/src/components/page/PageLabel.vue
+++ b/src/components/page/PageLabel.vue
@@ -148,13 +148,17 @@ async function handleStart(label: Pick<SelectLabel, 'id' | 'planId'>) {
     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<SelectLabel>) {
diff --git a/src/hooks/useFormModal.ts b/src/hooks/useFormModal.ts
index ef962af7..9f0ffbea 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) => {