renun/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-02-28 05:32:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vanessa
2024-03-08 23:39:38 +08:00
parent e32f7919d0 8b1efb16df
commit 4a00e5a124
3 changed files with 372 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

266
app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20200924100950-9op5xi1.sy
View File

@@ -7,7 +7,7 @@
"id": "20200924100950-9op5xi1",
"title": "Shortcuts",
"type": "doc",
"updated": "20240113110755"
"updated": "20240308233242"
},
"Children": [
{
@@ -40,7 +40,7 @@
"Properties": {
"colgroup": "||",
"id": "20210106154101-qrojg1b",
"updated": "20240112150727"
"updated": "20240308232956"
},
"Children": [
{
@@ -124,7 +124,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -133,7 +133,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -181,7 +181,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -190,7 +190,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -229,7 +229,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -238,7 +238,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
},
{
"Type": "NodeBr",
@@ -281,7 +281,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -290,7 +290,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -329,7 +329,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -338,7 +338,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -377,7 +377,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -386,7 +386,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -425,7 +425,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -434,7 +434,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -473,7 +473,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -482,7 +482,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -521,7 +521,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -530,7 +530,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -569,7 +569,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -578,7 +578,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -617,7 +617,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -626,7 +626,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -665,7 +665,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -674,7 +674,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -713,7 +713,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -722,7 +722,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -761,7 +761,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -770,7 +770,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -809,7 +809,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -818,7 +818,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -857,7 +857,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -866,7 +866,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -905,7 +905,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -914,7 +914,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -953,7 +953,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -962,7 +962,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -1001,7 +1001,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -1010,7 +1010,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -1049,7 +1049,7 @@
},
{
"Type": "NodeText",
"Data": "​​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -1058,7 +1058,7 @@
},
{
"Type": "NodeText",
"Data": "​​​"
"Data": "​"
}
]
},
@@ -1097,7 +1097,7 @@
},
{
"Type": "NodeText",
"Data": "​​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -1106,7 +1106,7 @@
},
{
"Type": "NodeText",
"Data": "​​​"
"Data": "​"
}
]
},
@@ -1155,7 +1155,7 @@
},
{
"Type": "NodeText",
"Data": "​​ to configure"
"Data": "​ to configure"
}
]
}
@@ -1200,7 +1200,7 @@
},
{
"Type": "NodeText",
"Data": "​​ to configure"
"Data": "​ to configure"
}
]
}
@@ -1245,7 +1245,7 @@
},
{
"Type": "NodeText",
"Data": "​​ to configure"
"Data": "​ to configure"
}
]
}
@@ -1290,7 +1290,7 @@
},
{
"Type": "NodeText",
"Data": "​​ to configure"
"Data": "​ to configure"
}
]
}
@@ -1325,7 +1325,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -1334,7 +1334,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -1373,7 +1373,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -1382,7 +1382,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -1421,7 +1421,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -1430,7 +1430,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -1469,7 +1469,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -1478,7 +1478,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -1517,7 +1517,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -1526,7 +1526,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -1565,7 +1565,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -1574,7 +1574,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -1613,7 +1613,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -1622,7 +1622,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -1661,7 +1661,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -1670,7 +1670,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -1709,7 +1709,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -1718,7 +1718,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -1757,7 +1757,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -1766,7 +1766,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -1805,7 +1805,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -1814,7 +1814,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -1853,7 +1853,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -1862,7 +1862,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -1901,7 +1901,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -1910,7 +1910,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -1949,7 +1949,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -1958,7 +1958,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -1997,7 +1997,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -2006,7 +2006,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -2045,7 +2045,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -2054,7 +2054,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -2093,7 +2093,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -2102,7 +2102,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -2147,7 +2147,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -2202,7 +2202,7 @@
},
{
"Type": "NodeText",
"Data": "​​ to configure"
"Data": "​ to configure"
}
]
}
@@ -2247,7 +2247,52 @@
},
{
"Type": "NodeText",
"Data": "​​ to configure"
"Data": "​ to configure"
}
]
}
]
},
{
"Type": "NodeTableRow",
"Data": "tr",
"Children": [
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "Add to Database"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "-"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "Go to "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "Settings - Shortcuts"
},
{
"Type": "NodeText",
"Data": "​ to configure"
}
]
}
@@ -2977,7 +3022,7 @@
"Properties": {
"colgroup": "||",
"id": "20240112150534-wiik5sl",
"updated": "20240113110755"
"updated": "20240308233242"
},
"Children": [
{
@@ -6899,7 +6944,52 @@
},
{
"Type": "NodeText",
"Data": "​​ to configure"
"Data": "​ to configure"
}
]
}
]
},
{
"Type": "NodeTableRow",
"Data": "tr",
"Children": [
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "Call up the Artificial Intelligence"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "-"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "Go to "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "Settings - Shortcuts"
},
{
"Type": "NodeText",
"Data": "​ to configure"
}
]
}
@@ -12526,4 +12616,4 @@
]
}
]
}
}

100
app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200813004551-gm0pbn1.sy
View File

@@ -7,7 +7,7 @@
"id": "20200813004551-gm0pbn1",
"title": "快捷键",
"type": "doc",
"updated": "20240113105903"
"updated": "20240308233106"
},
"Children": [
{
@@ -36,7 +36,7 @@
"Properties": {
"colgroup": "||",
"id": "20201227133317-ovwnk1y",
"updated": "20240112150738"
"updated": "20240308232815"
},
"Children": [
{
@@ -2250,6 +2250,51 @@
]
}
]
},
{
"Type": "NodeTableRow",
"Data": "tr",
"Children": [
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "添加到数据库"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "-"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "可前往 "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "设置- 快捷键"
},
{
"Type": "NodeText",
"Data": "​ 中配置"
}
]
}
]
}
]
},
@@ -2973,7 +3018,7 @@
"Properties": {
"colgroup": "||",
"id": "20201227133317-vopotjc",
"updated": "20240113105903"
"updated": "20240308233106"
},
"Children": [
{
@@ -6947,7 +6992,52 @@
},
{
"Type": "NodeText",
"Data": "​​ 中配置"
"Data": "​ 中配置"
}
]
}
]
},
{
"Type": "NodeTableRow",
"Data": "tr",
"Children": [
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "唤起人工智能"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "-"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "可前往 "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "设置- 快捷键"
},
{
"Type": "NodeText",
"Data": "​ 中配置"
}
]
}
@@ -12540,4 +12630,4 @@
}
}
]
}
}

108
app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122549-jktxego.sy
View File

@@ -6,7 +6,7 @@
"icon": "2328",
"id": "20211226122549-jktxego",
"title": "快捷鍵",
"updated": "20240113110727"
"updated": "20240308233137"
},
"Children": [
{
@@ -35,7 +35,7 @@
"Properties": {
"colgroup": "||",
"id": "20211226122652-4e9hm9i",
"updated": "20231030111812"
"updated": "20240308232846"
},
"Children": [
{
@@ -1040,7 +1040,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -1049,7 +1049,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -1088,7 +1088,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -1097,7 +1097,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
},
@@ -2243,6 +2243,51 @@
]
}
]
},
{
"Type": "NodeTableRow",
"Data": "tr",
"Children": [
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "新增到資料庫"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "-"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "可前往 "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "設置-\u0026gt;快捷鍵"
},
{
"Type": "NodeText",
"Data": "​ 中配置"
}
]
}
]
}
]
},
@@ -3048,7 +3093,7 @@
"Properties": {
"colgroup": "||",
"id": "20240112151141-ggglv0f",
"updated": "20240113110727"
"updated": "20240308233137"
},
"Children": [
{
@@ -7056,7 +7101,52 @@
},
{
"Type": "NodeText",
"Data": "​​ 中配置"
"Data": "​ 中配置"
}
]
}
]
},
{
"Type": "NodeTableRow",
"Data": "tr",
"Children": [
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "喚起人工智慧"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "-"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "可前往 "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "設置-\u0026gt;快捷鍵"
},
{
"Type": "NodeText",
"Data": "​ 中配置"
}
]
}
@@ -13218,4 +13308,4 @@
}
}
]
}
}