Merge remote-tracking branch 'origin/master'

# Conflicts: # app/package.json # kernel/util/working.go
appdev · Aug 5, 2024 · 6b2da92 · 6b2da92
2 parents 45dfc7a + 0ea7599
commit 6b2da92
Show file tree

Hide file tree

Showing 55 changed files with 1,012 additions and 448 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -14,10 +14,10 @@ Install pnpm: `npm install -g [email protected]`
 
 Set the Electron mirror environment variable and install Electron:
 
-* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v31.2.1 -D`
+* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v31.3.1 -D`
 * Windows:
     * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
-    * `pnpm install electron@v31.2.1 -D`
+    * `pnpm install electron@v31.3.1 -D`
 
 NPM mirror:
 
@@ -28,7 +28,7 @@ NPM mirror:
 
 On the desktop, go to the app folder to run:
 
-* `pnpm install electron@v31.2.1 -D`
+* `pnpm install electron@v31.3.1 -D`
 * `pnpm run dev`
 * `pnpm run start`
 

diff --git a/.github/CONTRIBUTING_zh_CN.md b/.github/CONTRIBUTING_zh_CN.md
@@ -16,11 +16,11 @@
 
 * macOS/Linux: 
  ```
- ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v31.2.1 -D
+ ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v31.3.1 -D
  ```
 * Windows:
     * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
-    * `pnpm install electron@v31.2.1 -D`
+    * `pnpm install electron@v31.3.1 -D`
 
 NPM 镜像：
 
@@ -30,7 +30,7 @@ NPM 镜像：
 
 桌面端进入 app 文件夹运行：
 
-* `pnpm install electron@v31.2.1 -D`
+* `pnpm install electron@v31.3.1 -D`
 * `pnpm run dev`
 * `pnpm run start`
 

diff --git a/app/appearance/emojis/conf.json b/app/appearance/emojis/conf.json
diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json
@@ -85,7 +85,7 @@
   "addToDatabase": "Add to Database",
   "clearContext": "Clear context",
   "cloudStoragePurge": "Purge cloud storage",
-  "cloudStoragePurgeConfirm": "Note:<ul class='fn__list'><li>Please ensure that other devices have paused sync before execution</li><li>The purge operation is very time-consuming, please ensure that the network is stable</li></ul>Are you sure to execute it now?",
+  "cloudStoragePurgeConfirm": "Purging the cloud storage will completely delete all unreferenced snapshots and related data objects. <ul class='fn__list'><li>Please ensure that other devices have paused sync before execution</li><li>The purge operation is very time-consuming, please ensure that the network is stable</li></ul>Are you sure to execute it now?",
   "dragFill": "Drag vertically to fill value",
   "switchReadonly": "Switch read-only mode",
   "original": "Original",
@@ -525,6 +525,7 @@
   "tagSnapshotTip": "Do not include symbols \\ / : * ? &quot; &#039; &lt; &gt; |",
   "dataRepo": "Data repo",
   "newSubDoc": "Create sub doc",
+  "newSubDocRef": "Create sub Doc with reference",
   "newDocBelow": "Create doc below",
   "newDocAbove": "Create doc above",
   "fullWidth": "Adaptive Width",
@@ -1108,6 +1109,7 @@
   "paragraphBeginningSpace": "Two empty spaces at the beginning of the paragraph",
   "outline": "Outline",
   "newFile": "New Doc",
+  "newFileRef": "Create new Doc with reference",
   "close": "Close",
   "delete": "Delete",
   "rename": "Rename",

diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json
@@ -85,7 +85,7 @@
   "addToDatabase": "Agregar a la base de datos",
   "clearContext": "Borrar contexto",
   "cloudStoragePurge": "Borrar almacenamiento en la nube",
-  "cloudStoragePurgeConfirm": "Nota:<ul class='fn__list'><li>Asegúrese de que otros dispositivos hayan pausado la sincronización antes de la ejecución</li><li>La operación de purga requiere mucho tiempo; asegúrese de que la red esté estable</li></ul>¿Está seguro de ejecutarla ahora?",
+  "cloudStoragePurgeConfirm": "Al purgar el almacenamiento en la nube se eliminarán por completo todas las instantáneas sin referencia y los objetos de datos relacionados.<ul class='fn__list'><li>Asegúrese de que otros dispositivos hayan pausado la sincronización antes de la ejecución</li><li>La operación de purga requiere mucho tiempo; asegúrese de que la red esté estable</li></ul>¿Está seguro de ejecutarla ahora?",
   "dragFill": "Arrastra verticalmente para rellenar el valor",
   "switchReadonly": "Cambiar modo de sólo lectura",
   "original": "Original",
@@ -525,6 +525,7 @@
   "tagSnapshotTip": "No incluir símbolos \\ / : * ? &quot; &#039; &lt; &gt; |",
   "dataRepo": "Repositorio de datos",
   "newSubDoc": "Crear subdocumento",
+  "newSubDocRef": "Crear subdocumento y hacer referencia",
   "newDocBelow": "Crear documento a continuación",
   "newDocAbove": "Crear documento arriba",
   "fullWidth": "Ancho adaptable",
@@ -1108,6 +1109,7 @@
   "paragraphBeginningSpace": "Dos espacios vacíos al principio del párrafo",
   "outline": "Esquema",
   "newFile": "Nuevo documento",
+  "newFileRef": "Crear un nuevo documento y hacer referencia",
   "close": "Cerrar",
   "delete": "Borrar",
   "rename": "Cambiar nombre",

diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json
@@ -85,7 +85,7 @@
   "addToDatabase": "Ajouter à la base de données",
   "clearContext": "Effacer le contexte",
   "cloudStoragePurge": "Purger le stockage cloud",
-  "cloudStoragePurgeConfirm": "Remarque :<ul class='fn__list'><li>Veuillez vous assurer que la synchronisation des autres appareils a été suspendue avant l'exécution</li><li>L'opération de purge prend beaucoup de temps, veuillez vous assurer que le réseau est stable</li></ul>Êtes-vous sûr de l'exécuter maintenant ?",
+  "cloudStoragePurgeConfirm": "La purge du stockage cloud supprimera complètement tous les instantanés non référencés et les objets de données associés. <ul class='fn__list'><li>Veuillez vous assurer que la synchronisation des autres appareils a été suspendue avant l'exécution</li><li>L'opération de purge prend beaucoup de temps, veuillez vous assurer que le réseau est stable</li></ul>Êtes-vous sûr de l'exécuter maintenant ?",
   "dragFill": "Arrastra verticalmente para rellenar el valor",
   "switchReadonly": "Changer de mode lecture seule",
   "original": "Originale",
@@ -525,6 +525,7 @@
   "tagSnapshotTip": "Ne pas inclure les symboles \\ / : * ? &quot; &#039; &lt; &gt; |",
   "dataRepo": "Dépôt de données",
   "newSubDoc": "Créer un sous-doc",
+  "newSubDocRef": "Créer un sous-doc et le référencer",
   "newDocBelow": "Créer un document ci-dessous",
   "newDocAbove": "Créer un document ci-dessus",
   "fullWidth": "Largeur adaptative",
@@ -1108,6 +1109,7 @@
   "paragraphBeginningSpace": "Deux espaces vides au début du paragraphe",
   "outline": "Outline",
   "newFile": "Nouveau Doc",
+  "newFileRef": "Créer un nouveau document et le citer",
   "close": "Fermer",
   "delete": "Supprimer",
   "rename": "Renommer",

diff --git a/app/appearance/langs/ja_JP.json b/app/appearance/langs/ja_JP.json
@@ -85,7 +85,7 @@
   "addToDatabase": "データベースに追加",
   "clearContext": "コンテキストを消去",
   "cloudStoragePurge": "クラウドストレージを消去",
-  "cloudStoragePurgeConfirm": "注意: <ul class='fn__list'><li>実行前に他のデバイスが同期を一時停止していることを確認してください</li><li>消去操作は非常に時間がかかるため、ネットワークが安定していることを確認してください</li></ul>今すぐ実行してもよろしいですか？",
+  "cloudStoragePurgeConfirm": "クラウド ストレージを消去すると、参照されていないスナップショットと関連データ オブジェクトがすべて完全に削除されます。<ul class='fn__list'><li>実行前に他のデバイスが同期を一時停止していることを確認してください</li><li>消去操作は非常に時間がかかるため、ネットワークが安定していることを確認してください</li></ul>今すぐ実行してもよろしいですか？",
   "dragFill": "ドロップダウンで値を入力する",
   "switchReadonly": "読み取り専用モードの切り替え",
   "original": "元の値",
@@ -525,6 +525,7 @@
   "tagSnapshotTip": "次の記号を含めないでください \\ / : * ? &quot; &#039; &lt; &gt; |",
   "dataRepo": "データリポジトリ",
   "newSubDoc": "サブドキュメントを作成",
+  "newSubDocRef": "サブドキュメントを作成して参照する",
   "newDocBelow": "下にドキュメントを作成",
   "newDocAbove": "上にドキュメントを作成",
   "fullWidth": "幅に合わせる",
@@ -1108,6 +1109,7 @@
   "paragraphBeginningSpace": "段落の先頭にスペースを2つ挿入",
   "outline": "アウトライン",
   "newFile": "新規ドキュメント",
+  "newFileRef": "新規ドキュメントを作成して引用する",
   "close": "閉じる",
   "delete": "削除",
   "rename": "名前の変更",

diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json
@@ -85,7 +85,7 @@
   "addToDatabase": "新增至資料庫",
   "clearContext": "清空上下文",
   "cloudStoragePurge": "清理雲端儲存",
-  "cloudStoragePurgeConfirm": "請注意：<ul class='fn__list'><li>執行前請確保其他設備已經暫停同步</li><li>清理作業非常耗時，請確保網路穩定</li></ul>確定現在就執行嗎？",
+  "cloudStoragePurgeConfirm": "清理雲端儲存會徹底刪除所有未引用的快照和相關資料物件。<ul class='fn__list'><li>執行前請確保其他設備已經暫停同步</li><li>清理作業非常耗時，請確保網路穩定</li></ul>確定現在就執行嗎？",
   "dragFill": "下拉填滿資料",
   "switchReadonly": "唯讀模式切換",
   "original": "原值",
@@ -525,6 +525,7 @@
   "tagSnapshotTip": "請勿包含符號 \\ / : * ? &quot; &#039; &lt; &gt; |",
   "dataRepo": "資料倉庫",
   "newSubDoc": "新建子文檔",
+  "newSubDocRef": "新建子文檔並引用",
   "newDocBelow": "在下方新建文檔",
   "newDocAbove": "在上方新建文檔",
   "fullWidth": "自適應寬度",
@@ -1108,6 +1109,7 @@
   "paragraphBeginningSpace": "段落開頭空兩格",
   "outline": "大綱",
   "newFile": "新建文檔",
+  "newFileRef": "新建文檔並引用",
   "close": "關閉",
   "delete": "刪除",
   "rename": "重命名",

diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json
@@ -85,7 +85,7 @@
   "addToDatabase": "添加到数据库",
   "clearContext": "清空上下文",
   "cloudStoragePurge": "清理云端存储",
-  "cloudStoragePurgeConfirm": "请注意：<ul class='fn__list'><li>执行前请确保其他设备已经暂停同步</li><li>清理操作非常耗时，请确保网络稳定</li></ul> 确定现在就执行吗？",
+  "cloudStoragePurgeConfirm": "清理云端存储会彻底删除所有未引用的快照和相关数据对象。<ul class='fn__list'><li>执行前请确保其他设备已经暂停同步</li><li>清理操作非常耗时，请确保网络稳定</li></ul> 确定现在就执行吗？",
   "dragFill": "下拉填充数据",
   "switchReadonly": "只读模式切换",
   "original": "原值",
@@ -525,6 +525,7 @@
   "tagSnapshotTip": "请勿包含符号 \\ / : * ? &quot; &#039; &lt; &gt; |",
   "dataRepo": "数据仓库",
   "newSubDoc": "新建子文档",
+  "newSubDocRef": "新建子文档并引用",
   "newDocBelow": "在下方新建文档",
   "newDocAbove": "在上方新建文档",
   "fullWidth": "自适应宽度",
@@ -1108,6 +1109,7 @@
   "paragraphBeginningSpace": "段落开头空两格",
   "outline": "大纲",
   "newFile": "新建文档",
+  "newFileRef": "新建文档并引用",
   "close": "关闭",
   "delete": "删除",
   "rename": "重命名",

diff --git a/app/appx/AppxManifest.xml b/app/appx/AppxManifest.xml
@@ -9,7 +9,7 @@
     <Identity Name="89C2A984.SiYuan"
               ProcessorArchitecture="x64"
               Publisher="CN=087C656E-C1D9-42D8-8807-CED45A74FC0F"
-              Version="3.1.1.0"/>
+              Version="3.1.2.0"/>
     <Properties>
         <DisplayName>SiYuan</DisplayName>
         <PublisherDisplayName>云南链滴科技有限公司</PublisherDisplayName>

diff --git a/app/changelogs/v3.1.2/v3.1.2.md b/app/changelogs/v3.1.2/v3.1.2.md
@@ -0,0 +1,37 @@
+## Overview
+
+This version improves web page clipping, fixes some bugs and improves some details.
+
+## Changelogs
+
+Below are the detailed changes in this version.
+
+### Enhancement
+
+* [Improve HTML code clipping](https://github.com/siyuan-note/siyuan/issues/11924)
+* [The database-bound block is automatically added to the database after being copied as a replica](https://github.com/siyuan-note/siyuan/issues/11959)
+* [Improve database template field exporting](https://github.com/siyuan-note/siyuan/issues/11988)
+* [Improve block ref anchor text exporting](https://github.com/siyuan-note/siyuan/issues/11995)
+* [Improve outline panel escape rendering](https://github.com/siyuan-note/siyuan/issues/12001)
+* [Improve block ref searching](https://github.com/siyuan-note/siyuan/issues/12010)
+* [Improve HTML code block clipping](https://github.com/siyuan-note/siyuan/issues/12014)
+* [Improve HTML kbd clipping](https://github.com/siyuan-note/siyuan/issues/12027)
+* [Improve emoji charsets](https://github.com/siyuan-note/siyuan/pull/12051)
+* [Supports converting network assets in the database to local](https://github.com/siyuan-note/siyuan/issues/12096)
+* [Improve database date filed sorting](https://github.com/siyuan-note/siyuan/issues/12127)
+
+### Bugfix
+
+* [Abnormal heading block update time](https://github.com/siyuan-note/siyuan/issues/11996)
+* [After setting search, `About` disappears](https://github.com/siyuan-note/siyuan/issues/12013)
+* [Exporting embedded heading blocks without blocks underneath](https://github.com/siyuan-note/siyuan/issues/12075)
+* [Dragging an embedded block in a superblock causes the embedded block to be duplicated](https://github.com/siyuan-note/siyuan/issues/12077)
+
+### Refactor
+
+* [Upgrade to Electron v31.3.1](https://github.com/siyuan-note/siyuan/issues/12134)
+
+## Download
+
+* [B3log](https://b3log.org/siyuan/en/download.html)
+* [GitHub](https://github.com/siyuan-note/siyuan/releases)
diff --git a/app/changelogs/v3.1.2/v3.1.2_zh_CHT.md b/app/changelogs/v3.1.2/v3.1.2_zh_CHT.md
@@ -0,0 +1,37 @@
+## 概述
+
+此版本改進了網頁剪藏、修復了一些缺陷並改進了一些細節。
+
+## 變更記錄
+
+以下是此版本中的詳細變更。
+
+### 改進功能
+
+* [改進 HTML 程式碼剪輯](https://github.com/siyuan-note/siyuan/issues/11924)
+* [資料庫綁定區塊在複製為副本後自動新增至資料庫](https://github.com/siyuan-note/siyuan/issues/11959)
+* [改進資料庫範本欄位匯出](https://github.com/siyuan-note/siyuan/issues/11988)
+* [改進區塊引用錨文本導出](https://github.com/siyuan-note/siyuan/issues/11995)
+* [改進大綱面板轉義渲染](https://github.com/siyuan-note/siyuan/issues/12001)
+* [改進區塊引用搜尋](https://github.com/siyuan-note/siyuan/issues/12010)
+* [改進 HTML 程式碼區塊剪輯](https://github.com/siyuan-note/siyuan/issues/12014)
+* [改進 HTML kbd 剪輯](https://github.com/siyuan-note/siyuan/issues/12027)
+* [改進表情字元集](https://github.com/siyuan-note/siyuan/pull/12051)
+* [支援將資料庫中的網路資產轉換為本地](https://github.com/siyuan-note/siyuan/issues/12096)
+* [改進資料庫日期欄位排序](https://github.com/siyuan-note/siyuan/issues/12127)
+
+### 修復缺陷
+
+* [標題區塊更新時間異常](https://github.com/siyuan-note/siyuan/issues/11996)
+* [設定搜尋後，「關於」消失](https://github.com/siyuan-note/siyuan/issues/12013)
+* [匯出嵌入的標題區塊時沒有下面的區塊](https://github.com/siyuan-note/siyuan/issues/12075)
+* [在超級區塊中拖曳嵌入區塊會導致嵌入區塊重複](https://github.com/siyuan-note/siyuan/issues/12077)
+
+### 開發重構
+
+* [升級 Electron v31.3.1](https://github.com/siyuan-note/siyuan/issues/12134)
+
+## 下載
+
+* [B3log](https://b3log.org/siyuan/download.html)
+* [GitHub](https://github.com/siyuan-note/siyuan/releases)
diff --git a/app/changelogs/v3.1.2/v3.1.2_zh_CN.md b/app/changelogs/v3.1.2/v3.1.2_zh_CN.md
@@ -0,0 +1,37 @@
+## 概述
+
+该版本改进了网页剪藏、修复了一些缺陷并改进了一些细节。
+
+## 变更记录
+
+以下是此版本中的详细变更。
+
+### 改进功能
+
+* [改进 HTML 代码剪辑](https://github.com/siyuan-note/siyuan/issues/11924)
+* [数据库绑定块在复制为副本后自动添加到数据库](https://github.com/siyuan-note/siyuan/issues/11959)
+* [改进数据库模板字段导出](https://github.com/siyuan-note/siyuan/issues/11988)
+* [改进块引用锚文本导出](https://github.com/siyuan-note/siyuan/issues/11995)
+* [改进大纲面板转义渲染](https://github.com/siyuan-note/siyuan/issues/12001)
+* [改进块引用搜索](https://github.com/siyuan-note/siyuan/issues/12010)
+* [改进 HTML 代码块剪辑](https://github.com/siyuan-note/siyuan/issues/12014)
+* [改进 HTML kbd 剪辑](https://github.com/siyuan-note/siyuan/issues/12027)
+* [改进表情字符集](https://github.com/siyuan-note/siyuan/pull/12051)
+* [支持将数据库中的网络资产转换为本地](https://github.com/siyuan-note/siyuan/issues/12096)
+* [改进数据库日期字段排序](https://github.com/siyuan-note/siyuan/issues/12127)
+
+### 修复缺陷
+
+* [标题块更新时间异常](https://github.com/siyuan-note/siyuan/issues/11996)
+* [设置搜索后，“关于”消失](https://github.com/siyuan-note/siyuan/issues/12013)
+* [导出嵌入的标题块时没有下面的块](https://github.com/siyuan-note/siyuan/issues/12075)
+* [在超级块中拖动嵌入块会导致嵌入块重复](https://github.com/siyuan-note/siyuan/issues/12077)
+
+### 开发重构
+
+* [升级 Electron v31.3.1](https://github.com/siyuan-note/siyuan/issues/12134)
+
+## 下载
+
+* [B3log](https://b3log.org/siyuan/download.html)
+* [GitHub](https://github.com/siyuan-note/siyuan/releases)
diff --git a/app/package.json b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "SiYuan",
-  "version": "103.1.1",
+  "version": "103.1.2",
   "description": "Refactor your thinking",
   "homepage": "https://b3log.org/siyuan",
   "main": "./electron/main.js",
@@ -55,7 +55,7 @@
     "clean-webpack-plugin": "^4.0.0",
     "css-loader": "^6.7.1",
     "dayjs": "^1.11.5",
-    "electron": "31.2.1",
+    "electron": "31.3.1",
     "electron-builder": "24.9.1",
     "encoding": "^0.1.13",
     "esbuild-loader": "^3.0.1",

diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml