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
2023-04-24 10:26:31 +08:00
parent c1ee730046 a677df916c
commit 35ff7ee744
3 changed files with 207 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
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": "20230423104023"
"updated": "20230424101729"
},
"Children": [
{
@@ -8270,7 +8270,7 @@
"Properties": {
"colgroup": "min-width: 60px;|min-width: 60px;",
"id": "20230316182941-du649ki",
"updated": "20230316183254"
"updated": "20230424101729"
},
"Children": [
{
@@ -8397,6 +8397,50 @@
}
]
},
{
"Type": "NodeTableRow",
"Data": "tr",
"Children": [
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "Select annotation"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "​"
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "0"
},
{
"Type": "NodeText",
"Data": "​ Last used color / "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "1-7"
},
{
"Type": "NodeText",
"Data": "​ Corresponding color"
}
]
}
]
},
{
"Type": "NodeTableRow",
"Data": "tr",

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

@@ -7,7 +7,7 @@
"id": "20200813004551-gm0pbn1",
"title": "快捷键",
"type": "doc",
"updated": "20230423103925"
"updated": "20230424101412"
},
"Children": [
{
@@ -8295,7 +8295,7 @@
"Properties": {
"colgroup": "min-width: 60px;|min-width: 60px;",
"id": "20230316151850-da0uf4c",
"updated": "20230316181047"
"updated": "20230424101412"
},
"Children": [
{
@@ -8359,7 +8359,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -8368,7 +8368,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
}
@@ -8403,7 +8403,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -8412,7 +8412,51 @@
},
{
"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": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "0"
},
{
"Type": "NodeText",
"Data": "​ 最近一次使用的颜色 / "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "1-7"
},
{
"Type": "NodeText",
"Data": "​ 对应颜色"
}
]
}
@@ -8447,7 +8491,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -8456,7 +8500,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
}
@@ -8491,7 +8535,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -8500,7 +8544,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
}
@@ -8535,7 +8579,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -8544,7 +8588,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
}
@@ -8579,7 +8623,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -8588,7 +8632,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
}
@@ -8623,7 +8667,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
}
@@ -8658,7 +8702,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
}
@@ -8693,7 +8737,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -8702,7 +8746,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
}
@@ -8737,7 +8781,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -8746,7 +8790,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
}
@@ -8781,7 +8825,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -8790,7 +8834,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
}
@@ -8825,7 +8869,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -8834,7 +8878,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
}
@@ -8869,7 +8913,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
}
@@ -8904,7 +8948,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
}
@@ -8939,7 +8983,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
}
@@ -8974,7 +9018,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
}
@@ -9009,7 +9053,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
}
@@ -9044,7 +9088,7 @@
},
{
"Type": "NodeText",
"Data": "​​ / "
"Data": "​ / "
},
{
"Type": "NodeTextMark",
@@ -9053,7 +9097,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
}
@@ -9088,7 +9132,7 @@
},
{
"Type": "NodeText",
"Data": "​​"
"Data": "​"
}
]
}

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

@@ -6,7 +6,7 @@
"icon": "2328",
"id": "20211226122549-jktxego",
"title": "快捷鍵",
"updated": "20230423103951"
"updated": "20230424101620"
},
"Children": [
{
@@ -8366,7 +8366,7 @@
"Properties": {
"colgroup": "|",
"id": "20230316183920-tlv3jvd",
"updated": "20230316184213"
"updated": "20230424101620"
},
"Children": [
{
@@ -8411,7 +8411,11 @@
"Children": [
{
"Type": "NodeText",
"Data": "矩形框標註"
"Data": "矩形框"
},
{
"Type": "NodeText",
"Data": "標註"
}
]
},
@@ -8430,7 +8434,7 @@
},
{
"Type": "NodeText",
"Data": "​ / "
"Data": "​​ / "
},
{
"Type": "NodeTextMark",
@@ -8439,7 +8443,7 @@
},
{
"Type": "NodeText",
"Data": "​"
"Data": "​​"
}
]
}
@@ -8455,7 +8459,11 @@
"Children": [
{
"Type": "NodeText",
"Data": "矩形標註"
"Data": "矩形"
},
{
"Type": "NodeText",
"Data": "標註"
}
]
},
@@ -8474,16 +8482,60 @@
},
{
"Type": "NodeText",
"Data": "​ / "
"Data": "​​ / "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "⌥D"
},
{
"Type": "NodeText",
"Data": "​​"
}
]
}
]
},
{
"Type": "NodeTableRow",
"Data": "tr",
"Children": [
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "劃選標註"
}
]
},
{
"Type": "NodeTableCell",
"Data": "td",
"Children": [
{
"Type": "NodeText",
"Data": "​"
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "0"
},
{
"Type": "NodeText",
"Data": "​ 最近一次使用的顏色 / "
},
{
"Type": "NodeTextMark",
"TextMarkType": "kbd",
"TextMarkTextContent": "1-7"
},
{
"Type": "NodeText",
"Data": "​ 對應顏色"
}
]
}
@@ -8518,7 +8570,7 @@
},
{
"Type": "NodeText",
"Data": "​ / "
"Data": "​​ / "
},
{
"Type": "NodeTextMark",
@@ -8527,7 +8579,7 @@
},
{
"Type": "NodeText",
"Data": "​"
"Data": "​​"
}
]
}
@@ -8562,7 +8614,7 @@
},
{
"Type": "NodeText",
"Data": "​ / "
"Data": "​​ / "
},
{
"Type": "NodeTextMark",
@@ -8571,7 +8623,7 @@
},
{
"Type": "NodeText",
"Data": "​"
"Data": "​​"
}
]
}
@@ -8606,7 +8658,7 @@
},
{
"Type": "NodeText",
"Data": "​ / "
"Data": "​​ / "
},
{
"Type": "NodeTextMark",
@@ -8615,7 +8667,7 @@
},
{
"Type": "NodeText",
"Data": "​"
"Data": "​​"
}
]
}
@@ -8650,7 +8702,7 @@
},
{
"Type": "NodeText",
"Data": "​ / "
"Data": "​​ / "
},
{
"Type": "NodeTextMark",
@@ -8659,7 +8711,7 @@
},
{
"Type": "NodeText",
"Data": "​"
"Data": "​​"
}
]
}
@@ -8694,7 +8746,7 @@
},
{
"Type": "NodeText",
"Data": "​"
"Data": "​​"
}
]
}
@@ -8729,7 +8781,7 @@
},
{
"Type": "NodeText",
"Data": "​"
"Data": "​​"
}
]
}
@@ -8764,7 +8816,7 @@
},
{
"Type": "NodeText",
"Data": "​ / "
"Data": "​​ / "
},
{
"Type": "NodeTextMark",
@@ -8773,7 +8825,7 @@
},
{
"Type": "NodeText",
"Data": "​"
"Data": "​​"
}
]
}
@@ -8808,7 +8860,7 @@
},
{
"Type": "NodeText",
"Data": "​ / "
"Data": "​​ / "
},
{
"Type": "NodeTextMark",
@@ -8817,7 +8869,7 @@
},
{
"Type": "NodeText",
"Data": "​"
"Data": "​​"
}
]
}
@@ -8852,7 +8904,7 @@
},
{
"Type": "NodeText",
"Data": "​ / "
"Data": "​​ / "
},
{
"Type": "NodeTextMark",
@@ -8861,7 +8913,7 @@
},
{
"Type": "NodeText",
"Data": "​"
"Data": "​​"
}
]
}
@@ -8896,7 +8948,7 @@
},
{
"Type": "NodeText",
"Data": "​ / "
"Data": "​​ / "
},
{
"Type": "NodeTextMark",
@@ -8905,7 +8957,7 @@
},
{
"Type": "NodeText",
"Data": "​"
"Data": "​​"
}
]
}
@@ -8940,7 +8992,7 @@
},
{
"Type": "NodeText",
"Data": "​"
"Data": "​​"
}
]
}
@@ -8975,7 +9027,7 @@
},
{
"Type": "NodeText",
"Data": "​"
"Data": "​​"
}
]
}
@@ -9010,7 +9062,7 @@
},
{
"Type": "NodeText",
"Data": "​"
"Data": "​​"
}
]
}
@@ -9045,7 +9097,7 @@
},
{
"Type": "NodeText",
"Data": "​"
"Data": "​​"
}
]
}
@@ -9080,7 +9132,7 @@
},
{
"Type": "NodeText",
"Data": "​"
"Data": "​​"
}
]
}
@@ -9115,7 +9167,7 @@
},
{
"Type": "NodeText",
"Data": "​ / "
"Data": "​​ / "
},
{
"Type": "NodeTextMark",
@@ -9124,7 +9176,7 @@
},
{
"Type": "NodeText",
"Data": "​"
"Data": "​​"
}
]
}
@@ -9159,7 +9211,7 @@
},
{
"Type": "NodeText",
"Data": "​"
"Data": "​​"
}
]
}