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-09-04 21:51:34 +08:00
commit 8143c58cf5
6 changed files with 86 additions and 144 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
app/guide/20210808180117-czj9bvb/20200813163359-v04n73b.sy
View file

@ -6,7 +6,7 @@
"id": "20200813163359-v04n73b",
"title": "隐私政策和用户协议",
"type": "doc",
"updated": "20220531181352"
"updated": "20220904093913"
},
"Children": [
{
@ -30,7 +30,7 @@
"ListData": {},
"Properties": {
"id": "20220212224529-q784muc",
"updated": "20220531180717"
"updated": "20220904093913"
},
"Children": [
{
@ -70,7 +70,7 @@
},
"Properties": {
"id": "20220212224529-q652whb",
"updated": "20220531180717"
"updated": "20220904093913"
},
"Children": [
{
@ -78,12 +78,12 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220212224529-1embibu",
"updated": "20220531180717"
"updated": "20220904093913"
},
"Children": [
{
"Type": "NodeText",
"Data": "最新日期：2022 年 5 月 31 日"
"Data": "最新日期：2022 年 9 月 4 日"
}
]
}
@ -3779,7 +3779,7 @@
"ListData": {},
"Properties": {
"id": "20220212224529-ycsnqo5",
"updated": "20220212224529"
"updated": "20220904093803"
},
"Children": [
{
@ -3874,6 +3874,52 @@
}
]
},
{
"ID": "20220904093737-xj216ur",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20220904093737-xj216ur",
"updated": "20220904093803"
},
"Children": [
{
"ID": "20220904093737-mgfz3tm",
"Type": "NodeParagraph",
"Properties": {
"id": "20220904093737-mgfz3tm",
"updated": "20220904093803"
},
"Children": [
{
"Type": "NodeStrong",
"Data": "strong",
"Children": [
{
"Type": "NodeStrongA6kOpenMarker",
"Data": "**"
},
{
"Type": "NodeText",
"Data": "允许获取应用列表："
},
{
"Type": "NodeStrongA6kCloseMarker",
"Data": "**"
}
]
},
{
"Type": "NodeText",
"Data": "当您安装应用时，我们会申请此权限。"
}
]
}
]
},
{
"ID": "20220212224529-1dsbitl",
"Type": "NodeListItem",

163
app/guide/20211226090932-5lcq56f/20211226114339-dk0gtpr.sy
View file

@ -5,7 +5,7 @@
"icon": "1f4c4",
"id": "20211226114339-dk0gtpr",
"title": "隱私政策和用戶協議",
"updated": "20220531181359"
"updated": "20220904095814"
},
"Children": [
{
@ -29,7 +29,7 @@
"ListData": {},
"Properties": {
"id": "20220212225517-4qagezn",
"updated": "20220531180705"
"updated": "20220904095814"
},
"Children": [
{
@ -67,7 +67,7 @@
},
"Properties": {
"id": "20220212225517-pvls0y0",
"updated": "20220531180705"
"updated": "20220904095814"
},
"Children": [
{
@ -75,12 +75,12 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220212225517-vgg1nrb",
"updated": "20220531180705"
"updated": "20220904095814"
},
"Children": [
{
"Type": "NodeText",
"Data": "最新日期：2022 年 5 月 31 日"
"Data": "最新日期：2022 年 9 月 4 日"
}
]
}
@ -3399,7 +3399,7 @@
},
"Properties": {
"id": "20220212225553-ud2rl66",
"updated": "20220526171944"
"updated": "20220904095758"
},
"Children": [
{
@ -3768,149 +3768,46 @@
]
},
{
"ID": "20220212225609-irfvmvz",
"Type": "NodeList",
"ListData": {},
"ID": "20220904095758-ek15ziy",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20220212225609-irfvmvz",
"updated": "20220212225609"
"id": "20220904095758-ek15ziy",
"updated": "20220904095758"
},
"Children": [
{
"ID": "20220212225609-5jwia5n",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"ID": "20220904095758-e2wsj68",
"Type": "NodeParagraph",
"Properties": {
"id": "20220212225609-5jwia5n",
"updated": "20220212225609"
"id": "20220904095758-e2wsj68",
"updated": "20220904095758"
},
"Children": [
{
"ID": "20220212225609-7z9vy2o",
"Type": "NodeParagraph",
"Properties": {
"id": "20220212225609-7z9vy2o",
"updated": "20220212225609"
},
"Type": "NodeStrong",
"Data": "strong",
"Children": [
{
"Type": "NodeStrong",
"Data": "strong",
"Children": [
{
"Type": "NodeStrongA6kOpenMarker",
"Data": "**"
},
{
"Type": "NodeText",
"Data": "允許訪問網絡："
},
{
"Type": "NodeStrongA6kCloseMarker",
"Data": "**"
}
]
"Type": "NodeStrongA6kOpenMarker",
"Data": "**"
},
{
"Type": "NodeText",
"Data": "當您安裝應用時，我們會申請此權限。"
"Data": "允許訪問網絡："
},
{
"Type": "NodeStrongA6kCloseMarker",
"Data": "**"
}
]
}
]
},
{
"ID": "20220212225609-q1uwt2u",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20220212225609-q1uwt2u",
"updated": "20220212225609"
},
"Children": [
},
{
"ID": "20220212225609-x6zxnw5",
"Type": "NodeParagraph",
"Properties": {
"id": "20220212225609-x6zxnw5",
"updated": "20220212225609"
},
"Children": [
{
"Type": "NodeStrong",
"Data": "strong",
"Children": [
{
"Type": "NodeStrongA6kOpenMarker",
"Data": "**"
},
{
"Type": "NodeText",
"Data": "允許常駐通知："
},
{
"Type": "NodeStrongA6kCloseMarker",
"Data": "**"
}
]
},
{
"Type": "NodeText",
"Data": "當您安裝應用，我們會申請此權限。"
}
]
}
]
},
{
"ID": "20220212225609-ips2ek8",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20220212225609-ips2ek8",
"updated": "20220212225609"
},
"Children": [
{
"ID": "20220212225609-i4aq0hw",
"Type": "NodeParagraph",
"Properties": {
"id": "20220212225609-i4aq0hw",
"updated": "20220212225609"
},
"Children": [
{
"Type": "NodeStrong",
"Data": "strong",
"Children": [
{
"Type": "NodeStrongA6kOpenMarker",
"Data": "**"
},
{
"Type": "NodeText",
"Data": "允許拍照/訪問相冊："
},
{
"Type": "NodeStrongA6kCloseMarker",
"Data": "**"
}
]
},
{
"Type": "NodeText",
"Data": "當您希望添加照片時，我們會申請此權限。"
}
]
"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

@ -7,7 +7,7 @@ require (
github.com/88250/css v0.1.2
github.com/88250/flock v0.8.2
github.com/88250/gulu v1.2.3-0.20220720144315-065ef35ec583
github.com/88250/lute v1.7.5-0.20220902131941-ca638a29c6d8
github.com/88250/lute v1.7.5-0.20220904100410-4749a9b16b91
github.com/88250/melody v0.0.0-20201115062536-c0b3394adcd1
github.com/88250/pdfcpu v0.3.13
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1

4
kernel/go.sum
View file

@ -19,8 +19,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.20220720144315-065ef35ec583 h1:FhA/zJemLrbOYJpdMIMBezO5rGigQSdPR1kv+aztHfA=
github.com/88250/gulu v1.2.3-0.20220720144315-065ef35ec583/go.mod h1:I1qBzsksFL2ciGSuqDE7R3XW4BUMrfDgOvSXEk7FsAI=
github.com/88250/lute v1.7.5-0.20220902131941-ca638a29c6d8 h1:ipqlRGbdsF7+GR9yVn+tkhYJbgtT40VOZcWTREG6D/U=
github.com/88250/lute v1.7.5-0.20220902131941-ca638a29c6d8/go.mod h1:cEoBGi0zArPqAsp0MdG9SKinvH/xxZZWXU7sRx8vHSA=
github.com/88250/lute v1.7.5-0.20220904100410-4749a9b16b91 h1:KYIq0WfoNHuvDNZDNv5NxSySgAjzfVQkwlkJSZ9pRfY=
github.com/88250/lute v1.7.5-0.20220904100410-4749a9b16b91/go.mod h1:cEoBGi0zArPqAsp0MdG9SKinvH/xxZZWXU7sRx8vHSA=
github.com/88250/melody v0.0.0-20201115062536-c0b3394adcd1 h1:9Cb+iN639vUI2OcIBc+4oGwml9/0J6bL6dWNb8Al+1s=
github.com/88250/melody v0.0.0-20201115062536-c0b3394adcd1/go.mod h1:jH6MMPr8G7AMzaVmWHXZQiB1DKO3giWbcWZ7UoJ1teI=
github.com/88250/pdfcpu v0.3.13 h1:touMWMZkCGalMIbEg9bxYp7rETM+zwb9hXjwhqi4I7Q=

1
kernel/model/export.go
View file

@ -975,7 +975,6 @@ func renderExportMdMathBlockContent(r *render.FormatRenderer, node *ast.Node, en
func renderExportMdInlineMathContent(r *render.FormatRenderer, node *ast.Node, entering bool) ast.WalkStatus {
if entering {
tokens := html.UnescapeHTML(node.Tokens)
tokens = gulu.Str.ToBytes("a" + gulu.Str.FromBytes(tokens) + "b")
r.Write(tokens)
}
return ast.WalkContinue