Merge commit '1d0d06512e10a7cb174deb366268e831cabf014e'

# Conflicts: # app/pnpm-lock.yaml
EightDoor · Oct 22, 2024 · 496d181 · 496d181
2 parents 60d6e52 + 1d0d065
commit 496d181
Show file tree

Hide file tree

Showing 45 changed files with 5,935 additions and 49 deletions.
diff --git a/app/appearance/langs/de_DE.json b/app/appearance/langs/de_DE.json
@@ -1,4 +1,7 @@
 {
+  "backlinkContainChildren": "Enthalten Rückverweise untergeordnete Blöcke",
+  "backlinkContainChildrenTip": "Wenn aktiviert, werden untergeordnete Blöcke in die Berechnung der Rückverweise einbezogen",
+  "entryNum": "Anzahl der Einträge",
   "workspaceData": "Arbeitsbereichsdaten",
   "confirmRemoveRelationField": "Sind Sie sicher, dass Sie das Feld, das mit <b>${x}</b> verknüpft ist, löschen möchten?",
   "removeButKeepRelationField": "Entfernen, aber verknüpftes Feld behalten",

diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json
@@ -1,4 +1,7 @@
 {
+  "backlinkContainChildren": "Do backlinks contain child blocks",
+  "backlinkContainChildrenTip": "When enabled, child blocks will be included in the backlink calculation",
+  "entryNum": "Number of entries",
   "workspaceData": "Workspace data",
   "confirmRemoveRelationField": "Are you sure you want to delete the field associated with <b>${x}</b>?",
   "removeButKeepRelationField": "Remove, but keep related field",

diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json
@@ -1,4 +1,7 @@
 {
+  "backlinkContainChildren": "¿Los enlaces inversos contienen bloques secundarios?",
+  "backlinkContainChildrenTip": "Una vez habilitado, los bloques secundarios se incluirán en el cálculo de los enlaces inversos",
+  "entryNum": "Número de entradas",
   "workspaceData": "Datos del espacio de trabajo",
   "confirmRemoveRelationField": "¿Está seguro de que desea eliminar el campo asociado a <b>${x}</b>?",
   "removeButKeepRelationField": "Eliminar, pero mantener el campo relacionado",

diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json
@@ -1,4 +1,7 @@
 {
+  "backlinkContainChildren": "Les liens retour contiennent-ils des sous-blocs",
+  "backlinkContainChildrenTip": "Une fois activé, les sous-blocs seront inclus dans le calcul des liens retour",
+  "entryNum": "Nombre d'entrées",
   "workspaceData": "Données de l'espace de travail",
   "confirmRemoveRelationField": "Êtes-vous sûr de vouloir supprimer le champ associé à <b>${x}</b>?",
   "removeButKeepRelationField": "Supprimer, mais conserver le champ associé",

diff --git a/app/appearance/langs/he_IL.json b/app/appearance/langs/he_IL.json
@@ -1,4 +1,7 @@
 {
+  "backlinkContainChildren": "האם קישורים חוזרים כוללים בלוקים משניים",
+  "backlinkContainChildrenTip": "לאחר ההפעלה, בלוקים משניים ייכללו בחישוב הקישורים החוזרים",
+  "entryNum": "מספר ערכים",
   "workspaceData": "נתוני סביבת עבודה",
   "confirmRemoveRelationField": "האם אתה בטוח שברצונך למחוק את השדה המשויך ל-<b>${x}</b>?",
   "removeButKeepRelationField": "מחק, אך שמור על שדה הקשר",

diff --git a/app/appearance/langs/it_IT.json b/app/appearance/langs/it_IT.json
@@ -1,4 +1,7 @@
 {
+  "backlinkContainChildren": "I backlink contengono blocchi figli",
+  "backlinkContainChildrenTip": "Dopo l'attivazione, i blocchi figli saranno inclusi nel calcolo dei backlink",
+  "entryNum": "Numero di voci",
   "workspaceData": "Dati dello spazio di lavoro",
   "confirmRemoveRelationField": "Sei sicuro di voler eliminare il campo associato a <b>${x}</b>?",
   "removeButKeepRelationField": "Rimuovi, ma mantieni il campo correlato",

diff --git a/app/appearance/langs/ja_JP.json b/app/appearance/langs/ja_JP.json
@@ -1,4 +1,7 @@
 {
+  "backlinkContainChildren": "バックリンクに子ブロックを含めるかどうか",
+  "backlinkContainChildrenTip": "有効にすると、子ブロックがバックリンク計算に含まれます",
+  "entryNum": "エントリ数",
   "workspaceData": "ワークスペースデータ",
   "confirmRemoveRelationField": "<b>${x}</b> に関連するフィールドを同時に削除してもよろしいですか？",
   "removeButKeepRelationField": "削除して関連フィールドを保持",

diff --git a/app/appearance/langs/pl_PL.json b/app/appearance/langs/pl_PL.json
@@ -1,4 +1,7 @@
 {
+  "backlinkContainChildren": "Czy linki zwrotne zawierają bloki podrzędne",
+  "backlinkContainChildrenTip": "Po włączeniu bloki podrzędne zostaną uwzględnione w obliczeniach linków zwrotnych",
+  "entryNum": "Количество записей",
   "workspaceData": "Dane przestrzeni roboczej",
   "confirmRemoveRelationField": "Czy na pewno chcesz usunąć pole powiązane z <b>${x}</b>?",
   "removeButKeepRelationField": "Usuń, ale zachowaj powiązane pole",

diff --git a/app/appearance/langs/ru_RU.json b/app/appearance/langs/ru_RU.json
@@ -1,4 +1,7 @@
 {
+  "backlinkContainChildren": "Включать ли дочерние блоки в обратные ссылки",
+  "backlinkContainChildrenTip": "После включения дочерние блоки будут включены в расчет обратных ссылок",
+  "entryNum": "Количество записей",
   "workspaceData": "Данные рабочей области",
   "confirmRemoveRelationField": "Вы уверены, что хотите удалить поле, связанное с <b>${x}</b>?",
   "removeButKeepRelationField": "Удалить, но сохранить связанное поле",

diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json
@@ -1,4 +1,7 @@
 {
+  "backlinkContainChildren": "反向鏈接包含子塊",
+  "backlinkContainChildrenTip": "啟用後子塊將被納入到反向鏈接計算中",
+  "entryNum": "條目數",
   "workspaceData": "工作空間數據",
   "confirmRemoveRelationField": "確定同時刪除關聯至 <b>${x}</b> 中的字段嗎？",
   "removeButKeepRelationField": "刪除，但保留關聯字段",

diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json
@@ -1,4 +1,7 @@
 {
+  "backlinkContainChildren": "反向链接包含子块",
+  "backlinkContainChildrenTip": "启用后子块将被纳入到反向链接计算中",
+  "entryNum": "条目数",
   "workspaceData": "工作空间数据",
   "confirmRemoveRelationField": "确定同时删除关联至 <b>${x}</b> 中的字段吗？",
   "removeButKeepRelationField": "删除，但保留关联字段",

diff --git a/app/appearance/themes/daylight/theme.css b/app/appearance/themes/daylight/theme.css
@@ -55,7 +55,7 @@
     --b3-menu-background: var(--b3-theme-surface);
 
     /* 提示 */
-    --b3-tooltips-background: rgba(0, 0, 0, .9);
+    --b3-tooltips-background: #312f35;
     --b3-tooltips-color: var(--b3-theme-background-light);
     --b3-tooltips-second-color: #7d7c7a;
     --b3-tooltips-shadow: 0 2px 8px rgba(0, 0, 0, .1);

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.9.0"/>
+              Version="3.1.10.0"/>
     <Properties>
         <DisplayName>SiYuan</DisplayName>
         <PublisherDisplayName>云南链滴科技有限公司</PublisherDisplayName>

diff --git a/app/changelogs/v3.1.10/v3.1.10.md b/app/changelogs/v3.1.10/v3.1.10.md
@@ -0,0 +1,41 @@
+## Overview
+
+This version improves database performance and user interface details.
+
+In addition, we have also improved the backlink panel details to support excluding child-blocks from backlink calculations, which helps to display backlinks more accurately.
+
+## Changelogs
+
+Below are the detailed changes in this version.
+
+### Enhancement
+
+* [Improve interaction when deleting two-way relation field in a database](https://github.com/siyuan-note/siyuan/issues/11252)
+* [Improve plugin dock position persistence](https://github.com/siyuan-note/siyuan/issues/11931)
+* [Supports disabling Markdown `~~` syntax input](https://github.com/siyuan-note/siyuan/issues/12641)
+* [Improve database paging loading](https://github.com/siyuan-note/siyuan/issues/12780)
+* [WebDAV/S3 data sync and backup support configurable concurrent requests](https://github.com/siyuan-note/siyuan/issues/12798)
+* [Improve the logic of multiple selected blocks forming a super block](https://github.com/siyuan-note/siyuan/issues/12809)
+* [Browser clipping extension sends no more scrolling pages](https://github.com/siyuan-note/siyuan/issues/12817)
+* [Improve database template field loading performance](https://github.com/siyuan-note/siyuan/issues/12818)
+* [Outline and bookmark supports displaying images](https://github.com/siyuan-note/siyuan/issues/12820)
+* [Improve importing .sy.zip](https://github.com/siyuan-note/siyuan/issues/12825)
+* [Improve database relation & rollup field loading performance](https://github.com/siyuan-note/siyuan/issues/12835)
+* [Improve user interface](https://github.com/siyuan-note/siyuan/issues/12848)
+* [Refresh doc tree after data sync](https://github.com/siyuan-note/siyuan/issues/12860)
+* [Support child-blocks not being included in the backlink calculation](https://github.com/siyuan-note/siyuan/issues/12861)
+* [The backlink panel no longer displays breadcrumbs of the first-level blocks](https://github.com/siyuan-note/siyuan/issues/12862)
+* [Improve custom emojis at the beginning of the block](https://github.com/siyuan-note/siyuan/issues/12868)
+
+### Bugfix
+
+* [Drag and drop to insert asset fails](https://github.com/siyuan-note/siyuan/issues/12791)
+* [Abnormal after pasting certain content](https://github.com/siyuan-note/siyuan/issues/12792)
+* [The word count of the selected block is inaccurate](https://github.com/siyuan-note/siyuan/issues/12793)
+* [Unable to open PDF](https://github.com/siyuan-note/siyuan/issues/12794)
+* [The corrupted data causes the kernel to hang](https://github.com/siyuan-note/siyuan/issues/12852)
+
+## Download
+
+* [B3log](https://b3log.org/siyuan/en/download.html)
+* [GitHub](https://github.com/siyuan-note/siyuan/releases)
diff --git a/app/changelogs/v3.1.10/v3.1.10_zh_CHT.md b/app/changelogs/v3.1.10/v3.1.10_zh_CHT.md
@@ -0,0 +1,41 @@
+## 概述
+
+此版本改進了資料庫效能和使用者介面細節。
+
+另外，我們也改進了反鏈面板細節，支援子區塊不納入反鏈計算，這有助於更精確地顯示反鏈。
+
+## 變更記錄
+
+以下是此版本中的詳細變更。
+
+### 改進功能
+
+* [改進刪除資料庫中雙向關聯欄位時的互動](https://github.com/siyuan-note/siyuan/issues/11252)
+* [改進插件停靠列位置的持久化](https://github.com/siyuan-note/siyuan/issues/11931)
+* [支援禁用 Markdown `~~` 語法輸入](https://github.com/siyuan-note/siyuan/issues/12641)
+* [改進資料庫分頁載入](https://github.com/siyuan-note/siyuan/issues/12780)
+* [WebDAV/S3 資料同步與備份支援設定並發請求數](https://github.com/siyuan-note/siyuan/issues/12798)
+* [改進多選塊形成超級塊的邏輯](https://github.com/siyuan-note/siyuan/issues/12809)
+* [瀏覽器剪藏擴充功能不再需要捲動頁面](https://github.com/siyuan-note/siyuan/issues/12817)
+* [改進資料庫範本欄位載入效能](https://github.com/siyuan-note/siyuan/issues/12818)
+* [大綱和書籤支援顯示圖片](https://github.com/siyuan-note/siyuan/issues/12820)
+* [改進導入 .sy.zip](https://github.com/siyuan-note/siyuan/issues/12825)
+* [改進資料庫關聯和匯總欄位載入效能](https://github.com/siyuan-note/siyuan/issues/12835)
+* [改進使用者介面](https://github.com/siyuan-note/siyuan/issues/12848)
+* [資料同步後刷新文件樹](https://github.com/siyuan-note/siyuan/issues/12860)
+* [支援子區塊不納入反鏈計算](https://github.com/siyuan-note/siyuan/issues/12861)
+* [反向連結面板不再顯示一一級塊的麵包屑](https://github.com/siyuan-note/siyuan/issues/12862)
+* [改進區塊開始處的自訂表情](https://github.com/siyuan-note/siyuan/issues/12868)
+
+### 修復缺陷
+
+* [拖曳插入資源檔案失敗](https://github.com/siyuan-note/siyuan/issues/12791)
+* [貼上某些內容後異常](https://github.com/siyuan-note/siyuan/issues/12792)
+* [選定區塊的字數統計不準確](https://github.com/siyuan-note/siyuan/issues/12793)
+* [無法開啟 PDF](https://github.com/siyuan-note/siyuan/issues/12794)
+* [資料損壞導致核心掛起](https://github.com/siyuan-note/siyuan/issues/12852)
+
+## 下載
+
+* [B3log](https://b3log.org/siyuan/download.html)
+* [GitHub](https://github.com/siyuan-note/siyuan/releases)
diff --git a/app/changelogs/v3.1.10/v3.1.10_zh_CN.md b/app/changelogs/v3.1.10/v3.1.10_zh_CN.md
@@ -0,0 +1,41 @@
+## 概述
+
+该版本改进了数据库性能和用户界面细节。
+
+另外，我们也改进了反链面板细节，支持子块不纳入反链计算，这有助于更加精确地显示反链。
+
+## 变更记录
+
+以下是此版本中的详细变更。
+
+### 改进功能
+
+* [改进删除数据库中双向关联字段时的交互](https://github.com/siyuan-note/siyuan/issues/11252)
+* [改进插件停靠栏位置的持久化](https://github.com/siyuan-note/siyuan/issues/11931)
+* [支持禁用 Markdown `~~` 语法输入](https://github.com/siyuan-note/siyuan/issues/12641)
+* [改进数据库分页加载](https://github.com/siyuan-note/siyuan/issues/12780)
+* [WebDAV/S3 数据同步和备份支持配置并发请求数](https://github.com/siyuan-note/siyuan/issues/12798)
+* [改进多选块形成超级块的逻辑](https://github.com/siyuan-note/siyuan/issues/12809)
+* [浏览器剪藏扩展不再需要滚动页面](https://github.com/siyuan-note/siyuan/issues/12817)
+* [改进数据库模板字段加载性能](https://github.com/siyuan-note/siyuan/issues/12818)
+* [大纲和书签支持显示图片](https://github.com/siyuan-note/siyuan/issues/12820)
+* [改进导入 .sy.zip](https://github.com/siyuan-note/siyuan/issues/12825)
+* [改进数据库关联和汇总字段加载性能](https://github.com/siyuan-note/siyuan/issues/12835)
+* [改进用户界面](https://github.com/siyuan-note/siyuan/issues/12848)
+* [数据同步后刷新文档树](https://github.com/siyuan-note/siyuan/issues/12860)
+* [支持子块不纳入反链计算](https://github.com/siyuan-note/siyuan/issues/12861)
+* [反向链接面板不再显示一级块的面包屑](https://github.com/siyuan-note/siyuan/issues/12862)
+* [改进块开始处的自定义表情](https://github.com/siyuan-note/siyuan/issues/12868)
+
+### 修复缺陷
+
+* [拖放插入资源文件失败](https://github.com/siyuan-note/siyuan/issues/12791)
+* [粘贴某些内容后异常](https://github.com/siyuan-note/siyuan/issues/12792)
+* [选定块的字数统计不准确](https://github.com/siyuan-note/siyuan/issues/12793)
+* [无法打开 PDF](https://github.com/siyuan-note/siyuan/issues/12794)
+* [数据损坏导致内核挂起](https://github.com/siyuan-note/siyuan/issues/12852)
+
+## 下载
+
+* [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": "3.1.9",
+  "version": "3.1.10",
   "description": "Refactor your thinking",
   "homepage": "https://b3log.org/siyuan",
   "main": "./electron/main.js",