Skip to content

Commit e101198

Browse files
committed
Merge branch 'dev' into release
2 parents 0741d10 + 165e827 commit e101198

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/app/core/note/tag/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export function TagManage() {
3535

3636
async function quickAddTag() {
3737
const res = await insertTag({ name })
38-
await setCurrentTagId(res.lastInsertId)
38+
await setCurrentTagId(res.lastInsertId as number)
3939
await fetchTags()
4040
await fetchCurrentNotes()
4141
await fetchCurrentNote()

src/app/core/setting/page.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import {
1212
FormMessage,
1313
} from "@/components/ui/form"
1414
import { Store } from "@tauri-apps/plugin-store"
15-
import { useEffect, useState } from "react"
15+
import { Suspense, useEffect, useState } from "react"
1616
import { toast } from "@/hooks/use-toast"
1717
import { debounce, upperFirst } from 'lodash-es'
1818
import { SettingTab } from "./setting-tab"
@@ -80,7 +80,9 @@ export default function Page() {
8080
}, [])
8181

8282
return <div className="flex">
83-
<SettingTab />
83+
<Suspense>
84+
<SettingTab />
85+
</Suspense>
8486
<Form {...form}>
8587
<form onChange={debounceSubmit} id="setting-form" className="space-y-4 p-4 flex-1 h-screen overflow-y-scroll">
8688
{

0 commit comments

Comments
 (0)