0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2022-10-03 22:32:51 +08:00
commit 503c46ce1e
6 changed files with 279 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20211010212318-3wx2kqb.sy
View file

@ -5,7 +5,7 @@
"Properties": {
"id": "20211010212318-3wx2kqb",
"title": "Virtual reference",
"updated": "20211010212551"
"updated": "20221003215008"
},
"Children": [
{
@ -121,6 +121,94 @@
"Data": "Search based on the anchor text/definition block text of the existing block ref, the name and alias of the block as keywords. If these keywords are searched on the plain text element of the current content block, it will be used as a virtual reference."
}
]
},
{
"ID": "20221003214846-p9q1wvx",
"Type": "NodeHeading",
"HeadingLevel": 2,
"Properties": {
"id": "20221003214846-p9q1wvx",
"updated": "20221003214853"
},
"Children": [
{
"Type": "NodeTextMark",
"TextMarkType": "tag",
"TextMarkTextContent": "Note"
}
]
},
{
"ID": "20221003214937-bqvm7yz",
"Type": "NodeList",
"ListData": {},
"Properties": {
"id": "20221003214937-bqvm7yz",
"updated": "20221003215008"
},
"Children": [
{
"ID": "20221003214937-hfdshei",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20221003214937-hfdshei",
"updated": "20221003214948"
},
"Children": [
{
"ID": "20221003214937-w913xwl",
"Type": "NodeParagraph",
"Properties": {
"id": "20221003214937-w913xwl",
"updated": "20221003214948"
},
"Children": [
{
"Type": "NodeText",
"Data": "For performance reasons, virtual references do not take effect immediately. If they are not displayed, you can try to refresh the current document via "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "F5"
}
]
}
]
},
{
"ID": "20221003214937-0yqjmgz",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20221003214937-0yqjmgz",
"updated": "20221003215008"
},
"Children": [
{
"ID": "20221003214937-7rkkbhp",
"Type": "NodeParagraph",
"Properties": {
"id": "20221003214937-7rkkbhp",
"updated": "20221003215008"
},
"Children": [
{
"Type": "NodeText",
"Data": "For English characters, you need to use a space for word segmentation to make the virtual reference take effect. If the English content appears at the beginning of the paragraph, you also need to use the space at the end to take effect"
}
]
}
]
}
]
}
]
}

94
app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20211010211311-ffz0wbu.sy
View file

@ -5,7 +5,7 @@
"Properties": {
"id": "20211010211311-ffz0wbu",
"title": "虚拟引用",
"updated": "20211010212520"
"updated": "20221003214924"
},
"Children": [
{
@ -121,6 +121,98 @@
"Data": "根据已有块引的锚文本/定义块文本、块的命名和别名作为关键字搜索，如果在当前内容块的纯文本元素上搜索到这些关键字，那么就会作为虚拟引用。"
}
]
},
{
"ID": "20221003214348-710vren",
"Type": "NodeHeading",
"HeadingLevel": 2,
"Properties": {
"id": "20221003214348-710vren",
"updated": "20221003214410"
},
"Children": [
{
"Type": "NodeTextMark",
"TextMarkType": "tag",
"TextMarkTextContent": "注意"
}
]
},
{
"ID": "20221003214411-d3c0jte",
"Type": "NodeList",
"ListData": {},
"Properties": {
"id": "20221003214411-d3c0jte",
"updated": "20221003214924"
},
"Children": [
{
"ID": "20221003214412-j7wcb07",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20221003214412-j7wcb07",
"updated": "20221003214924"
},
"Children": [
{
"ID": "20221003214412-uixysyj",
"Type": "NodeParagraph",
"Properties": {
"id": "20221003214412-uixysyj",
"updated": "20221003214924"
},
"Children": [
{
"Type": "NodeText",
"Data": "出于性能考虑，虚拟引用并不是即时生效的，如果没有显示，可以尝试通过 "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "F5"
},
{
"Type": "NodeText",
"Data": " 刷新当前文档"
}
]
}
]
},
{
"ID": "20221003214613-hik3s1f",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20221003214613-hik3s1f",
"updated": "20221003214741"
},
"Children": [
{
"ID": "20221003214613-954oouj",
"Type": "NodeParagraph",
"Properties": {
"id": "20221003214613-954oouj",
"updated": "20221003214741"
},
"Children": [
{
"Type": "NodeText",
"Data": "对于英文字符需要使用空格分词才能使虚拟引用生效，如果英文内容出现在段首，也需要使用空格结尾才能生效"
}
]
}
]
}
]
}
]
}

94
app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122814-r1rdpcx.sy
View file

@ -5,7 +5,7 @@
"Properties": {
"id": "20211226122814-r1rdpcx",
"title": "虛擬引用",
"updated": "20211228135304"
"updated": "20221003215039"
},
"Children": [
{
@ -121,6 +121,98 @@
"Data": "根據已有塊引的錨文本/定義塊文本、塊的命名和別名作為關鍵字搜索，如果在當前內容塊的純文本元素上搜索到這些關鍵字，那麽就會作為虛擬引用。"
}
]
},
{
"ID": "20221003215030-sldbsma",
"Type": "NodeHeading",
"HeadingLevel": 2,
"Properties": {
"id": "20221003215030-sldbsma",
"updated": "20221003215030"
},
"Children": [
{
"Type": "NodeTextMark",
"TextMarkType": "tag",
"TextMarkTextContent": "注意"
}
]
},
{
"ID": "20221003215030-n76ec39",
"Type": "NodeList",
"ListData": {},
"Properties": {
"id": "20221003215030-n76ec39",
"updated": "20221003215039"
},
"Children": [
{
"ID": "20221003215030-w2qi431",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20221003215030-w2qi431",
"updated": "20221003215039"
},
"Children": [
{
"ID": "20221003215030-v8qcvra",
"Type": "NodeParagraph",
"Properties": {
"id": "20221003215030-v8qcvra",
"updated": "20221003215039"
},
"Children": [
{
"Type": "NodeText",
"Data": "出於性能考慮，虛擬引用並不是即時生效的，如果沒有顯示，可以嘗試通過 "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "F5"
},
{
"Type": "NodeText",
"Data": " 刷新當前文檔"
}
]
}
]
},
{
"ID": "20221003215030-g5mzgmu",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20221003215030-g5mzgmu",
"updated": "20221003215030"
},
"Children": [
{
"ID": "20221003215030-k00obsv",
"Type": "NodeParagraph",
"Properties": {
"id": "20221003215030-k00obsv",
"updated": "20221003215030"
},
"Children": [
{
"Type": "NodeText",
"Data": "對於英文字符需要使用空格分詞才能使虛擬引用生效，如果英文內容出現在段首，也需要使用空格結尾才能生效"
}
]
}
]
}
]
}
]
}

2
app/stage/protyle/js/lute/lute.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
kernel/go.mod
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.20220929123404-da1dc91c9343
github.com/88250/lute v1.7.5-0.20221003092458-efd77ea45b2b
github.com/88250/lute v1.7.5-0.20221003132645-f3c741ac865a
github.com/88250/pdfcpu v0.3.13
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1
github.com/ConradIrwin/font v0.0.0-20210318200717-ce8d41cc0732

10
kernel/go.sum
View file

@ -17,14 +17,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.20220929123404-da1dc91c9343 h1:GJxJRZmA8GkAiU3GswwsSszKqp1/aywhpyFJ+aC7J+k=
github.com/88250/gulu v1.2.3-0.20220929123404-da1dc91c9343/go.mod h1:I1qBzsksFL2ciGSuqDE7R3XW4BUMrfDgOvSXEk7FsAI=
github.com/88250/lute v1.7.5-0.20221003024852-3e28f93cbc06 h1:K3LUCzNvQNoZXffCDpUbHy1qsmUGhI5CMVRk/maSLZw=
github.com/88250/lute v1.7.5-0.20221003024852-3e28f93cbc06/go.mod h1:cEoBGi0zArPqAsp0MdG9SKinvH/xxZZWXU7sRx8vHSA=
github.com/88250/lute v1.7.5-0.20221003075424-e3d6e699ca21 h1:hPD3uQuZj5W2VpyNV+TvyRFxcnum5m5lfY6UEHqSmM4=
github.com/88250/lute v1.7.5-0.20221003075424-e3d6e699ca21/go.mod h1:cEoBGi0zArPqAsp0MdG9SKinvH/xxZZWXU7sRx8vHSA=
github.com/88250/lute v1.7.5-0.20221003081612-8925a340e41a h1:FZXJ70fprHxPY09bDbmcIKHSU60zzIMaIbWdH5NAg5w=
github.com/88250/lute v1.7.5-0.20221003081612-8925a340e41a/go.mod h1:cEoBGi0zArPqAsp0MdG9SKinvH/xxZZWXU7sRx8vHSA=
github.com/88250/lute v1.7.5-0.20221003092458-efd77ea45b2b h1:tbQeFhsaWm5VLgx8J+yeoGOxUEWmnien2MQW4p4MF7s=
github.com/88250/lute v1.7.5-0.20221003092458-efd77ea45b2b/go.mod h1:cEoBGi0zArPqAsp0MdG9SKinvH/xxZZWXU7sRx8vHSA=
github.com/88250/lute v1.7.5-0.20221003132645-f3c741ac865a h1:emAfkMORcLHYU6/1wEt1WJoX1BbiRn9wVJHhoQa2wvg=
github.com/88250/lute v1.7.5-0.20221003132645-f3c741ac865a/go.mod h1:cEoBGi0zArPqAsp0MdG9SKinvH/xxZZWXU7sRx8vHSA=
github.com/88250/pdfcpu v0.3.13 h1:touMWMZkCGalMIbEg9bxYp7rETM+zwb9hXjwhqi4I7Q=
github.com/88250/pdfcpu v0.3.13/go.mod h1:S5YT38L/GCjVjmB4PB84PymA1qfopjEhfhTNQilLpv4=
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY=