From 611861f80b9e17b21004c980a0eeecbb82923c2b Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Wed, 4 Jan 2023 14:44:04 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E5=88=86=E4=BA=AB=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E5=88=B0=E9=93=BE=E6=BB=B4=20https://github.com/siyua?= =?UTF-8?q?n-note/siyuan/issues/2004?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/appearance/langs/en_US.json | 1 + app/appearance/langs/es_ES.json | 1 + app/appearance/langs/fr_FR.json | 1 + app/appearance/langs/zh_CHT.json | 1 + app/appearance/langs/zh_CN.json | 1 + app/src/protyle/breadcrumb/index.ts | 60 ++++++++++++++--------------- 6 files changed, 35 insertions(+), 30 deletions(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index e29deca25..a1a29e937 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -356,6 +356,7 @@ "moveToRight": "Move Right", "copyProtocol": "Copy block hyperlink", "uploadAssets2CDN": "Upload asset files to cloud", + "uploadAssets2CDNConfirmTip": "Are you sure to upload the assets in this document to the cloud?", "notSupport1": "Does not support drag and drop across notebooks", "keymapTip": "After some shortcut keys are modified, you need to click the refresh button to take effect", "keymapTip2": "Use default shortcut keys", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index bce42f739..7167b3f2e 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -356,6 +356,7 @@ "moveToRight": "Mover a la derecha", "copyProtocol": "Copiar hipervínculo de bloque", "uploadAssets2CDN": "Subir archivos de activos a la nube", + "uploadAssets2CDNConfirmTip": "¿Está seguro de cargar los recursos de este documento en la nube?", "notSupport1": "No admite la función de arrastrar y soltar en los cuadernos", "keymapTip": "Después de modificar algunas teclas de acceso directo, es necesario hacer clic en el botón de actualización para que surta efecto", "keymapTip2": "Usar teclas de acceso directo por defecto", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 227e9d09c..09dbc7a8a 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -356,6 +356,7 @@ "moveToRight": "vers la Droite", "copyProtocol": "Copier bloc d'hyperliens", "uploadAssets2CDN": "Transférer les fichiers asset vers le Cloud", + "uploadAssets2CDNConfirmTip": "Êtes-vous sûr de télécharger les ressources de ce document dans le cloud ?", "notSupport1": "Le glisser-déposer entre carnets n'est pas pris en charge", "keymapTip": "Après la modification de certaines touches de raccourci, vous devez cliquer sur le bouton d'actualisation pour prendre effet", "keymapTip2": "Utiliser les touches de raccourci par défaut", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index b4905f784..4ff17cf94 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -356,6 +356,7 @@ "moveToRight": "向右移", "copyProtocol": "複製塊超連結", "uploadAssets2CDN": "上傳資料檔到圖床", + "uploadAssets2CDNConfirmTip": "確定將該文檔內的資源文件上傳到圖床嗎？", "notSupport1": "不支援跨筆記本進行拖拽", "keymapTip": "部分快捷鍵修改後需點擊刷新按鈕後才能生效", "keymapTip2": "使用預設快捷鍵", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 2d5610c7a..e311d5dd9 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -356,6 +356,7 @@ "moveToRight": "向右移", "copyProtocol": "复制块超链接", "uploadAssets2CDN": "上传资源文件到图床", + "uploadAssets2CDNConfirmTip": "确定将该文档内的资源文件上传到图床吗？", "notSupport1": "不支持跨笔记本进行拖拽", "keymapTip": "部分快捷键修改后需点击刷新按钮后才能生效", "keymapTip2": "使用默认快捷键", diff --git a/app/src/protyle/breadcrumb/index.ts b/app/src/protyle/breadcrumb/index.ts index c8bb118fb..ab450c60b 100644 --- a/app/src/protyle/breadcrumb/index.ts +++ b/app/src/protyle/breadcrumb/index.ts @@ -231,36 +231,6 @@ export class Breadcrumb { } } if (!protyle.disabled) { - window.siyuan.menus.menu.append(new MenuItem({ - label: window.siyuan.languages.uploadAssets2CDN, - icon: "iconCloud", - click() { - if (!needSubscribe()) { - confirmDialog("🚀 " + window.siyuan.languages.uploadAssets2CDN, window.siyuan.languages.uploadAssets2CDNConfirmTip, () => { - fetchPost("/api/asset/uploadCloud", {id: protyle.block.parentID}); - }); - } - } - }).element); - window.siyuan.menus.menu.append(new MenuItem({ - label: window.siyuan.languages.netImg2LocalAsset, - icon: "iconTransform", - accelerator: window.siyuan.config.keymap.editor.general.netImg2LocalAsset.custom, - click() { - netImg2LocalAssets(protyle); - } - }).element); - if (!needSubscribe("")) { - window.siyuan.menus.menu.append(new MenuItem({ - label: window.siyuan.languages.share2Liandi, - icon: "iconLiandi", - click() { - confirmDialog("🚀 " + window.siyuan.languages.share2Liandi, window.siyuan.languages.share2LiandiConfirmTip, () => { - fetchPost("/api/export/export2Liandi", {id: protyle.block.parentID}); - }); - } - }).element); - } window.siyuan.menus.menu.append(new MenuItem({ label: window.siyuan.languages.optimizeTypography, icon: "iconFormat", @@ -293,6 +263,36 @@ export class Breadcrumb { }); } }).element); + window.siyuan.menus.menu.append(new MenuItem({ + label: window.siyuan.languages.netImg2LocalAsset, + icon: "iconTransform", + accelerator: window.siyuan.config.keymap.editor.general.netImg2LocalAsset.custom, + click() { + netImg2LocalAssets(protyle); + } + }).element); + window.siyuan.menus.menu.append(new MenuItem({ + label: window.siyuan.languages.uploadAssets2CDN, + icon: "iconCloud", + click() { + if (!needSubscribe()) { + confirmDialog("📦 " + window.siyuan.languages.uploadAssets2CDN, window.siyuan.languages.uploadAssets2CDNConfirmTip, () => { + fetchPost("/api/asset/uploadCloud", {id: protyle.block.parentID}); + }); + } + } + }).element); + if (!needSubscribe("")) { + window.siyuan.menus.menu.append(new MenuItem({ + label: window.siyuan.languages.share2Liandi, + icon: "iconLiandi", + click() { + confirmDialog("🚀 " + window.siyuan.languages.share2Liandi, window.siyuan.languages.share2LiandiConfirmTip, () => { + fetchPost("/api/export/export2Liandi", {id: protyle.block.parentID}); + }); + } + }).element); + } } if (!protyle.scroll?.element.classList.contains("fn__none")) { window.siyuan.menus.menu.append(new MenuItem({