-
提交消息
+
{t('commitMessage')}
{commitInfo.message}
From e76969a91c246e137db1fc1d19a67ad40adebc70 Mon Sep 17 00:00:00 2001
From: codexu <461229187@qq.com>
Date: Wed, 1 Apr 2026 16:20:02 +0800
Subject: [PATCH 10/11] fix: prevent organize note render loops
---
.../editor/markdown/md-editor-wrapper.tsx | 15 ++-
.../main/editor/markdown/tiptap-editor.tsx | 21 +++-
src/app/core/main/mark/organize-notes.tsx | 5 +-
src/app/core/main/page.tsx | 15 +--
src/lib/agent/tools/note-tools.ts | 5 +-
src/lib/emitter.ts | 2 +-
src/stores/sidebar.ts | 9 +-
src/stores/tag.ts | 100 ++++++++++++++++--
8 files changed, 143 insertions(+), 29 deletions(-)
diff --git a/src/app/core/main/editor/markdown/md-editor-wrapper.tsx b/src/app/core/main/editor/markdown/md-editor-wrapper.tsx
index 29d7d2a81..b2bd6d7e8 100644
--- a/src/app/core/main/editor/markdown/md-editor-wrapper.tsx
+++ b/src/app/core/main/editor/markdown/md-editor-wrapper.tsx
@@ -203,6 +203,19 @@ export function MdEditor({ tabContentsRef, filePath }: MdEditorProps) {
const isThisFile = currentArticlePathRef.current === filePath || storeActivePath === filePath
if (currentArticle && currentArticle.length > 0 && currentArticle !== initialContent && isThisFile) {
+ if (aiStreaming && activeFilePath === filePath) {
+ if (tabContentsRef.current) {
+ tabContentsRef.current[filePath] = currentArticle
+ }
+
+ if (isLoadingRef.current) {
+ setIsLoading(false)
+ isLoadingRef.current = false
+ }
+
+ return
+ }
+
// Bug fix: Set expected content BEFORE updating initialContent
// This ensures handleContentChange knows what to expect
expectedContentRef.current = currentArticle
@@ -233,7 +246,7 @@ export function MdEditor({ tabContentsRef, filePath }: MdEditorProps) {
// Mark as initialized for empty files so user can start typing
contentInitializedRef.current = true
}
- }, [currentArticle, filePath, tabContentsRef, initialContent, justPulledFile])
+ }, [activeFilePath, aiStreaming, currentArticle, filePath, tabContentsRef, initialContent, justPulledFile])
// Handle content changes - only save if this is the active file
const handleContentChange = useCallback((content: string) => {
diff --git a/src/app/core/main/editor/markdown/tiptap-editor.tsx b/src/app/core/main/editor/markdown/tiptap-editor.tsx
index 50653b130..c941db301 100644
--- a/src/app/core/main/editor/markdown/tiptap-editor.tsx
+++ b/src/app/core/main/editor/markdown/tiptap-editor.tsx
@@ -1371,16 +1371,22 @@ export function TipTapEditor({
// user edits (e.g., when switching back to a previously edited tab)
// Bug fix: Also check that we're initializing for the correct file path
if (!isInitializedRef.current) {
+ isInitializedRef.current = true
+ isReadyRef.current = false
+
// Use setTimeout to avoid flushSync conflict during React render
setTimeout(() => {
// Check if the file path is still the same (handle race condition)
if (activeFilePath !== currentPath) return
if (initialContent) {
+ externalUpdateCounterRef.current++
editor.commands.setContent(initialContent || '', { contentType: 'markdown' })
+ setTimeout(() => {
+ externalUpdateCounterRef.current = Math.max(0, externalUpdateCounterRef.current - 1)
+ }, 100)
}
- // Mark as initialized to allow subsequent content updates
- isInitializedRef.current = true
+
// Bug fix: Mark editor as ready AFTER content is set
// This prevents onUpdate from firing with empty content during init
isReadyRef.current = true
@@ -1638,7 +1644,14 @@ export function TipTapEditor({
// Handle external content updates (e.g., from Agent tools)
useEffect(() => {
- const handleExternalUpdate = (newContent: string) => {
+ const handleExternalUpdate = (payload: string | { content: string; targetFilePath?: string }) => {
+ const newContent = typeof payload === 'string' ? payload : payload.content
+ const targetFilePath = typeof payload === 'string' ? undefined : payload.targetFilePath
+
+ if (targetFilePath && targetFilePath !== activeFilePath) {
+ return
+ }
+
if (editor && externalUpdateCounterRef.current === 0) {
// Bug fix: Skip if content hasn't actually changed
const currentContent = editor.getMarkdown()
@@ -1666,7 +1679,7 @@ export function TipTapEditor({
return () => {
emitter.off('external-content-update', handleExternalUpdate as any)
}
- }, [editor])
+ }, [editor, activeFilePath])
// Set editable state
useEffect(() => {
diff --git a/src/app/core/main/mark/organize-notes.tsx b/src/app/core/main/mark/organize-notes.tsx
index 03e7cd805..0118f57f4 100644
--- a/src/app/core/main/mark/organize-notes.tsx
+++ b/src/app/core/main/mark/organize-notes.tsx
@@ -325,7 +325,10 @@ export const OrganizeNotes = forwardRef
fullContent = content
// Update editor content in real-time without reloading file
setCurrentArticle(content)
- emitter.emit('external-content-update', content)
+ emitter.emit('external-content-update', {
+ content,
+ targetFilePath,
+ })
// Also write to file
if (workspace.isCustom) {
await writeTextFile(pathOptions.path, content)
diff --git a/src/app/core/main/page.tsx b/src/app/core/main/page.tsx
index e6738cde6..75210fb66 100644
--- a/src/app/core/main/page.tsx
+++ b/src/app/core/main/page.tsx
@@ -6,7 +6,7 @@ import { EditorLayout } from './editor/editor-layout'
import Chat from './chat'
import dynamic from 'next/dynamic'
import { useSidebarStore } from "@/stores/sidebar"
-import { useEffect, useState, useRef } from 'react'
+import { useCallback, useEffect, useState, useRef } from 'react'
import { Store } from '@tauri-apps/plugin-store'
import { ImperativePanelHandle } from 'react-resizable-panels'
import { invoke } from "@tauri-apps/api/core"
@@ -90,12 +90,12 @@ function ResizableWrapper() {
// 初始化侧边栏状态
useEffect(() => {
- initSidebarState()
+ void initSidebarState()
calculateMinSizes()
window.addEventListener('resize', calculateMinSizes)
return () => window.removeEventListener('resize', calculateMinSizes)
- }, [])
+ }, [initSidebarState])
// 当面板可见性变化时，控制面板的折叠和展开
useEffect(() => {
@@ -148,11 +148,14 @@ function ResizableWrapper() {
const actualLayout = getActualLayout()
- const onLayout = (sizes: number[]) => {
+ const onLayout = useCallback((sizes: number[]) => {
// 保存当前面板布局
const storageKey = `react-resizable-panels:main-layout:${layoutKey}`
- localStorage.setItem(storageKey, JSON.stringify(sizes));
- };
+ const nextLayout = JSON.stringify(sizes)
+ if (localStorage.getItem(storageKey) !== nextLayout) {
+ localStorage.setItem(storageKey, nextLayout)
+ }
+ }, [layoutKey])
// 根据可见面板数量动态构建布局
const renderLayout = () => {
diff --git a/src/lib/agent/tools/note-tools.ts b/src/lib/agent/tools/note-tools.ts
index eeec6b2a0..9d3504031 100644
--- a/src/lib/agent/tools/note-tools.ts
+++ b/src/lib/agent/tools/note-tools.ts
@@ -329,7 +329,10 @@ export const updateMarkdownFileTool: Tool = {
const articleStore = useArticleStore.getState()
if (articleStore.activeFilePath === params.filePath) {
// 使用 emitter 通知编辑器内容已从外部更新
- emitter.emit('external-content-update', params.content)
+ emitter.emit('external-content-update', {
+ content: params.content,
+ targetFilePath: params.filePath,
+ })
}
return {
diff --git a/src/lib/emitter.ts b/src/lib/emitter.ts
index 2bfe14011..11c99dd0b 100644
--- a/src/lib/emitter.ts
+++ b/src/lib/emitter.ts
@@ -11,7 +11,7 @@ interface Events {
'editor-input': unknown;
'editor:ready': unknown;
'editor-mode-changed': string;
- 'external-content-update': string;
+ 'external-content-update': string | { content: string; targetFilePath?: string };
'editor-content-from-remote': { content: string };
'toolbar-text-number': number;
'toolbar-reset-selected-text': unknown;
diff --git a/src/stores/sidebar.ts b/src/stores/sidebar.ts
index ff13408a8..1ce3ad4d8 100644
--- a/src/stores/sidebar.ts
+++ b/src/stores/sidebar.ts
@@ -153,20 +153,21 @@ export const useSidebarStore = create((set, get) => ({
const centerState = await store.get('centerPanelVisible')
const rightState = await store.get('rightSidebarVisible')
const leftTab = await store.get<'files' | 'notes'>('leftSidebarTab')
+ const currentState = get()
- if (leftState !== null && leftState !== undefined) {
+ if (leftState !== null && leftState !== undefined && currentState.leftSidebarVisible !== leftState) {
set({ leftSidebarVisible: leftState })
localStorage.setItem('leftSidebarVisible', String(leftState))
}
- if (centerState !== null && centerState !== undefined) {
+ if (centerState !== null && centerState !== undefined && currentState.centerPanelVisible !== centerState) {
set({ centerPanelVisible: centerState })
localStorage.setItem('centerPanelVisible', String(centerState))
}
- if (rightState !== null && rightState !== undefined) {
+ if (rightState !== null && rightState !== undefined && currentState.rightSidebarVisible !== rightState) {
set({ rightSidebarVisible: rightState })
localStorage.setItem('rightSidebarVisible', String(rightState))
}
- if (leftTab) {
+ if (leftTab && currentState.leftSidebarTab !== leftTab) {
set({ leftSidebarTab: leftTab })
localStorage.setItem('leftSidebarTab', leftTab)
}
diff --git a/src/stores/tag.ts b/src/stores/tag.ts
index 5db34ec06..2380b4c8f 100644
--- a/src/stores/tag.ts
+++ b/src/stores/tag.ts
@@ -11,6 +11,37 @@ import { Store } from '@tauri-apps/plugin-store'
import { create } from 'zustand'
import { S3Config, WebDAVConfig } from '@/types/sync'
+function isSameTag(left?: Tag, right?: Tag) {
+ if (!left && !right) {
+ return true
+ }
+
+ if (!left || !right) {
+ return false
+ }
+
+ return (
+ left.id === right.id &&
+ left.name === right.name &&
+ left.isLocked === right.isLocked &&
+ left.isPin === right.isPin &&
+ left.sortOrder === right.sortOrder &&
+ left.total === right.total
+ )
+}
+
+function areTagsEqual(left: Tag[], right: Tag[]) {
+ if (left.length !== right.length) {
+ return false
+ }
+
+ return left.every((tag, index) => isSameTag(tag, right[index]))
+}
+
+function resolveCurrentTag(tags: Tag[], currentTagId: number) {
+ return tags.find((tag) => tag.id === currentTagId)
+}
+
interface TagState {
currentTagId: number
setCurrentTagId: (id: number) => Promise
@@ -37,38 +68,85 @@ const useTagStore = create((set, get) => ({
// 当前选择的 tag
currentTagId: 1,
setCurrentTagId: async(currentTagId: number) => {
- set({ currentTagId })
+ const nextCurrentTag = resolveCurrentTag(get().tags, currentTagId)
+
+ set((state) => {
+ if (state.currentTagId === currentTagId && isSameTag(state.currentTag, nextCurrentTag)) {
+ return state
+ }
+
+ return {
+ currentTagId,
+ currentTag: nextCurrentTag,
+ }
+ })
+
const store = await Store.load('store.json');
await store.set('currentTagId', currentTagId)
},
initTags: async () => {
const store = await Store.load('store.json');
const currentTagId = await store.get('currentTagId')
- if (currentTagId) set({ currentTagId })
- get().getCurrentTag()
+
+ if (!currentTagId) {
+ get().getCurrentTag()
+ return
+ }
+
+ set((state) => {
+ const nextCurrentTag = resolveCurrentTag(state.tags, currentTagId)
+
+ if (state.currentTagId === currentTagId && isSameTag(state.currentTag, nextCurrentTag)) {
+ return state
+ }
+
+ return {
+ currentTagId,
+ currentTag: nextCurrentTag,
+ }
+ })
},
currentTag: undefined,
getCurrentTag: () => {
- const tags = get().tags
- const getcurrentTagId = get().currentTagId
- const currentTag = tags.find((tag) => tag.id === getcurrentTagId)
- if (currentTag) {
- set({ currentTag })
- }
+ const { tags, currentTagId } = get()
+ const currentTag = resolveCurrentTag(tags, currentTagId)
+
+ set((state) => {
+ if (isSameTag(state.currentTag, currentTag)) {
+ return state
+ }
+
+ return { currentTag }
+ })
},
// 所有 tag
tags: [],
fetchTags: async () => {
const tags = await getTags()
- set({ tags })
+ set((state) => {
+ const currentTag = resolveCurrentTag(tags, state.currentTagId)
+
+ if (areTagsEqual(state.tags, tags) && isSameTag(state.currentTag, currentTag)) {
+ return state
+ }
+
+ return {
+ tags,
+ currentTag,
+ }
+ })
},
deleteTag: async (id: number) => {
await delTag(id)
await get().fetchTags()
- await get().setCurrentTagId(get().tags[0].id)
+
+ const nextTag = get().tags[0]
+ if (nextTag) {
+ await get().setCurrentTagId(nextTag.id)
+ }
},
// 同步
From b1035b2723737bfa9a3dd2426ad91ed56e19d1bb Mon Sep 17 00:00:00 2001
From: wlchen
Date: Wed, 1 Apr 2026 16:57:33 +0800
Subject: [PATCH 11/11] refactor: lazily initialize vector database
---
src/app/mobile/layout.tsx | 38 ++++++++++++++++++++++++++------------
src/db/index.ts | 9 ++++++---
src/db/vector.ts | 10 +++++++++-
3 files changed, 41 insertions(+), 16 deletions(-)
diff --git a/src/app/mobile/layout.tsx b/src/app/mobile/layout.tsx
index 0e1e0db0d..caf2dc194 100644
--- a/src/app/mobile/layout.tsx
+++ b/src/app/mobile/layout.tsx
@@ -35,20 +35,34 @@ export default function RootLayout({
const { initSettingData, customThemeColors } = useSettingStore()
const { initMainHosting } = useImageStore()
const { currentLocale } = useI18n()
- useEffect(() => {
- initSettingData()
- initMainHosting()
- initAllDatabases()
- initMcp()
- // 上报应用启动事件
- reportAppStart()
- }, [])
-
const { initVectorDb } = useVectorStore()
-
- // 初始化向量数据库
+
useEffect(() => {
- initVectorDb()
+ let cancelled = false
+
+ const initializeApp = async () => {
+ try {
+ initSettingData()
+ initMainHosting()
+
+ await initAllDatabases()
+ if (cancelled) return
+
+ await initVectorDb()
+ if (cancelled) return
+
+ initMcp()
+ reportAppStart()
+ } catch (error) {
+ console.error('Failed to initialize mobile app core:', error)
+ }
+ }
+
+ void initializeApp()
+
+ return () => {
+ cancelled = true
+ }
}, [])
useEffect(() => {
diff --git a/src/db/index.ts b/src/db/index.ts
index 6f5d68b72..9bac47196 100644
--- a/src/db/index.ts
+++ b/src/db/index.ts
@@ -1,12 +1,15 @@
import Database from '@tauri-apps/plugin-sql';
-// 导出数据库实例
-export const db = await Database.load('sqlite:note.db');
+let dbPromise: Promise | null = null;
// 获取数据库实例(兼容旧代码)
export async function getDb() {
- return db;
+ if (!dbPromise) {
+ dbPromise = Database.load('sqlite:note.db');
+ }
+
+ return dbPromise;
}
// 初始化所有数据库
diff --git a/src/db/vector.ts b/src/db/vector.ts
index 67b14681f..6b67908a8 100644
--- a/src/db/vector.ts
+++ b/src/db/vector.ts
@@ -1,4 +1,4 @@
-import { db } from './index';
+import { getDb } from './index';
// 向量数据库表结构定义
export interface VectorDocument {
@@ -44,6 +44,7 @@ class VectorCache {
// 更新缓存
async update() {
+ const db = await getDb();
const docs = await db.select(`
select id, filename, content, embedding, updated_at from vector_documents
`);
@@ -123,6 +124,7 @@ const vectorCache = new VectorCache();
// 初始化向量数据库表
export async function initVectorDb() {
+ const db = await getDb();
await db.execute(`
create table if not exists vector_documents (
id integer primary key autoincrement,
@@ -147,6 +149,7 @@ export async function initVectorDb() {
// 插入或更新向量文档
export async function upsertVectorDocument(doc: Omit) {
+ const db = await getDb();
await db.execute(
"insert into vector_documents (filename, chunk_id, content, embedding, updated_at) values ($1, $2, $3, $4, $5) on conflict(filename, chunk_id) do update set content = excluded.content, embedding = excluded.embedding, updated_at = excluded.updated_at",
[doc.filename, doc.chunk_id, doc.content, doc.embedding, doc.updated_at]);
@@ -164,6 +167,7 @@ export async function upsertVectorDocument(doc: Omit) {
// 获取指定文件名的所有向量文档
export async function getVectorDocumentsByFilename(filename: string) {
+ const db = await getDb();
return await db.select(
"select * from vector_documents where filename = $1 order by chunk_id",
[filename]);
@@ -171,6 +175,7 @@ export async function getVectorDocumentsByFilename(filename: string) {
// 通过文件名删除向量文档
export async function deleteVectorDocumentsByFilename(filename: string) {
+ const db = await getDb();
await db.execute(
"delete from vector_documents where filename = $1",
[filename]);
@@ -181,6 +186,7 @@ export async function deleteVectorDocumentsByFilename(filename: string) {
// 检查文件是否已存在于向量数据库中
export async function checkVectorDocumentExists(filename: string) {
+ const db = await getDb();
const result = await db.select<{ count: number }[]>(
"select count(*) as count from vector_documents where filename = $1",
[filename]);
@@ -247,6 +253,7 @@ function cosineSimilarity(vecA: number[], vecB: number[]): number {
// 清空向量数据库
export async function clearVectorDb() {
+ const db = await getDb();
await db.execute(`
delete from vector_documents
`);
@@ -257,6 +264,7 @@ export async function clearVectorDb() {
// 获取所有向量文档的文件名列表
export async function getAllVectorDocumentFilenames() {
+ const db = await getDb();
return await db.select<{filename: string}[]>(`
select distinct filename from vector_documents
`);