From 50883cb4e158463d4a4f87cce145cc10b8cff526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A2=96=E9=80=B8?= <49649786+Zuoqiu-Yingyi@users.noreply.github.com> Date: Fri, 5 May 2023 00:10:41 +0800 Subject: [PATCH] :art: custom ial key support '_' symbol --- app/src/menus/commonMenuItem.ts | 91 ++++++++------------------------- 1 file changed, 22 insertions(+), 69 deletions(-) diff --git a/app/src/menus/commonMenuItem.ts b/app/src/menus/commonMenuItem.ts index 6f220ba2c..f891b6d89 100644 --- a/app/src/menus/commonMenuItem.ts +++ b/app/src/menus/commonMenuItem.ts @@ -9,7 +9,7 @@ import {MenuItem} from "./Menu"; import {hasClosestByClassName} from "../protyle/util/hasClosest"; import {saveExport} from "../protyle/export"; import {openByMobile, writeText} from "../protyle/util/compatibility"; -import {fetchPost, fetchSyncPost} from "../util/fetch"; +import {fetchPost} from "../util/fetch"; import {hideMessage, showMessage} from "../dialog/message"; import {Dialog} from "../dialog"; import {focusBlock, focusByRange, getEditorRange} from "../protyle/util/selection"; @@ -19,7 +19,7 @@ import {getAllModels} from "../layout/getAll"; import {Bookmark} from "../layout/dock/Bookmark"; import {openAsset, openBy} from "../editor/util"; /// #endif -import {rename, replaceFileName} from "../editor/rename"; +import {rename} from "../editor/rename"; import {matchHotKey} from "../protyle/util/hotKey"; import * as dayjs from "dayjs"; import {Constants} from "../constants"; @@ -192,22 +192,22 @@ const genAttr = (attrs: IObject, focusName = "bookmark", cb: (dialog: Dialog, rm
- + ${notifyHTML} ${customHTML} @@ -473,7 +473,7 @@ export const copySubMenu = (id: string, accelerator = true, focusElement?: Eleme label: window.siyuan.languages.copyProtocolInMd, click: () => { fetchPost("/api/block/getRefText", {id}, (response) => { - writeText(`[${response.data}](siyuan://blocks/${id})`); + writeText(`[${response.data.substring(0, Constants.SIZE_LINK_TEXT_MAX)}](siyuan://blocks/${id})`); }); if (focusElement) { focusBlock(focusElement); @@ -509,69 +509,22 @@ export const exportMd = (id: string) => { submenu: [{ label: window.siyuan.languages.template, icon: "iconMarkdown", - click: async () => { - const result = await fetchSyncPost("/api/block/getRefText", {id: id}); - - const dialog = new Dialog({ - title: window.siyuan.languages.fileName, - content: `
-
-
- -
`, - width: isMobile() ? "92vw" : "520px", - }); - const inputElement = dialog.element.querySelector("input") as HTMLInputElement; - const btnsElement = dialog.element.querySelectorAll(".b3-button"); - dialog.bindInput(inputElement, () => { - (btnsElement[1] as HTMLButtonElement).click(); - }); - let name = replaceFileName(result.data); - const maxNameLen = 32; - if (name.length > maxNameLen) { - name = name.substring(0, maxNameLen); - } - inputElement.value = name; - inputElement.focus(); - inputElement.select(); - btnsElement[0].addEventListener("click", () => { - dialog.destroy(); - }); - btnsElement[1].addEventListener("click", () => { - if (inputElement.value.trim() === "") { - inputElement.value = "Untitled"; - } else { - inputElement.value = replaceFileName(inputElement.value); - } - - if (name.length > maxNameLen) { - name = name.substring(0, maxNameLen); - } - - fetchPost("/api/template/docSaveAsTemplate", { - id, - name, - overwrite: false - }, response => { - if (response.code === 1) { - // 重名 - confirmDialog(window.siyuan.languages.export, window.siyuan.languages.exportTplTip, () => { - fetchPost("/api/template/docSaveAsTemplate", { - id, - name, - overwrite: true - }, resp => { - if (resp.code === 0) { - showMessage(window.siyuan.languages.exportTplSucc); - } - }); + click: () => { + fetchPost("/api/template/docSaveAsTemplate", { + id, + overwrite: false + }, response => { + if (response.code === 1) { + // 重名 + confirmDialog(window.siyuan.languages.export, window.siyuan.languages.exportTplTip, () => { + fetchPost("/api/template/docSaveAsTemplate", { + id, + overwrite: true }); - return; - } - showMessage(window.siyuan.languages.exportTplSucc); - }); - - dialog.destroy(); + }); + return; + } + showMessage(window.siyuan.languages.exportTplSucc); }); } }, {