From dc72c05d18b126d4e63b42a2615fbf1904eaf9ce Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sun, 25 Dec 2022 10:35:06 +0800 Subject: [PATCH 1/3] =?UTF-8?q?:memo:=20ECharts=20=E5=9B=BE=E8=A1=A8?= =?UTF-8?q?=E5=9D=97=E6=94=AF=E6=8C=81=20loose-json=20https://github.com/s?= =?UTF-8?q?iyuan-note/siyuan/pull/6917?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../20200924093441-ft2rhps.sy | 195 ++++++------------ .../20200825162036-4dx365o.sy | 193 ++++++----------- .../20211226121319-emrk2yy.sy | 195 ++++++------------ 3 files changed, 180 insertions(+), 403 deletions(-) diff --git a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-h361q1i/20200924093441-ft2rhps.sy b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-h361q1i/20200924093441-ft2rhps.sy index a812be022..98c8f2ebc 100644 --- a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-h361q1i/20200924093441-ft2rhps.sy +++ b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-h361q1i/20200924093441-ft2rhps.sy @@ -8,7 +8,7 @@ "title": "Formatting elements", "title-img": "background-color:#269;background-image: linear-gradient(white 2px, transparent 2px),linear-gradient(90deg, white 2px, transparent 2px),linear-gradient(rgba(255,255,255,.3) 1px, transparent 1px),linear-gradient(90deg, rgba(255,255,255,.3) 1px, transparent 1px);background-size: 100px 100px, 100px 100px, 20px 20px, 20px 20px;background-position:-2px -2px, -2px -2px, -1px -1px, -1px -1px;", "type": "doc", - "updated": "20221225013408" + "updated": "20221225103242" }, "Children": [ { @@ -3138,7 +3138,7 @@ "ListData": {}, "Properties": { "id": "20221225013111-f97ur4a", - "updated": "20221225013408" + "updated": "20221225103242" }, "Children": [ { @@ -3150,7 +3150,7 @@ }, "Properties": { "id": "20221225013111-jhcu06t", - "updated": "20221225013111" + "updated": "20221225103242" }, "Children": [ { @@ -3168,54 +3168,29 @@ ] }, { - "ID": "20221225013111-t6sb6j6", - "Type": "NodeList", - "ListData": {}, + "ID": "20221225103239-3a212px", + "Type": "NodeCodeBlock", + "IsFencedCodeBlock": true, "Properties": { - "id": "20221225013111-t6sb6j6", - "updated": "20221225013111" + "id": "20221225103239-3a212px", + "updated": "20221225103242" }, "Children": [ { - "ID": "20221225013111-7mps9wm", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20221225013111-7mps9wm", - "updated": "20221225013111" - }, - "Children": [ - { - "ID": "20221225013111-r6474wt", - "Type": "NodeCodeBlock", - "IsFencedCodeBlock": true, - "Properties": { - "id": "20221225013111-r6474wt", - "updated": "20221225013111" - }, - "Children": [ - { - "Type": "NodeCodeBlockFenceOpenMarker", - "Data": "```" - }, - { - "Type": "NodeCodeBlockFenceInfoMarker", - "CodeBlockInfo": "anNvbg==" - }, - { - "Type": "NodeCodeBlockCode", - "Data": "{\n \"propName\": \"propValue\"\n}\n" - }, - { - "Type": "NodeCodeBlockFenceCloseMarker", - "Data": "```" - } - ] - } - ] + "Type": "NodeCodeBlockFenceOpenMarker", + "Data": "```" + }, + { + "Type": "NodeCodeBlockFenceInfoMarker", + "CodeBlockInfo": "anNvbg==" + }, + { + "Type": "NodeCodeBlockCode", + "Data": "{\n \"propName\": \"propValue\"\n}\n" + }, + { + "Type": "NodeCodeBlockFenceCloseMarker", + "Data": "```" } ] } @@ -3248,54 +3223,29 @@ ] }, { - "ID": "20221225013111-unluh7r", - "Type": "NodeList", - "ListData": {}, + "ID": "20221225103231-nffgx96", + "Type": "NodeCodeBlock", + "IsFencedCodeBlock": true, "Properties": { - "id": "20221225013111-unluh7r", - "updated": "20221225013111" + "id": "20221225103231-nffgx96", + "updated": "20221225103236" }, "Children": [ { - "ID": "20221225013111-oy9fq7l", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20221225013111-oy9fq7l", - "updated": "20221225013111" - }, - "Children": [ - { - "ID": "20221225013111-hdaldw8", - "Type": "NodeCodeBlock", - "IsFencedCodeBlock": true, - "Properties": { - "id": "20221225013111-hdaldw8", - "updated": "20221225013111" - }, - "Children": [ - { - "Type": "NodeCodeBlockFenceOpenMarker", - "Data": "```" - }, - { - "Type": "NodeCodeBlockFenceInfoMarker", - "CodeBlockInfo": "amF2YXNjcmlwdA==" - }, - { - "Type": "NodeCodeBlockCode", - "Data": "{\n propName: 'propValue',\n}\n" - }, - { - "Type": "NodeCodeBlockFenceCloseMarker", - "Data": "```" - } - ] - } - ] + "Type": "NodeCodeBlockFenceOpenMarker", + "Data": "```" + }, + { + "Type": "NodeCodeBlockFenceInfoMarker", + "CodeBlockInfo": "amF2YXNjcmlwdA==" + }, + { + "Type": "NodeCodeBlockCode", + "Data": "{\n propName: 'propValue',\n}\n" + }, + { + "Type": "NodeCodeBlockFenceCloseMarker", + "Data": "```" } ] } @@ -3328,54 +3278,29 @@ ] }, { - "ID": "20221225013111-ech372z", - "Type": "NodeList", - "ListData": {}, + "ID": "20221225103222-gizv6uz", + "Type": "NodeCodeBlock", + "IsFencedCodeBlock": true, "Properties": { - "id": "20221225013111-ech372z", - "updated": "20221225013111" + "id": "20221225103222-gizv6uz", + "updated": "20221225103227" }, "Children": [ { - "ID": "20221225013111-hhjn30z", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20221225013111-hhjn30z", - "updated": "20221225013111" - }, - "Children": [ - { - "ID": "20221225013111-vq3lqmp", - "Type": "NodeCodeBlock", - "IsFencedCodeBlock": true, - "Properties": { - "id": "20221225013111-vq3lqmp", - "updated": "20221225013111" - }, - "Children": [ - { - "Type": "NodeCodeBlockFenceOpenMarker", - "Data": "```" - }, - { - "Type": "NodeCodeBlockFenceInfoMarker", - "CodeBlockInfo": "amF2YXNjcmlwdA==" - }, - { - "Type": "NodeCodeBlockCode", - "Data": "(() =\u003e {\n const option = {};\n option.propName = `propValue`;\n return option;\n})()\n" - }, - { - "Type": "NodeCodeBlockFenceCloseMarker", - "Data": "```" - } - ] - } - ] + "Type": "NodeCodeBlockFenceOpenMarker", + "Data": "```" + }, + { + "Type": "NodeCodeBlockFenceInfoMarker", + "CodeBlockInfo": "amF2YXNjcmlwdA==" + }, + { + "Type": "NodeCodeBlockCode", + "Data": "(() =\u003e {\n const option = {};\n option.propName = `propValue`;\n return option;\n})()\n" + }, + { + "Type": "NodeCodeBlockFenceCloseMarker", + "Data": "```" } ] } diff --git a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-abz7w6k/20200825162036-4dx365o.sy b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-abz7w6k/20200825162036-4dx365o.sy index df6036622..e02badeee 100644 --- a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-abz7w6k/20200825162036-4dx365o.sy +++ b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-abz7w6k/20200825162036-4dx365o.sy @@ -8,7 +8,7 @@ "title": "排版元素", "title-img": "background-color: hsl(2, 57%, 40%);background-image: repeating-linear-gradient(transparent, transparent 50px, rgba(0,0,0,.4) 50px, rgba(0,0,0,.4) 53px, transparent 53px, transparent 63px, rgba(0,0,0,.4) 63px, rgba(0,0,0,.4) 66px, transparent 66px, transparent 116px, rgba(0,0,0,.5) 116px, rgba(0,0,0,.5) 166px, rgba(255,255,255,.2) 166px, rgba(255,255,255,.2) 169px, rgba(0,0,0,.5) 169px, rgba(0,0,0,.5) 179px, rgba(255,255,255,.2) 179px, rgba(255,255,255,.2) 182px, rgba(0,0,0,.5) 182px, rgba(0,0,0,.5) 232px, transparent 232px),repeating-linear-gradient(270deg, transparent, transparent 50px, rgba(0,0,0,.4) 50px, rgba(0,0,0,.4) 53px, transparent 53px, transparent 63px, rgba(0,0,0,.4) 63px, rgba(0,0,0,.4) 66px, transparent 66px, transparent 116px, rgba(0,0,0,.5) 116px, rgba(0,0,0,.5) 166px, rgba(255,255,255,.2) 166px, rgba(255,255,255,.2) 169px, rgba(0,0,0,.5) 169px, rgba(0,0,0,.5) 179px, rgba(255,255,255,.2) 179px, rgba(255,255,255,.2) 182px, rgba(0,0,0,.5) 182px, rgba(0,0,0,.5) 232px, transparent 232px),repeating-linear-gradient(125deg, transparent, transparent 2px, rgba(0,0,0,.2) 2px, rgba(0,0,0,.2) 3px, transparent 3px, transparent 5px, rgba(0,0,0,.2) 5px);", "type": "doc", - "updated": "20221225012910" + "updated": "20221225103122" }, "Children": [ { @@ -3135,7 +3135,7 @@ "ListData": {}, "Properties": { "id": "20221225011757-zcfae5d", - "updated": "20221225012910" + "updated": "20221225103122" }, "Children": [ { @@ -3165,54 +3165,29 @@ ] }, { - "ID": "20221225012020-fclr7wc", - "Type": "NodeList", - "ListData": {}, + "ID": "20221225103039-o8ap7h6", + "Type": "NodeCodeBlock", + "IsFencedCodeBlock": true, "Properties": { - "id": "20221225012020-fclr7wc", - "updated": "20221225012827" + "id": "20221225103039-o8ap7h6", + "updated": "20221225103059" }, "Children": [ { - "ID": "20221225012020-ccv0cpm", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20221225012020-ccv0cpm", - "updated": "20221225012827" - }, - "Children": [ - { - "ID": "20221225012020-a7nibhu", - "Type": "NodeCodeBlock", - "IsFencedCodeBlock": true, - "Properties": { - "id": "20221225012020-a7nibhu", - "updated": "20221225012827" - }, - "Children": [ - { - "Type": "NodeCodeBlockFenceOpenMarker", - "Data": "```" - }, - { - "Type": "NodeCodeBlockFenceInfoMarker", - "CodeBlockInfo": "anNvbg==" - }, - { - "Type": "NodeCodeBlockCode", - "Data": "{\n \"propName\": \"propValue\"\n}\n" - }, - { - "Type": "NodeCodeBlockFenceCloseMarker", - "Data": "```" - } - ] - } - ] + "Type": "NodeCodeBlockFenceOpenMarker", + "Data": "```" + }, + { + "Type": "NodeCodeBlockFenceInfoMarker", + "CodeBlockInfo": "anNvbg==" + }, + { + "Type": "NodeCodeBlockCode", + "Data": "{\n \"propName\": \"propValue\"\n}\n" + }, + { + "Type": "NodeCodeBlockFenceCloseMarker", + "Data": "```" } ] } @@ -3244,52 +3219,29 @@ ] }, { - "ID": "20221225012504-vri2cye", - "Type": "NodeList", - "ListData": {}, + "ID": "20221225103111-8jioici", + "Type": "NodeCodeBlock", + "IsFencedCodeBlock": true, "Properties": { - "id": "20221225012504-vri2cye" + "id": "20221225103111-8jioici", + "updated": "20221225103114" }, "Children": [ { - "ID": "20221225012503-52bpd8m", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20221225012503-52bpd8m" - }, - "Children": [ - { - "ID": "20221225012503-osjhbni", - "Type": "NodeCodeBlock", - "IsFencedCodeBlock": true, - "Properties": { - "id": "20221225012503-osjhbni", - "updated": "20221225012615" - }, - "Children": [ - { - "Type": "NodeCodeBlockFenceOpenMarker", - "Data": "```" - }, - { - "Type": "NodeCodeBlockFenceInfoMarker", - "CodeBlockInfo": "amF2YXNjcmlwdA==" - }, - { - "Type": "NodeCodeBlockCode", - "Data": "{\n propName: 'propValue',\n}\n" - }, - { - "Type": "NodeCodeBlockFenceCloseMarker", - "Data": "```" - } - ] - } - ] + "Type": "NodeCodeBlockFenceOpenMarker", + "Data": "```" + }, + { + "Type": "NodeCodeBlockFenceInfoMarker", + "CodeBlockInfo": "amF2YXNjcmlwdA==" + }, + { + "Type": "NodeCodeBlockCode", + "Data": "{\n propName: 'propValue',\n}\n" + }, + { + "Type": "NodeCodeBlockFenceCloseMarker", + "Data": "```" } ] } @@ -3304,7 +3256,7 @@ }, "Properties": { "id": "20221225011805-qla9i5b", - "updated": "20221225012910" + "updated": "20221225103122" }, "Children": [ { @@ -3322,54 +3274,29 @@ ] }, { - "ID": "20221225012629-qdzqfiq", - "Type": "NodeList", - "ListData": {}, + "ID": "20221225103118-uw8ui6i", + "Type": "NodeCodeBlock", + "IsFencedCodeBlock": true, "Properties": { - "id": "20221225012629-qdzqfiq", - "updated": "20221225012910" + "id": "20221225103118-uw8ui6i", + "updated": "20221225103122" }, "Children": [ { - "ID": "20221225012629-wkougnr", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20221225012629-wkougnr", - "updated": "20221225012910" - }, - "Children": [ - { - "ID": "20221225012629-1ha6h2j", - "Type": "NodeCodeBlock", - "IsFencedCodeBlock": true, - "Properties": { - "id": "20221225012629-1ha6h2j", - "updated": "20221225012910" - }, - "Children": [ - { - "Type": "NodeCodeBlockFenceOpenMarker", - "Data": "```" - }, - { - "Type": "NodeCodeBlockFenceInfoMarker", - "CodeBlockInfo": "amF2YXNjcmlwdA==" - }, - { - "Type": "NodeCodeBlockCode", - "Data": "(() =\u003e {\n const option = {};\n option.propName = `propValue`;\n return option;\n})()\n" - }, - { - "Type": "NodeCodeBlockFenceCloseMarker", - "Data": "```" - } - ] - } - ] + "Type": "NodeCodeBlockFenceOpenMarker", + "Data": "```" + }, + { + "Type": "NodeCodeBlockFenceInfoMarker", + "CodeBlockInfo": "amF2YXNjcmlwdA==" + }, + { + "Type": "NodeCodeBlockCode", + "Data": "(() =\u003e {\n const option = {};\n option.propName = `propValue`;\n return option;\n})()\n" + }, + { + "Type": "NodeCodeBlockFenceCloseMarker", + "Data": "```" } ] } diff --git a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226120854-dr1jfx2/20211226121319-emrk2yy.sy b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226120854-dr1jfx2/20211226121319-emrk2yy.sy index ce275752e..2515ab257 100644 --- a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226120854-dr1jfx2/20211226121319-emrk2yy.sy +++ b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226120854-dr1jfx2/20211226121319-emrk2yy.sy @@ -7,7 +7,7 @@ "id": "20211226121319-emrk2yy", "title": "排版元素", "title-img": "background-color: hsl(2, 57%, 40%);background-image: repeating-linear-gradient(transparent, transparent 50px, rgba(0,0,0,.4) 50px, rgba(0,0,0,.4) 53px, transparent 53px, transparent 63px, rgba(0,0,0,.4) 63px, rgba(0,0,0,.4) 66px, transparent 66px, transparent 116px, rgba(0,0,0,.5) 116px, rgba(0,0,0,.5) 166px, rgba(255,255,255,.2) 166px, rgba(255,255,255,.2) 169px, rgba(0,0,0,.5) 169px, rgba(0,0,0,.5) 179px, rgba(255,255,255,.2) 179px, rgba(255,255,255,.2) 182px, rgba(0,0,0,.5) 182px, rgba(0,0,0,.5) 232px, transparent 232px),repeating-linear-gradient(270deg, transparent, transparent 50px, rgba(0,0,0,.4) 50px, rgba(0,0,0,.4) 53px, transparent 53px, transparent 63px, rgba(0,0,0,.4) 63px, rgba(0,0,0,.4) 66px, transparent 66px, transparent 116px, rgba(0,0,0,.5) 116px, rgba(0,0,0,.5) 166px, rgba(255,255,255,.2) 166px, rgba(255,255,255,.2) 169px, rgba(0,0,0,.5) 169px, rgba(0,0,0,.5) 179px, rgba(255,255,255,.2) 179px, rgba(255,255,255,.2) 182px, rgba(0,0,0,.5) 182px, rgba(0,0,0,.5) 232px, transparent 232px),repeating-linear-gradient(125deg, transparent, transparent 2px, rgba(0,0,0,.2) 2px, rgba(0,0,0,.2) 3px, transparent 3px, transparent 5px, rgba(0,0,0,.2) 5px);", - "updated": "20221225013013" + "updated": "20221225103315" }, "Children": [ { @@ -3112,7 +3112,7 @@ "ListData": {}, "Properties": { "id": "20221225012948-i6bceww", - "updated": "20221225013013" + "updated": "20221225103315" }, "Children": [ { @@ -3142,54 +3142,29 @@ ] }, { - "ID": "20221225012948-si3kytj", - "Type": "NodeList", - "ListData": {}, + "ID": "20221225103257-i53ywyn", + "Type": "NodeCodeBlock", + "IsFencedCodeBlock": true, "Properties": { - "id": "20221225012948-si3kytj", - "updated": "20221225012948" + "id": "20221225103257-i53ywyn", + "updated": "20221225103300" }, "Children": [ { - "ID": "20221225012948-4hjr5xi", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20221225012948-4hjr5xi", - "updated": "20221225012948" - }, - "Children": [ - { - "ID": "20221225012948-jhn1wm0", - "Type": "NodeCodeBlock", - "IsFencedCodeBlock": true, - "Properties": { - "id": "20221225012948-jhn1wm0", - "updated": "20221225012948" - }, - "Children": [ - { - "Type": "NodeCodeBlockFenceOpenMarker", - "Data": "```" - }, - { - "Type": "NodeCodeBlockFenceInfoMarker", - "CodeBlockInfo": "anNvbg==" - }, - { - "Type": "NodeCodeBlockCode", - "Data": "{\n \"propName\": \"propValue\"\n}\n" - }, - { - "Type": "NodeCodeBlockFenceCloseMarker", - "Data": "```" - } - ] - } - ] + "Type": "NodeCodeBlockFenceOpenMarker", + "Data": "```" + }, + { + "Type": "NodeCodeBlockFenceInfoMarker", + "CodeBlockInfo": "anNvbg==" + }, + { + "Type": "NodeCodeBlockCode", + "Data": "{\n \"propName\": \"propValue\"\n}\n" + }, + { + "Type": "NodeCodeBlockFenceCloseMarker", + "Data": "```" } ] } @@ -3222,54 +3197,29 @@ ] }, { - "ID": "20221225012948-w1w6605", - "Type": "NodeList", - "ListData": {}, + "ID": "20221225103303-e1cnv1n", + "Type": "NodeCodeBlock", + "IsFencedCodeBlock": true, "Properties": { - "id": "20221225012948-w1w6605", - "updated": "20221225012948" + "id": "20221225103303-e1cnv1n", + "updated": "20221225103308" }, "Children": [ { - "ID": "20221225012948-dcmh3u7", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20221225012948-dcmh3u7", - "updated": "20221225012948" - }, - "Children": [ - { - "ID": "20221225012948-6envn24", - "Type": "NodeCodeBlock", - "IsFencedCodeBlock": true, - "Properties": { - "id": "20221225012948-6envn24", - "updated": "20221225012948" - }, - "Children": [ - { - "Type": "NodeCodeBlockFenceOpenMarker", - "Data": "```" - }, - { - "Type": "NodeCodeBlockFenceInfoMarker", - "CodeBlockInfo": "amF2YXNjcmlwdA==" - }, - { - "Type": "NodeCodeBlockCode", - "Data": "{\n propName: 'propValue',\n}\n" - }, - { - "Type": "NodeCodeBlockFenceCloseMarker", - "Data": "```" - } - ] - } - ] + "Type": "NodeCodeBlockFenceOpenMarker", + "Data": "```" + }, + { + "Type": "NodeCodeBlockFenceInfoMarker", + "CodeBlockInfo": "amF2YXNjcmlwdA==" + }, + { + "Type": "NodeCodeBlockCode", + "Data": "{\n propName: 'propValue',\n}\n" + }, + { + "Type": "NodeCodeBlockFenceCloseMarker", + "Data": "```" } ] } @@ -3284,7 +3234,7 @@ }, "Properties": { "id": "20221225012948-u5z9jmr", - "updated": "20221225013013" + "updated": "20221225103315" }, "Children": [ { @@ -3302,54 +3252,29 @@ ] }, { - "ID": "20221225012948-2d26uk8", - "Type": "NodeList", - "ListData": {}, + "ID": "20221225103311-4asih4h", + "Type": "NodeCodeBlock", + "IsFencedCodeBlock": true, "Properties": { - "id": "20221225012948-2d26uk8", - "updated": "20221225012948" + "id": "20221225103311-4asih4h", + "updated": "20221225103315" }, "Children": [ { - "ID": "20221225012948-0pxhnd0", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20221225012948-0pxhnd0", - "updated": "20221225012948" - }, - "Children": [ - { - "ID": "20221225012948-27doejs", - "Type": "NodeCodeBlock", - "IsFencedCodeBlock": true, - "Properties": { - "id": "20221225012948-27doejs", - "updated": "20221225012948" - }, - "Children": [ - { - "Type": "NodeCodeBlockFenceOpenMarker", - "Data": "```" - }, - { - "Type": "NodeCodeBlockFenceInfoMarker", - "CodeBlockInfo": "amF2YXNjcmlwdA==" - }, - { - "Type": "NodeCodeBlockCode", - "Data": "(() =\u003e {\n const option = {};\n option.propName = `propValue`;\n return option;\n})()\n" - }, - { - "Type": "NodeCodeBlockFenceCloseMarker", - "Data": "```" - } - ] - } - ] + "Type": "NodeCodeBlockFenceOpenMarker", + "Data": "```" + }, + { + "Type": "NodeCodeBlockFenceInfoMarker", + "CodeBlockInfo": "amF2YXNjcmlwdA==" + }, + { + "Type": "NodeCodeBlockCode", + "Data": "(() =\u003e {\n const option = {};\n option.propName = `propValue`;\n return option;\n})()\n" + }, + { + "Type": "NodeCodeBlockFenceCloseMarker", + "Data": "```" } ] } From 3d92974f9e933c834549e55d441e834579882f97 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sun, 25 Dec 2022 11:06:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?:art:=20=E6=90=9C=E7=B4=A2=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E9=AB=98=E4=BA=AE=E6=94=AF=E6=8C=81=E5=A4=A7=E9=83=A8?= =?UTF-8?q?=E5=88=86=E8=A1=8C=E7=BA=A7=E5=85=83=E7=B4=A0=20https://github.?= =?UTF-8?q?com/siyuan-note/siyuan/issues/6745?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/file.go | 30 ++++++++++++++---------------- kernel/model/history.go | 8 +++----- kernel/model/search.go | 1 + kernel/model/virutalref.go | 4 ++++ 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/kernel/model/file.go b/kernel/model/file.go index a6b237540..c50236e31 100644 --- a/kernel/model/file.go +++ b/kernel/model/file.go @@ -644,25 +644,23 @@ func GetDoc(startID, endID, id string, index int, keyword string, mode int, size n.Tokens = gulu.Str.ToBytes(text) } - if ast.NodeText == n.Type { - if 0 < len(keywords) { - hitBlock := false - for p := n.Parent; nil != p; p = p.Parent { - if p.ID == id { - hitBlock = true - break - } - } - if hitBlock { - if markReplaceSpan(n, &unlinks, keywords, searchMarkDataType, luteEngine) { - return ast.WalkContinue - } + if 0 < len(keywords) { + hitBlock := false + for p := n.Parent; nil != p; p = p.Parent { + if p.ID == id { + hitBlock = true + break } } + if hitBlock { + if markReplaceSpan(n, &unlinks, keywords, searchMarkDataType, luteEngine) { + return ast.WalkContinue + } + } + } - if processVirtualRef(n, &unlinks, virtualBlockRefKeywords, refCount, luteEngine) { - return ast.WalkContinue - } + if processVirtualRef(n, &unlinks, virtualBlockRefKeywords, refCount, luteEngine) { + return ast.WalkContinue } return ast.WalkContinue }) diff --git a/kernel/model/history.go b/kernel/model/history.go index 19070ae9c..7372df72e 100644 --- a/kernel/model/history.go +++ b/kernel/model/history.go @@ -177,11 +177,9 @@ func GetDocHistoryContent(historyPath, keyword string) (id, rootID, content stri n.RemoveIALAttr("heading-fold") n.RemoveIALAttr("fold") - if ast.NodeText == n.Type { - if 0 < len(keywords) { - if markReplaceSpan(n, &unlinks, keywords, searchMarkDataType, luteEngine) { - return ast.WalkContinue - } + if 0 < len(keywords) { + if markReplaceSpan(n, &unlinks, keywords, searchMarkDataType, luteEngine) { + return ast.WalkContinue } } return ast.WalkContinue diff --git a/kernel/model/search.go b/kernel/model/search.go index b17e21bb6..9d92063e4 100644 --- a/kernel/model/search.go +++ b/kernel/model/search.go @@ -893,6 +893,7 @@ func markReplaceSpan(n *ast.Node, unlinks *[]*ast.Node, keywords []string, markS } } else if ast.NodeTextMark == n.Type { // TODO 搜索结果高亮支持大部分行级元素 https://github.com/siyuan-note/siyuan/issues/6745 + } return false } diff --git a/kernel/model/virutalref.go b/kernel/model/virutalref.go index a897bdd8e..7ca3db966 100644 --- a/kernel/model/virutalref.go +++ b/kernel/model/virutalref.go @@ -35,6 +35,10 @@ func processVirtualRef(n *ast.Node, unlinks *[]*ast.Node, virtualBlockRefKeyword return false } + if ast.NodeText != n.Type { + return false + } + parentBlock := treenode.ParentBlock(n) if nil == parentBlock || 0 < refCount[parentBlock.ID] { return false From 9561b800cf4e93986d0a05d7de19d118de7b5d6f Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sun, 25 Dec 2022 11:07:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?:art:=20=E5=AE=9A=E4=BD=8D=20=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=B7=BB=E5=8A=A0=E9=A2=98=E5=A4=B4=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=20https://github.com/siyuan-note/siyuan/issues/6756?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/tag.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/model/tag.go b/kernel/model/tag.go index 13d387f3a..96baabc13 100644 --- a/kernel/model/tag.go +++ b/kernel/model/tag.go @@ -264,7 +264,7 @@ func sortTags(tags Tags) { func SearchTags(keyword string) (ret []string) { ret = []string{} - defer logging.Recover() // TODO: 定位 无法添加题头图标签 https://github.com/siyuan-note/siyuan/issues/6756 + defer logging.Recover() // 定位 无法添加题头图标签 https://github.com/siyuan-note/siyuan/issues/6756 labels := labelBlocksByKeyword(keyword) for label, _ := range labels {