🎨 桌面端支持同时打开多个工作空间 #4567

siyuan-note · Jan 9, 2023 · aecb71d · aecb71d
1 parent c0f007c
commit aecb71d
Show file tree

Hide file tree

Showing 15 changed files with 335 additions and 240 deletions.
diff --git a/app/electron/init.html b/app/electron/init.html
@@ -215,7 +215,7 @@ <h2>思源笔记</h2>
     <label class="b3-label">
         <div>
             🗂️ 工作空间
-            <div class="b3-label__text"> 工作空间用于存放数据，后续可在 <kbd>设置</kbd> - <kbd>关于</kbd> 中切换</div>
+            <div class="b3-label__text"> 工作空间用于存放数据，后续可在顶栏菜单中切换</div>
         </div>
         <div class="fn__space"></div>
         <div class="fn__flex-1"></div>
@@ -258,8 +258,8 @@ <h2>SiYuan</h2>
     <label class="b3-label">
         <div>
             🗂️ Workspace
-            <div class="b3-label__text">The workspace is used to store data, which can be switched later in <br>
-                <kbd>Settings</kbd> - <kbd>About</kbd>
+            <div class="b3-label__text">The workspace is used to store data, which can be switched <br>
+                later in the top bar menu later
             </div>
         </div>
         <div class="fn__space"></div>

diff --git a/...808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20200924100906-0u4zfq3.sy b/...808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20200924100906-0u4zfq3.sy
@@ -5,7 +5,8 @@
 	"Properties": {
 		"id": "20200924100906-0u4zfq3",
 		"title": "Window and Tab",
-		"type": "doc"
+		"type": "doc",
+		"updated": "20200924100906"
 	},
 	"Children": [
 		{

diff --git a/...808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20201004194026-s8h2cog.sy b/...808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20201004194026-s8h2cog.sy
@@ -4,7 +4,6 @@
 	"Type": "NodeDocument",
 	"Properties": {
 		"id": "20201004194026-s8h2cog",
-		"scroll": "{\u0026quot;startId\u0026quot;:\u0026quot;20210104091447-8iiuxlt\u0026quot;,\u0026quot;endId\u0026quot;:\u0026quot;20210117211053-tq2km4f\u0026quot;,\u0026quot;scrollTop\u0026quot;:346,\u0026quot;focusId\u0026quot;:\u0026quot;20210302223802-ghpurq7\u0026quot;,\u0026quot;focusStart\u0026quot;:22,\u0026quot;focusEnd\u0026quot;:22}",
 		"title": "Use on browser",
 		"type": "doc",
 		"updated": "20221025093157"

diff --git a/...808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20210110181011-fbhoesf.sy b/...808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20210110181011-fbhoesf.sy
@@ -5,7 +5,8 @@
 	"Properties": {
 		"id": "20210110181011-fbhoesf",
 		"title": "Daily notes",
-		"type": "doc"
+		"type": "doc",
+		"updated": "20210110181011"
 	},
 	"Children": [
 		{

diff --git a/...808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20230106104821-9nfphwm.sy b/...808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20230106104821-9nfphwm.sy
@@ -5,7 +5,7 @@
 	"Properties": {
 		"id": "20230106104821-9nfphwm",
 		"title": "Workspace",
-		"updated": "20230107212528"
+		"updated": "20230109114122"
 	},
 	"Children": [
 		{
@@ -105,75 +105,125 @@
 			]
 		},
 		{
-			"ID": "20230106105213-6rjvwvf",
-			"Type": "NodeParagraph",
+			"ID": "20230109113955-ja8w7gp",
+			"Type": "NodeHeading",
+			"HeadingLevel": 2,
 			"Properties": {
-				"id": "20230106105213-6rjvwvf",
-				"updated": "20230106105236"
+				"id": "20230109113955-ja8w7gp",
+				"updated": "20230109113959"
 			},
 			"Children": [
 				{
 					"Type": "NodeText",
-					"Data": "We can switch workspaces in "
-				},
-				{
-					"Type": "NodeTextMark",
-					"TextMarkType": "kbd",
-					"TextMarkTextContent": "Settings"
-				},
-				{
-					"Type": "NodeText",
-					"Data": " - "
-				},
-				{
-					"Type": "NodeTextMark",
-					"TextMarkType": "kbd",
-					"TextMarkTextContent": "About"
-				},
-				{
-					"Type": "NodeText",
-					"Data": " - "
-				},
-				{
-					"Type": "NodeTextMark",
-					"TextMarkType": "kbd",
-					"TextMarkTextContent": "Workspace"
-				},
-				{
-					"Type": "NodeText",
-					"Data": ". The desktop side supports opening multiple workspaces at the same time, but the mobile side can only switch different workspaces."
+					"Data": "Switch workspace"
 				}
 			]
 		},
 		{
-			"ID": "20230107212451-h2phr5b",
-			"Type": "NodeParagraph",
+			"ID": "20230109113955-471odxk",
+			"Type": "NodeList",
+			"ListData": {},
 			"Properties": {
-				"id": "20230107212451-h2phr5b",
-				"updated": "20230107212528"
+				"id": "20230109113955-471odxk",
+				"updated": "20230109114122"
 			},
 			"Children": [
 				{
-					"Type": "NodeText",
-					"Data": "If your multiple workspaces need to be started frequently, you can consider creating a different startup entry for each workspace and specify the startup parameter "
-				},
-				{
-					"Type": "NodeTextMark",
-					"TextMarkType": "code",
-					"TextMarkTextContent": "--workspace absolute path of the workspace"
-				},
-				{
-					"Type": "NodeText",
-					"Data": ". For example, multiple shortcuts can be copied on a Windows system, and each Shortcut - Property - Target is followed by a workspace path parameter, such as "
-				},
-				{
-					"Type": "NodeTextMark",
-					"TextMarkType": "code",
-					"TextMarkTextContent": "--workspace F:\\SiYuan"
+					"ID": "20230109113955-4p8sitz",
+					"Type": "NodeListItem",
+					"ListData": {
+						"BulletChar": 42,
+						"Marker": "Kg=="
+					},
+					"Properties": {
+						"id": "20230109113955-4p8sitz",
+						"updated": "20230109114122"
+					},
+					"Children": [
+						{
+							"ID": "20230109113955-25acju9",
+							"Type": "NodeParagraph",
+							"Properties": {
+								"id": "20230109113955-25acju9",
+								"updated": "20230109114014"
+							},
+							"Children": [
+								{
+									"Type": "NodeText",
+									"Data": "On the desktop, multiple workspaces can be opened in the drop-down menu on the left side of the top bar"
+								}
+							]
+						},
+						{
+							"ID": "20230109113955-f2iskk4",
+							"Type": "NodeParagraph",
+							"Properties": {
+								"id": "20230109113955-f2iskk4",
+								"updated": "20230109114122"
+							},
+							"Children": [
+								{
+									"Type": "NodeText",
+									"Data": "If your multiple workspaces need to be started frequently, you can consider creating a different startup entry for each workspace and specify the startup parameter "
+								},
+								{
+									"Type": "NodeTextMark",
+									"TextMarkType": "code",
+									"TextMarkTextContent": "--workspace absolute path of the workspace"
+								},
+								{
+									"Type": "NodeText",
+									"Data": ". For example, multiple shortcuts can be copied on a Windows system, and each Shortcut - Property - Target is followed by a workspace path parameter, such as "
+								},
+								{
+									"Type": "NodeTextMark",
+									"TextMarkType": "code",
+									"TextMarkTextContent": "--workspace F:\\SiYuan"
+								},
+								{
+									"Type": "NodeText",
+									"Data": "."
+								}
+							]
+						}
+					]
 				},
 				{
-					"Type": "NodeText",
-					"Data": "."
+					"ID": "20230109113955-gi1ao5j",
+					"Type": "NodeListItem",
+					"ListData": {
+						"BulletChar": 42,
+						"Marker": "Kg=="
+					},
+					"Properties": {
+						"id": "20230109113955-gi1ao5j",
+						"updated": "20230109114043"
+					},
+					"Children": [
+						{
+							"ID": "20230109113955-hpw3tsz",
+							"Type": "NodeParagraph",
+							"Properties": {
+								"id": "20230109113955-hpw3tsz",
+								"updated": "20230109114043"
+							},
+							"Children": [
+								{
+									"Type": "NodeText",
+									"Data": "On the mobile, we can switch between different workspaces in "
+								},
+								{
+									"Type": "NodeTextMark",
+									"TextMarkType": "kbd",
+									"TextMarkTextContent": "About"
+								},
+								{
+									"Type": "NodeText",
+									"Data": " in the right column"
+								}
+							]
+						}
+					]
 				}
 			]
 		},

diff --git a/app/guide/20210808180117-6v0mkxr/20200923234731-h3zkwm2.sy b/app/guide/20210808180117-6v0mkxr/20200923234731-h3zkwm2.sy
@@ -7,7 +7,7 @@
 		"id": "20200923234731-h3zkwm2",
 		"title": "FAQ",
 		"type": "doc",
-		"updated": "20230106105350"
+		"updated": "20230109113754"
 	},
 	"Children": [
 		{
@@ -242,7 +242,7 @@
 			"Type": "NodeParagraph",
 			"Properties": {
 				"id": "20210428222603-g1752n7",
-				"updated": "20230106105350"
+				"updated": "20230109113754"
 			},
 			"Children": [
 				{
@@ -258,25 +258,7 @@
 				},
 				{
 					"Type": "NodeText",
-					"Data": " folder (the default is in the user's home directory Documents/SiYuan, which can be modified in "
-				},
-				{
-					"Type": "NodeTextMark",
-					"TextMarkType": "kbd",
-					"TextMarkTextContent": "Settings"
-				},
-				{
-					"Type": "NodeText",
-					"Data": " - "
-				},
-				{
-					"Type": "NodeTextMark",
-					"TextMarkType": "kbd",
-					"TextMarkTextContent": "About"
-				},
-				{
-					"Type": "NodeText",
-					"Data": "), in the workspace/data/ folder:"
+					"Data": " folder (the default is in the user's home directory/Documents/SiYuan), in the workspace/data/ folder:"
 				}
 			]
 		},

diff --git a/...808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200822191536-rm6hwid.sy b/...808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200822191536-rm6hwid.sy
@@ -5,7 +5,8 @@
 	"Properties": {
 		"id": "20200822191536-rm6hwid",
 		"title": "窗口和页签",
-		"type": "doc"
+		"type": "doc",
+		"updated": "20200822191536"
 	},
 	"Children": [
 		{

diff --git a/...808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20201004184819-nj8ibyg.sy b/...808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20201004184819-nj8ibyg.sy
@@ -4,7 +4,6 @@
 	"Type": "NodeDocument",
 	"Properties": {
 		"id": "20201004184819-nj8ibyg",
-		"scroll": "{\u0026quot;startId\u0026quot;:\u0026quot;20210104090909-6pyfjgx\u0026quot;,\u0026quot;endId\u0026quot;:\u0026quot;20210104090909-20f2hvi\u0026quot;,\u0026quot;scrollTop\u0026quot;:0,\u0026quot;focusId\u0026quot;:\u0026quot;20221025092410-jsrv6gc\u0026quot;,\u0026quot;focusStart\u0026quot;:0,\u0026quot;focusEnd\u0026quot;:0}",
 		"title": "在浏览器上使用",
 		"type": "doc",
 		"updated": "20221025093126"

diff --git a/...808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20210110175347-2xrwoiq.sy b/...808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20210110175347-2xrwoiq.sy
@@ -5,7 +5,8 @@
 	"Properties": {
 		"id": "20210110175347-2xrwoiq",
 		"title": "日记",
-		"type": "doc"
+		"type": "doc",
+		"updated": "20210110175347"
 	},
 	"Children": [
 		{