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

This commit is contained in:
Vanessa 2025-12-01 10:51:43 +08:00
commit 8a60aaff49
4 changed files with 26 additions and 34 deletions

View file

@ -6,7 +6,7 @@
"id": "20210613191509-cbkxcbz", "id": "20210613191509-cbkxcbz",
"title": "Content Block Attribute", "title": "Content Block Attribute",
"type": "doc", "type": "doc",
"updated": "20251126211142" "updated": "20251201102407"
}, },
"Children": [ "Children": [
{ {
@ -214,7 +214,7 @@
"HeadingLevel": 2, "HeadingLevel": 2,
"Properties": { "Properties": {
"id": "20210613191548-65gd8yo", "id": "20210613191548-65gd8yo",
"updated": "20251126211142" "updated": "20251201102407"
}, },
"Children": [ "Children": [
{ {
@ -224,16 +224,16 @@
] ]
}, },
{ {
"ID": "20210613191548-7p2bvoq", "ID": "20251201102224-5uvilvm",
"Type": "NodeParagraph", "Type": "NodeParagraph",
"Properties": { "Properties": {
"id": "20210613191548-7p2bvoq", "id": "20251201102224-5uvilvm",
"updated": "20251126211142" "updated": "20251201102407"
}, },
"Children": [ "Children": [
{ {
"Type": "NodeText", "Type": "NodeText",
"Data": "The user-defined attributes are set by the user through the " "Data": "Custom attributes are set by the user through the "
}, },
{ {
"Type": "NodeTextMark", "Type": "NodeTextMark",
@ -251,7 +251,7 @@
}, },
{ {
"Type": "NodeText", "Type": "NodeText",
"Data": ", and only lowercase English letters and Arabic numerals are allowed in the attribute name (such as " "Data": ", attribute names can only use lowercase English letters and Arabic numerals and must begin with a letter (e.g., "
}, },
{ {
"Type": "NodeTextMark", "Type": "NodeTextMark",
@ -265,11 +265,11 @@
{ {
"Type": "NodeTextMark", "Type": "NodeTextMark",
"TextMarkType": "code", "TextMarkType": "code",
"TextMarkTextContent": "7days" "TextMarkTextContent": "day1"
}, },
{ {
"Type": "NodeText", "Type": "NodeText",
"Data": "). After setting, SiYuan will automatically prefix the attribute name with " "Data": "). After setting, SiYuan will automatically add the prefix "
}, },
{ {
"Type": "NodeTextMark", "Type": "NodeTextMark",
@ -278,7 +278,7 @@
}, },
{ {
"Type": "NodeText", "Type": "NodeText",
"Data": " to distinguish built-in attributes from custom attributes." "Data": " to the attribute name to distinguish it from built-in attributes."
} }
] ]
}, },

View file

@ -6,7 +6,7 @@
"id": "20210612224500-ywcms1m", "id": "20210612224500-ywcms1m",
"title": "内容块属性", "title": "内容块属性",
"type": "doc", "type": "doc",
"updated": "20251126211031" "updated": "20251201102135"
}, },
"Children": [ "Children": [
{ {
@ -214,7 +214,7 @@
"HeadingLevel": 2, "HeadingLevel": 2,
"Properties": { "Properties": {
"id": "20210613004117-1jnl9m0", "id": "20210613004117-1jnl9m0",
"updated": "20251126211031" "updated": "20251201102135"
}, },
"Children": [ "Children": [
{ {
@ -228,7 +228,7 @@
"Type": "NodeParagraph", "Type": "NodeParagraph",
"Properties": { "Properties": {
"id": "20210613004135-7td7u1o", "id": "20210613004135-7td7u1o",
"updated": "20251126211031" "updated": "20251201102135"
}, },
"Children": [ "Children": [
{ {
@ -251,7 +251,7 @@
}, },
{ {
"Type": "NodeText", "Type": "NodeText",
"Data": " 进行设置,属性名仅允许使用小写英文字母和阿拉伯数字(例如 " "Data": " 进行设置,属性名仅允许使用小写英文字母和阿拉伯数字并且需要以字母开头(例如 "
}, },
{ {
"Type": "NodeTextMark", "Type": "NodeTextMark",
@ -265,7 +265,7 @@
{ {
"Type": "NodeTextMark", "Type": "NodeTextMark",
"TextMarkType": "code", "TextMarkType": "code",
"TextMarkTextContent": " 7days" "TextMarkTextContent": "day1"
}, },
{ {
"Type": "NodeText", "Type": "NodeText",

View file

@ -6,7 +6,7 @@
"id": "20211226120802-77aj0is", "id": "20211226120802-77aj0is",
"title": "内容塊屬性", "title": "内容塊屬性",
"type": "doc", "type": "doc",
"updated": "20251126211207" "updated": "20251201102544"
}, },
"Children": [ "Children": [
{ {
@ -215,7 +215,7 @@
"HeadingLevel": 2, "HeadingLevel": 2,
"Properties": { "Properties": {
"id": "20211226120833-347kbz5", "id": "20211226120833-347kbz5",
"updated": "20251126211207" "updated": "20251201102544"
}, },
"Children": [ "Children": [
{ {
@ -229,7 +229,7 @@
"Type": "NodeParagraph", "Type": "NodeParagraph",
"Properties": { "Properties": {
"id": "20211226120833-a02rthr", "id": "20211226120833-a02rthr",
"updated": "20251126211207" "updated": "20251201102544"
}, },
"Children": [ "Children": [
{ {
@ -252,7 +252,7 @@
}, },
{ {
"Type": "NodeText", "Type": "NodeText",
"Data": " 進行設置,屬性名僅允許使用小寫英文字母和阿拉伯數字(例如 " "Data": " 進行設置,屬性名僅允許使用小寫英文字母和阿拉伯數字並且需要以字母開頭(例如 "
}, },
{ {
"Type": "NodeTextMark", "Type": "NodeTextMark",
@ -266,7 +266,7 @@
{ {
"Type": "NodeTextMark", "Type": "NodeTextMark",
"TextMarkType": "code", "TextMarkType": "code",
"TextMarkTextContent": " 7days" "TextMarkTextContent": "day1"
}, },
{ {
"Type": "NodeText", "Type": "NodeText",

View file

@ -7,7 +7,7 @@
"id": "20240530101000-875snki", "id": "20240530101000-875snki",
"title": "コンテンツブロックの属性", "title": "コンテンツブロックの属性",
"type": "doc", "type": "doc",
"updated": "20251126211401" "updated": "20251201102644"
}, },
"Children": [ "Children": [
{ {
@ -221,7 +221,7 @@
"Properties": { "Properties": {
"ID": "20240530101000-i0jnklc", "ID": "20240530101000-i0jnklc",
"id": "20240530101000-41pnskz", "id": "20240530101000-41pnskz",
"updated": "20251126211401" "updated": "20251201102644"
}, },
"Children": [ "Children": [
{ {
@ -235,7 +235,7 @@
"Type": "NodeParagraph", "Type": "NodeParagraph",
"Properties": { "Properties": {
"id": "20240530101000-qc6ciit", "id": "20240530101000-qc6ciit",
"updated": "20251126211401" "updated": "20251201102644"
}, },
"Children": [ "Children": [
{ {
@ -249,7 +249,7 @@
}, },
{ {
"Type": "NodeText", "Type": "NodeText",
"Data": " を選んで設定します。属性名には小文字の英語とアラビア数字のみを使用できます (例: " "Data": " を選んで設定します。属性名には小文字の英語とアラビア数字のみを使用でき、文字で始まる必要があります(例:"
}, },
{ {
"Type": "NodeTextMark", "Type": "NodeTextMark",
@ -263,11 +263,11 @@
{ {
"Type": "NodeTextMark", "Type": "NodeTextMark",
"TextMarkType": "code", "TextMarkType": "code",
"TextMarkTextContent": "7days" "TextMarkTextContent": "day1"
}, },
{ {
"Type": "NodeText", "Type": "NodeText",
"Data": ")。属性を設定すると、組み込み属性と区別するため属性名に " "Data": "。属性を設定すると、組み込み属性と区別するため属性名に "
}, },
{ {
"Type": "NodeTextMark", "Type": "NodeTextMark",
@ -280,14 +280,6 @@
} }
] ]
}, },
{
"ID": "20251126211253-ndli88f",
"Type": "NodeParagraph",
"Properties": {
"id": "20251126211253-ndli88f",
"updated": "20251126211253"
}
},
{ {
"ID": "20240530101000-st9ddhf", "ID": "20240530101000-st9ddhf",
"Type": "NodeHeading", "Type": "NodeHeading",