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

This commit is contained in:
Vanessa 2023-05-07 09:55:57 +08:00
commit 813bd27fb3
13 changed files with 533 additions and 62 deletions

View file

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

View file

@ -5,7 +5,7 @@
"Properties": {
"id": "20210824202056-udkf7wg",
"title": "Widgets",
"updated": "20230418085917"
"updated": "20230506210716"
},
"Children": [
{
@ -66,12 +66,21 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20210824202107-cmsetzk",
"updated": "20230418085759"
"updated": "20230506210716"
},
"Children": [
{
"Type": "NodeText",
"Data": "The widgets are installed through the widget marketplace. After installation, the widgets will be placed in the workspace/widgets folder. In the editor, use the slash menu to trigger the call search. After selecting the widget you need, the widget will be inserted into the document in the form of a widget block."
"Data": "The widgets are installed through the widget marketplace. After installation, the widgets will be placed in the "
},
{
"Type": "NodeTextMark",
"TextMarkType": "code",
"TextMarkTextContent": "workspace/widgets/"
},
{
"Type": "NodeText",
"Data": " folder. In the editor, use the slash menu to trigger the call search. After selecting the widget you need, the widget will be inserted into the document in the form of a widget block."
}
]
},

View file

@ -0,0 +1,156 @@
{
"ID": "20230506205948-yah52eb",
"Spec": "1",
"Type": "NodeDocument",
"Properties": {
"id": "20230506205948-yah52eb",
"title": "Plugins",
"updated": "20230506211146"
},
"Children": [
{
"ID": "20230506210937-ubi5da4",
"Type": "NodeHeading",
"HeadingLevel": 2,
"Properties": {
"id": "20230506210937-ubi5da4",
"updated": "20230506210937"
},
"Children": [
{
"Type": "NodeText",
"Data": "Overview"
}
]
},
{
"ID": "20230506210937-bt48731",
"Type": "NodeParagraph",
"Properties": {
"id": "20230506210937-bt48731",
"updated": "20230506211000"
},
"Children": [
{
"Type": "NodeText",
"Data": "Plugins are mainly used to expand the overall functions of SiYuan. Compared with "
},
{
"Type": "NodeTextMark",
"TextMarkType": "block-ref",
"TextMarkBlockRefID": "20210824202056-udkf7wg",
"TextMarkBlockRefSubtype": "s",
"TextMarkTextContent": "Widgets"
},
{
"Type": "NodeText",
"Data": ", the plugin can exist without the document, which is more flexible and powerful."
}
]
},
{
"ID": "20230506210937-yel1yei",
"Type": "NodeHeading",
"HeadingLevel": 2,
"Properties": {
"id": "20230506210937-yel1yei",
"updated": "20230506210937"
},
"Children": [
{
"Type": "NodeText",
"Data": "How to use"
}
]
},
{
"ID": "20230506210937-v1ki1ir",
"Type": "NodeParagraph",
"Properties": {
"id": "20230506210937-v1ki1ir",
"updated": "20230506211116"
},
"Children": [
{
"Type": "NodeText",
"Data": "The plugin is installed through the plugin marketplace. After installation, the plugin will be placed in the folder "
},
{
"Type": "NodeTextMark",
"TextMarkType": "code",
"TextMarkTextContent": "workspace/plugins/"
},
{
"Type": "NodeText",
"Data": ". You can enable or disable plugins in "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "Marketplace"
},
{
"Type": "NodeText",
"Data": " - "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "Downloaded"
},
{
"Type": "NodeText",
"Data": " - "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "Plugin"
},
{
"Type": "NodeText",
"Data": "."
}
]
},
{
"ID": "20230506210937-jxzxwz7",
"Type": "NodeHeading",
"HeadingLevel": 2,
"Properties": {
"id": "20230506210937-jxzxwz7",
"updated": "20230506211146"
},
"Children": [
{
"Type": "NodeText",
"Data": "Push on plugin marketplace"
}
]
},
{
"ID": "20230506210937-i9vqw4g",
"Type": "NodeParagraph",
"Properties": {
"id": "20230506210937-i9vqw4g",
"updated": "20230506210937"
},
"Children": [
{
"Type": "NodeText",
"Data": "Please refer to "
},
{
"Type": "NodeTextMark",
"TextMarkType": "a",
"TextMarkAHref": "https://github.com/siyuan-note/bazaar",
"TextMarkTextContent": "Community Bazaar README"
},
{
"Type": "NodeText",
"Data": "."
}
]
}
]
}

View file

@ -1,6 +1,6 @@
{
"20200812220555-lj3enxa": 1,
"20200813004551-gm0pbn1": 16,
"20200813004551-gm0pbn1": 17,
"20200813004931-q4cu8na": 1,
"20200813013559-sgbzl5k": 3,
"20200813093015-u6bopdt": 2,
@ -9,27 +9,27 @@
"20200813163359-v04n73b": 7,
"20200822191536-rm6hwid": 4,
"20200825162036-4dx365o": 1,
"20200828105441-r76vmu5": 19,
"20200828105441-r76vmu5": 20,
"20200905090211-2vixtlf": 2,
"20200910201551-h4twhas": 6,
"20200915214115-42b8zma": 8,
"20200915214115-42b8zma": 9,
"20200922102318-oz84yu3": 2,
"20201004184819-nj8ibyg": 17,
"20201004184819-nj8ibyg": 18,
"20201117101902-2ewjjum": 6,
"20201121212605-9td1a62": 8,
"20201204181006-7bkppue": 9,
"20201204181006-7bkppue": 10,
"20201210103036-1x3vm8t": 5,
"20201222093044-rx4zjoy": 1,
"20201222095049-hghafhe": 2,
"20201227173504-847cs1q": 18,
"20201227194925-7ipoiv6": 20,
"20201227173504-847cs1q": 19,
"20201227194925-7ipoiv6": 21,
"20210110175347-2xrwoiq": 5,
"20210117211155-56n4odu": 3,
"20210127202655-2334vvv": 10,
"20210331200042-94gs1hh": 12,
"20210127202655-2334vvv": 11,
"20210331200042-94gs1hh": 13,
"20210505163537-oo97zov": 3,
"20210612224500-ywcms1m": 7,
"20210615211733-v6rzowm": 13,
"20210615211733-v6rzowm": 14,
"20210721101227-pi8f6ga": 1,
"20210721103420-vn6g2yy": 2,
"20210721154441-vav9m02": 6,
@ -40,18 +40,19 @@
"20210808180320-qgr0b3q": 4,
"20210808180321-hbvl5c2": 5,
"20210824201257-cy7icrc": 7,
"20211010211311-ffz0wbu": 11,
"20211010211311-ffz0wbu": 12,
"20220105100506-auvmvcw": 7,
"20220119224322-rdzzk5e": 4,
"20220414110705-tu2un99": 5,
"20220628204444-9n0y9h2": 2,
"20220708095345-tu7nz95": 3,
"20221016213308-uz5af79": 3,
"20221223215557-o6gfsoy": 14,
"20230104144904-39br4c6": 21,
"20221223215557-o6gfsoy": 15,
"20230104144904-39br4c6": 22,
"20230106101434-e6g4av3": 1,
"20230303235619-ex5l63e": 15,
"20230303235619-ex5l63e": 16,
"20230405155631-leo4vc6": 5,
"20230428153709-hioyy5l": 6,
"20230429114837-70asb4j": 4
"20230429114837-70asb4j": 4,
"20230506210010-houyyvy": 8
}

View file

@ -5,7 +5,7 @@
"Properties": {
"id": "20210824201257-cy7icrc",
"title": "挂件",
"updated": "20221114172650"
"updated": "20230506210708"
},
"Children": [
{
@ -66,12 +66,21 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20210824201352-xhr1kmi",
"updated": "20211230223933"
"updated": "20230506210708"
},
"Children": [
{
"Type": "NodeText",
"Data": "挂件通过挂件集市安装,安装后挂件将被放置到工作空间/widgets 文件夹下。在编辑器中使用斜杆菜单触发调用搜索,选择需要的挂件后该挂件就会以挂件块的形式插入到文档中。"
"Data": "挂件通过挂件集市安装,安装后挂件将被放置到 "
},
{
"Type": "NodeTextMark",
"TextMarkType": "code",
"TextMarkTextContent": "工作空间/widgets/"
},
{
"Type": "NodeText",
"Data": " 文件夹下。在编辑器中使用斜杆菜单触发调用搜索,选择需要的挂件后该挂件就会以挂件块的形式插入到文档中。"
}
]
},

View file

@ -0,0 +1,156 @@
{
"ID": "20230506210010-houyyvy",
"Spec": "1",
"Type": "NodeDocument",
"Properties": {
"id": "20230506210010-houyyvy",
"title": "插件",
"updated": "20230506211757"
},
"Children": [
{
"ID": "20230506210021-udp6q1j",
"Type": "NodeHeading",
"HeadingLevel": 2,
"Properties": {
"id": "20230506210021-udp6q1j",
"updated": "20230506210021"
},
"Children": [
{
"Type": "NodeText",
"Data": "概述"
}
]
},
{
"ID": "20230506210021-1ngx24g",
"Type": "NodeParagraph",
"Properties": {
"id": "20230506210021-1ngx24g",
"updated": "20230506211757"
},
"Children": [
{
"Type": "NodeText",
"Data": "插件主要用于扩展思源整体功能。相较于"
},
{
"Type": "NodeTextMark",
"TextMarkType": "block-ref",
"TextMarkBlockRefID": "20210824201257-cy7icrc",
"TextMarkBlockRefSubtype": "s",
"TextMarkTextContent": "挂件"
},
{
"Type": "NodeText",
"Data": "而言,插件可以脱离于文档而存在,更为灵活和强大。"
}
]
},
{
"ID": "20230506210021-04aesus",
"Type": "NodeHeading",
"HeadingLevel": 2,
"Properties": {
"id": "20230506210021-04aesus",
"updated": "20230506210021"
},
"Children": [
{
"Type": "NodeText",
"Data": "使用方式"
}
]
},
{
"ID": "20230506210021-tk7w2m5",
"Type": "NodeParagraph",
"Properties": {
"id": "20230506210021-tk7w2m5",
"updated": "20230506210853"
},
"Children": [
{
"Type": "NodeText",
"Data": "插件通过插件集市安装,安装后插件将被放置到 "
},
{
"Type": "NodeTextMark",
"TextMarkType": "code",
"TextMarkTextContent": "工作空间/plugins/"
},
{
"Type": "NodeText",
"Data": " 文件夹下,你可以在 "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "插件集市"
},
{
"Type": "NodeText",
"Data": " - "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "已下载"
},
{
"Type": "NodeText",
"Data": " - "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "插件"
},
{
"Type": "NodeText",
"Data": " 中启用或禁用插件。"
}
]
},
{
"ID": "20230506210021-f12gucj",
"Type": "NodeHeading",
"HeadingLevel": 2,
"Properties": {
"id": "20230506210021-f12gucj",
"updated": "20230506210911"
},
"Children": [
{
"Type": "NodeText",
"Data": "上架插件集市"
}
]
},
{
"ID": "20230506210021-jimdgxy",
"Type": "NodeParagraph",
"Properties": {
"id": "20230506210021-jimdgxy",
"updated": "20230506210021"
},
"Children": [
{
"Type": "NodeText",
"Data": "请参考"
},
{
"Type": "NodeTextMark",
"TextMarkType": "a",
"TextMarkAHref": "https://github.com/siyuan-note/bazaar",
"TextMarkTextContent": "社区集市 README"
},
{
"Type": "NodeText",
"Data": "。"
}
]
}
]
}

View file

@ -18,20 +18,20 @@
"20211226121203-rjjngpz": 6,
"20211226121232-23s79xr": 7,
"20211226121319-emrk2yy": 1,
"20211226121329-c5v3dto": 20,
"20211226121329-c5v3dto": 21,
"20211226121332-irgblss": 4,
"20211226121438-xaafdo8": 2,
"20211226121503-k3jma6m": 1,
"20211226122358-hctqcn5": 19,
"20211226122459-08mi5cq": 18,
"20211226122523-rl8356a": 17,
"20211226122549-jktxego": 16,
"20211226122707-8cr09co": 13,
"20211226122728-cnqf7rz": 12,
"20211226122814-r1rdpcx": 11,
"20211226122943-st7fpcj": 10,
"20211226123004-dplpw0o": 9,
"20211226123038-4umgpxy": 8,
"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,
@ -42,10 +42,11 @@
"20220628204420-ui79vkt": 2,
"20220708102441-u6wopo9": 3,
"20221016213639-1nag9jj": 3,
"20221223221501-mops33i": 14,
"20230104151953-48hwkwf": 21,
"20221223221501-mops33i": 15,
"20230104151953-48hwkwf": 22,
"20230106104645-o838uew": 1,
"20230304000829-9jwu3po": 15,
"20230304000829-9jwu3po": 16,
"20230405172131-yb16aax": 5,
"20230429115206-ob8nl8t": 4
"20230429115206-ob8nl8t": 4,
"20230506211210-1roopyo": 8
}

View file

@ -5,7 +5,7 @@
"Properties": {
"id": "20211226123101-qjw03ab",
"title": "小工具",
"updated": "20221114173622"
"updated": "20230506210742"
},
"Children": [
{
@ -66,12 +66,21 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20211226123118-4dtjsok",
"updated": "20211226005635"
"updated": "20230506210742"
},
"Children": [
{
"Type": "NodeText",
"Data": "小工具通過小工具集市安裝,安裝後小工具將被放置到工作空間/widgets 文件夾下。在編輯器中使用斜桿菜單觸發調用搜索,選擇需要的小工具後就會以小工具塊的形式插入到文檔中。"
"Data": "小工具通過小工具集市安裝,安裝後小工具將被放置到 "
},
{
"Type": "NodeTextMark",
"TextMarkType": "code",
"TextMarkTextContent": "工作空間/widgets/"
},
{
"Type": "NodeText",
"Data": " 文件夾下。在編輯器中使用斜桿菜單觸發調用搜索,選擇需要的小工具後就會以小工具塊的形式插入到文檔中。"
}
]
},

View file

@ -0,0 +1,129 @@
{
"ID": "20230506211210-1roopyo",
"Spec": "1",
"Type": "NodeDocument",
"Properties": {
"id": "20230506211210-1roopyo",
"title": "插件",
"updated": "20230506211739"
},
"Children": [
{
"ID": "20230506211224-qhnwy60",
"Type": "NodeHeading",
"HeadingLevel": 2,
"Properties": {
"id": "20230506211224-qhnwy60",
"updated": "20230506211224"
},
"Children": [
{
"Type": "NodeText",
"Data": "概述"
}
]
},
{
"ID": "20230506211224-e8zojdm",
"Type": "NodeParagraph",
"Properties": {
"id": "20230506211224-e8zojdm",
"updated": "20230506211739"
},
"Children": [
{
"Type": "NodeText",
"Data": "插件主要用於擴展思源整體功能。相較於"
},
{
"Type": "NodeTextMark",
"TextMarkType": "block-ref",
"TextMarkBlockRefID": "20211226123101-qjw03ab",
"TextMarkBlockRefSubtype": "s",
"TextMarkTextContent": "小工具"
},
{
"Type": "NodeText",
"Data": "而言,插件可以脫離於文檔而存在,更為靈活和強大。"
}
]
},
{
"ID": "20230506211224-q293o5x",
"Type": "NodeHeading",
"HeadingLevel": 2,
"Properties": {
"id": "20230506211224-q293o5x",
"updated": "20230506211224"
},
"Children": [
{
"Type": "NodeText",
"Data": "使用方式"
}
]
},
{
"ID": "20230506211224-uqq704u",
"Type": "NodeParagraph",
"Properties": {
"id": "20230506211224-uqq704u",
"updated": "20230506211224"
},
"Children": [
{
"Type": "NodeText",
"Data": "插件通過插件集市安裝,安裝後插件將被放置到 "
},
{
"Type": "NodeTextMark",
"TextMarkType": "code",
"TextMarkTextContent": "工作空間/plugins/"
},
{
"Type": "NodeText",
"Data": " 文件夾下,你可以在 \u003ckbd\u003e插件集市\u003c/kbd\u003e - \u003ckbd\u003e已下載\u003c/kbd\u003e - \u003ckbd\u003e插件\u003c/kbd\u003e 中啟用或禁用插件。"
}
]
},
{
"ID": "20230506211224-p7vkirt",
"Type": "NodeHeading",
"HeadingLevel": 2,
"Properties": {
"id": "20230506211224-p7vkirt",
"updated": "20230506211224"
},
"Children": [
{
"Type": "NodeText",
"Data": "上架插件集市"
}
]
},
{
"ID": "20230506211224-n2giwy1",
"Type": "NodeParagraph",
"Properties": {
"id": "20230506211224-n2giwy1",
"updated": "20230506211224"
},
"Children": [
{
"Type": "NodeText",
"Data": "請參考"
},
{
"Type": "NodeTextMark",
"TextMarkType": "a",
"TextMarkAHref": "https://github.com/siyuan-note/bazaar",
"TextMarkTextContent": "社區集市 README"
},
{
"Type": "NodeText",
"Data": "。"
}
]
}
]
}

File diff suppressed because one or more lines are too long

View file

@ -169,13 +169,13 @@ func getPreferredFunding(funding *Funding) string {
}
if "" != funding.OpenCollective {
return funding.OpenCollective
return "https://opencollective.com/" + funding.OpenCollective
}
if "" != funding.Patreon {
return funding.Patreon
return "https://www.patreon.com/" + funding.Patreon
}
if "" != funding.GitHub {
return funding.GitHub
return "https://github.com/sponsors/" + funding.GitHub
}
if 0 < len(funding.Custom) {
return funding.Custom[0]

View file

@ -6,7 +6,7 @@ require (
github.com/88250/clipboard v0.1.5
github.com/88250/css v0.1.2
github.com/88250/gulu v1.2.3-0.20230501031728-4d62370997cd
github.com/88250/lute v1.7.6-0.20230506015935-ca8269ccf0ef
github.com/88250/lute v1.7.6-0.20230506121837-23574b7b9c4e
github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1
github.com/ClarkThan/ahocorasick v0.0.0-20230220142845-f237b6348b3e

View file

@ -8,8 +8,8 @@ github.com/88250/go-sqlite3 v1.14.13-0.20220714142610-fbbda1ee84f5 h1:8HdZozCsXS
github.com/88250/go-sqlite3 v1.14.13-0.20220714142610-fbbda1ee84f5/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/88250/gulu v1.2.3-0.20230501031728-4d62370997cd h1:PgbmnoTqfVbYyhUljovnAz6l/oWPlbM1d5yrkVDHO1w=
github.com/88250/gulu v1.2.3-0.20230501031728-4d62370997cd/go.mod h1:pTWnjt+6qUqNnP9xltswsJxgCBVu3C7eW09u48LWX0k=
github.com/88250/lute v1.7.6-0.20230506015935-ca8269ccf0ef h1:nNRs8oFCKPRsgnz6k2m0iDXXm9ManWyvP7K4J/OMov8=
github.com/88250/lute v1.7.6-0.20230506015935-ca8269ccf0ef/go.mod h1:+wUqx/1kdFDbWtxn9LYJlaCOAeol2pjSO6w+WJTVQsg=
github.com/88250/lute v1.7.6-0.20230506121837-23574b7b9c4e h1:IvTdnBkNCPa6Y4wY4Gt/534wC9MgAVqlfkR5uGyoOWI=
github.com/88250/lute v1.7.6-0.20230506121837-23574b7b9c4e/go.mod h1:+wUqx/1kdFDbWtxn9LYJlaCOAeol2pjSO6w+WJTVQsg=
github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c h1:Dl/8S9iLyPMTElnWIBxmjaLiWrkI5P4a21ivwAn5pU0=
github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c/go.mod h1:S5YT38L/GCjVjmB4PB84PymA1qfopjEhfhTNQilLpv4=
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY=