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

This commit is contained in:
Vanessa 2025-12-30 17:01:34 +08:00
commit 51477c53ec
10 changed files with 865 additions and 176 deletions

View file

@ -7,7 +7,7 @@
"id": "20200923234011-ieuun1p",
"title": "Please Start Here",
"type": "doc",
"updated": "20251209212055"
"updated": "20240508004348"
},
"Children": [
{
@ -616,7 +616,7 @@
"Type": "NodeSuperBlock",
"Properties": {
"id": "20240508004352-iqm6xt7",
"updated": "20240508004353"
"updated": "20240508004348"
},
"Children": [
{
@ -1040,7 +1040,7 @@
"Type": "NodeSuperBlock",
"Properties": {
"id": "20240508004347-hfoqii3",
"updated": "20240508004353"
"updated": "20240508004348"
},
"Children": [
{

View file

@ -6,7 +6,7 @@
"id": "20200924101225-k254i8g",
"title": "Content Block Type",
"type": "doc",
"updated": "20251209213552"
"updated": "20251230163004"
},
"Children": [
{
@ -15,7 +15,7 @@
"HeadingLevel": 2,
"Properties": {
"id": "20210104091538-4b3n4al",
"updated": "20251209212738"
"updated": "20251230141904"
},
"Children": [
{
@ -64,7 +64,7 @@
"Properties": {
"colgroup": "||",
"id": "20210104091538-le8t1ci",
"updated": "20251209212738"
"updated": "20251230141904"
},
"Children": [
{
@ -595,6 +595,75 @@
}
]
},
{
"Type": "NodeTableRow",
"Data": "tr",
"Children": [
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": ""
},
{
"Type": "NodeImage",
"Data": "span",
"Children": [
{
"Type": "NodeBang"
},
{
"Type": "NodeOpenBracket"
},
{
"Type": "NodeLinkText",
"Data": "database"
},
{
"Type": "NodeCloseBracket"
},
{
"Type": "NodeOpenParen"
},
{
"Type": "NodeLinkDest",
"Data": "assets/database-20251230141500-2trhu14.svg"
},
{
"Type": "NodeCloseParen"
}
]
},
{
"Type": "NodeText",
"Data": ""
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "Database block"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "Leaf block"
}
]
}
]
},
{
"Type": "NodeTableRow",
"Data": "tr",
@ -921,6 +990,8 @@
{
"Type": "NodeTableCell",
"Data": "td",
"TableCellContentWidth": 18,
"TableCellContentMaxWidth": 22,
"Children": [
{
"Type": "NodeText",
@ -931,6 +1002,8 @@
{
"Type": "NodeTableCell",
"Data": "td",
"TableCellContentWidth": 17,
"TableCellContentMaxWidth": 17,
"Children": [
{
"Type": "NodeText",
@ -947,6 +1020,8 @@
{
"Type": "NodeTableCell",
"Data": "td",
"TableCellContentWidth": 58,
"TableCellContentMaxWidth": 72,
"Children": [
{
"Type": "NodeText",
@ -990,6 +1065,8 @@
{
"Type": "NodeTableCell",
"Data": "td",
"TableCellContentWidth": 15,
"TableCellContentMaxWidth": 22,
"Children": [
{
"Type": "NodeText",
@ -1000,6 +1077,8 @@
{
"Type": "NodeTableCell",
"Data": "td",
"TableCellContentWidth": 17,
"TableCellContentMaxWidth": 17,
"Children": [
{
"Type": "NodeText",
@ -1016,6 +1095,8 @@
{
"Type": "NodeTableCell",
"Data": "td",
"TableCellContentWidth": 66,
"TableCellContentMaxWidth": 72,
"Children": [
{
"Type": "NodeText",
@ -1051,14 +1132,15 @@
]
},
{
"Type": "NodeText",
"Data": ""
"Type": "NodeText"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"TableCellContentWidth": 13,
"TableCellContentMaxWidth": 22,
"Children": [
{
"Type": "NodeText",
@ -1069,6 +1151,8 @@
{
"Type": "NodeTableCell",
"Data": "td",
"TableCellContentWidth": 17,
"TableCellContentMaxWidth": 17,
"Children": [
{
"Type": "NodeText",
@ -1085,6 +1169,8 @@
{
"Type": "NodeTableCell",
"Data": "td",
"TableCellContentWidth": 50,
"TableCellContentMaxWidth": 72,
"Children": [
{
"Type": "NodeText",
@ -1120,14 +1206,15 @@
]
},
{
"Type": "NodeText",
"Data": ""
"Type": "NodeText"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"TableCellContentWidth": 16,
"TableCellContentMaxWidth": 22,
"Children": [
{
"Type": "NodeText",
@ -1138,6 +1225,8 @@
{
"Type": "NodeTableCell",
"Data": "td",
"TableCellContentWidth": 17,
"TableCellContentMaxWidth": 17,
"Children": [
{
"Type": "NodeText",
@ -1631,7 +1720,7 @@
"HeadingLevel": 3,
"Properties": {
"id": "20210104091538-38bsz5r",
"updated": "20250330192541"
"updated": "20251230163004"
},
"Children": [
{
@ -1833,12 +1922,12 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20240818174819-rfu3puw",
"updated": "20250330191901"
"updated": "20251230163004"
},
"Children": [
{
"Type": "NodeText",
"Data": "If you need to wrap a line in a table block, use "
"Data": "To insert a line break within a cell, use "
},
{
"Type": "NodeTextMark",
@ -1847,7 +1936,7 @@
},
{
"Type": "NodeText",
"Data": "+"
"Data": " + "
},
{
"Type": "NodeTextMark",
@ -1953,7 +2042,7 @@
"HeadingLevel": 3,
"Properties": {
"id": "20220429115218-ydwuros",
"updated": "20250330192550"
"updated": "20251230141912"
},
"Children": [
{
@ -2144,6 +2233,111 @@
}
]
},
{
"ID": "20251230141911-udqgcrm",
"Type": "NodeHeading",
"HeadingLevel": 3,
"Properties": {
"id": "20251230141911-udqgcrm",
"updated": "20251230162958"
},
"Children": [
{
"Type": "NodeText",
"Data": "Database block"
}
]
},
{
"ID": "20251230141916-nuqlgln",
"Type": "NodeParagraph",
"Properties": {
"id": "20251230141916-nuqlgln",
"updated": "20251230141916"
},
"Children": [
{
"Type": "NodeText",
"Data": ""
},
{
"Type": "NodeImage",
"Data": "span",
"Children": [
{
"Type": "NodeBang"
},
{
"Type": "NodeOpenBracket"
},
{
"Type": "NodeLinkText",
"Data": "database"
},
{
"Type": "NodeCloseBracket"
},
{
"Type": "NodeOpenParen"
},
{
"Type": "NodeLinkDest",
"Data": "assets/database-20251230141500-2trhu14.svg"
},
{
"Type": "NodeCloseParen"
}
]
},
{
"Type": "NodeText",
"Data": ""
}
]
},
{
"ID": "20251230141917-1ljqnn4",
"Type": "NodeAttributeView",
"Properties": {
"custom-sy-av-view": "20251230141929-ogkqgga",
"id": "20251230141917-1ljqnn4",
"updated": "20251230141929"
},
"AttributeViewID": "20251230141929-2trv0vl",
"AttributeViewType": "table"
},
{
"ID": "20251230162952-v98vteh",
"Type": "NodeParagraph",
"Properties": {
"id": "20251230162952-v98vteh",
"updated": "20251230162958"
},
"Children": [
{
"Type": "NodeText",
"Data": "To insert a line break within a cell, use "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "Shift"
},
{
"Type": "NodeText",
"Data": " + "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "Enter"
},
{
"Type": "NodeText",
"Data": "."
}
]
},
{
"ID": "20210104091538-cddpqkl",
"Type": "NodeHeading",

View file

@ -0,0 +1,3 @@
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32" fill="#660e7a">
<path d="M16 14.278q-6.932 0-11.216-2.11t-4.284-4.779q0-2.712 4.284-4.801t11.216-2.088 11.216 2.088 4.284 4.801q0 2.669-4.284 4.779t-11.216 2.11zM16 22.889q-6.286 0-10.893-1.894t-4.607-4.564v-4.306q0 1.679 1.615 2.906t4.004 2.024 5.081 1.163 4.801 0.366q2.153 0 4.822-0.366t5.059-1.141 4.004-2.002 1.615-2.949v4.306q0 2.669-4.607 4.564t-10.893 1.894zM16 31.5q-6.286 0-10.893-1.894t-4.607-4.564v-4.306q0 1.679 1.615 2.906t4.004 2.024 5.081 1.163 4.801 0.366q2.153 0 4.822-0.366t5.059-1.141 4.004-2.002 1.615-2.949v4.306q0 2.669-4.607 4.564t-10.893 1.894z"></path>
</svg>

After

Width:  |  Height:  |  Size: 683 B

View file

@ -6,7 +6,7 @@
"id": "20200905090211-2vixtlf",
"title": "内容块类型",
"type": "doc",
"updated": "20251209212012"
"updated": "20251230162824"
},
"Children": [
{
@ -15,7 +15,7 @@
"HeadingLevel": 2,
"Properties": {
"id": "20210104090624-fkv1xsc",
"updated": "20251209211820"
"updated": "20251230141500"
},
"Children": [
{
@ -53,7 +53,7 @@
"Properties": {
"colgroup": "||",
"id": "20210104090624-c5bu25o",
"updated": "20251209211820"
"updated": "20251230141500"
},
"Children": [
{
@ -584,6 +584,75 @@
}
]
},
{
"Type": "NodeTableRow",
"Data": "tr",
"Children": [
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": ""
},
{
"Type": "NodeImage",
"Data": "span",
"Children": [
{
"Type": "NodeBang"
},
{
"Type": "NodeOpenBracket"
},
{
"Type": "NodeLinkText",
"Data": "database"
},
{
"Type": "NodeCloseBracket"
},
{
"Type": "NodeOpenParen"
},
{
"Type": "NodeLinkDest",
"Data": "assets/database-20251230141500-2trhu14.svg"
},
{
"Type": "NodeCloseParen"
}
]
},
{
"Type": "NodeText",
"Data": ""
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "数据库块"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "叶子块"
}
]
}
]
},
{
"Type": "NodeTableRow",
"Data": "tr",
@ -703,6 +772,8 @@
{
"Type": "NodeTableCell",
"Data": "td",
"TableCellContentWidth": 12,
"TableCellContentMaxWidth": 12,
"Children": [
{
"Type": "NodeText",
@ -713,6 +784,8 @@
{
"Type": "NodeTableCell",
"Data": "td",
"TableCellContentWidth": 8,
"TableCellContentMaxWidth": 8,
"Children": [
{
"Type": "NodeText",
@ -729,6 +802,8 @@
{
"Type": "NodeTableCell",
"Data": "td",
"TableCellContentWidth": 62,
"TableCellContentMaxWidth": 72,
"Children": [
{
"Type": "NodeText",
@ -764,14 +839,15 @@
]
},
{
"Type": "NodeText",
"Data": ""
"Type": "NodeText"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"TableCellContentWidth": 12,
"TableCellContentMaxWidth": 12,
"Children": [
{
"Type": "NodeText",
@ -782,6 +858,8 @@
{
"Type": "NodeTableCell",
"Data": "td",
"TableCellContentWidth": 8,
"TableCellContentMaxWidth": 8,
"Children": [
{
"Type": "NodeText",
@ -798,6 +876,8 @@
{
"Type": "NodeTableCell",
"Data": "td",
"TableCellContentWidth": 62,
"TableCellContentMaxWidth": 72,
"Children": [
{
"Type": "NodeText",
@ -833,14 +913,15 @@
]
},
{
"Type": "NodeText",
"Data": ""
"Type": "NodeText"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"TableCellContentWidth": 10,
"TableCellContentMaxWidth": 12,
"Children": [
{
"Type": "NodeText",
@ -851,6 +932,8 @@
{
"Type": "NodeTableCell",
"Data": "td",
"TableCellContentWidth": 8,
"TableCellContentMaxWidth": 8,
"Children": [
{
"Type": "NodeText",
@ -867,6 +950,8 @@
{
"Type": "NodeTableCell",
"Data": "td",
"TableCellContentWidth": 64,
"TableCellContentMaxWidth": 72,
"Children": [
{
"Type": "NodeText",
@ -902,14 +987,15 @@
]
},
{
"Type": "NodeText",
"Data": ""
"Type": "NodeText"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"TableCellContentWidth": 8,
"TableCellContentMaxWidth": 12,
"Children": [
{
"Type": "NodeText",
@ -920,6 +1006,8 @@
{
"Type": "NodeTableCell",
"Data": "td",
"TableCellContentWidth": 8,
"TableCellContentMaxWidth": 8,
"Children": [
{
"Type": "NodeText",
@ -936,6 +1024,8 @@
{
"Type": "NodeTableCell",
"Data": "td",
"TableCellContentWidth": 58,
"TableCellContentMaxWidth": 72,
"Children": [
{
"Type": "NodeText",
@ -971,14 +1061,15 @@
]
},
{
"Type": "NodeText",
"Data": ""
"Type": "NodeText"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"TableCellContentWidth": 8,
"TableCellContentMaxWidth": 12,
"Children": [
{
"Type": "NodeText",
@ -989,6 +1080,8 @@
{
"Type": "NodeTableCell",
"Data": "td",
"TableCellContentWidth": 8,
"TableCellContentMaxWidth": 8,
"Children": [
{
"Type": "NodeText",
@ -1005,6 +1098,8 @@
{
"Type": "NodeTableCell",
"Data": "td",
"TableCellContentWidth": 66,
"TableCellContentMaxWidth": 72,
"Children": [
{
"Type": "NodeText",
@ -1040,14 +1135,15 @@
]
},
{
"Type": "NodeText",
"Data": ""
"Type": "NodeText"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"TableCellContentWidth": 8,
"TableCellContentMaxWidth": 12,
"Children": [
{
"Type": "NodeText",
@ -1058,6 +1154,8 @@
{
"Type": "NodeTableCell",
"Data": "td",
"TableCellContentWidth": 8,
"TableCellContentMaxWidth": 8,
"Children": [
{
"Type": "NodeText",
@ -1074,6 +1172,8 @@
{
"Type": "NodeTableCell",
"Data": "td",
"TableCellContentWidth": 50,
"TableCellContentMaxWidth": 72,
"Children": [
{
"Type": "NodeText",
@ -1109,14 +1209,15 @@
]
},
{
"Type": "NodeText",
"Data": ""
"Type": "NodeText"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"TableCellContentWidth": 8,
"TableCellContentMaxWidth": 12,
"Children": [
{
"Type": "NodeText",
@ -1127,6 +1228,8 @@
{
"Type": "NodeTableCell",
"Data": "td",
"TableCellContentWidth": 8,
"TableCellContentMaxWidth": 8,
"Children": [
{
"Type": "NodeText",
@ -1619,7 +1722,7 @@
"HeadingLevel": 3,
"Properties": {
"id": "20210104090624-erf17it",
"updated": "20250330184312"
"updated": "20251230162813"
},
"Children": [
{
@ -1821,12 +1924,12 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20240818173939-j0bcrw6",
"updated": "20250311200014"
"updated": "20251230162813"
},
"Children": [
{
"Type": "NodeText",
"Data": "如果需要在表格块中换行,请使用 "
"Data": "如果需要在单元格中换行,请使用 "
},
{
"Type": "NodeTextMark",
@ -1844,7 +1947,7 @@
},
{
"Type": "NodeText",
"Data": " 。"
"Data": "​。"
}
]
},
@ -1941,7 +2044,7 @@
"HeadingLevel": 3,
"Properties": {
"id": "20220429115141-c7omuyq",
"updated": "20250330184318"
"updated": "20251230141559"
},
"Children": [
{
@ -2060,7 +2163,23 @@
"Children": [
{
"Type": "NodeText",
"Data": "使用 HTML 块时默认会对其中的代码进行安全过滤,如果不需要过滤,请开启 "
"Data": "使用 HTML 块时默认会对其中的代码进行安全"
},
{
"Type": "NodeText",
"Data": "过滤"
},
{
"Type": "NodeText",
"Data": ",如果不需要"
},
{
"Type": "NodeText",
"Data": "过滤"
},
{
"Type": "NodeText",
"Data": ",请开启 "
},
{
"Type": "NodeTextMark",
@ -2132,6 +2251,111 @@
}
]
},
{
"ID": "20251230141559-ewkpoyo",
"Type": "NodeHeading",
"HeadingLevel": 3,
"Properties": {
"id": "20251230141559-ewkpoyo",
"updated": "20251230162824"
},
"Children": [
{
"Type": "NodeText",
"Data": "数据库块"
}
]
},
{
"ID": "20251230141602-c7rdmid",
"Type": "NodeParagraph",
"Properties": {
"id": "20251230141602-c7rdmid",
"updated": "20251230141604"
},
"Children": [
{
"Type": "NodeText",
"Data": ""
},
{
"Type": "NodeImage",
"Data": "span",
"Children": [
{
"Type": "NodeBang"
},
{
"Type": "NodeOpenBracket"
},
{
"Type": "NodeLinkText",
"Data": "database"
},
{
"Type": "NodeCloseBracket"
},
{
"Type": "NodeOpenParen"
},
{
"Type": "NodeLinkDest",
"Data": "assets/database-20251230141500-2trhu14.svg"
},
{
"Type": "NodeCloseParen"
}
]
},
{
"Type": "NodeText",
"Data": ""
}
]
},
{
"ID": "20251230141605-6a4fi5j",
"Type": "NodeAttributeView",
"Properties": {
"custom-sy-av-view": "20251230141609-lcme2fh",
"id": "20251230141605-6a4fi5j",
"updated": "20251230141636"
},
"AttributeViewID": "20251230141609-2kvghrg",
"AttributeViewType": "table"
},
{
"ID": "20251230162824-tgrt7nd",
"Type": "NodeParagraph",
"Properties": {
"id": "20251230162824-tgrt7nd",
"updated": "20251230162824"
},
"Children": [
{
"Type": "NodeText",
"Data": "如果需要在单元格中换行,请使用 "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "Shift"
},
{
"Type": "NodeText",
"Data": "+"
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "回车"
},
{
"Type": "NodeText",
"Data": "​。"
}
]
},
{
"ID": "20210104090624-1gdzl0u",
"Type": "NodeHeading",

View file

@ -0,0 +1,3 @@
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32" fill="#660e7a">
<path d="M16 14.278q-6.932 0-11.216-2.11t-4.284-4.779q0-2.712 4.284-4.801t11.216-2.088 11.216 2.088 4.284 4.801q0 2.669-4.284 4.779t-11.216 2.11zM16 22.889q-6.286 0-10.893-1.894t-4.607-4.564v-4.306q0 1.679 1.615 2.906t4.004 2.024 5.081 1.163 4.801 0.366q2.153 0 4.822-0.366t5.059-1.141 4.004-2.002 1.615-2.949v4.306q0 2.669-4.607 4.564t-10.893 1.894zM16 31.5q-6.286 0-10.893-1.894t-4.607-4.564v-4.306q0 1.679 1.615 2.906t4.004 2.024 5.081 1.163 4.801 0.366q2.153 0 4.822-0.366t5.059-1.141 4.004-2.002 1.615-2.949v4.306q0 2.669-4.607 4.564t-10.893 1.894z"></path>
</svg>

After

Width:  |  Height:  |  Size: 683 B

View file

@ -6,7 +6,7 @@
"id": "20211226120147-ib6yy3i",
"title": "內容塊類型",
"type": "doc",
"updated": "20251209212407"
"updated": "20251230162901"
},
"Children": [
{
@ -15,7 +15,7 @@
"HeadingLevel": 2,
"Properties": {
"id": "20211226120227-2s70boj",
"updated": "20251209212229"
"updated": "20251230141833"
},
"Children": [
{
@ -49,7 +49,7 @@
"Properties": {
"colgroup": "||",
"id": "20211226120227-nx8tlf5",
"updated": "20251209212229"
"updated": "20251230141833"
},
"Children": [
{
@ -107,7 +107,7 @@
"Children": [
{
"Type": "NodeText",
"Data": ""
"Data": ""
},
{
"Type": "NodeImage",
@ -176,7 +176,7 @@
"Children": [
{
"Type": "NodeText",
"Data": ""
"Data": ""
},
{
"Type": "NodeImage",
@ -245,7 +245,7 @@
"Children": [
{
"Type": "NodeText",
"Data": ""
"Data": ""
},
{
"Type": "NodeImage",
@ -314,7 +314,7 @@
"Children": [
{
"Type": "NodeText",
"Data": ""
"Data": ""
},
{
"Type": "NodeImage",
@ -383,7 +383,7 @@
"Children": [
{
"Type": "NodeText",
"Data": ""
"Data": ""
},
{
"Type": "NodeImage",
@ -426,11 +426,7 @@
"Children": [
{
"Type": "NodeText",
"Data": "表格"
},
{
"Type": "NodeText",
"Data": "塊"
"Data": "表格塊"
}
]
},
@ -456,7 +452,7 @@
"Children": [
{
"Type": "NodeText",
"Data": ""
"Data": ""
},
{
"Type": "NodeImage",
@ -525,7 +521,7 @@
"Children": [
{
"Type": "NodeText",
"Data": ""
"Data": ""
},
{
"Type": "NodeImage",
@ -594,7 +590,76 @@
"Children": [
{
"Type": "NodeText",
"Data": ""
"Data": ""
},
{
"Type": "NodeImage",
"Data": "span",
"Children": [
{
"Type": "NodeBang"
},
{
"Type": "NodeOpenBracket"
},
{
"Type": "NodeLinkText",
"Data": "database"
},
{
"Type": "NodeCloseBracket"
},
{
"Type": "NodeOpenParen"
},
{
"Type": "NodeLinkDest",
"Data": "assets/database-20251230141500-2trhu14.svg"
},
{
"Type": "NodeCloseParen"
}
]
},
{
"Type": "NodeText",
"Data": ""
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "資料庫塊"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "葉子塊"
}
]
}
]
},
{
"Type": "NodeTableRow",
"Data": "tr",
"Children": [
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": ""
},
{
"Type": "NodeImage",
@ -637,15 +702,7 @@
"Children": [
{
"Type": "NodeText",
"Data": "無序"
},
{
"Type": "NodeText",
"Data": "列表"
},
{
"Type": "NodeText",
"Data": "塊"
"Data": "無序列表塊"
}
]
},
@ -671,7 +728,7 @@
"Children": [
{
"Type": "NodeText",
"Data": ""
"Data": ""
},
{
"Type": "NodeImage",
@ -714,15 +771,7 @@
"Children": [
{
"Type": "NodeText",
"Data": "有序"
},
{
"Type": "NodeText",
"Data": "列表"
},
{
"Type": "NodeText",
"Data": "塊"
"Data": "有序列表塊"
}
]
},
@ -748,7 +797,7 @@
"Children": [
{
"Type": "NodeText",
"Data": ""
"Data": ""
},
{
"Type": "NodeImage",
@ -791,15 +840,7 @@
"Children": [
{
"Type": "NodeText",
"Data": "任務"
},
{
"Type": "NodeText",
"Data": "列表"
},
{
"Type": "NodeText",
"Data": "塊"
"Data": "任務列表塊"
}
]
},
@ -825,7 +866,7 @@
"Children": [
{
"Type": "NodeText",
"Data": ""
"Data": ""
},
{
"Type": "NodeImage",
@ -868,11 +909,7 @@
"Children": [
{
"Type": "NodeText",
"Data": "列表"
},
{
"Type": "NodeText",
"Data": "項塊"
"Data": "列表項塊"
}
]
},
@ -898,7 +935,7 @@
"Children": [
{
"Type": "NodeText",
"Data": ""
"Data": ""
},
{
"Type": "NodeImage",
@ -941,11 +978,7 @@
"Children": [
{
"Type": "NodeText",
"Data": "引述"
},
{
"Type": "NodeText",
"Data": "塊"
"Data": "引述塊"
}
]
},
@ -971,7 +1004,7 @@
"Children": [
{
"Type": "NodeText",
"Data": ""
"Data": ""
},
{
"Type": "NodeImage",
@ -1040,7 +1073,7 @@
"Children": [
{
"Type": "NodeText",
"Data": ""
"Data": ""
},
{
"Type": "NodeImage",
@ -1109,7 +1142,7 @@
"Children": [
{
"Type": "NodeText",
"Data": ""
"Data": ""
},
{
"Type": "NodeImage",
@ -1612,7 +1645,7 @@
"HeadingLevel": 3,
"Properties": {
"id": "20211226120227-fe8klj7",
"updated": "20250330184021"
"updated": "20251230162852"
},
"Children": [
{
@ -1812,12 +1845,12 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20240818174341-89p5u2n",
"updated": "20250311195936"
"updated": "20251230162852"
},
"Children": [
{
"Type": "NodeText",
"Data": "如果需要在表格塊中換行,請使用 "
"Data": "如果需要在儲存格中換行,請使用 "
},
{
"Type": "NodeTextMark",
@ -1835,7 +1868,7 @@
},
{
"Type": "NodeText",
"Data": " 。"
"Data": "​。"
}
]
},
@ -1932,7 +1965,7 @@
"HeadingLevel": 3,
"Properties": {
"id": "20220429114938-37kksd9",
"updated": "20250330184030"
"updated": "20251230141743"
},
"Children": [
{
@ -2123,6 +2156,111 @@
}
]
},
{
"ID": "20251230141742-xyhhm1l",
"Type": "NodeHeading",
"HeadingLevel": 3,
"Properties": {
"id": "20251230141742-xyhhm1l",
"updated": "20251230162901"
},
"Children": [
{
"Type": "NodeText",
"Data": "資料庫區塊"
}
]
},
{
"ID": "20251230141744-qf3rmxh",
"Type": "NodeParagraph",
"Properties": {
"id": "20251230141744-qf3rmxh",
"updated": "20251230141808"
},
"Children": [
{
"Type": "NodeText",
"Data": ""
},
{
"Type": "NodeImage",
"Data": "span",
"Children": [
{
"Type": "NodeBang"
},
{
"Type": "NodeOpenBracket"
},
{
"Type": "NodeLinkText",
"Data": "database"
},
{
"Type": "NodeCloseBracket"
},
{
"Type": "NodeOpenParen"
},
{
"Type": "NodeLinkDest",
"Data": "assets/database-20251230141500-2trhu14.svg"
},
{
"Type": "NodeCloseParen"
}
]
},
{
"Type": "NodeText",
"Data": ""
}
]
},
{
"ID": "20251230141809-o8wm8y4",
"Type": "NodeAttributeView",
"Properties": {
"custom-sy-av-view": "20251230141813-nlkdgna",
"id": "20251230141809-o8wm8y4",
"updated": "20251230141811"
},
"AttributeViewID": "20251230141813-9w627cg",
"AttributeViewType": "table"
},
{
"ID": "20251230162900-r3hhecc",
"Type": "NodeParagraph",
"Properties": {
"id": "20251230162900-r3hhecc",
"updated": "20251230162901"
},
"Children": [
{
"Type": "NodeText",
"Data": "如果需要在儲存格中換行,請使用 "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "Shift"
},
{
"Type": "NodeText",
"Data": "+"
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "回車"
},
{
"Type": "NodeText",
"Data": "​。"
}
]
},
{
"ID": "20211226120227-icf8aai",
"Type": "NodeHeading",

View file

@ -0,0 +1,3 @@
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32" fill="#660e7a">
<path d="M16 14.278q-6.932 0-11.216-2.11t-4.284-4.779q0-2.712 4.284-4.801t11.216-2.088 11.216 2.088 4.284 4.801q0 2.669-4.284 4.779t-11.216 2.11zM16 22.889q-6.286 0-10.893-1.894t-4.607-4.564v-4.306q0 1.679 1.615 2.906t4.004 2.024 5.081 1.163 4.801 0.366q2.153 0 4.822-0.366t5.059-1.141 4.004-2.002 1.615-2.949v4.306q0 2.669-4.607 4.564t-10.893 1.894zM16 31.5q-6.286 0-10.893-1.894t-4.607-4.564v-4.306q0 1.679 1.615 2.906t4.004 2.024 5.081 1.163 4.801 0.366q2.153 0 4.822-0.366t5.059-1.141 4.004-2.002 1.615-2.949v4.306q0 2.669-4.607 4.564t-10.893 1.894z"></path>
</svg>

After

Width:  |  Height:  |  Size: 683 B

View file

@ -7,7 +7,7 @@
"id": "20240530101000-35bbvcx",
"title": "コンテンツブロックの種類",
"type": "doc",
"updated": "20251209213509"
"updated": "20251230162933"
},
"Children": [
{
@ -17,7 +17,7 @@
"Properties": {
"ID": "20240530101000-6nam42g",
"id": "20240530101000-n0tipvh",
"updated": "20251209213247"
"updated": "20251230142024"
},
"Children": [
{
@ -73,7 +73,7 @@
"Properties": {
"colgroup": "||",
"id": "20240530101000-7ed5u6l",
"updated": "20251209213247"
"updated": "20251230142024"
},
"Children": [
{
@ -644,6 +644,75 @@
}
]
},
{
"Type": "NodeTableRow",
"Data": "tr",
"Children": [
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": ""
},
{
"Type": "NodeImage",
"Data": "span",
"Children": [
{
"Type": "NodeBang"
},
{
"Type": "NodeOpenBracket"
},
{
"Type": "NodeLinkText",
"Data": "database"
},
{
"Type": "NodeCloseBracket"
},
{
"Type": "NodeOpenParen"
},
{
"Type": "NodeLinkDest",
"Data": "assets/database-20251230141500-2trhu14.svg"
},
{
"Type": "NodeCloseParen"
}
]
},
{
"Type": "NodeText",
"Data": ""
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "データベースブロック"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "リーフブロック"
}
]
}
]
},
{
"Type": "NodeTableRow",
"Data": "tr",
@ -1676,7 +1745,7 @@
"Properties": {
"ID": "20240530101000-1iwbq48",
"id": "20240530101000-riwihza",
"updated": "20250330192704"
"updated": "20251230162927"
},
"Children": [
{
@ -1900,12 +1969,12 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20240818180047-hluqmta",
"updated": "20250115145206"
"updated": "20251230162927"
},
"Children": [
{
"Type": "NodeText",
"Data": "テーブルブロックで改行する必要がある場合は、"
"Data": "セル内に改行を追加するには、"
},
{
"Type": "NodeTextMark",
@ -1914,7 +1983,7 @@
},
{
"Type": "NodeText",
"Data": "+"
"Data": " + "
},
{
"Type": "NodeTextMark",
@ -1923,7 +1992,7 @@
},
{
"Type": "NodeText",
"Data": " を使用してください。"
"Data": " を使用します。"
}
]
},
@ -2021,7 +2090,7 @@
"Properties": {
"ID": "20240530101000-l2cwfzo",
"id": "20240530101000-3b4bvhu",
"updated": "20250330192711"
"updated": "20251230141957"
},
"Children": [
{
@ -2133,15 +2202,8 @@
{
"ID": "20240530101000-jplysif",
"Type": "NodeList",
"ListData": {
"Tight": true,
"BulletChar": 42,
"Padding": 2,
"Marker": "Kg==",
"Num": -1
},
"ListData": {},
"Properties": {
"ID": "20240530101000-w48cspx",
"id": "20240530101000-jplysif",
"updated": "20240530101000"
},
@ -2149,16 +2211,11 @@
{
"ID": "20240530101000-veodkk2",
"Type": "NodeListItem",
"Data": "*",
"ListData": {
"Tight": true,
"BulletChar": 42,
"Padding": 2,
"Marker": "Kg==",
"Num": -1
"Marker": "Kg=="
},
"Properties": {
"ID": "20240530101000-8zzjykz",
"id": "20240530101000-veodkk2",
"updated": "20240530101000"
},
@ -2167,62 +2224,40 @@
"ID": "20240530101000-u4lkzdu",
"Type": "NodeParagraph",
"Properties": {
"ID": "20240530101000-jlcafxx",
"id": "20240530101000-u4lkzdu",
"updated": "20240530101000"
},
"Children": [
{
"Type": "NodeText",
"Data": "HTML ブロックを使用する場合、ブロック内のコードはデフォルトでサニタイズされます。サニタイズが不要な場合は、",
"Properties": {
"id": ""
}
"Data": "HTML ブロックを使用する場合、ブロック内のコードはデフォルトでサニタイズされます。サニタイズが不要な場合は、"
},
{
"Type": "NodeTextMark",
"Properties": {
"id": ""
},
"TextMarkType": "kbd",
"TextMarkTextContent": "設定"
},
{
"Type": "NodeText",
"Data": " - ",
"Properties": {
"id": ""
}
"Data": " - "
},
{
"Type": "NodeTextMark",
"Properties": {
"id": ""
},
"TextMarkType": "kbd",
"TextMarkTextContent": "エディタ"
},
{
"Type": "NodeText",
"Data": " - ",
"Properties": {
"id": ""
}
"Data": " - "
},
{
"Type": "NodeTextMark",
"Properties": {
"id": ""
},
"TextMarkType": "kbd",
"TextMarkTextContent": "HTML ブロック内のスクリプトの実行を許可"
},
{
"Type": "NodeText",
"Data": " を有効にします。この場合、クロスサイトスクリプティング攻撃 (XSS) を避けるため、コードが十分に安全であることを確認してください。",
"Properties": {
"id": ""
}
"Data": " を有効にします。この場合、クロスサイトスクリプティング攻撃 (XSS) を避けるため、コードが十分に安全であることを確認してください。"
}
]
}
@ -2231,16 +2266,11 @@
{
"ID": "20240530101000-af3aq09",
"Type": "NodeListItem",
"Data": "*",
"ListData": {
"Tight": true,
"BulletChar": 42,
"Padding": 2,
"Marker": "Kg==",
"Num": -1
"Marker": "Kg=="
},
"Properties": {
"ID": "20240530101000-osa9ud4",
"id": "20240530101000-af3aq09",
"updated": "20240530101000"
},
@ -2249,32 +2279,22 @@
"ID": "20240530101000-znnyg92",
"Type": "NodeParagraph",
"Properties": {
"ID": "20240530101000-yqcf1hp",
"id": "20240530101000-znnyg92",
"updated": "20240530101000"
},
"Children": [
{
"Type": "NodeText",
"Data": "Markdown の仕様では HTML ブロックの解析ルールが複雑なため、HTML コード全体を ",
"Properties": {
"id": ""
}
"Data": "Markdown の仕様では HTML ブロックの解析ルールが複雑なため、HTML コード全体を "
},
{
"Type": "NodeTextMark",
"Properties": {
"id": ""
},
"TextMarkType": "code",
"TextMarkTextContent": "\u0026lt;div\u0026gt;\u0026lt;/div\u0026gt;"
},
{
"Type": "NodeText",
"Data": " で囲み、空の行は削除することを推奨します。",
"Properties": {
"id": ""
}
"Data": " で囲み、空の行は削除することを推奨します。"
}
]
}
@ -2282,6 +2302,111 @@
}
]
},
{
"ID": "20251230141957-1a2yhar",
"Type": "NodeHeading",
"HeadingLevel": 3,
"Properties": {
"id": "20251230141957-1a2yhar",
"updated": "20251230162933"
},
"Children": [
{
"Type": "NodeText",
"Data": "データベースブロック"
}
]
},
{
"ID": "20251230142001-2h2tzno",
"Type": "NodeParagraph",
"Properties": {
"id": "20251230142001-2h2tzno",
"updated": "20251230142009"
},
"Children": [
{
"Type": "NodeText",
"Data": ""
},
{
"Type": "NodeImage",
"Data": "span",
"Children": [
{
"Type": "NodeBang"
},
{
"Type": "NodeOpenBracket"
},
{
"Type": "NodeLinkText",
"Data": "database"
},
{
"Type": "NodeCloseBracket"
},
{
"Type": "NodeOpenParen"
},
{
"Type": "NodeLinkDest",
"Data": "assets/database-20251230141500-2trhu14.svg"
},
{
"Type": "NodeCloseParen"
}
]
},
{
"Type": "NodeText",
"Data": ""
}
]
},
{
"ID": "20251230142010-ihoh4dv",
"Type": "NodeAttributeView",
"Properties": {
"custom-sy-av-view": "20251230142020-srwlylx",
"id": "20251230142010-ihoh4dv",
"updated": "20251230142019"
},
"AttributeViewID": "20251230142020-5frasem",
"AttributeViewType": "table"
},
{
"ID": "20251230162932-9udtkk5",
"Type": "NodeParagraph",
"Properties": {
"id": "20251230162932-9udtkk5",
"updated": "20251230162933"
},
"Children": [
{
"Type": "NodeText",
"Data": "セル内に改行を追加するには、"
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "Shift"
},
{
"Type": "NodeText",
"Data": " + "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "Enter"
},
{
"Type": "NodeText",
"Data": " を使用します。"
}
]
},
{
"ID": "20240530101000-qkndmzb",
"Type": "NodeHeading",

View file

@ -0,0 +1,3 @@
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32" fill="#660e7a">
<path d="M16 14.278q-6.932 0-11.216-2.11t-4.284-4.779q0-2.712 4.284-4.801t11.216-2.088 11.216 2.088 4.284 4.801q0 2.669-4.284 4.779t-11.216 2.11zM16 22.889q-6.286 0-10.893-1.894t-4.607-4.564v-4.306q0 1.679 1.615 2.906t4.004 2.024 5.081 1.163 4.801 0.366q2.153 0 4.822-0.366t5.059-1.141 4.004-2.002 1.615-2.949v4.306q0 2.669-4.607 4.564t-10.893 1.894zM16 31.5q-6.286 0-10.893-1.894t-4.607-4.564v-4.306q0 1.679 1.615 2.906t4.004 2.024 5.081 1.163 4.801 0.366q2.153 0 4.822-0.366t5.059-1.141 4.004-2.002 1.615-2.949v4.306q0 2.669-4.607 4.564t-10.893 1.894z"></path>
</svg>

After

Width:  |  Height:  |  Size: 683 B

View file

@ -18,11 +18,11 @@ package proxy
import (
"context"
"errors"
"fmt"
"net"
"net/http"
"net/http/httputil"
"time"
"github.com/siyuan-note/logging"
"github.com/siyuan-note/siyuan/kernel/model"
@ -93,11 +93,9 @@ func closePublishListener() {
return
}
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
if err := server.Shutdown(ctx); err != nil {
if err := server.Shutdown(context.Background()); err != nil {
logging.LogErrorf("shutdown server failed: %s", err)
}
cancel()
if err := server.Close(); err != nil {
logging.LogErrorf("close server failed: %s", err)
@ -116,10 +114,8 @@ func startPublishReverseProxyService() {
},
}
if err := server.Serve(listener); err != nil {
if listener != nil {
logging.LogErrorf("boot publish service failed: %s", err)
}
if err := server.Serve(listener); err != nil && !errors.Is(err, http.ErrServerClosed) {
logging.LogErrorf("boot publish service failed: %s", err)
}
logging.LogInfof("publish service [%s:%s] is stopped", Host, Port)