Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-20 16:40:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 fix https://github.com/siyuan-note/siyuan/issues/12098

Browse source
This commit is contained in:
Vanessa 2024-09-26 10:59:45 +08:00
parent d586a26cba
commit 03b00a6b8d
4 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/dialog/processSystem.ts
View file

@ -43,7 +43,8 @@ export const reloadSync = (
hideMsg = true, hideMsg = true,
// 同步的时候需要更新只读状态 https://github.com/siyuan-note/siyuan/issues/11517 // 同步的时候需要更新只读状态 https://github.com/siyuan-note/siyuan/issues/11517
// 调整大纲的时候需要使用现有状态 https://github.com/siyuan-note/siyuan/issues/11808 // 调整大纲的时候需要使用现有状态 https://github.com/siyuan-note/siyuan/issues/11808
updateReadonly = true updateReadonly = true,
onlyUpdateDoc = false
) => { ) => {
if (hideMsg) { if (hideMsg) {
hideMessage(); hideMessage();
@ -124,11 +125,13 @@ export const reloadSync = (
} }
} }
}); });
if (onlyUpdateDoc) {
allModels.files.forEach(item => { allModels.files.forEach(item => {
setNoteBook(() => { setNoteBook(() => {
item.init(false); item.init(false);
}); });
}); });
}
allModels.bookmark.forEach(item => { allModels.bookmark.forEach(item => {
item.update(); item.update();
}); });

2
app/src/index.ts
View file

@ -77,7 +77,7 @@ export class App {
reloadSync(this, data.data); reloadSync(this, data.data);
break; break;
case "reloaddoc": case "reloaddoc":
reloadSync(this, {upsertRootIDs: [data.data], removeRootIDs: []}, false, false); reloadSync(this, {upsertRootIDs: [data.data], removeRootIDs: []}, false, false, true);
break; break;
case "readonly": case "readonly":
window.siyuan.config.editor.readOnly = data.data; window.siyuan.config.editor.readOnly = data.data;

3
app/src/mobile/util/onMessage.ts
View file

@ -31,6 +31,9 @@ export const onMessage = (app: App, data: IWebSocketData) => {
case "setConf": case "setConf":
window.siyuan.config = data.data; window.siyuan.config = data.data;
break; break;
case "reloaddoc":
reloadSync(this, {upsertRootIDs: [data.data], removeRootIDs: []}, false, false, true);
break;
case "readonly": case "readonly":
window.siyuan.config.editor.readOnly = data.data; window.siyuan.config.editor.readOnly = data.data;
break; break;

2
app/src/window/index.ts
View file

@ -63,7 +63,7 @@ class App {
reloadEmoji(); reloadEmoji();
break; break;
case "reloaddoc": case "reloaddoc":
reloadSync(this, {upsertRootIDs: [data.data], removeRootIDs: []}, false, false); reloadSync(this, {upsertRootIDs: [data.data], removeRootIDs: []}, false, false, true);
break; break;
case "syncMergeResult": case "syncMergeResult":
reloadSync(this, data.data); reloadSync(this, data.data);