Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-01 14:28:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2025-10-19 10:19:12 +08:00
commit bda1ec9e03
6 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/src/layout/dock/Outline.ts
View file

@ -6,7 +6,13 @@ import {getDockByType} from "../tabUtil";
import {fetchPost} from "../../util/fetch";
import {getAllModels} from "../getAll";
import {hasClosestBlock, hasClosestByClassName, hasTopClosestByClassName} from "../../protyle/util/hasClosest";
import {setStorageVal, updateHotkeyAfterTip, updateHotkeyTip} from "../../protyle/util/compatibility";
import {
isInAndroid,
isInHarmony,
setStorageVal,
updateHotkeyAfterTip,
writeText
} from "../../protyle/util/compatibility";
import {openFileById} from "../../editor/util";
import {Constants} from "../../constants";
import {MenuItem} from "../../menus/Menu";
@ -18,7 +24,6 @@ import {checkFold} from "../../util/noRelyPCFunction";
import {transaction, turnsIntoTransaction} from "../../protyle/wysiwyg/transaction";
import {goHome} from "../../protyle/wysiwyg/commonHotkey";
import {Editor} from "../../editor";
import {writeText, isInAndroid, isInHarmony} from "../../protyle/util/compatibility";
import {mathRender} from "../../protyle/render/mathRender";
import {genEmptyElement} from "../../block/util";
import {focusBlock, focusByWbr} from "../../protyle/util/selection";
@ -658,6 +663,10 @@ export class Outline extends Model {
}
public saveExpendIds() {
if (window.siyuan.config.readonly || window.siyuan.isPublish) {
return;
}
if (!this.isPreview && this.type === "pin") {
fetchPost("/api/storage/setOutlineStorage", {
docID: this.blockId,

4
app/src/plugin/index.ts
View file

@ -251,6 +251,10 @@ export class Plugin {
}
public saveData(storageName: string, data: any) {
if (window.siyuan.config.readonly || window.siyuan.isPublish) {
return;
}
return new Promise((resolve) => {
const pathString = `/data/storage/petal/${this.name}/${storageName}`;
let file: File;

5
app/src/protyle/util/compatibility.ts
View file

@ -2,8 +2,7 @@ import {focusByRange} from "./selection";
import {fetchPost, fetchSyncPost} from "../../util/fetch";
import {Constants} from "../../constants";
/// #if !BROWSER
import {clipboard} from "electron";
import {ipcRenderer} from "electron";
import {clipboard, ipcRenderer} from "electron";
/// #endif
export const encodeBase64 = (text: string): string => {
@ -500,7 +499,7 @@ export const getLocalStorage = (cb: () => void) => {
};
export const setStorageVal = (key: string, val: any, cb?: () => void) => {
if (window.siyuan.config.readonly) {
if (window.siyuan.config.readonly || window.siyuan.isPublish) {
return;
}
fetchPost("/api/storage/setLocalStorageVal", {