-
提交消息
+
{t('commitMessage')}
{commitInfo.message}
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
`);
diff --git a/src/lib/agent/tools/note-tools.ts b/src/lib/agent/tools/note-tools.ts
index b8ff3606b..252f505da 100644
--- a/src/lib/agent/tools/note-tools.ts
+++ b/src/lib/agent/tools/note-tools.ts
@@ -430,7 +430,10 @@ export const updateMarkdownFileTool: Tool = {
const articleStore = useArticleStore.getState()
if (articleStore.activeFilePath === normalizedFilePath) {
// 使用 emitter 通知编辑器内容已从外部更新
- emitter.emit('external-content-update', params.content)
+ emitter.emit('external-content-update', {
+ content: params.content,
+ targetFilePath: params.filePath,
+ })
}
const updatedStat = baseDir
diff --git a/src/lib/emitter.ts b/src/lib/emitter.ts
index 535334395..5cafb7c16 100644
--- a/src/lib/emitter.ts
+++ b/src/lib/emitter.ts
@@ -1,6 +1,7 @@
import mitt from 'mitt'
import type { QuickPrompt } from '@/lib/ai/placeholder'
import type { OnboardingStepId } from '@/app/core/main/editor/onboarding-state'
+import type { Mark } from '@/db/marks'
// 定义事件类型
interface Events {
@@ -10,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;
@@ -69,6 +70,7 @@ interface Events {
'toolbar-question': unknown;
'toolbar-translation': unknown;
'toolbar-organize': unknown;
+ 'open-organize-notes': { marks?: Mark[] } | undefined;
'screenshot-shortcut-register': unknown;
'text-shortcut-register': unknown;
'window-pin-register': unknown;
diff --git a/src/stores/article.ts b/src/stores/article.ts
index 15e061314..ffb38083a 100644
--- a/src/stores/article.ts
+++ b/src/stores/article.ts
@@ -445,6 +445,11 @@ const useArticleStore = create((set, get) => ({
activeFilePath: '',
setActiveFilePath: async (path: string) => {
+ const state = get()
+ if (state.activeFilePath === path && (state.currentArticle !== '' || state.readFilePath === path)) {
+ return
+ }
+
// 切换文件时，先清空 currentArticle，避免内容覆盖
set({ currentArticle: '', activeFilePath: path })
const store = await getStore();
@@ -1960,7 +1965,13 @@ const useArticleStore = create((set, get) => ({
vectorIndexedFiles: new Map(), // 文件名 -> 向量索引时间戳
setCurrentArticle: (content: string) => {
- set({ currentArticle: content })
+ set((state) => {
+ if (state.currentArticle === content) {
+ return state
+ }
+
+ return { currentArticle: content }
+ })
},
setIsPulling: (pulling: boolean) => {
@@ -1972,15 +1983,33 @@ const useArticleStore = create((set, get) => ({
},
setSkipSyncOnSave: (skip: boolean) => {
- set({ skipSyncOnSave: skip })
+ set((state) => {
+ if (state.skipSyncOnSave === skip) {
+ return state
+ }
+
+ return { skipSyncOnSave: skip }
+ })
},
setAiGeneratingFilePath: (path: string | null) => {
- set({ aiGeneratingFilePath: path })
+ set((state) => {
+ if (state.aiGeneratingFilePath === path) {
+ return state
+ }
+
+ return { aiGeneratingFilePath: path }
+ })
},
setAiTerminateFn: (fn: (() => void) | null) => {
- set({ aiTerminateFn: fn })
+ set((state) => {
+ if (state.aiTerminateFn === fn) {
+ return state
+ }
+
+ return { aiTerminateFn: fn }
+ })
},
// 更新文件 sha 状态（推送成功后调用）
diff --git a/src/stores/mark.ts b/src/stores/mark.ts
index f4e149f75..581eaf03c 100644
--- a/src/stores/mark.ts
+++ b/src/stores/mark.ts
@@ -39,6 +39,23 @@ const DEFAULT_RECORD_FILTERS: RecordFilters = {
tagId: 'all',
}
+function areArraysEqual(left: T[], right: T[]) {
+ if (left.length !== right.length) {
+ return false
+ }
+
+ return left.every((value, index) => value === right[index])
+}
+
+function areRecordFiltersEqual(left: RecordFilters, right: RecordFilters) {
+ return (
+ left.search === right.search &&
+ left.timePreset === right.timePreset &&
+ left.tagId === right.tagId &&
+ areArraysEqual(left.selectedTypes, right.selectedTypes)
+ )
+}
+
async function persistRecordFilters(recordFilters: RecordFilters) {
const store = await Store.load('store.json')
await store.set('recordFilters', recordFilters)
@@ -240,15 +257,33 @@ const useMarkStore = create((set, get) => ({
},
visibleMarkIds: [],
setVisibleMarkIds: (ids) => {
- set({ visibleMarkIds: ids })
+ set((state) => {
+ if (areArraysEqual(state.visibleMarkIds, ids)) {
+ return state
+ }
+
+ return { visibleMarkIds: ids }
+ })
},
pendingScrollMarkId: null,
setPendingScrollMarkId: (id) => {
- set({ pendingScrollMarkId: id })
+ set((state) => {
+ if (state.pendingScrollMarkId === id) {
+ return state
+ }
+
+ return { pendingScrollMarkId: id }
+ })
},
highlightedMarkId: null,
setHighlightedMarkId: (id) => {
- set({ highlightedMarkId: id })
+ set((state) => {
+ if (state.highlightedMarkId === id) {
+ return state
+ }
+
+ return { highlightedMarkId: id }
+ })
},
recordFilters: DEFAULT_RECORD_FILTERS,
@@ -317,14 +352,25 @@ const useMarkStore = create((set, get) => ({
initRecordFilters: async () => {
const store = await Store.load('store.json')
const savedFilters = await store.get('recordFilters')
- set({
- recordFilters: normalizeRecordFilters(savedFilters),
+ const normalizedFilters = normalizeRecordFilters(savedFilters)
+ set((state) => {
+ if (areRecordFiltersEqual(state.recordFilters, normalizedFilters)) {
+ return state
+ }
+
+ return {
+ recordFilters: normalizedFilters,
+ }
})
},
recordViewMode: 'list',
setRecordViewMode: (mode) => {
const recordViewMode = normalizeRecordViewMode(mode) as RecordViewMode
+ if (get().recordViewMode === recordViewMode) {
+ return
+ }
+
void persistRecordViewMode(recordViewMode)
set({ recordViewMode })
},
@@ -335,7 +381,13 @@ const useMarkStore = create((set, get) => ({
if (savedRecordViewMode !== recordViewMode) {
await store.set('recordViewMode', recordViewMode)
}
- set({ recordViewMode })
+ set((state) => {
+ if (state.recordViewMode === recordViewMode) {
+ return state
+ }
+
+ return { recordViewMode }
+ })
},
// 同步
diff --git a/src/stores/sidebar.ts b/src/stores/sidebar.ts
index ec1d83e2c..1ce3ad4d8 100644
--- a/src/stores/sidebar.ts
+++ b/src/stores/sidebar.ts
@@ -137,6 +137,10 @@ export const useSidebarStore = create((set, get) => ({
},
leftSidebarTab: 'files',
setLeftSidebarTab: async (tab: 'files' | 'notes') => {
+ if (get().leftSidebarTab === tab) {
+ return
+ }
+
set({ leftSidebarTab: tab })
localStorage.setItem('leftSidebarTab', tab)
const store = await Store.load('store.json')
@@ -149,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)
+ }
},
// 同步