Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-25 19:08:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2022-12-29 11:50:18 +08:00
commit 5f2f97db79
3 changed files with 270 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

139
app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20221223221636-ms2b4w9.sy
View file

@ -5,7 +5,7 @@
"Properties": {
"id": "20221223221636-ms2b4w9",
"title": "Flashcards",
"updated": "20221223222920"
"updated": "20221229111520"
},
"Children": [
{
@ -63,65 +63,32 @@
]
},
{
"ID": "20221223221639-4wtuvaf",
"ID": "20221229111328-8hwsv9o",
"Type": "NodeList",
"ListData": {},
"Properties": {
"id": "20221223221639-4wtuvaf",
"updated": "20221223221956"
"id": "20221229111328-8hwsv9o",
"updated": "20221229111520"
},
"Children": [
{
"ID": "20221223221639-jm5vt4w",
"ID": "20221229111328-l01l8rb",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20221223221639-jm5vt4w",
"updated": "20221223221715"
"id": "20221229111328-l01l8rb",
"updated": "20221229111520"
},
"Children": [
{
"ID": "20221223221639-rx7gp3h",
"ID": "20221229111328-n738r3a",
"Type": "NodeParagraph",
"Properties": {
"id": "20221223221639-rx7gp3h",
"updated": "20221223221715"
},
"Children": [
{
"Type": "NodeTextMark",
"TextMarkType": "mark",
"TextMarkTextContent": "Mark"
},
{
"Type": "NodeText",
"Data": " elements in content blocks will be treated as knockout answers"
}
]
}
]
},
{
"ID": "20221223221639-e1gfrb2",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20221223221639-e1gfrb2",
"updated": "20221223221956"
},
"Children": [
{
"ID": "20221223221639-lokw910",
"Type": "NodeParagraph",
"Properties": {
"id": "20221223221639-lokw910",
"updated": "20221223221956"
"id": "20221229111328-n738r3a",
"updated": "20221229111440"
},
"Children": [
{
@ -135,30 +102,102 @@
},
{
"Type": "NodeText",
"Data": "​ in the block menu, then choose to add this content block to a card deck"
"Data": "​ in the block icon menu, then choose to add this content block to a card deck"
}
]
},
{
"ID": "20221229111328-m09a7o4",
"Type": "NodeList",
"ListData": {},
"Properties": {
"id": "20221229111328-m09a7o4",
"updated": "20221229111520"
},
"Children": [
{
"ID": "20221229111328-vjyvl27",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20221229111328-vjyvl27",
"updated": "20221229111459"
},
"Children": [
{
"ID": "20221229111328-ayebaxi",
"Type": "NodeParagraph",
"Properties": {
"id": "20221229111328-ayebaxi",
"updated": "20221229111459"
},
"Children": [
{
"Type": "NodeTextMark",
"TextMarkType": "mark",
"TextMarkTextContent": "Mark"
},
{
"Type": "NodeText",
"Data": " elements in content blocks will be treated as knockout answers"
}
]
}
]
},
{
"ID": "20221229111328-ovvadcn",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20221229111328-ovvadcn",
"updated": "20221229111520"
},
"Children": [
{
"ID": "20221229111328-2amris5",
"Type": "NodeParagraph",
"Properties": {
"id": "20221229111328-2amris5",
"updated": "20221229111520"
},
"Children": [
{
"Type": "NodeText",
"Data": "If a super block is set as a flashcard, the first sub-block of the super block will be regarded as a question, and the rest of the sub-blocks will be regarded as an answer"
}
]
}
]
}
]
}
]
},
{
"ID": "20221223221639-4udcuga",
"ID": "20221229111328-5zd9v4g",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20221223221639-4udcuga",
"updated": "20221223221656"
"id": "20221229111328-5zd9v4g",
"updated": "20221229111347"
},
"Children": [
{
"ID": "20221223221639-rjod2g1",
"ID": "20221229111328-vdse89d",
"Type": "NodeParagraph",
"Properties": {
"id": "20221223221639-rjod2g1",
"updated": "20221223221656"
"id": "20221229111328-vdse89d",
"updated": "20221229111347"
},
"Children": [
{

130
app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20221223215557-o6gfsoy.sy
View file

@ -5,7 +5,7 @@
"Properties": {
"id": "20221223215557-o6gfsoy",
"title": "闪卡",
"updated": "20221223221838"
"updated": "20221229111221"
},
"Children": [
{
@ -68,63 +68,27 @@
"ListData": {},
"Properties": {
"id": "20221223215834-z8ny593",
"updated": "20221223221347"
"updated": "20221229111221"
},
"Children": [
{
"ID": "20221223220707-il9wt7t",
"ID": "20221229111046-50w42e3",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20221223220707-il9wt7t",
"updated": "20221223221347"
"id": "20221229111046-50w42e3",
"updated": "20221229111221"
},
"Children": [
{
"ID": "20221223220707-v0oxdls",
"ID": "20221229111046-fh0iyx1",
"Type": "NodeParagraph",
"Properties": {
"id": "20221223220707-v0oxdls",
"updated": "20221223221347"
},
"Children": [
{
"Type": "NodeText",
"Data": "内容块中的 "
},
{
"Type": "NodeTextMark",
"TextMarkType": "mark",
"TextMarkTextContent": "标记"
},
{
"Type": "NodeText",
"Data": " 元素会被视作挖空的答案"
}
]
}
]
},
{
"ID": "20221223220723-2ltt4np",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20221223220723-2ltt4np"
},
"Children": [
{
"ID": "20221223220723-ti8ofs3",
"Type": "NodeParagraph",
"Properties": {
"id": "20221223220723-ti8ofs3",
"updated": "20221223220723"
"id": "20221229111046-fh0iyx1",
"updated": "20221229111046"
},
"Children": [
{
@ -141,6 +105,82 @@
"Data": "​，然后选择将该内容块添加到一个卡包中"
}
]
},
{
"ID": "20221229111119-i5mqtf1",
"Type": "NodeList",
"ListData": {},
"Properties": {
"id": "20221229111119-i5mqtf1",
"updated": "20221229111221"
},
"Children": [
{
"ID": "20221223220707-il9wt7t",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20221223220707-il9wt7t",
"updated": "20221223221347"
},
"Children": [
{
"ID": "20221223220707-v0oxdls",
"Type": "NodeParagraph",
"Properties": {
"id": "20221223220707-v0oxdls",
"updated": "20221223221347"
},
"Children": [
{
"Type": "NodeText",
"Data": "内容块中的 "
},
{
"Type": "NodeTextMark",
"TextMarkType": "mark",
"TextMarkTextContent": "标记"
},
{
"Type": "NodeText",
"Data": " 元素会被视作挖空的答案"
}
]
}
]
},
{
"ID": "20221229110953-e7fm7vg",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20221229110953-e7fm7vg",
"updated": "20221229111221"
},
"Children": [
{
"ID": "20221229110953-fwtd0u1",
"Type": "NodeParagraph",
"Properties": {
"id": "20221229110953-fwtd0u1",
"updated": "20221229111221"
},
"Children": [
{
"Type": "NodeText",
"Data": "如果将超级块设置为闪卡，则该超级块的第一个子块会被视作问题，其余子块会被视作答案"
}
]
}
]
}
]
}
]
},
@ -174,7 +214,7 @@
},
{
"Type": "NodeText",
"Data": "​ 可进入复习界面"
"Data": "​​ 可进入复习界面"
}
]
}

153
app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20221223221501-mops33i.sy
View file

@ -5,7 +5,7 @@
"Properties": {
"id": "20221223221501-mops33i",
"title": "閃卡",
"updated": "20221223221852"
"updated": "20221229111623"
},
"Children": [
{
@ -63,116 +63,155 @@
]
},
{
"ID": "20221223221502-rkjnzs0",
"ID": "20221229111606-kwmh3f1",
"Type": "NodeList",
"ListData": {},
"Properties": {
"id": "20221223221502-rkjnzs0",
"updated": "20221223221530"
"id": "20221229111606-kwmh3f1",
"updated": "20221229111623"
},
"Children": [
{
"ID": "20221223221502-pk248zi",
"ID": "20221229111606-92hkjay",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20221223221502-pk248zi",
"updated": "20221223221502"
"id": "20221229111606-92hkjay",
"updated": "20221229111615"
},
"Children": [
{
"ID": "20221223221502-ydmpbkv",
"ID": "20221229111606-eh5ev9r",
"Type": "NodeParagraph",
"Properties": {
"id": "20221223221502-ydmpbkv",
"updated": "20221223221502"
"id": "20221229111606-eh5ev9r",
"updated": "20221229111615"
},
"Children": [
{
"Type": "NodeText",
"Data": "內容塊中的 "
},
{
"Type": "NodeTextMark",
"TextMarkType": "mark",
"TextMarkTextContent": "標記"
},
{
"Type": "NodeText",
"Data": " 元素會被視作挖空的答案"
}
]
}
]
},
{
"ID": "20221223221502-8vhk110",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20221223221502-8vhk110",
"updated": "20221223221526"
},
"Children": [
{
"ID": "20221223221502-3asr889",
"Type": "NodeParagraph",
"Properties": {
"id": "20221223221502-3asr889",
"updated": "20221223221526"
},
"Children": [
{
"Type": "NodeText",
"Data": "在塊標菜單中選擇 "
"Data": "在塊標菜單中選擇 "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "闪卡"
"TextMarkTextContent": "閃卡"
},
{
"Type": "NodeText",
"Data": "​，然後選擇將該內容塊添加到一個卡包中"
}
]
},
{
"ID": "20221229111606-jsk0whs",
"Type": "NodeList",
"ListData": {},
"Properties": {
"id": "20221229111606-jsk0whs",
"updated": "20221229111606"
},
"Children": [
{
"ID": "20221229111606-ir6cz09",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20221229111606-ir6cz09",
"updated": "20221229111606"
},
"Children": [
{
"ID": "20221229111606-51p41j7",
"Type": "NodeParagraph",
"Properties": {
"id": "20221229111606-51p41j7",
"updated": "20221229111606"
},
"Children": [
{
"Type": "NodeText",
"Data": "內容塊中的 "
},
{
"Type": "NodeTextMark",
"TextMarkType": "mark",
"TextMarkTextContent": "標記"
},
{
"Type": "NodeText",
"Data": " 元素會被視作挖空的答案"
}
]
}
]
},
{
"ID": "20221229111606-qq7gaqu",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20221229111606-qq7gaqu",
"updated": "20221229111606"
},
"Children": [
{
"ID": "20221229111606-o45nneg",
"Type": "NodeParagraph",
"Properties": {
"id": "20221229111606-o45nneg",
"updated": "20221229111606"
},
"Children": [
{
"Type": "NodeText",
"Data": "如果將超級塊設置為閃卡，則該超級塊的第一個子塊會被視作問題，其餘子塊會被視作答案"
}
]
}
]
}
]
}
]
},
{
"ID": "20221223221502-7e3upud",
"ID": "20221229111606-e13cee3",
"Type": "NodeListItem",
"ListData": {
"BulletChar": 42,
"Marker": "Kg=="
},
"Properties": {
"id": "20221223221502-7e3upud",
"updated": "20221223221530"
"id": "20221229111606-e13cee3",
"updated": "20221229111623"
},
"Children": [
{
"ID": "20221223221502-168jv05",
"ID": "20221229111606-9v3d8sc",
"Type": "NodeParagraph",
"Properties": {
"id": "20221223221502-168jv05",
"updated": "20221223221530"
"id": "20221229111606-9v3d8sc",
"updated": "20221229111623"
},
"Children": [
{
"Type": "NodeText",
"Data": "通過點擊頂欄菜單中的 "
"Data": "通過點擊頂欄菜單中的 "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "闪卡"
"TextMarkTextContent": "閃卡"
},
{
"Type": "NodeText",