Merge pull request #758 from Hi-Windom/v0.35

V0.35
Hi-Windom · May 23, 2024 · 39833a5 · 39833a5
2 parents 0ff4df5 + f8123f0
commit 39833a5
Show file tree

Hide file tree

Showing 39 changed files with 555 additions and 240 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.35.1200",
+  "version": "0.35.1300",
   "preview": true,
   "repository": "https://github.com/Hi-Windom/Sillot",
   "publisher": "Hi-Windom",

diff --git a/README.md b/README.md
@@ -50,7 +50,6 @@
   * [Does it support data synchronization through a third-party sync disk?](#does-it-support-data-synchronization-through-a-third-party-sync-disk)
   * [Is SiYuan open source?](#is-siyuan-open-source)
   * [How to upgrade to a new version?](#how-to-upgrade-to-a-new-version)
-  * [Is there any note for deleting docs?](#is-there-any-note-for-deleting-docs)
   * [How can I just wrap and not start a new paragraph?](#how-can-i-just-wrap-and-not-start-a-new-paragraph)
   * [What if some blocks (such as paragraph blocks in list items) cannot find the block icon?](#what-if-some-blocks-such-as-paragraph-blocks-in-list-items-cannot-find-the-block-icon)
   * [How to share notes?](#how-to-share-notes)
@@ -322,10 +321,6 @@ For more details, please refer to [Development Guide](https://github.com/siyuan-
 
 You can <kbd>Check update</kbd> in <kbd>Settings</kbd> - <kbd>About</kbd> - <kbd>Current Version</kbd>, or pay attention to [Official Download](https://b3log.org/siyuan/en/download.html) or [GitHub Releases](https://github.com/siyuan-note/siyuan/releases) to get the new version.
 
-### Is there any note for deleting docs?
-
-After deletion, the doc will not appear in the operating system's recycle bin, but will be deleted directly. When deleted, SiYuan will generate data history.
-
 ### How can I just wrap and not start a new paragraph?
 
 Please use <kbd>Shift+Enter</kbd>.

diff --git a/README_zh_CN.md b/README_zh_CN.md
@@ -50,7 +50,6 @@
   * [支持通过第三方同步盘进行数据同步吗？](#支持通过第三方同步盘进行数据同步吗)
   * [思源是开源的吗？](#思源是开源的吗)
   * [如何升级到新版本？](#如何升级到新版本)
-  * [删除文档有什么注意事项吗？](#删除文档有什么注意事项吗)
   * [如何才能只换行不新起段落？](#如何才能只换行不新起段落)
   * [有的块（比如在列表项中的段落块）找不到块标怎么办？](#有的块比如在列表项中的段落块找不到块标怎么办)
   * [如何分享笔记？](#如何分享笔记)
@@ -327,10 +326,6 @@ Publish parameters: --accessAuthCode=******（访问授权码）
 
 **注意**：切勿将工作空间放置于安装目录下，因为更新版本会清空安装目录下的所有文件
 
-### 删除文档有什么注意事项吗？
-
-文档被删除后不会出现在操作系统回收站中，而是直接删除，删除时思源会生成数据历史。
-
 ### 如何才能只换行不新起段落？
 
 请使用 <kbd>Shift+Enter</kbd>。

diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json
@@ -1,4 +1,7 @@
 {
+  "copyMirror": "Copy mirror",
+  "duplicateMirror": "Duplicate mirror",
+  "duplicateCompletely": "Duplicate completely",
   "isMsStoreVerTip": "The currently used version is the Microsoft Store version, please check for updates in the Microsoft Store",
   "andSubFile": "Are you sure you want to delete <b>${x}</b> and its ${y} subdocs?",
   "confirmDeleteTip": "Are you sure to delete <b>${x}</b>?",

diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json
@@ -1,4 +1,7 @@
 {
+  "copyMirror": "Copiar espejo",
+  "duplicateMirror": "Espejo duplicado",
+  "duplicateCompletely": "Duplicar completamente",
   "isMsStoreVerTip": "La versión utilizada actualmente es la versión de Microsoft Store, verifique si hay actualizaciones en Microsoft Store",
   "andSubFile": "¿Está seguro de que desea eliminar <b>${x}</b> y sus subdocumentos ${y}?",
   "confirmDeleteTip": "¿Está seguro de eliminar <b>${x}</b>?",

diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json
@@ -1,4 +1,7 @@
 {
+  "copyMirror": "Copier le miroir",
+  "duplicateMirror": "Miroir en double",
+  "duplicateCompletely": "Dupliquer complètement",
   "isMsStoreVerTip": "La version actuellement utilisée est la version du Microsoft Store, veuillez vérifier les mises à jour dans le Microsoft Store",
   "andSubFile": "Êtes-vous sûr de vouloir supprimer <b>${x}</b> et ses sous-documents ${y} ?",
   "confirmDeleteTip": "Êtes-vous sûr de supprimer <b>${x}</b> ?",

diff --git a/app/appearance/langs/ja_JP.json b/app/appearance/langs/ja_JP.json
@@ -1,4 +1,7 @@
 {
+  "copyMirror": "ミラーをコピー",
+  "duplicateMirror": "ミラーの複製",
+  "duplicateCompletely": "完全に複製します",
   "isMsStoreVerTip": "現在使用されているバージョンは Microsoft Store バージョンです。Microsoft Store で更新プログラムを確認してください",
   "andSubFile": "<b>${x}</b> とそのサブドキュメント ${y} を削除してもよろしいですか?",
   "confirmDeleteTip": "<b>${x}</b> を削除してもよろしいですか?",

diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json
@@ -1,4 +1,7 @@
 {
+  "copyMirror": "複製鏡像",
+  "duplicateMirror": "複製為鏡像副本",
+  "duplicateCompletely": "複製為完整副本",
   "isMsStoreVerTip": "目前使用的版本為 Microsoft Store 版本，請在 Microsoft Store 中檢查更新",
   "andSubFile": "決定刪除 <b>${x}</b> 及其 ${y} 個子文件嗎？",
   "confirmDeleteTip": "確定刪除<b>${x}</b> 嗎？",

diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json
@@ -1,4 +1,7 @@
 {
+  "copyMirror": "复制镜像",
+  "duplicateMirror": "复制为镜像副本",
+  "duplicateCompletely": "复制为完整副本",
   "isMsStoreVerTip": "当前使用的版本为微软商店版，请在微软商店中检查更新",
   "andSubFile": "确定删除 <b>${x}</b> 及其 ${y} 个子文档吗？",
   "confirmDeleteTip": "确定删除 <b>${x}</b> 吗？",

diff --git a/...808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20200924100950-9op5xi1.sy b/...808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20200924100950-9op5xi1.sy
@@ -7,7 +7,7 @@
 		"id": "20200924100950-9op5xi1",
 		"title": "Shortcuts",
 		"type": "doc",
-		"updated": "20240517003750"
+		"updated": "20240523114032"
 	},
 	"Children": [
 		{
@@ -16,7 +16,7 @@
 			"HeadingLevel": 2,
 			"Properties": {
 				"id": "20201227133532-44ubczo",
-				"updated": "20240517003750"
+				"updated": "20240523114032"
 			},
 			"Children": [
 				{
@@ -40,7 +40,7 @@
 			"Properties": {
 				"colgroup": "||",
 				"id": "20210106154101-qrojg1b",
-				"updated": "20240426100644"
+				"updated": "20240523114032"
 			},
 			"Children": [
 				{
@@ -1296,6 +1296,96 @@
 						}
 					]
 				},
+				{
+					"Type": "NodeTableRow",
+					"Data": "tr",
+					"Children": [
+						{
+							"Type": "NodeTableCell",
+							"Data": "td",
+							"Children": [
+								{
+									"Type": "NodeText",
+									"Data": "Unsplit"
+								}
+							]
+						},
+						{
+							"Type": "NodeTableCell",
+							"Data": "td",
+							"Children": [
+								{
+									"Type": "NodeText",
+									"Data": "-"
+								}
+							]
+						},
+						{
+							"Type": "NodeTableCell",
+							"Data": "td",
+							"Children": [
+								{
+									"Type": "NodeText",
+									"Data": "Go to "
+								},
+								{
+									"Type": "NodeTextMark",
+									"TextMarkType": "kbd",
+									"TextMarkTextContent": "Settings - Shortcuts"
+								},
+								{
+									"Type": "NodeText",
+									"Data": " to configure"
+								}
+							]
+						}
+					]
+				},
+				{
+					"Type": "NodeTableRow",
+					"Data": "tr",
+					"Children": [
+						{
+							"Type": "NodeTableCell",
+							"Data": "td",
+							"Children": [
+								{
+									"Type": "NodeText",
+									"Data": "Unsplit All"
+								}
+							]
+						},
+						{
+							"Type": "NodeTableCell",
+							"Data": "td",
+							"Children": [
+								{
+									"Type": "NodeText",
+									"Data": "-"
+								}
+							]
+						},
+						{
+							"Type": "NodeTableCell",
+							"Data": "td",
+							"Children": [
+								{
+									"Type": "NodeText",
+									"Data": "Go to "
+								},
+								{
+									"Type": "NodeTextMark",
+									"TextMarkType": "kbd",
+									"TextMarkTextContent": "Settings - Shortcuts"
+								},
+								{
+									"Type": "NodeText",
+									"Data": " to configure"
+								}
+							]
+						}
+					]
+				},
 				{
 					"Type": "NodeTableRow",
 					"Data": "tr",

diff --git a/app/guide/20210808180117-6v0mkxr/20200923234731-h3zkwm2.sy b/app/guide/20210808180117-6v0mkxr/20200923234731-h3zkwm2.sy
@@ -869,55 +869,6 @@
 				}
 			]
 		},
-		{
-			"ID": "20201224120448-ygu8bzx",
-			"Type": "NodeHeading",
-			"HeadingLevel": 2,
-			"Properties": {
-				"id": "20201224120448-ygu8bzx",
-				"updated": "20211009092454"
-			},
-			"Children": [
-				{
-					"Type": "NodeText",
-					"Data": "Is there any "
-				},
-				{
-					"Type": "NodeTextMark",
-					"TextMarkType": "tag",
-					"TextMarkTextContent": "Note"
-				},
-				{
-					"Type": "NodeText",
-					"Data": " for deleting docs?"
-				}
-			]
-		},
-		{
-			"ID": "20210615213114-fq2uew0",
-			"Type": "NodeParagraph",
-			"Properties": {
-				"id": "20210615213114-fq2uew0",
-				"updated": "20220502163309"
-			},
-			"Children": [
-				{
-					"Type": "NodeText",
-					"Data": "After deletion, the doc will not appear in the operating system's recycle bin, but will be deleted directly. When deleted, SiYuan will generate "
-				},
-				{
-					"Type": "NodeTextMark",
-					"TextMarkType": "block-ref",
-					"TextMarkBlockRefID": "20210615213222-vs5tzbd",
-					"TextMarkBlockRefSubtype": "s",
-					"TextMarkTextContent": "data history"
-				},
-				{
-					"Type": "NodeText",
-					"Data": "."
-				}
-			]
-		},
 		{
 			"ID": "20210106192438-on2fb5k",
 			"Type": "NodeHeading",

diff --git a/...808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200813004551-gm0pbn1.sy b/...808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200813004551-gm0pbn1.sy
@@ -7,7 +7,7 @@
 		"id": "20200813004551-gm0pbn1",
 		"title": "快捷键",
 		"type": "doc",
-		"updated": "20240517004202"
+		"updated": "20240523113529"
 	},
 	"Children": [
 		{
@@ -16,7 +16,7 @@
 			"HeadingLevel": 2,
 			"Properties": {
 				"id": "20240112150737-e41yt1y",
-				"updated": "20240517004202"
+				"updated": "20240523113529"
 			},
 			"Children": [
 				{
@@ -36,7 +36,7 @@
 			"Properties": {
 				"colgroup": "||",
 				"id": "20201227133317-ovwnk1y",
-				"updated": "20240517004202"
+				"updated": "20240523113529"
 			},
 			"Children": [
 				{
@@ -1294,6 +1294,96 @@
 						}
 					]
 				},
+				{
+					"Type": "NodeTableRow",
+					"Data": "tr",
+					"Children": [
+						{
+							"Type": "NodeTableCell",
+							"Data": "td",
+							"Children": [
+								{
+									"Type": "NodeText",
+									"Data": "取消分屏"
+								}
+							]
+						},
+						{
+							"Type": "NodeTableCell",
+							"Data": "td",
+							"Children": [
+								{
+									"Type": "NodeText",
+									"Data": "-"
+								}
+							]
+						},
+						{
+							"Type": "NodeTableCell",
+							"Data": "td",
+							"Children": [
+								{
+									"Type": "NodeText",
+									"Data": "可前往 "
+								},
+								{
+									"Type": "NodeTextMark",
+									"TextMarkType": "kbd",
+									"TextMarkTextContent": "设置 - 快捷键"
+								},
+								{
+									"Type": "NodeText",
+									"Data": " 中配置"
+								}
+							]
+						}
+					]
+				},
+				{
+					"Type": "NodeTableRow",
+					"Data": "tr",
+					"Children": [
+						{
+							"Type": "NodeTableCell",
+							"Data": "td",
+							"Children": [
+								{
+									"Type": "NodeText",
+									"Data": "取消全部分屏"
+								}
+							]
+						},
+						{
+							"Type": "NodeTableCell",
+							"Data": "td",
+							"Children": [
+								{
+									"Type": "NodeText",
+									"Data": "-"
+								}
+							]
+						},
+						{
+							"Type": "NodeTableCell",
+							"Data": "td",
+							"Children": [
+								{
+									"Type": "NodeText",
+									"Data": "可前往 "
+								},
+								{
+									"Type": "NodeTextMark",
+									"TextMarkType": "kbd",
+									"TextMarkTextContent": "设置 - 快捷键"
+								},
+								{
+									"Type": "NodeText",
+									"Data": " 中配置"
+								}
+							]
+						}
+					]
+				},
 				{
 					"Type": "NodeTableRow",
 					"Data": "tr",