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

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

Browse source
This commit is contained in:
Vanessa 2025-01-09 11:28:02 +08:00
commit 4edcc84abc
3 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/protyle/gutter/index.ts
View file

@ -1888,7 +1888,8 @@ export class Gutter {
// this.genHeights([nodeElement], protyle);
}
window.siyuan.menus.menu.append(new MenuItem({id: "separator_4", type: "separator"}).element);
if (!["NodeThematicBreak", "NodeBlockQueryEmbed", "NodeIFrame", "NodeHTMLBlock", "NodeWidget", "NodeVideo", "NodeAudio"].includes(type) &&
if (window.siyuan.config.cloudRegion === 0 &&
!["NodeThematicBreak", "NodeBlockQueryEmbed", "NodeIFrame", "NodeHTMLBlock", "NodeWidget", "NodeVideo", "NodeAudio"].includes(type) &&
getContenteditableElement(nodeElement)?.textContent.trim() !== "" &&
(type !== "NodeCodeBlock" || (type === "NodeCodeBlock" && !nodeElement.getAttribute("data-subtype")))) {
window.siyuan.menus.menu.append(new MenuItem({

18
app/src/protyle/header/openTitleMenu.ts
View file

@ -118,14 +118,16 @@ export const openTitleMenu = (protyle: IProtyle, position: IPosition) => {
}
}).element);
if (!window.siyuan.config.readonly) {
window.siyuan.menus.menu.append(new MenuItem({
id: "wechatReminder",
label: window.siyuan.languages.wechatReminder,
icon: "iconMp",
click() {
openFileWechatNotify(protyle);
}
}).element);
if (window.siyuan.config.cloudRegion === 0) {
window.siyuan.menus.menu.append(new MenuItem({
id: "wechatReminder",
label: window.siyuan.languages.wechatReminder,
icon: "iconMp",
click() {
openFileWechatNotify(protyle);
}
}).element);
}
const riffCardMenu: IMenu[] = [{
id: "spaceRepetition",
iconHTML: "",

4
app/src/types/config.d.ts vendored
View file

@ -32,8 +32,8 @@ declare namespace Config {
bazaar: IBazaar;
/**
* Cloud Service Provider Region
* - `0`: Chinese mainland
* - `1`: North America
* - `0`: Chinese mainland (LianDi)
* - `1`: North America (LiuYun)
*/
cloudRegion: number;
editor: IEditor;