Merge remote-tracking branch 'origin/dev' into dev

app/electron/main.js

@@ -518,7 +518,7 @@ const initKernel = (workspace, port, lang) => {
                 bootWindow.show();
             } catch (e) {
                 writeLog("get kernel version failed: " + e.message);
-                await sleep(100);
+                await sleep(200);
             } finally {
                 count++;
                 if (14 < count) {

app/guide/20210808180117-6v0mkxr/.siyuan/sort.json

@@ -1 +1 @@
-{"20200923234011-ieuun1p":1,"20200923234602-gy54e67":6,"20200923234731-h3zkwm2":2,"20200924093441-ft2rhps":1,"20200924095938-a9p5450":2,"20200924100110-vcg96wy":1,"20200924100635-ms0p9lb":6,"20200924100717-yzwzn64":20,"20200924100744-br924ar":9,"20200924100808-j9sddk9":2,"20200924100906-0u4zfq3":4,"20200924100950-9op5xi1":17,"20200924101106-19z4kaa":1,"20200924101200-gss5vee":4,"20200924101225-k254i8g":2,"20200924101256-f8b1sbi":3,"20201004194026-s8h2cog":18,"20201117112518-dott91x":6,"20201121224345-rc27qvo":7,"20201204184532-3qm9l8n":10,"20201210233038-3xr19g5":5,"20201222100222-q47d64s":2,"20201222100339-i5hzcph":1,"20201227201128-m1wrouw":19,"20201227201751-gv0fpx2":21,"20210110181011-fbhoesf":5,"20210117215840-jcl17fx":3,"20210127203829-qe2mzof":11,"20210331201142-4g923es":13,"20210505164949-c085p1d":3,"20210613191509-cbkxcbz":7,"20210615213222-vs5tzbd":14,"20210808180303-6yi0dv5":1,"20210808180303-axh6q1d":4,"20210808180303-h361q1i":2,"20210808180303-l3qg72k":3,"20210808180303-xaduj2o":5,"20210824202056-udkf7wg":7,"20211010212318-3wx2kqb":12,"20220628204454-hhxohv5":2,"20221016204105-qx2aq0g":3,"20221223221636-ms2b4w9":15,"20230104152135-1iei0xa":22,"20230106104821-9nfphwm":1,"20230304000547-ibldj1z":16,"20230405172236-pg3l9eu":5,"20230429115711-ejbts4s":4,"20230506205948-yah52eb":8,"20230805231614-vqn28eh":7,"20230805231816-h1z9mpc":2,"20230805232018-hgrq0ju":1,"20230805232134-3d6mx2k":2}
+{"20200923234011-ieuun1p":1,"20200923234602-gy54e67":6,"20200923234731-h3zkwm2":2,"20200924093441-ft2rhps":1,"20200924095938-a9p5450":2,"20200924100110-vcg96wy":1,"20200924100635-ms0p9lb":6,"20200924100717-yzwzn64":20,"20200924100744-br924ar":9,"20200924100808-j9sddk9":2,"20200924100906-0u4zfq3":4,"20200924100950-9op5xi1":17,"20200924101106-19z4kaa":1,"20200924101200-gss5vee":4,"20200924101225-k254i8g":2,"20200924101256-f8b1sbi":3,"20201004194026-s8h2cog":18,"20201117112518-dott91x":6,"20201121224345-rc27qvo":7,"20201204184532-3qm9l8n":10,"20201210233038-3xr19g5":5,"20201222100222-q47d64s":2,"20201222100339-i5hzcph":1,"20201227201128-m1wrouw":19,"20201227201751-gv0fpx2":21,"20210110181011-fbhoesf":5,"20210117215840-jcl17fx":3,"20210127203829-qe2mzof":11,"20210331201142-4g923es":13,"20210505164949-c085p1d":3,"20210613191509-cbkxcbz":7,"20210615213222-vs5tzbd":14,"20210721112159-9p645xm":1,"20210721112206-mhr9wxi":2,"20210721160238-yvhbh0h":4,"20210808180303-6yi0dv5":1,"20210808180303-axh6q1d":4,"20210808180303-h361q1i":2,"20210808180303-l3qg72k":3,"20210808180303-xaduj2o":5,"20210824202056-udkf7wg":7,"20211010212318-3wx2kqb":12,"20220105101227-n5zpr1a":6,"20220628204454-hhxohv5":2,"20220708103401-mgydrfg":3,"20221016204105-qx2aq0g":3,"20221223221636-ms2b4w9":15,"20230104152135-1iei0xa":22,"20230106104821-9nfphwm":1,"20230304000547-ibldj1z":16,"20230405172236-pg3l9eu":5,"20230429115711-ejbts4s":4,"20230506205948-yah52eb":8,"20230802114825-2jkkct7":5,"20230805231614-vqn28eh":7,"20230805231816-h1z9mpc":2,"20230805232018-hgrq0ju":1,"20230805232134-3d6mx2k":2}

app/guide/20210808180117-czj9bvb/.siyuan/sort.json

@@ -1 +1 @@
-{"20200812220555-lj3enxa":1,"20200813004551-gm0pbn1":17,"20200813004931-q4cu8na":1,"20200813013559-sgbzl5k":3,"20200813093015-u6bopdt":2,"20200813125307-pxsjela":2,"20200813131152-0wk5akh":4,"20200813163359-v04n73b":8,"20200822191536-rm6hwid":4,"20200825162036-4dx365o":1,"20200828105441-r76vmu5":20,"20200905090211-2vixtlf":2,"20200910201551-h4twhas":6,"20200915214115-42b8zma":9,"20200922102318-oz84yu3":2,"20201004184819-nj8ibyg":18,"20201117101902-2ewjjum":6,"20201121212605-9td1a62":9,"20201204181006-7bkppue":10,"20201210103036-1x3vm8t":5,"20201222093044-rx4zjoy":1,"20201222095049-hghafhe":2,"20201227173504-847cs1q":19,"20201227194925-7ipoiv6":21,"20210110175347-2xrwoiq":5,"20210117211155-56n4odu":3,"20210127202655-2334vvv":11,"20210331200042-94gs1hh":13,"20210505163537-oo97zov":3,"20210612224500-ywcms1m":7,"20210615211733-v6rzowm":14,"20210808180320-abz7w6k":2,"20210808180320-fqgskfj":1,"20210808180320-gyngv2x":3,"20210808180320-qgr0b3q":4,"20210808180321-hbvl5c2":5,"20210824201257-cy7icrc":7,"20211010211311-ffz0wbu":12,"20220628204444-9n0y9h2":2,"20221016213308-uz5af79":3,"20221223215557-o6gfsoy":15,"20230104144904-39br4c6":22,"20230106101434-e6g4av3":1,"20230303235619-ex5l63e":16,"20230405155631-leo4vc6":5,"20230428153709-hioyy5l":6,"20230429114837-70asb4j":4,"20230506210010-houyyvy":8,"20230519105228-hm0y74i":7,"20230805222417-2lj3dvk":6,"20230805225107-qm1m2f5":2,"20230805230131-sn7obzb":1,"20230805230218-aea8icj":2}
+{"20200812220555-lj3enxa":1,"20200813004551-gm0pbn1":17,"20200813004931-q4cu8na":1,"20200813013559-sgbzl5k":3,"20200813093015-u6bopdt":2,"20200813125307-pxsjela":2,"20200813131152-0wk5akh":4,"20200813163359-v04n73b":8,"20200822191536-rm6hwid":4,"20200825162036-4dx365o":1,"20200828105441-r76vmu5":20,"20200905090211-2vixtlf":2,"20200910201551-h4twhas":6,"20200915214115-42b8zma":9,"20200922102318-oz84yu3":2,"20201004184819-nj8ibyg":18,"20201117101902-2ewjjum":6,"20201121212605-9td1a62":9,"20201204181006-7bkppue":10,"20201210103036-1x3vm8t":5,"20201222093044-rx4zjoy":1,"20201222095049-hghafhe":2,"20201227173504-847cs1q":19,"20201227194925-7ipoiv6":21,"20210110175347-2xrwoiq":5,"20210117211155-56n4odu":3,"20210127202655-2334vvv":11,"20210331200042-94gs1hh":13,"20210505163537-oo97zov":3,"20210612224500-ywcms1m":7,"20210615211733-v6rzowm":14,"20210808180320-abz7w6k":2,"20210808180320-fqgskfj":1,"20210808180320-gyngv2x":3,"20210808180320-qgr0b3q":4,"20210808180321-hbvl5c2":5,"20210824201257-cy7icrc":7,"20211010211311-ffz0wbu":12,"20220628204444-9n0y9h2":2,"20221016213308-uz5af79":3,"20221223215557-o6gfsoy":15,"20230104144904-39br4c6":22,"20230106101434-e6g4av3":1,"20230303235619-ex5l63e":16,"20230405155631-leo4vc6":5,"20230428153709-hioyy5l":6,"20230429114837-70asb4j":4,"20230506210010-houyyvy":8,"20230519105228-hm0y74i":7,"20230805222417-2lj3dvk":6,"20230805225107-qm1m2f5":2,"20230805230131-sn7obzb":1,"20230805230218-aea8icj":2,"20230808120347-3cob0nb":2,"20230808120347-mw3qrwy":4,"20230808120347-pzvmkik":1,"20230808120348-hynr7og":5,"20230808120348-lgcp9zm":3,"20230808120348-vaxi6eq":6,"20230808120348-yut741f":7}

app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20230805222417-2lj3dvk/20230808120348-orm8sjf/20230808120348-yut741f.sy

@@ -5,7 +5,7 @@
 	"Properties": {
 		"id": "20230808120348-yut741f",
 		"title": "限制",
-		"updated": "20230526091115"
+		"updated": "20230808220435"
 	},
 	"Children": [
 		{
@@ -14,7 +14,7 @@
 			"ListData": {},
 			"Properties": {
 				"id": "20230808120348-fti66eq",
-				"updated": "20230526091115"
+				"updated": "20230808220435"
 			},
 			"Children": [
 				{
@@ -138,7 +138,7 @@
 					},
 					"Properties": {
 						"id": "20230808120348-34cmomp",
-						"updated": "20230526091115"
+						"updated": "20230808220435"
 					},
 					"Children": [
 						{
@@ -161,7 +161,7 @@
 							"ListData": {},
 							"Properties": {
 								"id": "20230808120348-sfmxfq9",
-								"updated": "20230526091115"
+								"updated": "20230808220435"
 							},
 							"Children": [
 								{
@@ -199,7 +199,8 @@
 										"Marker": "Kg=="
 									},
 									"Properties": {
-										"id": "20230808120348-gv9fu0a"
+										"id": "20230808120348-gv9fu0a",
+										"updated": "20230808220435"
 									},
 									"Children": [
 										{
@@ -207,12 +208,12 @@
 											"Type": "NodeParagraph",
 											"Properties": {
 												"id": "20230808120348-o7wtrws",
-												"updated": "20230526090536"
+												"updated": "20230808220435"
 											},
 											"Children": [
 												{
 													"Type": "NodeText",
-													"Data": "到期前 2 天，会推送一次短信提醒到账号绑定的手机上"
+													"Data": "到期前 1 天，会推送一次短信提醒到账号绑定的手机上"
 												}
 											]
 										}

app/guide/20211226090932-5lcq56f/.siyuan/sort.json

@@ -1 +1 @@
-{"20211226114339-dk0gtpr":6,"20211226114929-08ap1r0":7,"20211226115043-afhev0g":3,"20211226115227-r1rty9v":2,"20211226115423-d5z1joq":1,"20211226115825-mhcslw2":1,"20211226120055-9mityht":1,"20211226120147-ib6yy3i":2,"20211226120247-63nd8y5":3,"20211226120349-rbkmozu":4,"20211226120422-bkzsd2e":5,"20211226120508-yzh70eh":6,"20211226120802-77aj0is":7,"20211226120854-dr1jfx2":2,"20211226120933-vnjgwwh":3,"20211226121109-f060fkg":4,"20211226121203-rjjngpz":5,"20211226121319-emrk2yy":1,"20211226121329-c5v3dto":21,"20211226122358-hctqcn5":20,"20211226122459-08mi5cq":19,"20211226122523-rl8356a":18,"20211226122549-jktxego":17,"20211226122707-8cr09co":14,"20211226122728-cnqf7rz":13,"20211226122814-r1rdpcx":12,"20211226122943-st7fpcj":11,"20211226123004-dplpw0o":10,"20211226123038-4umgpxy":9,"20211226123101-qjw03ab":7,"20211226123130-jpeg5b2":6,"20211226123154-fd5e001":5,"20211226123216-tlxw66f":4,"20211226123241-51pujtr":3,"20211226123302-akitvb1":2,"20220628204420-ui79vkt":2,"20221016213639-1nag9jj":3,"20221223221501-mops33i":15,"20230104151953-48hwkwf":22,"20230106104645-o838uew":1,"20230304000829-9jwu3po":16,"20230405172131-yb16aax":5,"20230429115206-ob8nl8t":4,"20230506211210-1roopyo":8,"20230805232636-zh0adz2":6,"20230805232719-04mqbcx":2,"20230805232903-erdoerp":1,"20230805232920-5fdco36":2}
+{"20211226114339-dk0gtpr":6,"20211226114929-08ap1r0":7,"20211226115043-afhev0g":3,"20211226115227-r1rty9v":2,"20211226115423-d5z1joq":1,"20211226115825-mhcslw2":1,"20211226120055-9mityht":1,"20211226120147-ib6yy3i":2,"20211226120247-63nd8y5":3,"20211226120349-rbkmozu":4,"20211226120422-bkzsd2e":5,"20211226120508-yzh70eh":6,"20211226120802-77aj0is":7,"20211226120854-dr1jfx2":2,"20211226120933-vnjgwwh":3,"20211226121109-f060fkg":4,"20211226121203-rjjngpz":5,"20211226121319-emrk2yy":1,"20211226121329-c5v3dto":21,"20211226121332-irgblss":4,"20211226121438-xaafdo8":2,"20211226121503-k3jma6m":1,"20211226122358-hctqcn5":20,"20211226122459-08mi5cq":19,"20211226122523-rl8356a":18,"20211226122549-jktxego":17,"20211226122707-8cr09co":14,"20211226122728-cnqf7rz":13,"20211226122814-r1rdpcx":12,"20211226122943-st7fpcj":11,"20211226123004-dplpw0o":10,"20211226123038-4umgpxy":9,"20211226123101-qjw03ab":7,"20211226123130-jpeg5b2":6,"20211226123154-fd5e001":5,"20211226123216-tlxw66f":4,"20211226123241-51pujtr":3,"20211226123302-akitvb1":2,"20220105101348-corstqc":5,"20220628204420-ui79vkt":2,"20220708102441-u6wopo9":3,"20221016213639-1nag9jj":3,"20221223221501-mops33i":15,"20230104151953-48hwkwf":22,"20230106104645-o838uew":1,"20230304000829-9jwu3po":16,"20230405172131-yb16aax":5,"20230429115206-ob8nl8t":4,"20230506211210-1roopyo":8,"20230805232636-zh0adz2":6,"20230805232719-04mqbcx":2,"20230805232903-erdoerp":1,"20230805232920-5fdco36":2}

app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq.sy

@@ -7,7 +7,7 @@
 		"id": "20211226115423-d5z1joq",
 		"title": "請從這裡開始",
 		"title-img": "background-color:#556;background-image: linear-gradient(30deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(150deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(30deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(150deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(60deg, #99a 25%, transparent 25.5%, transparent 75%, #99a 75%, #99a),linear-gradient(60deg, #99a 25%, transparent 25.5%, transparent 75%, #99a 75%, #99a);background-size:80px 140px;background-position: 0 0, 0 0, 40px 70px, 40px 70px, 0 0, 40px 70px;",
-		"updated": "20230728103709"
+		"updated": "20230808220623"
 	},
 	"Children": [
 		{
@@ -17,7 +17,7 @@
 			"Properties": {
 				"bookmark": "✨",
 				"id": "20211226115745-mwqouic",
-				"updated": "20211225212212"
+				"updated": "20230808220623"
 			},
 			"Children": [
 				{

app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20230805232636-zh0adz2/20211226121232-23s79xr/20220105101348-corstqc.sy

@@ -5,7 +5,7 @@
 	"Properties": {
 		"id": "20220105101348-corstqc",
 		"title": "限制",
-		"updated": "20230630142748"
+		"updated": "20230808220451"
 	},
 	"Children": [
 		{
@@ -14,7 +14,7 @@
 			"ListData": {},
 			"Properties": {
 				"id": "20220105101409-es213ce",
-				"updated": "20230630142748"
+				"updated": "20230808220451"
 			},
 			"Children": [
 				{
@@ -135,7 +135,7 @@
 					},
 					"Properties": {
 						"id": "20220105101409-7he9vg5",
-						"updated": "20230630142748"
+						"updated": "20230808220451"
 					},
 					"Children": [
 						{
@@ -166,7 +166,7 @@
 							"ListData": {},
 							"Properties": {
 								"id": "20230526090813-n13j66a",
-								"updated": "20230630142748"
+								"updated": "20230808220451"
 							},
 							"Children": [
 								{
@@ -206,7 +206,7 @@
 									},
 									"Properties": {
 										"id": "20230526090813-18hhanu",
-										"updated": "20230630142748"
+										"updated": "20230808220451"
 									},
 									"Children": [
 										{
@@ -214,12 +214,12 @@
 											"Type": "NodeParagraph",
 											"Properties": {
 												"id": "20230526090813-3or6hwd",
-												"updated": "20230630142748"
+												"updated": "20230808220451"
 											},
 											"Children": [
 												{
 													"Type": "NodeText",
-													"Data": "到期前 2 天，會推送一次簡訊提醒到賬號綁定的手機上"
+													"Data": "到期前 1 天，會推送一次簡訊提醒到賬號綁定的手機上"
 												}
 											]
 										}

kernel/model/tag.go

@@ -321,7 +321,9 @@ func labelTags() (ret map[string]Tags) {
 func appendTagChildren(tags *Tags, labels map[string]Tags) {
 	for _, tag := range *tags {
 		tag.Label = tag.Name
-		tag.Count = len(labels[tag.Label]) + 1
+		if _, ok := labels[tag.Label]; ok {
+			tag.Count = len(labels[tag.Label]) + 1
+		}
 		appendChildren0(tag, labels)
 		sortTags(tag.Children)
 	}
@@ -331,7 +333,9 @@ func appendChildren0(tag *Tag, labels map[string]Tags) {
 	sortTags(tag.tags)
 	for _, t := range tag.tags {
 		t.Label = tag.Label + "/" + t.Name
-		t.Count = len(labels[t.Label]) + 1
+		if _, ok := labels[t.Label]; ok {
+			t.Count = len(labels[t.Label]) + 1
+		}
 		tag.Children = append(tag.Children, t)
 	}
 	for _, child := range tag.tags {