+
` : `
+ ${window.siyuan.languages.currentVer} v${Constants.SIYUAN_VERSION}
+
+
+${window.siyuan.languages.isMsStoreVerTip}
+
+
`;
return `
+ ${window.siyuan.languages.currentVer} v${Constants.SIYUAN_VERSION}
+
+
+
+ ${window.siyuan.languages.downloadLatestVer}
+
+
+
+
${window.siyuan.languages.autoLaunch}
@@ -143,19 +162,7 @@ export const about = {
${window.siyuan.languages.export}
-
-
+${checkUpdateHTML}
- ${window.siyuan.languages.currentVer} v${Constants.SIYUAN_VERSION}
-
-
-
- ${window.siyuan.languages.downloadLatestVer}
-
-
-
-
${window.siyuan.languages.about13}
diff --git a/app/src/config/account.ts b/app/src/config/account.ts
index 11c8b2527a1..ece1f94dadb 100644
--- a/app/src/config/account.ts
+++ b/app/src/config/account.ts
@@ -5,7 +5,7 @@ import {fetchPost} from "../util/fetch";
import {repos} from "./repos";
import {confirmDialog} from "../dialog/confirmDialog";
import {hasClosestByClassName} from "../protyle/util/hasClosest";
-import {getEventName} from "../protyle/util/compatibility";
+import {getEventName, isIPad} from "../protyle/util/compatibility";
import {processSync} from "../dialog/processSystem";
import {needSubscribe} from "../util/needSubscribe";
import {syncGuide} from "../sync/syncGuide";
@@ -29,10 +29,11 @@ const genSVGBG = () => {
export const account = {
element: undefined as Element,
genHTML: (onlyPayHTML = false) => {
- const payHTML = `
+ const hideIPad = isIPad() ? " fn__none" : "";
+ const payHTML = `
${window.siyuan.languages[window.siyuan.user?.userSiYuanOneTimePayStatus === 1 ? "account4" : "account1"]}
-
+
${window.siyuan.languages.freeSub}
@@ -86,7 +87,7 @@ ${genSVGBG()}
${window.siyuan.languages.account6}
${Math.max(0, Math.floor((window.siyuan.user.userSiYuanProExpireTime - new Date().getTime()) / 1000 / 60 / 60 / 24))}
${window.siyuan.languages.day}
- ${window.siyuan.languages.clickMeToRenew}
+ ${window.siyuan.languages.clickMeToRenew}
`;
if (window.siyuan.user.userSiYuanOneTimePayStatus === 1) {
subscriptionHTML = `${window.siyuan.languages.onepay}
@@ -121,8 +122,8 @@ ${renewHTML}
- ${window.siyuan.languages.manage}
-
+ ${window.siyuan.languages.manage}
+
diff --git a/app/src/config/bazaar.ts b/app/src/config/bazaar.ts
index 584001e389f..555fb447cda 100644
--- a/app/src/config/bazaar.ts
+++ b/app/src/config/bazaar.ts
@@ -97,7 +97,7 @@ export const bazaar = {
-
-
+
@@ -127,7 +127,7 @@ export const bazaar = {
-
+
@@ -150,7 +150,7 @@ export const bazaar = {
-
+
@@ -173,7 +173,7 @@ export const bazaar = {
-
+
@@ -196,7 +196,7 @@ export const bazaar = {
-
+
@@ -219,7 +219,7 @@ export const bazaar = {
-
+
diff --git a/app/src/config/keymap.ts b/app/src/config/keymap.ts
index ea94b2bfc96..bb699eca183 100644
--- a/app/src/config/keymap.ts
+++ b/app/src/config/keymap.ts
@@ -17,8 +17,12 @@ export const keymap = {
Object.keys(keymap).forEach(key => {
if (window.siyuan.languages[key]) {
const keyValue = updateHotkeyTip(keymap[key].custom);
+ let keymapName = window.siyuan.languages[key];
+ if ("editor" + Constants.ZWSP + "general" === keys && key === "duplicate") {
+ keymapName = `${window.siyuan.languages.duplicate} / ${window.siyuan.languages.duplicateMirror}`;
+ }
html += `
+
- `;
if (window.siyuan.user.userSiYuanOneTimePayStatus === 1) {
subscriptionHTML = `
${window.siyuan.languages.userGuide}
diff --git a/app/src/menus/commonMenuItem.ts b/app/src/menus/commonMenuItem.ts
index 25a0768fb5a..0c45f02721f 100644
--- a/app/src/menus/commonMenuItem.ts
+++ b/app/src/menus/commonMenuItem.ts
@@ -372,7 +372,7 @@ export const openAttr = (nodeElement: Element, focusName = "bookmark", protyle?:
export const copySubMenu = (id: string, accelerator = true, focusElement?: Element) => {
return [{
- icon: "iconRef",
+ iconHTML: "",
accelerator: accelerator ? window.siyuan.config.keymap.editor.general.copyBlockRef.custom : undefined,
label: window.siyuan.languages.copyBlockRef,
click: () => {
@@ -384,7 +384,7 @@ export const copySubMenu = (id: string, accelerator = true, focusElement?: Eleme
}
}
}, {
- icon: "iconSQL",
+ iconHTML: "",
label: window.siyuan.languages.copyBlockEmbed,
accelerator: accelerator ? window.siyuan.config.keymap.editor.general.copyBlockEmbed.custom : undefined,
click: () => {
@@ -394,7 +394,7 @@ export const copySubMenu = (id: string, accelerator = true, focusElement?: Eleme
}
}
}, {
- icon: "iconSiYuan",
+ iconHTML: "",
label: window.siyuan.languages.copyProtocol,
accelerator: accelerator ? window.siyuan.config.keymap.editor.general.copyProtocol.custom : undefined,
click: () => {
@@ -404,6 +404,7 @@ export const copySubMenu = (id: string, accelerator = true, focusElement?: Eleme
}
}
}, {
+ iconHTML: "",
label: window.siyuan.languages.copyProtocolInMd,
accelerator: accelerator ? window.siyuan.config.keymap.editor.general.copyProtocolInMd.custom : undefined,
click: () => {
@@ -415,6 +416,7 @@ export const copySubMenu = (id: string, accelerator = true, focusElement?: Eleme
}
}
}, {
+ iconHTML: "",
label: window.siyuan.languages.copyHPath,
accelerator: accelerator ? window.siyuan.config.keymap.editor.general.copyHPath.custom : undefined,
click: () => {
@@ -425,6 +427,7 @@ export const copySubMenu = (id: string, accelerator = true, focusElement?: Eleme
});
}
}, {
+ iconHTML: "",
label: window.siyuan.languages.copyID,
accelerator: accelerator ? window.siyuan.config.keymap.editor.general.copyID.custom : undefined,
click: () => {
diff --git a/app/src/menus/navigation.ts b/app/src/menus/navigation.ts
index 47ea5c1793d..afcf178dd46 100644
--- a/app/src/menus/navigation.ts
+++ b/app/src/menus/navigation.ts
@@ -424,6 +424,7 @@ export const initFileMenu = (app: App, notebookId: string, pathString: string, l
type: "submenu",
icon: "iconCopy",
submenu: (copySubMenu(id, false) as IMenu[]).concat([{
+ iconHTML: "",
label: window.siyuan.languages.duplicate,
accelerator: window.siyuan.config.keymap.editor.general.duplicate.custom,
click() {
diff --git a/app/src/menus/tab.ts b/app/src/menus/tab.ts
index d21b6966521..c48282bdc30 100644
--- a/app/src/menus/tab.ts
+++ b/app/src/menus/tab.ts
@@ -136,6 +136,7 @@ const splitSubMenu = (app: App, tab: Tab) => {
if (wndsTemp.length > 1) {
subMenus.push({
label: window.siyuan.languages.unsplit,
+ accelerator: window.siyuan.config.keymap.general.unsplit.custom,
click: () => {
let layout = tab.parent.parent;
while (layout.id !== window.siyuan.layout.centerLayout.id) {
@@ -153,6 +154,7 @@ const splitSubMenu = (app: App, tab: Tab) => {
});
subMenus.push({
label: window.siyuan.languages.unsplitAll,
+ accelerator: window.siyuan.config.keymap.general.unsplitAll.custom,
click: () => {
unsplitWnd(window.siyuan.layout.centerLayout, window.siyuan.layout.centerLayout, false);
resizeTabs();
@@ -220,7 +222,7 @@ export const initTabMenu = (app: App, tab: Tab) => {
return window.siyuan.menus.menu;
};
-const unsplitWnd = (target: Wnd | Layout, layout: Layout, onlyWnd: boolean) => {
+export const unsplitWnd = (target: Wnd | Layout, layout: Layout, onlyWnd: boolean) => {
let wnd: Wnd = target as Wnd;
while (wnd instanceof Layout) {
wnd = wnd.children[0] as Wnd;
diff --git a/app/src/menus/workspace.ts b/app/src/menus/workspace.ts
index e58ea991781..04ed7fcd5fb 100644
--- a/app/src/menus/workspace.ts
+++ b/app/src/menus/workspace.ts
@@ -432,13 +432,15 @@ export const workspaceMenu = (app: App, rect: DOMRect) => {
}).element);
window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element);
}
- window.siyuan.menus.menu.append(new MenuItem({
- label: window.siyuan.languages.userGuide,
- icon: "iconHelp",
- click: () => {
- mountHelp();
- }
- }).element);
+ if (!isIPad()) {
+ window.siyuan.menus.menu.append(new MenuItem({
+ label: window.siyuan.languages.userGuide,
+ icon: "iconHelp",
+ click: () => {
+ mountHelp();
+ }
+ }).element);
+ }
window.siyuan.menus.menu.append(new MenuItem({
label: window.siyuan.languages.feedback,
icon: "iconFeedback",
diff --git a/app/src/mobile/dock/MobileTags.ts b/app/src/mobile/dock/MobileTags.ts
index 42fc0e581ec..c54aad242b9 100644
--- a/app/src/mobile/dock/MobileTags.ts
+++ b/app/src/mobile/dock/MobileTags.ts
@@ -3,7 +3,6 @@ import {fetchPost} from "../../util/fetch";
import {hasClosestByClassName} from "../../protyle/util/hasClosest";
import {MenuItem} from "../../menus/Menu";
import {popSearch} from "../menu/search";
-import {Constants} from "../../constants";
import {App} from "../../index";
import {openTagMenu} from "../../menus/tag";
diff --git a/app/src/mobile/menu/index.ts b/app/src/mobile/menu/index.ts
index 5d25057f96c..33175a132b2 100644
--- a/app/src/mobile/menu/index.ts
+++ b/app/src/mobile/menu/index.ts
@@ -16,7 +16,7 @@ import {initAbout} from "../settings/about";
import {getRecentDocs} from "./getRecentDocs";
import {initEditor} from "../settings/editor";
import {App} from "../../index";
-import {isHuawei, isInAndroid, isInIOS} from "../../protyle/util/compatibility";
+import {isHuawei, isInAndroid, isInIOS, isIPhone} from "../../protyle/util/compatibility";
import {newFile} from "../../util/newFile";
import {afterLoadPlugin} from "../../plugin/loader";
import {Menu} from "../../plugin/Menu";
@@ -112,7 +112,7 @@ export const initRightMenu = (app: App) => {
${window.siyuan.languages.onepay}
@@ -86,8 +87,8 @@ ${renewHTML}`;
- ${window.siyuan.languages.manage}
-
+ ${window.siyuan.languages.manage}
+
@@ -119,6 +120,14 @@ ${renewHTML}`;
bindLoginEvent(dialog.element.querySelector(".b3-dialog__body"), true);
dialog.element.setAttribute("data-key", Constants.DIALOG_DEACTIVATEUSER);
});
+ const trialSubElement = modelMainElement.querySelector("#trialSub");
+ if (trialSubElement) {
+ trialSubElement.addEventListener("click", () => {
+ fetchPost("/api/account/startFreeTrial", {}, () => {
+ modelMainElement.querySelector("#refresh").dispatchEvent(new Event("click"));
+ });
+ });
+ }
const refreshElement = modelMainElement.querySelector("#refresh");
refreshElement.addEventListener("click", () => {
const svgElement = refreshElement.firstElementChild;
diff --git a/app/src/mobile/settings/editor.ts b/app/src/mobile/settings/editor.ts
index 69106bcb9fb..4326c408ddd 100644
--- a/app/src/mobile/settings/editor.ts
+++ b/app/src/mobile/settings/editor.ts
@@ -54,6 +54,10 @@ const setEditor = (modelMainElement: Element) => {
};
export const initEditor = () => {
+ let fontSizeHTML = "";
+ for (let i = 9; i <= 72; i++) {
+ fontSizeHTML += ``;
+ }
openModel({
title: window.siyuan.languages.editor,
icon: "iconEdit",
@@ -229,14 +233,18 @@ export const initEditor = () => {
${window.siyuan.languages.fontSize}
${window.siyuan.config.editor.fontSize}
-
+
${window.siyuan.languages.fontSizeTip}
${window.siyuan.languages.md29}
- ${window.siyuan.config.editor.codeTabSpaces}
-
+
${window.siyuan.languages.md30}
diff --git a/app/src/mobile/util/setEmpty.ts b/app/src/mobile/util/setEmpty.ts
index f11cc94df09..7bdf33e850a 100644
--- a/app/src/mobile/util/setEmpty.ts
+++ b/app/src/mobile/util/setEmpty.ts
@@ -6,6 +6,7 @@ import {getRecentDocs} from "../menu/getRecentDocs";
import {openHistory} from "../../history/history";
import {App} from "../../index";
import {setTitle} from "../../dialog/processSystem";
+import {isIPhone} from "../../protyle/util/compatibility";
export const setEmpty = (app: App) => {
setTitle(window.siyuan.languages.siyuanNote);
@@ -31,7 +32,7 @@ export const setEmpty = (app: App) => {
${window.siyuan.languages.newNotebook}
-
+
`;
} else {
- contentHTML = ``;
+ contentHTML = ``;
}
- html += `
${window.siyuan.languages.userGuide}
`;
emptyElement.addEventListener("click", (event) => {
@@ -77,7 +78,7 @@ export const setEmpty = (app: App) => {
};
export const setEditor = () => {
- const toolbarNameElement = document.getElementById("toolbarName") as HTMLInputElement;
+ const toolbarNameElement = document.getElementById("toolbarName") as HTMLInputElement;
setTitle(toolbarNameElement.value);
toolbarNameElement.classList.remove("fn__hidden");
document.getElementById("editor").classList.remove("fn__none");
diff --git a/app/src/plugin/Setting.ts b/app/src/plugin/Setting.ts
index c3b58766595..3225c928537 100644
--- a/app/src/plugin/Setting.ts
+++ b/app/src/plugin/Setting.ts
@@ -7,6 +7,7 @@ export class Setting {
private destroyCallback: () => void;
private width: string;
private height: string;
+ public dialog:Dialog;
constructor(options: {
height?: string,
@@ -97,5 +98,6 @@ export class Setting {
}
dialog.destroy();
});
+ this.dialog = dialog;
}
}
diff --git a/app/src/protyle/gutter/index.ts b/app/src/protyle/gutter/index.ts
index d12a61ba602..2bb2badb6ff 100644
--- a/app/src/protyle/gutter/index.ts
+++ b/app/src/protyle/gutter/index.ts
@@ -52,7 +52,7 @@ import {setPosition} from "../../util/setPosition";
import {avRender} from "../render/av/render";
import {emitOpenMenu} from "../../plugin/EventBus";
import {insertAttrViewBlockAnimation} from "../render/av/row";
-import {avContextmenu} from "../render/av/action";
+import {avContextmenu, duplicateCompletely} from "../render/av/action";
import {getPlainText} from "../util/paste";
import {Menu} from "../../plugin/Menu";
import {addEditorToDatabase} from "../render/av/addToDatabase";
@@ -756,6 +756,7 @@ export class Gutter {
}).element);
}
const copyMenu: IMenu[] = [{
+ iconHTML: "",
label: window.siyuan.languages.copy,
accelerator: "⌘C",
click() {
@@ -767,6 +768,7 @@ export class Gutter {
document.execCommand("copy");
}
}, {
+ iconHTML: "",
label: window.siyuan.languages.copyPlainText,
accelerator: window.siyuan.config.keymap.editor.general.copyPlainText.custom,
click() {
@@ -778,6 +780,7 @@ export class Gutter {
focusBlock(selectsElement[0]);
}
}, {
+ iconHTML: "",
label: window.siyuan.languages.duplicate,
accelerator: window.siyuan.config.keymap.editor.general.duplicate.custom,
disabled: protyle.disabled,
@@ -1210,8 +1213,18 @@ export class Gutter {
}
}).element);
}
+
const copyMenu = (copySubMenu(id, true, nodeElement) as IMenu[]).concat([{
- label: window.siyuan.languages.copy,
+ iconHTML: "",
+ label: window.siyuan.languages.copyPlainText,
+ accelerator: window.siyuan.config.keymap.editor.general.copyPlainText.custom,
+ click() {
+ copyPlainText(getPlainText(nodeElement as HTMLElement).trimEnd());
+ focusBlock(nodeElement);
+ }
+ }, {
+ iconHTML: "",
+ label: type === "NodeAttributeView" ? window.siyuan.languages.copyMirror : window.siyuan.languages.copy,
accelerator: "⌘C",
click() {
if (isNotEditBlock(nodeElement)) {
@@ -1222,23 +1235,28 @@ export class Gutter {
document.execCommand("copy");
}
}, {
- label: window.siyuan.languages.copyPlainText,
- accelerator: window.siyuan.config.keymap.editor.general.copyPlainText.custom,
- click() {
- copyPlainText(getPlainText(nodeElement as HTMLElement).trimEnd());
- focusBlock(nodeElement);
- }
- }, {
- label: window.siyuan.languages.duplicate,
+ iconHTML: "",
+ label: type === "NodeAttributeView" ? window.siyuan.languages.duplicateMirror : window.siyuan.languages.duplicate,
accelerator: window.siyuan.config.keymap.editor.general.duplicate.custom,
disabled: protyle.disabled,
click() {
duplicateBlock([nodeElement], protyle);
}
}]);
+ if (type === "NodeAttributeView") {
+ copyMenu.push({
+ iconHTML: "",
+ label: window.siyuan.languages.duplicateCompletely,
+ accelerator: window.siyuan.config.keymap.editor.general.duplicateCompletely.custom,
+ disabled: protyle.disabled,
+ click() {
+ duplicateCompletely(protyle, nodeElement as HTMLElement);
+ }
+ });
+ }
const copyTextRefMenu = this.genCopyTextRef([nodeElement]);
if (copyTextRefMenu) {
- copyMenu.splice(copyMenu.length - 1, 0, copyTextRefMenu);
+ copyMenu.splice(7, 0, copyTextRefMenu);
}
window.siyuan.menus.menu.append(new MenuItem({
label: window.siyuan.languages.copy,
@@ -1980,6 +1998,7 @@ export class Gutter {
return false;
}
return {
+ iconHTML: "",
accelerator: window.siyuan.config.keymap.editor.general.copyText.custom,
label: window.siyuan.languages.copyText,
click() {
diff --git a/app/src/protyle/hint/extend.ts b/app/src/protyle/hint/extend.ts
index bf331f3b557..2d8109189eb 100644
--- a/app/src/protyle/hint/extend.ts
+++ b/app/src/protyle/hint/extend.ts
@@ -289,9 +289,6 @@ export const hintSlash = (key: string, protyle: IProtyle) => {
};
export const hintTag = (key: string, protyle: IProtyle): IHintData[] => {
- if (!window.siyuan.config.editor.markdown.inlineTag) {
- return [];
- }
protyle.hint.genLoading(protyle);
fetchPost("/api/search/searchTag", {
k: key,
diff --git a/app/src/protyle/render/av/action.ts b/app/src/protyle/render/av/action.ts
index f1055ab1e16..42d35061b80 100644
--- a/app/src/protyle/render/av/action.ts
+++ b/app/src/protyle/render/av/action.ts
@@ -19,7 +19,7 @@ import {deleteRow, insertRows, selectRow, setPageSize, updateHeader} from "./row
import {emitOpenMenu} from "../../../plugin/EventBus";
import {openMenuPanel} from "./openMenuPanel";
import {hintRef} from "../../hint/extend";
-import {focusByRange} from "../../util/selection";
+import {focusBlock, focusByRange} from "../../util/selection";
import {showMessage} from "../../../dialog/message";
import {previewImage} from "../../preview/image";
import {unicode2Emoji} from "../../../emoji";
@@ -31,6 +31,8 @@ import {isOnlyMeta, writeText} from "../../util/compatibility";
import {openSearchAV} from "./relation";
import {Constants} from "../../../constants";
import {hideElements} from "../../ui/hideElements";
+import {fetchPost} from "../../../util/fetch";
+import {scrollCenter} from "../../../util/highlightById";
export const avClick = (protyle: IProtyle, event: MouseEvent & { target: HTMLElement }) => {
if (isOnlyMeta(event)) {
@@ -489,3 +491,26 @@ export const removeAttrViewColAnimation = (blockElement: Element, id: string) =>
item.remove();
});
};
+
+export const duplicateCompletely = (protyle:IProtyle, nodeElement:HTMLElement) => {
+ fetchPost("/api/av/duplicateAttributeViewBlock", {avID: nodeElement.getAttribute("data-av-id")}, (response) => {
+ nodeElement.classList.remove("protyle-wysiwyg--select")
+ const tempElement = document.createElement("template");
+ tempElement.innerHTML = protyle.lute.SpinBlockDOM(``)
+ const cloneElement = tempElement.content.firstElementChild;
+ nodeElement.after(cloneElement);
+ avRender(cloneElement, protyle, () => {
+ focusBlock(cloneElement);
+ scrollCenter(protyle);
+ });
+ transaction(protyle, [{
+ action: "insert",
+ data: cloneElement.outerHTML,
+ id: response.data.blockID,
+ previousID: nodeElement.dataset.nodeId,
+ }], [{
+ action: "delete",
+ id: response.data.blockID,
+ }]);
+ });
+}
diff --git a/app/src/protyle/render/av/asset.ts b/app/src/protyle/render/av/asset.ts
index e0095e9453c..1de43567876 100644
--- a/app/src/protyle/render/av/asset.ts
+++ b/app/src/protyle/render/av/asset.ts
@@ -16,6 +16,7 @@ import {fetchPost} from "../../../util/fetch";
import {hasClosestBlock, hasClosestByClassName} from "../../util/hasClosest";
import {genCellValueByElement, getTypeByCellElement} from "./cell";
import {writeText} from "../../util/compatibility";
+import {escapeAttr} from "../../../util/escape";
export const bindAssetEvent = (options: {
protyle: IProtyle,
@@ -58,10 +59,10 @@ export const getAssetHTML = (cellElements: HTMLElement[]) => {