label页直接录入跳转判断

shion-app · Jun 8, 2024 · f889816 · f889816
1 parent 2454dc9
commit f889816
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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) => {