Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-12 02:04:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Vanessa 2025-03-11 23:43:22 +08:00
commit 6ef317e3de
9 changed files with 48 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-fqgskfj/20200813013559-sgbzl5k.sy
View file

@ -6,7 +6,7 @@
"id": "20200813013559-sgbzl5k",
"title": "引用内容块",
"type": "doc",
"updated": "20250115145454"
"updated": "20250311200002"
},
"Children": [
{
@ -277,7 +277,7 @@
"HeadingLevel": 2,
"Properties": {
"id": "20220623194755-30vtsr7",
"updated": "20250115145454"
"updated": "20250311200002"
},
"Children": [
{
@ -572,7 +572,7 @@
"ListData": {},
"Properties": {
"id": "20230420185742-g0vtyx7",
"updated": "20250115145454"
"updated": "20250311200002"
},
"Children": [
{
@ -584,7 +584,7 @@
},
"Properties": {
"id": "20230420185742-14djxj3",
"updated": "20230420190025"
"updated": "20250311200000"
},
"Children": [
{
@ -592,7 +592,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20230420185742-brqgayg",
"updated": "20230420190025"
"updated": "20250311200000"
},
"Children": [
{
@ -602,7 +602,7 @@
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "Enter"
"TextMarkTextContent": "回车"
},
{
"Type": "NodeText",
@ -630,7 +630,7 @@
},
"Properties": {
"id": "20230420185748-ehr9h7w",
"updated": "20250115145454"
"updated": "20250311200002"
},
"Children": [
{
@ -638,7 +638,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20230420185748-sb1thir",
"updated": "20250115145454"
"updated": "20250311200002"
},
"Children": [
{
@ -657,7 +657,7 @@
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "Enter"
"TextMarkTextContent": "回车"
},
{
"Type": "NodeText",

14
app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-fqgskfj/20200905090211-2vixtlf.sy
View file

@ -6,7 +6,7 @@
"id": "20200905090211-2vixtlf",
"title": "内容块类型",
"type": "doc",
"updated": "20250115153225"
"updated": "20250311200014"
},
"Children": [
{
@ -1353,7 +1353,7 @@
"HeadingLevel": 3,
"Properties": {
"id": "20210104090624-erf17it",
"updated": "20250115145222"
"updated": "20250311200014"
},
"Children": [
{
@ -1551,7 +1551,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20240818173939-j0bcrw6",
"updated": "20250115145222"
"updated": "20250311200014"
},
"Children": [
{
@ -1570,7 +1570,7 @@
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "Enter"
"TextMarkTextContent": "回车"
},
{
"Type": "NodeText",
@ -2320,7 +2320,7 @@
"HeadingLevel": 3,
"Properties": {
"id": "20210104090624-n9anlgh",
"updated": "20250115145347"
"updated": "20250311200006"
},
"Children": [
{
@ -2420,7 +2420,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20210104090624-5p4i03b",
"updated": "20250115145347"
"updated": "20250311200006"
},
"Children": [
{
@ -2439,7 +2439,7 @@
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "Enter"
"TextMarkTextContent": "回车"
},
{
"Type": "NodeText",

8
app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20240208113259-nykkvaq.sy
View file

@ -7,7 +7,7 @@
"id": "20240208113259-nykkvaq",
"title": "数据库",
"type": "doc",
"updated": "20250115152026"
"updated": "20250311200010"
},
"Children": [
{
@ -634,7 +634,7 @@
"HeadingLevel": 2,
"Properties": {
"id": "20240818174119-3zag9wr",
"updated": "20250115145300"
"updated": "20250311200010"
},
"Children": [
{
@ -653,7 +653,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20240818174124-ab1x2an",
"updated": "20250115145300"
"updated": "20250311200010"
},
"Children": [
{
@ -672,7 +672,7 @@
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "Enter"
"TextMarkTextContent": "回车"
},
{
"Type": "NodeText",

14
app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226115825-mhcslw2/20211226120147-ib6yy3i.sy
View file

@ -6,7 +6,7 @@
"id": "20211226120147-ib6yy3i",
"title": "內容塊類型",
"type": "doc",
"updated": "20250115153220"
"updated": "20250311195936"
},
"Children": [
{
@ -1318,7 +1318,7 @@
"HeadingLevel": 3,
"Properties": {
"id": "20211226120227-fe8klj7",
"updated": "20250115145215"
"updated": "20250311195936"
},
"Children": [
{
@ -1510,7 +1510,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20240818174341-89p5u2n",
"updated": "20250115145215"
"updated": "20250311195936"
},
"Children": [
{
@ -1529,7 +1529,7 @@
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "Enter"
"TextMarkTextContent": "回車"
},
{
"Type": "NodeText",
@ -2219,7 +2219,7 @@
"HeadingLevel": 3,
"Properties": {
"id": "20211226120227-ot6klof",
"updated": "20250115145342"
"updated": "20250311195925"
},
"Children": [
{
@ -2311,7 +2311,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20211226120227-wx6gvu6",
"updated": "20250115145342"
"updated": "20250311195925"
},
"Children": [
{
@ -2330,7 +2330,7 @@
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "Enter"
"TextMarkTextContent": "回車"
},
{
"Type": "NodeText",

24
app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226115825-mhcslw2/20211226120247-63nd8y5.sy
View file

@ -6,7 +6,7 @@
"id": "20211226120247-63nd8y5",
"title": "引用内容塊",
"type": "doc",
"updated": "20250115145500"
"updated": "20250311195912"
},
"Children": [
{
@ -15,7 +15,7 @@
"HeadingLevel": 2,
"Properties": {
"id": "20211226120337-x5qwass",
"updated": "20211225232221"
"updated": "20250311195846"
},
"Children": [
{
@ -29,7 +29,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220623200737-sx458du",
"updated": "20230630093355"
"updated": "20250311195846"
},
"Children": [
{
@ -43,7 +43,7 @@
},
{
"Type": "NodeText",
"Data": "​ 後將觸發內容塊引用搜索，繼續輸入作為搜索關鍵字，在搜索結果中使用上下鍵選定後Enter就可以完成內容塊的引用了。建立好內容塊引用後，鼠標懸浮在錨文字上後將彈出預覽浮層，展現被引用的內容塊（定義塊）。"
"Data": "​ 後將觸發內容塊引用搜索，繼續輸入作為搜索關鍵字，在搜索結果中使用上下鍵選定後回車就可以完成內容塊的引用了。建立好內容塊引用後，鼠標懸浮在錨文字上後將彈出預覽浮層，展現被引用的內容塊（定義塊）。"
},
{
"Type": "NodeTextMark",
@ -239,7 +239,7 @@
"HeadingLevel": 2,
"Properties": {
"id": "20220623200754-u00gfsg",
"updated": "20250115145500"
"updated": "20250311195912"
},
"Children": [
{
@ -535,7 +535,7 @@
"ListData": {},
"Properties": {
"id": "20230420185856-fpkt2wv",
"updated": "20250115145500"
"updated": "20250311195912"
},
"Children": [
{
@ -547,7 +547,7 @@
},
"Properties": {
"id": "20230420185856-4v3g6nz",
"updated": "20230420190021"
"updated": "20250311195908"
},
"Children": [
{
@ -555,7 +555,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20230420185856-tnhsmet",
"updated": "20230420190021"
"updated": "20250311195908"
},
"Children": [
{
@ -565,7 +565,7 @@
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "Enter"
"TextMarkTextContent": "回車"
},
{
"Type": "NodeText",
@ -593,7 +593,7 @@
},
"Properties": {
"id": "20230420185856-jg6anpy",
"updated": "20250115145500"
"updated": "20250311195912"
},
"Children": [
{
@ -601,7 +601,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20230420185856-nh72xao",
"updated": "20250115145500"
"updated": "20250311195912"
},
"Children": [
{
@ -620,7 +620,7 @@
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "Enter"
"TextMarkTextContent": "回車"
},
{
"Type": "NodeText",

8
app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20240208171522-y7dxcno.sy
View file

@ -7,7 +7,7 @@
"id": "20240208171522-y7dxcno",
"title": "資料庫",
"type": "doc",
"updated": "20250115152038"
"updated": "20250311195932"
},
"Children": [
{
@ -636,7 +636,7 @@
"HeadingLevel": 2,
"Properties": {
"id": "20240818174403-xnbqd38",
"updated": "20250115145255"
"updated": "20250311195932"
},
"Children": [
{
@ -655,7 +655,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20240818174421-v5il1as",
"updated": "20250115145255"
"updated": "20250311195932"
},
"Children": [
{
@ -674,7 +674,7 @@
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "Enter"
"TextMarkTextContent": "回車"
},
{
"Type": "NodeText",

4
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

@ -10,7 +10,7 @@ require (
github.com/88250/epub v0.0.0-20230830085737-c19055cd1f48
github.com/88250/go-humanize v0.0.0-20240424102817-4f78fac47ea7
github.com/88250/gulu v1.2.3-0.20250227144607-7f4570b0d689
github.com/88250/lute v1.7.7-0.20250310044047-1b5c5c16b1d3
github.com/88250/lute v1.7.7-0.20250311111757-77ff1f87fd18
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1
github.com/ClarkThan/ahocorasick v0.0.0-20231011042242-30d1ef1347f4
github.com/ConradIrwin/font v0.2.1

4
kernel/go.sum
View file

@ -14,8 +14,8 @@ github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950 h1:Pa5hMiBceT
github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/88250/gulu v1.2.3-0.20250227144607-7f4570b0d689 h1:39y5g7vnFAIcXhTN3IXPk7h2xBhC4a9hBTykDhHJqRY=
github.com/88250/gulu v1.2.3-0.20250227144607-7f4570b0d689/go.mod h1:c8uVw25vW2W4dhJ/j4iYsX5H1hc19spim266jO5x2hU=
github.com/88250/lute v1.7.7-0.20250310044047-1b5c5c16b1d3 h1:QoRh1vo/F+g+v+oxJSp3jpcN/QWmnyV7LcyFR/v7ofA=
github.com/88250/lute v1.7.7-0.20250310044047-1b5c5c16b1d3/go.mod h1:WYyUw//5yVw9BJnoVjx7rI/3szsISxNZCYGOqTIrV0o=
github.com/88250/lute v1.7.7-0.20250311111757-77ff1f87fd18 h1:KqpnL5yMxE0macmJwAb0g9uC0sMOwcKa1Rd5u629Hbo=
github.com/88250/lute v1.7.7-0.20250311111757-77ff1f87fd18/go.mod h1:WYyUw//5yVw9BJnoVjx7rI/3szsISxNZCYGOqTIrV0o=
github.com/88250/pdfcpu v0.3.14-0.20241201033812-5a93b7586a01 h1:AcFe63RXjIh1XtX/dc4Es3U8bYKjlEkvavHd1nFBOHM=
github.com/88250/pdfcpu v0.3.14-0.20241201033812-5a93b7586a01/go.mod h1:fVfOloBzs2+W2VJCCbq60XIxc3yJHAZ0Gahv1oO0gyI=
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY=