Merge pull request #725 from Hi-Windom/v0.34

V0.34
Hi-Windom · May 14, 2024 · e13505e · e13505e
2 parents eb052ad + a6c565b
commit e13505e
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 25 deletions.
diff --git a/.vscode/extensions/Sillot/package.json b/.vscode/extensions/Sillot/package.json
@@ -2,7 +2,7 @@
   "name": "sillot",
   "displayName": "汐洛 Sillot",
   "description": "汐洛彖夲肜矩阵（Sillot T☳Converbenk Matrix）为智慧新彖务服务。此插件为汐洛官方插件，提供多功能一体化集成。",
-  "version": "0.33.2000",
+  "version": "0.34.1000",
   "preview": true,
   "repository": "https://github.com/Hi-Windom/Sillot",
   "publisher": "Hi-Windom",

diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json
@@ -289,7 +289,7 @@
   "continueReview1": "Continue Review",
   "continueReview2": "There are still <code class='fn__code'>${count}</code> cards to review, continue?",
   "whatsNewInSiYuan": "What's New in SiYuan",
-  "returnDesktop": "Press back again to desktop",
+  "returnDesktop": "Press back again to desktop. Use [Exit Application] in the right sidebar panel to normally exit the application",
   "enterNew": "Enter to create",
   "enterNewTip": "No documents found, Enter to create a new document.",
   "searchTip1": "to navigate",
@@ -599,7 +599,7 @@
   "bootSyncFailed": "Failed to synchronize data at startup",
   "use": "Use",
   "uninstallTip": "Currently in use, please switch it in [Settings - Appearance] before uninstalling",
-  "safeQuit": "Exit the application",
+  "safeQuit": "Exit Application",
   "anchor": "Anchor",
   "showMore": "Show More",
   "refPopover": "Open in popover",

diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json
@@ -289,7 +289,7 @@
   "continueReview1": "Continuar revisión",
   "continueReview2": "Todavía hay tarjetas <code class='fn__code'>${count}</code> para revisar, ¿continuar?",
   "whatsNewInSiYuan": "Novedades en SiYuan",
-  "returnDesktop": "Presiona volver de nuevo al escritorio",
+  "returnDesktop": "Presione nuevamente para regresar al escritorio. Utilice [Salir de la aplicación] en el panel de la barra lateral derecha para salir normalmente de la aplicación.",
   "enterNew": "Ingresar para crear",
   "enterNewTip": "No se encontraron documentos, ingrese para crear un nuevo documento.",
   "searchTip1": "para navegar",

diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json
@@ -289,7 +289,7 @@
   "continueReview1": "Continuer la révision",
   "continueReview2": "Il reste encore des fiches <code class='fn__code'>${count}</code> à examiner, continuer ?",
   "whatsNewInSiYuan": "Quoi de neuf dans SiYuan",
-  "returnDesktop": "Appuyez à nouveau sur le bureau",
+  "returnDesktop": "Appuyez à nouveau sur le bureau. Utilisez [Quitter l'application] dans le panneau de la barre latérale droite pour quitter normalement l'application",
   "enterNew": "Entrez pour créer",
   "enterNewTip": "Aucun document trouvé, entrez pour créer un nouveau document.",
   "searchTip1": "pour naviguer",

diff --git a/app/appearance/langs/ja_JP.json b/app/appearance/langs/ja_JP.json
@@ -289,7 +289,7 @@
   "continueReview1": "復習を続ける",
   "continueReview2": "<code class='fn__code'>${count}</code> 枚のカードの復習が残っています。続けますか？",
   "whatsNewInSiYuan": "SiYuan の新機能",
-  "returnDesktop": "デスクトップに戻るにはもう一度バックを押してください",
+  "returnDesktop": "もう一度押すとデスクトップに戻ります。終了するには、右側のサイドバーパネルの[アプリケーションの終了]を使用します",
   "enterNew": "入力して作成",
   "enterNewTip": "ドキュメントが見つかりませんでした。新規ドキュメントを作成するには Enter キーを押してください",
   "searchTip1": "移動する",

diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json
@@ -289,7 +289,7 @@
   "continueReview1": "繼續複習",
   "continueReview2": "還有 <code class='fn__code'>${count}</code> 張卡片待複習，是否繼續？",
   "whatsNewInSiYuan": "思源筆記最新變化",
-  "returnDesktop": "再按一次返回桌面",
+  "returnDesktop": "再按一次返回桌面，如需退出請使用右側欄面板中的 [退出應用]",
   "enterNew": "Enter建立",
   "enterNewTip": "搜索結果為空，Enter建立新文檔",
   "searchTip1": "導航",

diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json
@@ -289,7 +289,7 @@
   "continueReview1": "继续复习",
   "continueReview2": "还有 <code class='fn__code'>${count}</code> 张卡片待复习，是否继续？",
   "whatsNewInSiYuan": "汐洛最新变化",
-  "returnDesktop": "再按一次返回桌面",
+  "returnDesktop": "再按一次返回桌面，如需退出请使用右侧栏面板中的 [退出应用]",
   "exitSillotAndroid": "再按一次退出应用",
   "enterNew": "回车创建",
   "enterNewTip": "搜索结果为空，回车创建新文档",

diff --git a/app/package.json b/app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "sillot",
-  "version": "0.33.2000",
-  "syv": "3.0.14",
+  "version": "0.34.1000",
+  "syv": "3.0.15",
   "sypv": "[]",
   "description": "Build Your Eternal Digital Garden",
   "author": "Hi-Windom",
@@ -163,4 +163,4 @@
   "resolutions": {
     "lodash": "4.17.21"
   }
-}
+}
diff --git a/app/src/menus/protyle.ts b/app/src/menus/protyle.ts
@@ -1094,9 +1094,7 @@ export const imgMenu = (protyle: IProtyle, range: Range, assetElement: HTMLEleme
         window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element);
         openMenu(protyle.app, imgSrc, false, false);
     }
-    /// #if !BROWSER
     window.siyuan.menus.menu.append(new MenuItem(exportAsset(imgElement.getAttribute("data-src"))).element);
-    /// #endif
     if (protyle?.app?.plugins) {
         emitOpenMenu({
             plugins: protyle.app.plugins,
@@ -1229,11 +1227,9 @@ export const linkMenu = (protyle: IProtyle, linkElement: HTMLElement, focusText
     }
     if (linkAddress) {
         openMenu(protyle.app, linkAddress, false, true);
-        /// #if !BROWSER
         if (linkAddress?.startsWith("assets/")) {
             window.siyuan.menus.menu.append(new MenuItem(exportAsset(linkAddress)).element);
         }
-        /// #endif
     }
     if (!protyle.disabled) {
         if (linkAddress?.startsWith("assets/")) {
@@ -1596,9 +1592,7 @@ export const videoMenu = (protyle: IProtyle, nodeElement: Element, type: string)
             submenu: openMenu(protyle.app, VideoSrc, true, false) as IMenu[]
         });
     }
-    /// #if !BROWSER
     subMenus.push(exportAsset(src));
-    /// #endif
     return subMenus;
 };
 

diff --git a/app/src/menus/util.ts b/app/src/menus/util.ts
@@ -9,16 +9,18 @@ import {Constants} from "../constants";
 import {openNewWindowById} from "../window/openNewWindow";
 import {MenuItem} from "./Menu";
 import type {App} from "../index";
-import {isInAndroid, updateHotkeyTip} from "../protyle/util/compatibility";
+import {isInAndroid, openByMobile, updateHotkeyTip} from "../protyle/util/compatibility";
 import {checkFold} from "../util/noRelyPCFunction";
 
 export const exportAsset = (src: string) => {
     window.sout.tracker("invoked");
-    /// #if !BROWSER
     return {
         label: window.siyuan.languages.export,
         icon: "iconUpload",
         async click() {
+            /// #if BROWSER
+            openByMobile(src);
+            /// #else
             const result = await ipcRenderer.invoke(Constants.SIYUAN_GET, {
                 cmd: "showSaveDialog",
                 defaultPath: getAssetName(src) + pathPosix().extname(src),
@@ -27,9 +29,9 @@ export const exportAsset = (src: string) => {
             if (!result.canceled) {
                 fetchPost("/api/file/copyFile", {src, dest: result.filePath});
             }
+            /// #endif
         }
     };
-    /// #endif
 };
 
 export const openEditorTab = (app: App, ids: string[], notebookId?: string, pathString?: string) => {

diff --git a/app/src/protyle/render/av/asset.ts b/app/src/protyle/render/av/asset.ts
@@ -248,11 +248,9 @@ ${window.siyuan.languages.title}
         }
     });
     openMenu(protyle ? protyle.app : window.siyuan.ws.app, linkAddress, false, true);
-    /// #if !BROWSER
     if (linkAddress?.startsWith("assets/")) {
         window.siyuan.menus.menu.append(new MenuItem(exportAsset(linkAddress)).element);
     }
-    /// #endif
     const rect = target.getBoundingClientRect();
     menu.open({
         x: rect.right,

diff --git a/docs/starlight/package.json b/docs/starlight/package.json
@@ -1,7 +1,7 @@
 {
   "name": "starlight",
   "type": "module",
-  "version": "0.33.2000",
+  "version": "0.34.1000",
   "scripts": {
     "test": "echo 'Test your sister day by day'",
     "dev": "astro dev",

diff --git a/docs/starlight/src/content/docs/汐洛宝典/与思源笔记共存.mdx b/docs/starlight/src/content/docs/汐洛宝典/与思源笔记共存.mdx
@@ -0,0 +1,5 @@
+---
+title: 与思源笔记共存
+---
+
+理论上汐洛可以与思源笔记共存，不会发生什么冲突，偶尔会有些意外，比如：对 siyuan:// 协议的处理
diff --git a/docs/starlight/src/content/docs/汐洛宝典/汐洛扩展.md b/docs/starlight/src/content/docs/汐洛宝典/汐洛扩展.md
@@ -0,0 +1,11 @@
+---
+title: 汐洛扩展（插件）
+---
+1. 汐洛绞架（规划中）
+2. [VSCode](https://marketplace.visualstudio.com/items?itemName=Hi-Windom.sillot)
+3. Obsidian（规划中）
+4. Android Studio（规划中）
+5. Chromium 浏览器（维护中）
+6. Utools（规划中）
+7. rubick（规划中）
+8. KeePass 2（规划中）
diff --git a/kernel/util/working.go b/kernel/util/working.go
@@ -45,9 +45,9 @@ import (
 var Mode = "prod"
 
 const (
-	Ver       = "0.33"
+	Ver       = "0.34"
 	VerC      = Ver + ".999" // 用于检查版本更新
-	VerSY     = "3.0.14"     // 思源版本号
+	VerSY     = "3.0.15"     // 思源版本号
 	IsInsider = true
 	VerDeno   = "1.32.5"
 )