Merge tag 'v2.10.11-dev2' into feat/attrs-view-adaptive-width

Zuoqiu-Yingyi · Oct 14, 2023 · cd115ad · cd115ad
1 parent 23bd6bc
commit cd115ad
Show file tree

Hide file tree

Showing 57 changed files with 1,462 additions and 385 deletions.
diff --git a/app/appearance/icons/ant/icon.js b/app/appearance/icons/ant/icon.js
diff --git a/app/appearance/icons/ant/icon.json b/app/appearance/icons/ant/icon.json
@@ -2,5 +2,5 @@
   "name": "ant",
   "author": "Vanessa",
   "url": "https://github.com/Vanessa219",
-  "version": "1.24.0"
+  "version": "1.25.0"
 }
diff --git a/app/appearance/icons/index.html b/app/appearance/icons/index.html
@@ -28,6 +28,12 @@
 <body>
 <h2>SiYuan</h2>
 <div class="fn__clear">
+    <div>
+        <svg>
+            <use xlink:href="#iconKey"></use>
+        </svg>
+        iconKey
+    </div>
     <div>
         <svg>
             <use xlink:href="#iconClock"></use>

diff --git a/app/appearance/icons/material/icon.js b/app/appearance/icons/material/icon.js
diff --git a/app/appearance/icons/material/icon.json b/app/appearance/icons/material/icon.json
@@ -2,5 +2,5 @@
   "name": "material",
   "author": "Vanessa",
   "url": "https://github.com/Vanessa219",
-  "version": "1.24.0"
+  "version": "1.25.0"
 }
diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json
@@ -96,7 +96,7 @@
   "date": "Date",
   "select": "Select",
   "multiSelect": "Multi-select",
-  "commandEmpty": "No command yet, click to go to the market to download more plugins",
+  "commandEmpty": "No command yet, click to go to the marketplace to install plugins",
   "commandPanel": "Command Palette",
   "cloudRegionNorthAmerica": "LiuYun (North America data center)",
   "cloudRegionChina": "LianDi (Mainland China data center)",

diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json
@@ -96,7 +96,7 @@
   "fecha": "Fecha",
   "seleccionar": "Seleccionar",
   "multiSelect": "Selección múltiple",
-  "commandEmpty": "Sin comando todavía, haga clic para ir al mercado para descargar más complementos",
+  "commandEmpty": "Aún no hay ningún comando, haga clic para ir al mercado e instalar complementos",
   "commandPanel": "Paleta de comandos",
   "cloudRegionNorthAmerica": "LiuYun (Centro de datos de América del Norte)",
   "cloudRegionChina": "LianDi (Centro de datos de China continental)",

diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json
@@ -96,7 +96,7 @@
   "date": "Date",
   "select": "Sélectionner",
   "multiSelect": "Multi-sélection",
-  "commandEmpty": "Aucune commande pour le moment, cliquez pour aller sur le marché pour télécharger plus de plugins",
+  "commandEmpty": "Pas de commande pour l'instant, cliquez pour aller sur la Marketplace pour installer les plugins",
   "commandPanel": "Palette de commandes",
   "cloudRegionNorthAmerica": "LiuYun (Centre de données d'Amérique du Nord)",
   "cloudRegionChina": "LianDi (Centre de données de Chine continentale)",

diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json
@@ -96,7 +96,7 @@
   "date": "日期",
   "select": "單選",
   "multiSelect": "多選",
-  "commandEmpty": "暫無命令，點擊前往集市下載更多插件",
+  "commandEmpty": "暫無指令，點選前往市集安裝插件",
   "commandPanel": "命令面板",
   "cloudRegionNorthAmerica": "流雲（北美資料中心）",
   "cloudRegionChina": "鏈滴（中國大陸資料中心）",

diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json
@@ -96,7 +96,7 @@
   "date": "日期",
   "select": "单选",
   "multiSelect": "多选",
-  "commandEmpty": "暂无命令，点击前往集市下载更多插件",
+  "commandEmpty": "暂无命令，点击前往集市安装插件",
   "commandPanel": "命令面板",
   "cloudRegionNorthAmerica": "流云（北美数据中心）",
   "cloudRegionChina": "链滴（中国大陆数据中心）",

diff --git a/app/appx/AppxManifest.xml b/app/appx/AppxManifest.xml
@@ -8,7 +8,7 @@
     <!-- use single quotes to avoid double quotes escaping in the publisher value  -->
     <Identity Name="89C2A984.SiYuan"
               ProcessorArchitecture="x64"
-              Publisher='CN=087C656E-C1D9-42D8-8807-CED45A74FC0F'
+              Publisher="CN=087C656E-C1D9-42D8-8807-CED45A74FC0F"
               Version="2.10.10.0"/>
     <Properties>
         <DisplayName>SiYuan</DisplayName>

diff --git a/app/electron/main.js b/app/electron/main.js
@@ -695,9 +695,10 @@ app.whenReady().then(() => {
                     return;
                 }
                 const ids = decodeURIComponent(new URL(item.webContents.getURL()).hash.substring(1)).split("\u200b");
-                if (ids.includes(data.options.rootID) || ids.includes(data.options.assetPath)) {
+                const options = JSON.parse(data.options);
+                if (ids.includes(options.rootID) || ids.includes(options.assetPath)) {
                     item.focus();
-                    item.webContents.send("siyuan-open-file", data.options);
+                    item.webContents.send("siyuan-open-file", options);
                     hasMatch = true;
                     return true;
                 }

diff --git a/...808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20221223221636-ms2b4w9.sy b/...808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20221223221636-ms2b4w9.sy
@@ -5,7 +5,7 @@
 	"Properties": {
 		"id": "20221223221636-ms2b4w9",
 		"title": "Flashcards",
-		"updated": "20230820185231"
+		"updated": "20231013104018"
 	},
 	"Children": [
 		{
@@ -87,7 +87,7 @@
 			"ListData": {},
 			"Properties": {
 				"id": "20230219092249-yzjjb1o",
-				"updated": "20230219092854"
+				"updated": "20231013104018"
 			},
 			"Children": [
 				{
@@ -132,20 +132,20 @@
 					},
 					"Properties": {
 						"id": "20230219092249-xdxmusm",
-						"updated": "20230219092407"
+						"updated": "20231013103949"
 					},
 					"Children": [
 						{
 							"ID": "20230219092249-04pxvxk",
 							"Type": "NodeParagraph",
 							"Properties": {
 								"id": "20230219092249-04pxvxk",
-								"updated": "20230219092407"
+								"updated": "20231013103949"
 							},
 							"Children": [
 								{
 									"Type": "NodeText",
-									"Data": "If the super block is set as a flashcard, the first sub-block of the super block will be regarded as a question, and the rest of the sub-blocks will be regarded as an answer"
+									"Data": "If a super block is set as a flashcard, the first sub-block of the super block will be regarded as a question, and the rest of the sub-blocks will be regarded as an answer"
 								}
 							]
 						}
@@ -178,6 +178,34 @@
 							]
 						}
 					]
+				},
+				{
+					"ID": "20231013103926-u4hxd38",
+					"Type": "NodeListItem",
+					"ListData": {
+						"BulletChar": 42,
+						"Marker": "Kg=="
+					},
+					"Properties": {
+						"id": "20231013103926-u4hxd38",
+						"updated": "20231013104018"
+					},
+					"Children": [
+						{
+							"ID": "20231013103926-o3y1n5a",
+							"Type": "NodeParagraph",
+							"Properties": {
+								"id": "20231013103926-o3y1n5a",
+								"updated": "20231013104018"
+							},
+							"Children": [
+								{
+									"Type": "NodeText",
+									"Data": "If a heading block is set as an flashcard, the heading block will be treated as a question and the blocks below it will be treated answers"
+								}
+							]
+						}
+					]
 				}
 			]
 		},

diff --git a/app/guide/20210808180117-6v0mkxr/20230405172236-pg3l9eu.sy b/app/guide/20210808180117-6v0mkxr/20230405172236-pg3l9eu.sy
@@ -6,7 +6,7 @@
 		"icon": "1f680",
 		"id": "20230405172236-pg3l9eu",
 		"title": "Performance Optimization",
-		"updated": "20230406155736"
+		"updated": "20231014100732"
 	},
 	"Children": [
 		{
@@ -393,7 +393,7 @@
 			"ListData": {},
 			"Properties": {
 				"id": "20230405172238-ba6rydi",
-				"updated": "20230405172238"
+				"updated": "20231014100732"
 			},
 			"Children": [
 				{
@@ -489,20 +489,20 @@
 					},
 					"Properties": {
 						"id": "20230405172238-2jjuvev",
-						"updated": "20230405172238"
+						"updated": "20231014100732"
 					},
 					"Children": [
 						{
 							"ID": "20230405172238-qnz5kn9",
 							"Type": "NodeParagraph",
 							"Properties": {
 								"id": "20230405172238-qnz5kn9",
-								"updated": "20230405172238"
+								"updated": "20231014100732"
 							},
 							"Children": [
 								{
 									"Type": "NodeText",
-									"Data": "Pictures and charts: Pictures and charts mainly affect the performance of the editor. If the document contains a large number of pictures and charts, the editor may freeze"
+									"Data": "Formulas, images and charts: Formulas, images and charts mainly affect the performance of the editor. If the document contains a large number of formulas, images and charts, the editor may freeze"
 								}
 							]
 						}

diff --git a/...808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20221223215557-o6gfsoy.sy b/...808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20221223215557-o6gfsoy.sy
@@ -5,7 +5,7 @@
 	"Properties": {
 		"id": "20221223215557-o6gfsoy",
 		"title": "闪卡",
-		"updated": "20230820185147"
+		"updated": "20231013103850"
 	},
 	"Children": [
 		{
@@ -87,7 +87,7 @@
 			"ListData": {},
 			"Properties": {
 				"id": "20230219085658-xnrf7rf",
-				"updated": "20230219092140"
+				"updated": "20231013103850"
 			},
 			"Children": [
 				{
@@ -112,11 +112,7 @@
 							"Children": [
 								{
 									"Type": "NodeText",
-									"Data": "内容块"
-								},
-								{
-									"Type": "NodeText",
-									"Data": "中的 "
+									"Data": "内容块中的 "
 								},
 								{
 									"Type": "NodeTextMark",
@@ -186,6 +182,34 @@
 							]
 						}
 					]
+				},
+				{
+					"ID": "20231013103816-b0k440b",
+					"Type": "NodeListItem",
+					"ListData": {
+						"BulletChar": 42,
+						"Marker": "Kg=="
+					},
+					"Properties": {
+						"id": "20231013103816-b0k440b",
+						"updated": "20231013103850"
+					},
+					"Children": [
+						{
+							"ID": "20231013103816-sx34w1r",
+							"Type": "NodeParagraph",
+							"Properties": {
+								"id": "20231013103816-sx34w1r",
+								"updated": "20231013103850"
+							},
+							"Children": [
+								{
+									"Type": "NodeText",
+									"Data": "如果将标题块设置为上卡，则该标题块会被视作问题，其下方块会被视作答案"
+								}
+							]
+						}
+					]
 				}
 			]
 		},