diff --git a/app/src/card/openCard.ts b/app/src/card/openCard.ts index ffa88dbc5..ca2a50e99 100644 --- a/app/src/card/openCard.ts +++ b/app/src/card/openCard.ts @@ -285,7 +285,7 @@ export const bindCardEvent = async (options: { fetchPost("/api/riff/getRiffDecks", {}, (response) => { window.siyuan.menus.menu.remove(); window.siyuan.menus.menu.append(new MenuItem({ - iconHTML: Constants.ZWSP, + iconHTML: "", label: window.siyuan.languages.all, click() { filterElement.setAttribute("data-id", ""); @@ -294,7 +294,7 @@ export const bindCardEvent = async (options: { }, }).element); window.siyuan.menus.menu.append(new MenuItem({ - iconHTML: Constants.ZWSP, + iconHTML: "", label: window.siyuan.languages.fileTree, click() { movePathTo((toPath, toNotebook) => { @@ -309,7 +309,7 @@ export const bindCardEvent = async (options: { } if (options.title) { window.siyuan.menus.menu.append(new MenuItem({ - iconHTML: Constants.ZWSP, + iconHTML: "", label: escapeHtml(options.title), click() { filterElement.setAttribute("data-id", options.id); @@ -321,7 +321,7 @@ export const bindCardEvent = async (options: { } response.data.forEach((deck: { id: string, name: string }) => { window.siyuan.menus.menu.append(new MenuItem({ - iconHTML: Constants.ZWSP, + iconHTML: "", label: escapeHtml(deck.name), click() { filterElement.setAttribute("data-id", deck.id); diff --git a/app/src/layout/status.ts b/app/src/layout/status.ts index b224c2ffe..4dd577301 100644 --- a/app/src/layout/status.ts +++ b/app/src/layout/status.ts @@ -48,7 +48,7 @@ export const initStatus = (isWindow = false) => { JSON.parse(target.getAttribute("data-tasks")).forEach((item: { action: string }) => { window.siyuan.menus.menu.append(new MenuItem({ type: "readonly", - iconHTML: Constants.ZWSP, + iconHTML: "", label: item.action }).element); }); diff --git a/app/src/menus/commonMenuItem.ts b/app/src/menus/commonMenuItem.ts index 14500d67c..214be1388 100644 --- a/app/src/menus/commonMenuItem.ts +++ b/app/src/menus/commonMenuItem.ts @@ -280,7 +280,7 @@ export const openFileAttr = (attrs: IObject, focusName = "bookmark", protyle?: I window.siyuan.menus.menu.remove(); if (response.data.length === 0) { window.siyuan.menus.menu.append(new MenuItem({ - iconHTML: Constants.ZWSP, + iconHTML: "", label: window.siyuan.languages.emptyContent, type: "readonly", }).element); diff --git a/app/src/menus/navigation.ts b/app/src/menus/navigation.ts index 540994629..0237fa11e 100644 --- a/app/src/menus/navigation.ts +++ b/app/src/menus/navigation.ts @@ -63,7 +63,7 @@ const initMultiMenu = (selectItemElements: NodeListOf, app: App) => { } window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element); const riffCardMenu = [{ - iconHTML: Constants.ZWSP, + iconHTML: "", accelerator: window.siyuan.config.keymap.editor.general.quickMakeCard.custom, label: window.siyuan.languages.quickMakeCard, click: () => { @@ -78,7 +78,7 @@ const initMultiMenu = (selectItemElements: NodeListOf, app: App) => { }]); } }, { - iconHTML: Constants.ZWSP, + iconHTML: "", label: `${window.siyuan.languages.cancel} ${window.siyuan.languages.quickMakeCard}`, click: () => { transaction(undefined, [{ @@ -94,7 +94,7 @@ const initMultiMenu = (selectItemElements: NodeListOf, app: App) => { }]; if (window.siyuan.config.flashcard.deck) { riffCardMenu.push({ - iconHTML: Constants.ZWSP, + iconHTML: "", label: window.siyuan.languages.addToDeck, click: () => { makeCard(app, blockIDs); @@ -193,7 +193,7 @@ export const initNavigationMenu = (app: App, liElement: HTMLElement) => { type: "submenu", icon: "iconRiffCard", submenu: [{ - iconHTML: Constants.ZWSP, + iconHTML: "", label: window.siyuan.languages.spaceRepetition, accelerator: window.siyuan.config.keymap.editor.general.spaceRepetition.custom, click: () => { @@ -205,7 +205,7 @@ export const initNavigationMenu = (app: App, liElement: HTMLElement) => { /// #endif } }, { - iconHTML: Constants.ZWSP, + iconHTML: "", label: window.siyuan.languages.manage, click: () => { viewCards(app, notebookId, name, "Notebook"); @@ -467,7 +467,7 @@ export const initFileMenu = (app: App, notebookId: string, pathString: string, l } }).element); const riffCardMenu = [{ - iconHTML: Constants.ZWSP, + iconHTML: "", label: window.siyuan.languages.spaceRepetition, accelerator: window.siyuan.config.keymap.editor.general.spaceRepetition.custom, click: () => { @@ -479,7 +479,7 @@ export const initFileMenu = (app: App, notebookId: string, pathString: string, l /// #endif } }, { - iconHTML: Constants.ZWSP, + iconHTML: "", label: window.siyuan.languages.manage, click: () => { fetchPost("/api/filetree/getHPathByID", { @@ -492,7 +492,7 @@ export const initFileMenu = (app: App, notebookId: string, pathString: string, l /// #endif } }, { - iconHTML: Constants.ZWSP, + iconHTML: "", accelerator: window.siyuan.config.keymap.editor.general.quickMakeCard.custom, label: window.siyuan.languages.quickMakeCard, click: () => { @@ -507,7 +507,7 @@ export const initFileMenu = (app: App, notebookId: string, pathString: string, l }]); } }, { - iconHTML: Constants.ZWSP, + iconHTML: "", label: `${window.siyuan.languages.cancel} ${window.siyuan.languages.quickMakeCard}`, click: () => { transaction(undefined, [{ @@ -523,7 +523,7 @@ export const initFileMenu = (app: App, notebookId: string, pathString: string, l }]; if (window.siyuan.config.flashcard.deck) { riffCardMenu.push({ - iconHTML: Constants.ZWSP, + iconHTML: "", label: window.siyuan.languages.addToDeck, click: () => { makeCard(app, [id]); diff --git a/app/src/menus/workspace.ts b/app/src/menus/workspace.ts index 3f0f5fd72..ee2b3242e 100644 --- a/app/src/menus/workspace.ts +++ b/app/src/menus/workspace.ts @@ -185,7 +185,7 @@ export const workspaceMenu = (app: App, rect: DOMRect) => { workspaceSubMenu.push({type: "separator"}); response.data.forEach((item: IWorkspace) => { workspaceSubMenu.push({ - iconHTML: Constants.ZWSP, + iconHTML: "", action: "iconCloseRound", current: window.siyuan.config.system.workspaceDir === item.path, label: pathPosix().basename(item.path), @@ -223,7 +223,7 @@ export const workspaceMenu = (app: App, rect: DOMRect) => { } } const layoutSubMenu: IMenu[] = [{ - iconHTML: Constants.ZWSP, + iconHTML: "", label: window.siyuan.languages.save, click() { const saveDialog = new Dialog({ @@ -278,7 +278,7 @@ export const workspaceMenu = (app: App, rect: DOMRect) => { } window.siyuan.storage[Constants.LOCAL_LAYOUTS].forEach((item: ISaveLayout) => { layoutSubMenu.push({ - iconHTML: Constants.ZWSP, + iconHTML: "", action: "iconCloseRound", label: item.name, bind(menuElement) { @@ -348,14 +348,14 @@ export const workspaceMenu = (app: App, rect: DOMRect) => { type: "submenu", icon: "iconRiffCard", submenu: [{ - iconHTML: Constants.ZWSP, + iconHTML: "", label: window.siyuan.languages.spaceRepetition, accelerator: window.siyuan.config.keymap.general.riffCard.custom, click: () => { openCard(app); } }, { - iconHTML: Constants.ZWSP, + iconHTML: "", label: window.siyuan.languages.manage, click: () => { viewCards(app, "", window.siyuan.languages.all, ""); @@ -455,7 +455,7 @@ const workspaceItem = (item: IWorkspace) => { ${originalPath().basename(item.path)} `, current: !item.closed, - iconHTML: Constants.ZWSP, + iconHTML: "", type: "submenu", submenu: [{ icon: "iconOpenWindow", diff --git a/app/src/protyle/breadcrumb/index.ts b/app/src/protyle/breadcrumb/index.ts index 0a1ce8693..8620ae7a1 100644 --- a/app/src/protyle/breadcrumb/index.ts +++ b/app/src/protyle/breadcrumb/index.ts @@ -514,13 +514,10 @@ export class Breadcrumb { } window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element); window.siyuan.menus.menu.append(new MenuItem({ - iconHTML: Constants.ZWSP, + iconHTML: "", type: "readonly", - label: `
${window.siyuan.languages.runeCount}${response.data.runeCount}
-
${window.siyuan.languages.wordCount}${response.data.wordCount}
-
${window.siyuan.languages.linkCount}${response.data.linkCount}
-
${window.siyuan.languages.imgCount}${response.data.imageCount}
-
${window.siyuan.languages.refCount}${response.data.refCount}
`, + // 不能换行,否则移动端间距过大 + label: `
${window.siyuan.languages.runeCount}${response.data.runeCount}
${window.siyuan.languages.wordCount}${response.data.wordCount}
${window.siyuan.languages.linkCount}${response.data.linkCount}
${window.siyuan.languages.imgCount}${response.data.imageCount}
${window.siyuan.languages.refCount}${response.data.refCount}
`, }).element); /// #if MOBILE window.siyuan.menus.menu.fullscreen(); diff --git a/app/src/protyle/gutter/index.ts b/app/src/protyle/gutter/index.ts index 9c7778caa..e297b1f59 100644 --- a/app/src/protyle/gutter/index.ts +++ b/app/src/protyle/gutter/index.ts @@ -1683,7 +1683,7 @@ export class Gutter { updateHTML = `${window.siyuan.languages.modifiedAt} ${dayjs(updateHTML).format("YYYY-MM-DD HH:mm:ss")}
`; } window.siyuan.menus.menu.append(new MenuItem({ - iconHTML: Constants.ZWSP, + iconHTML: "", type: "readonly", label: `${updateHTML}${window.siyuan.languages.createdAt} ${dayjs(id.substr(0, 14)).format("YYYY-MM-DD HH:mm:ss")}`, }).element); diff --git a/app/src/protyle/header/openTitleMenu.ts b/app/src/protyle/header/openTitleMenu.ts index 1c3870b78..d7ff42994 100644 --- a/app/src/protyle/header/openTitleMenu.ts +++ b/app/src/protyle/header/openTitleMenu.ts @@ -112,7 +112,7 @@ export const openTitleMenu = (protyle: IProtyle, position: IPosition) => { } }).element); const riffCardMenu = [{ - iconHTML: Constants.ZWSP, + iconHTML: "", label: window.siyuan.languages.spaceRepetition, accelerator: window.siyuan.config.keymap.editor.general.spaceRepetition.custom, click: () => { @@ -121,7 +121,7 @@ export const openTitleMenu = (protyle: IProtyle, position: IPosition) => { }); } }, { - iconHTML: Constants.ZWSP, + iconHTML: "", label: window.siyuan.languages.manage, click: () => { fetchPost("/api/filetree/getHPathByID", { @@ -131,7 +131,7 @@ export const openTitleMenu = (protyle: IProtyle, position: IPosition) => { }); } }, { - iconHTML: Constants.ZWSP, + iconHTML: "", label: window.siyuan.languages.quickMakeCard, accelerator: window.siyuan.config.keymap.editor.general.quickMakeCard.custom, click: () => { @@ -146,7 +146,7 @@ export const openTitleMenu = (protyle: IProtyle, position: IPosition) => { }]; if (window.siyuan.config.flashcard.deck) { riffCardMenu.push({ - iconHTML: Constants.ZWSP, + iconHTML: "", label: window.siyuan.languages.addToDeck, click: () => { makeCard(protyle.app, [protyle.block.rootID]); @@ -246,10 +246,10 @@ export const openTitleMenu = (protyle: IProtyle, position: IPosition) => { } window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element); window.siyuan.menus.menu.append(new MenuItem({ - iconHTML: Constants.ZWSP, + iconHTML: "", type: "readonly", - label: `${window.siyuan.languages.modifiedAt} ${dayjs(response.data.ial.updated).format("YYYY-MM-DD HH:mm:ss")}
-${window.siyuan.languages.createdAt} ${dayjs(response.data.ial.id.substr(0, 14)).format("YYYY-MM-DD HH:mm:ss")}` + // 不能换行,否则移动端间距过大 + label: `${window.siyuan.languages.modifiedAt} ${dayjs(response.data.ial.updated).format("YYYY-MM-DD HH:mm:ss")}
${window.siyuan.languages.createdAt} ${dayjs(response.data.ial.id.substr(0, 14)).format("YYYY-MM-DD HH:mm:ss")}` }).element); /// #if MOBILE window.siyuan.menus.menu.fullscreen(); diff --git a/app/src/search/assets.ts b/app/src/search/assets.ts index b2e8009b9..8ebe55246 100644 --- a/app/src/search/assets.ts +++ b/app/src/search/assets.ts @@ -353,7 +353,7 @@ export const assetMethodMenu = (target: HTMLElement, cb: () => void) => { window.siyuan.menus.menu.remove(); window.siyuan.menus.menu.element.setAttribute("data-name", "searchAssetMethod"); window.siyuan.menus.menu.append(new MenuItem({ - iconHTML: Constants.ZWSP, + iconHTML: "", label: window.siyuan.languages.keyword, current: method === 0, click() { @@ -362,7 +362,7 @@ export const assetMethodMenu = (target: HTMLElement, cb: () => void) => { } }).element); window.siyuan.menus.menu.append(new MenuItem({ - iconHTML: Constants.ZWSP, + iconHTML: "", label: window.siyuan.languages.querySyntax, current: method === 1, click() { @@ -371,7 +371,7 @@ export const assetMethodMenu = (target: HTMLElement, cb: () => void) => { } }).element); window.siyuan.menus.menu.append(new MenuItem({ - iconHTML: Constants.ZWSP, + iconHTML: "", label: window.siyuan.languages.regex, current: method === 3, click() { @@ -440,7 +440,7 @@ export const assetMoreMenu = (target: Element, element: Element, cb: () => void) window.siyuan.menus.menu.element.setAttribute("data-name", "searchAssetMore"); const localData = window.siyuan.storage[Constants.LOCAL_SEARCHASSET]; const sortMenu = [{ - iconHTML: Constants.ZWSP, + iconHTML: "", label: window.siyuan.languages.sortByRankAsc, current: localData.sort === 1, click() { @@ -448,7 +448,7 @@ export const assetMoreMenu = (target: Element, element: Element, cb: () => void) cb(); } }, { - iconHTML: Constants.ZWSP, + iconHTML: "", label: window.siyuan.languages.sortByRankDesc, current: localData.sort === 0, click() { @@ -456,7 +456,7 @@ export const assetMoreMenu = (target: Element, element: Element, cb: () => void) cb(); } }, { - iconHTML: Constants.ZWSP, + iconHTML: "", label: window.siyuan.languages.modifiedASC, current: localData.sort === 3, click() { @@ -464,7 +464,7 @@ export const assetMoreMenu = (target: Element, element: Element, cb: () => void) cb(); } }, { - iconHTML: Constants.ZWSP, + iconHTML: "", label: window.siyuan.languages.modifiedDESC, current: localData.sort === 2, click() { @@ -473,18 +473,18 @@ export const assetMoreMenu = (target: Element, element: Element, cb: () => void) } }]; window.siyuan.menus.menu.append(new MenuItem({ - iconHTML: Constants.ZWSP, + iconHTML: "", label: window.siyuan.languages.sort, type: "submenu", submenu: sortMenu, }).element); /// #if !MOBILE window.siyuan.menus.menu.append(new MenuItem({ - iconHTML: Constants.ZWSP, + iconHTML: "", label: window.siyuan.languages.layout, type: "submenu", submenu: [{ - iconHTML: Constants.ZWSP, + iconHTML: "", label: window.siyuan.languages.topBottomLayout, current: localData.layout === 0, click() { @@ -501,7 +501,7 @@ export const assetMoreMenu = (target: Element, element: Element, cb: () => void) setStorageVal(Constants.LOCAL_SEARCHASSET, window.siyuan.storage[Constants.LOCAL_SEARCHASSET]); } }, { - iconHTML: Constants.ZWSP, + iconHTML: "", label: window.siyuan.languages.leftRightLayout, current: localData.layout === 1, click() { @@ -521,7 +521,7 @@ export const assetMoreMenu = (target: Element, element: Element, cb: () => void) }).element); /// #endif window.siyuan.menus.menu.append(new MenuItem({ - iconHTML: Constants.ZWSP, + iconHTML: "", label: window.siyuan.languages.rebuildIndex, click() { if (!isPaidUser()) { diff --git a/app/src/search/util.ts b/app/src/search/util.ts index 1ae599d3b..812ddf0ea 100644 --- a/app/src/search/util.ts +++ b/app/src/search/util.ts @@ -699,11 +699,11 @@ export const genSearch = (app: App, config: ISearchOption, element: Element, clo const localData = window.siyuan.storage[Constants.LOCAL_SEARCHKEYS]; const isPopover = hasClosestByClassName(element, "b3-dialog__container"); window.siyuan.menus.menu.append(new MenuItem({ - iconHTML: Constants.ZWSP, + iconHTML: "", label: window.siyuan.languages.layout, type: "submenu", submenu: [{ - iconHTML: Constants.ZWSP, + iconHTML: "", label: window.siyuan.languages.topBottomLayout, current: isPopover ? localData.layout === 0 : localData.layoutTab === 0, click() { @@ -724,7 +724,7 @@ export const genSearch = (app: App, config: ISearchOption, element: Element, clo setStorageVal(Constants.LOCAL_SEARCHKEYS, window.siyuan.storage[Constants.LOCAL_SEARCHKEYS]); } }, { - iconHTML: Constants.ZWSP, + iconHTML: "", label: window.siyuan.languages.leftRightLayout, current: isPopover ? localData.layout === 1 : localData.layoutTab === 1, click() {