diff --git a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20200924100950-9op5xi1.sy b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20200924100950-9op5xi1.sy index 546ae0040..358f57769 100644 --- a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20200924100950-9op5xi1.sy +++ b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20200924100950-9op5xi1.sy @@ -7,7 +7,7 @@ "id": "20200924100950-9op5xi1", "title": "Shortcuts", "type": "doc", - "updated": "20221105231226" + "updated": "20221107215308" }, "Children": [ { @@ -1165,7 +1165,7 @@ "Properties": { "colgroup": "||", "id": "20210826183314-axmylf4", - "updated": "20220619001735" + "updated": "20221107214415" }, "Children": [ { @@ -1228,10 +1228,18 @@ "Type": "NodeTableCell", "Data": "td", "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeTextMark", "TextMarkType": "kbd", "TextMarkTextContent": "Ctrl+/" + }, + { + "Type": "NodeText", + "Data": "​" } ] }, @@ -1259,6 +1267,10 @@ "Type": "NodeTableCell", "Data": "td", "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeTextMark", "TextMarkType": "kbd", @@ -1266,7 +1278,7 @@ }, { "Type": "NodeText", - "Data": " / " + "Data": "​ / " }, { "Type": "NodeTextMark", @@ -1275,7 +1287,7 @@ }, { "Type": "NodeText", - "Data": " / " + "Data": "​ / " }, { "Type": "NodeTextMark", @@ -1284,12 +1296,112 @@ }, { "Type": "NodeText", - "Data": " / " + "Data": "​ / " }, { "Type": "NodeTextMark", "TextMarkType": "kbd", "TextMarkTextContent": "←" + }, + { + "Type": "NodeText", + "Data": "​" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "td" + } + ] + }, + { + "Type": "NodeTableRow", + "Data": "tr", + "Children": [ + { + "Type": "NodeTableCell", + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "Select or deselect block up" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "Shift+↑" + }, + { + "Type": "NodeText", + "Data": "​ / " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "⇧↑" + }, + { + "Type": "NodeText", + "Data": "​" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "td" + } + ] + }, + { + "Type": "NodeTableRow", + "Data": "tr", + "Children": [ + { + "Type": "NodeTableCell", + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "Select or deselect block down" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "Shift+↓" + }, + { + "Type": "NodeText", + "Data": "​ / " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "⇧↓" + }, + { + "Type": "NodeText", + "Data": "​" } ] }, @@ -1317,10 +1429,18 @@ "Type": "NodeTableCell", "Data": "td", "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeTextMark", "TextMarkType": "kbd", "TextMarkTextContent": "Enter" + }, + { + "Type": "NodeText", + "Data": "​" } ] }, @@ -1348,10 +1468,18 @@ "Type": "NodeTableCell", "Data": "td", "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeTextMark", "TextMarkType": "kbd", "TextMarkTextContent": "Delete" + }, + { + "Type": "NodeText", + "Data": "​" } ] }, @@ -1379,6 +1507,10 @@ "Type": "NodeTableCell", "Data": "td", "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeTextMark", "TextMarkType": "kbd", @@ -1386,13 +1518,17 @@ }, { "Type": "NodeText", - "Data": " / " + "Data": "​ / " }, { "Type": "NodeTextMark", "TextMarkType": "kbd", "TextMarkTextContent": "⌘F" }, + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeBr", "Data": "br" @@ -1423,6 +1559,10 @@ "Type": "NodeTableCell", "Data": "td", "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeTextMark", "TextMarkType": "kbd", @@ -1430,12 +1570,16 @@ }, { "Type": "NodeText", - "Data": " / " + "Data": "​ / " }, { "Type": "NodeTextMark", "TextMarkType": "kbd", "TextMarkTextContent": "⌘R" + }, + { + "Type": "NodeText", + "Data": "​" } ] }, @@ -1463,10 +1607,18 @@ "Type": "NodeTableCell", "Data": "td", "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeTextMark", "TextMarkType": "kbd", "TextMarkTextContent": "F2" + }, + { + "Type": "NodeText", + "Data": "​" } ] }, @@ -1494,6 +1646,10 @@ "Type": "NodeTableCell", "Data": "td", "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeTextMark", "TextMarkType": "kbd", @@ -1501,12 +1657,16 @@ }, { "Type": "NodeText", - "Data": " / " + "Data": "​ / " }, { "Type": "NodeTextMark", "TextMarkType": "kbd", "TextMarkTextContent": "⌘/" + }, + { + "Type": "NodeText", + "Data": "​" } ] }, @@ -1555,7 +1715,7 @@ }, { "Type": "NodeText", - "Data": " to configure" + "Data": "​ to configure" } ] } @@ -1600,7 +1760,7 @@ }, { "Type": "NodeText", - "Data": " to configure" + "Data": "​ to configure" } ] } @@ -8113,26 +8273,348 @@ "HeadingLevel": 3, "Properties": { "id": "20220619002135-5dfw1yo", - "updated": "20220619003128" + "updated": "20221107215002" }, "Children": [ { "Type": "NodeText", - "Data": "File tree / Search list" + "Data": "File tree" } ] }, { "ID": "20220619002135-s399g7e", "Type": "NodeTable", + "TableAligns": [ + 0, + 0, + 0 + ], + "Properties": { + "colgroup": "||", + "id": "20220619002135-s399g7e", + "updated": "20221107215308" + }, + "Children": [ + { + "Type": "NodeTableHead", + "Data": "thead", + "Children": [ + { + "Type": "NodeTableRow", + "Data": "tr", + "Children": [ + { + "Type": "NodeTableCell", + "Data": "th", + "Children": [ + { + "Type": "NodeText", + "Data": "Name" + }, + { + "Type": "NodeBr", + "Data": "br" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "th", + "Children": [ + { + "Type": "NodeText", + "Data": "Shortcuts" + }, + { + "Type": "NodeBr", + "Data": "br" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "th", + "Children": [ + { + "Type": "NodeText", + "Data": "Memo" + } + ] + } + ] + } + ] + }, + { + "Type": "NodeTableRow", + "Data": "tr", + "Children": [ + { + "Type": "NodeTableCell", + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "Open tab" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "Click" + }, + { + "Type": "NodeText", + "Data": "​" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "td" + } + ] + }, + { + "Type": "NodeTableRow", + "Data": "tr", + "Children": [ + { + "Type": "NodeTableCell", + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "Multiple choice" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "Ctrl+Click" + }, + { + "Type": "NodeText", + "Data": "​ / " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "⌘Click" + }, + { + "Type": "NodeText", + "Data": "​" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "td" + } + ] + }, + { + "Type": "NodeTableRow", + "Data": "tr", + "Children": [ + { + "Type": "NodeTableCell", + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "Open on the right" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "Alt+Click" + }, + { + "Type": "NodeText", + "Data": "​ / " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "⌥Click" + }, + { + "Type": "NodeText", + "Data": "​" + }, + { + "Type": "NodeBr", + "Data": "br" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "td" + } + ] + }, + { + "Type": "NodeTableRow", + "Data": "tr", + "Children": [ + { + "Type": "NodeTableCell", + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "Open on the bottom" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "Shift+Click" + }, + { + "Type": "NodeText", + "Data": "​ / " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "⇧Click" + }, + { + "Type": "NodeText", + "Data": "​" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "td" + } + ] + }, + { + "Type": "NodeTableRow", + "Data": "tr", + "Children": [ + { + "Type": "NodeTableCell", + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "Open in new tab" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "Ctrl+Alt+Click" + }, + { + "Type": "NodeText", + "Data": "​ / " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "⌥⌘Click" + }, + { + "Type": "NodeText", + "Data": "​" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "It needs to be set to open in the current tab" + } + ] + } + ] + } + ] + }, + { + "ID": "20221107214951-fa1pwoe", + "Type": "NodeHeading", + "HeadingLevel": 3, + "Properties": { + "id": "20221107214951-fa1pwoe", + "updated": "20221107214956" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "Search list" + } + ] + }, + { + "ID": "20221107215005-z10km9k", + "Type": "NodeTable", "TableAligns": [ 0, 0 ], "Properties": { "colgroup": "|", - "id": "20220619002135-s399g7e", - "updated": "20220619002858" + "id": "20221107215005-z10km9k", + "updated": "20221107215005" }, "Children": [ { @@ -8193,10 +8675,18 @@ "Type": "NodeTableCell", "Data": "td", "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeTextMark", "TextMarkType": "kbd", "TextMarkTextContent": "Click" + }, + { + "Type": "NodeText", + "Data": "​" } ] } @@ -8220,6 +8710,10 @@ "Type": "NodeTableCell", "Data": "td", "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeTextMark", "TextMarkType": "kbd", @@ -8227,13 +8721,17 @@ }, { "Type": "NodeText", - "Data": " / " + "Data": "​ / " }, { "Type": "NodeTextMark", "TextMarkType": "kbd", "TextMarkTextContent": "⌥Click" }, + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeBr", "Data": "br" diff --git a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200813004551-gm0pbn1.sy b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200813004551-gm0pbn1.sy index 91fce4b92..62e44aeef 100644 --- a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200813004551-gm0pbn1.sy +++ b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200813004551-gm0pbn1.sy @@ -7,7 +7,7 @@ "id": "20200813004551-gm0pbn1", "title": "快捷键", "type": "doc", - "updated": "20221105230438" + "updated": "20221107215100" }, "Children": [ { @@ -1171,7 +1171,7 @@ "Properties": { "colgroup": "||", "id": "20210826183308-gok25ug", - "updated": "20220618235429" + "updated": "20221107214214" }, "Children": [ { @@ -1234,10 +1234,18 @@ "Type": "NodeTableCell", "Data": "td", "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeTextMark", "TextMarkType": "kbd", "TextMarkTextContent": "Ctrl+/" + }, + { + "Type": "NodeText", + "Data": "​" } ] }, @@ -1265,6 +1273,10 @@ "Type": "NodeTableCell", "Data": "td", "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeTextMark", "TextMarkType": "kbd", @@ -1272,7 +1284,7 @@ }, { "Type": "NodeText", - "Data": " / " + "Data": "​ / " }, { "Type": "NodeTextMark", @@ -1281,7 +1293,7 @@ }, { "Type": "NodeText", - "Data": " / " + "Data": "​ / " }, { "Type": "NodeTextMark", @@ -1290,12 +1302,112 @@ }, { "Type": "NodeText", - "Data": " / " + "Data": "​ / " }, { "Type": "NodeTextMark", "TextMarkType": "kbd", "TextMarkTextContent": "←" + }, + { + "Type": "NodeText", + "Data": "​" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "td" + } + ] + }, + { + "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": "Shift+↑" + }, + { + "Type": "NodeText", + "Data": "​ / " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "⇧↑" + }, + { + "Type": "NodeText", + "Data": "​" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "td" + } + ] + }, + { + "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": "Shift+↓" + }, + { + "Type": "NodeText", + "Data": "​ / " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "⇧↓" + }, + { + "Type": "NodeText", + "Data": "​" } ] }, @@ -1323,10 +1435,18 @@ "Type": "NodeTableCell", "Data": "td", "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeTextMark", "TextMarkType": "kbd", "TextMarkTextContent": "Enter" + }, + { + "Type": "NodeText", + "Data": "​" } ] }, @@ -1354,10 +1474,18 @@ "Type": "NodeTableCell", "Data": "td", "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeTextMark", "TextMarkType": "kbd", "TextMarkTextContent": "Delete" + }, + { + "Type": "NodeText", + "Data": "​" } ] }, @@ -1385,6 +1513,10 @@ "Type": "NodeTableCell", "Data": "td", "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeTextMark", "TextMarkType": "kbd", @@ -1392,13 +1524,17 @@ }, { "Type": "NodeText", - "Data": " / " + "Data": "​ / " }, { "Type": "NodeTextMark", "TextMarkType": "kbd", "TextMarkTextContent": "⌘F" }, + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeBr", "Data": "br" @@ -1429,6 +1565,10 @@ "Type": "NodeTableCell", "Data": "td", "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeTextMark", "TextMarkType": "kbd", @@ -1436,12 +1576,16 @@ }, { "Type": "NodeText", - "Data": " / " + "Data": "​ / " }, { "Type": "NodeTextMark", "TextMarkType": "kbd", "TextMarkTextContent": "⌘R" + }, + { + "Type": "NodeText", + "Data": "​" } ] }, @@ -1469,10 +1613,18 @@ "Type": "NodeTableCell", "Data": "td", "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeTextMark", "TextMarkType": "kbd", "TextMarkTextContent": "F2" + }, + { + "Type": "NodeText", + "Data": "​" } ] }, @@ -1500,6 +1652,10 @@ "Type": "NodeTableCell", "Data": "td", "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeTextMark", "TextMarkType": "kbd", @@ -1507,12 +1663,16 @@ }, { "Type": "NodeText", - "Data": " / " + "Data": "​ / " }, { "Type": "NodeTextMark", "TextMarkType": "kbd", "TextMarkTextContent": "⌘/" + }, + { + "Type": "NodeText", + "Data": "​" } ] }, @@ -1561,7 +1721,7 @@ }, { "Type": "NodeText", - "Data": " 中配置" + "Data": "​ 中配置" } ] } @@ -1606,7 +1766,7 @@ }, { "Type": "NodeText", - "Data": " 中配置" + "Data": "​ 中配置" } ] } @@ -8058,26 +8218,340 @@ "HeadingLevel": 3, "Properties": { "id": "20220619001156-26volkp", - "updated": "20220619001210" + "updated": "20221107214453" }, "Children": [ { "Type": "NodeText", - "Data": "文档树 / 搜索列表" + "Data": "文档树" } ] }, { "ID": "20220619001217-e9cwukj", "Type": "NodeTable", + "TableAligns": [ + 0, + 0, + 0 + ], + "Properties": { + "colgroup": "||", + "id": "20220619001217-e9cwukj", + "updated": "20221107215100" + }, + "Children": [ + { + "Type": "NodeTableHead", + "Data": "thead", + "Children": [ + { + "Type": "NodeTableRow", + "Data": "tr", + "Children": [ + { + "Type": "NodeTableCell", + "Data": "th", + "Children": [ + { + "Type": "NodeText", + "Data": "名称" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "th", + "Children": [ + { + "Type": "NodeText", + "Data": "操作" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "th", + "Children": [ + { + "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": "Click" + }, + { + "Type": "NodeText", + "Data": "​" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "td" + } + ] + }, + { + "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": "Ctrl+Click" + }, + { + "Type": "NodeText", + "Data": "​ / " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "⌘Click" + }, + { + "Type": "NodeText", + "Data": "​" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "td" + } + ] + }, + { + "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": "Alt+Click" + }, + { + "Type": "NodeText", + "Data": "​ / " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "⌥Click" + }, + { + "Type": "NodeText", + "Data": "​" + }, + { + "Type": "NodeBr", + "Data": "br" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "td" + } + ] + }, + { + "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": "Shift+Click" + }, + { + "Type": "NodeText", + "Data": "​ / " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "⇧Click" + }, + { + "Type": "NodeText", + "Data": "​" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "td" + } + ] + }, + { + "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": "Ctrl+Alt+Click" + }, + { + "Type": "NodeText", + "Data": "​ / " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "⌥⌘Click" + }, + { + "Type": "NodeText", + "Data": "​" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "需设置为在当前页签中打开" + } + ] + } + ] + } + ] + }, + { + "ID": "20221107214439-v40c6qz", + "Type": "NodeHeading", + "HeadingLevel": 2, + "Properties": { + "id": "20221107214439-v40c6qz", + "updated": "20221107214442" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "搜索列表" + } + ] + }, + { + "ID": "20221107214448-jbr9n5v", + "Type": "NodeTable", "TableAligns": [ 0, 0 ], "Properties": { "colgroup": "|", - "id": "20220619001217-e9cwukj", - "updated": "20220619001253" + "id": "20221107214448-jbr9n5v", + "updated": "20221107214448" }, "Children": [ { @@ -8130,10 +8604,18 @@ "Type": "NodeTableCell", "Data": "td", "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeTextMark", "TextMarkType": "kbd", "TextMarkTextContent": "Click" + }, + { + "Type": "NodeText", + "Data": "​" } ] } @@ -8157,6 +8639,10 @@ "Type": "NodeTableCell", "Data": "td", "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeTextMark", "TextMarkType": "kbd", @@ -8164,13 +8650,17 @@ }, { "Type": "NodeText", - "Data": " / " + "Data": "​ / " }, { "Type": "NodeTextMark", "TextMarkType": "kbd", "TextMarkTextContent": "⌥Click" }, + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeBr", "Data": "br" diff --git a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122549-jktxego.sy b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122549-jktxego.sy index e0b43c8a2..e75fd146e 100644 --- a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122549-jktxego.sy +++ b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122549-jktxego.sy @@ -6,7 +6,7 @@ "icon": "2328", "id": "20211226122549-jktxego", "title": "快捷鍵", - "updated": "20221105231222" + "updated": "20221107215259" }, "Children": [ { @@ -1161,7 +1161,7 @@ "Properties": { "colgroup": "||", "id": "20211226122652-eu9085n", - "updated": "20220619001926" + "updated": "20221107214321" }, "Children": [ { @@ -1224,10 +1224,18 @@ "Type": "NodeTableCell", "Data": "td", "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeTextMark", "TextMarkType": "kbd", "TextMarkTextContent": "Ctrl+/" + }, + { + "Type": "NodeText", + "Data": "​" } ] }, @@ -1255,6 +1263,10 @@ "Type": "NodeTableCell", "Data": "td", "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeTextMark", "TextMarkType": "kbd", @@ -1262,7 +1274,7 @@ }, { "Type": "NodeText", - "Data": " / " + "Data": "​ / " }, { "Type": "NodeTextMark", @@ -1271,7 +1283,7 @@ }, { "Type": "NodeText", - "Data": " / " + "Data": "​ / " }, { "Type": "NodeTextMark", @@ -1280,12 +1292,112 @@ }, { "Type": "NodeText", - "Data": " / " + "Data": "​ / " }, { "Type": "NodeTextMark", "TextMarkType": "kbd", "TextMarkTextContent": "←" + }, + { + "Type": "NodeText", + "Data": "​" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "td" + } + ] + }, + { + "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": "Shift+↑" + }, + { + "Type": "NodeText", + "Data": "​ / " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "⇧↑" + }, + { + "Type": "NodeText", + "Data": "​" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "td" + } + ] + }, + { + "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": "Shift+↓" + }, + { + "Type": "NodeText", + "Data": "​ / " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "⇧↓" + }, + { + "Type": "NodeText", + "Data": "​" } ] }, @@ -1313,10 +1425,18 @@ "Type": "NodeTableCell", "Data": "td", "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeTextMark", "TextMarkType": "kbd", "TextMarkTextContent": "Enter" + }, + { + "Type": "NodeText", + "Data": "​" } ] }, @@ -1344,10 +1464,18 @@ "Type": "NodeTableCell", "Data": "td", "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeTextMark", "TextMarkType": "kbd", "TextMarkTextContent": "Delete" + }, + { + "Type": "NodeText", + "Data": "​" } ] }, @@ -1375,6 +1503,10 @@ "Type": "NodeTableCell", "Data": "td", "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeTextMark", "TextMarkType": "kbd", @@ -1382,13 +1514,17 @@ }, { "Type": "NodeText", - "Data": " / " + "Data": "​ / " }, { "Type": "NodeTextMark", "TextMarkType": "kbd", "TextMarkTextContent": "⌘F" }, + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeBr", "Data": "br" @@ -1419,6 +1555,10 @@ "Type": "NodeTableCell", "Data": "td", "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeTextMark", "TextMarkType": "kbd", @@ -1426,12 +1566,16 @@ }, { "Type": "NodeText", - "Data": " / " + "Data": "​ / " }, { "Type": "NodeTextMark", "TextMarkType": "kbd", "TextMarkTextContent": "⌘R" + }, + { + "Type": "NodeText", + "Data": "​" } ] }, @@ -1459,10 +1603,18 @@ "Type": "NodeTableCell", "Data": "td", "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeTextMark", "TextMarkType": "kbd", "TextMarkTextContent": "F2" + }, + { + "Type": "NodeText", + "Data": "​" } ] }, @@ -1490,6 +1642,10 @@ "Type": "NodeTableCell", "Data": "td", "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeTextMark", "TextMarkType": "kbd", @@ -1497,12 +1653,16 @@ }, { "Type": "NodeText", - "Data": " / " + "Data": "​ / " }, { "Type": "NodeTextMark", "TextMarkType": "kbd", "TextMarkTextContent": "⌘/" + }, + { + "Type": "NodeText", + "Data": "​" } ] }, @@ -1551,7 +1711,7 @@ }, { "Type": "NodeText", - "Data": " 中配置" + "Data": "​ 中配置" } ] } @@ -1596,7 +1756,7 @@ }, { "Type": "NodeText", - "Data": " 中配置" + "Data": "​ 中配置" } ] } @@ -8114,26 +8274,356 @@ "HeadingLevel": 3, "Properties": { "id": "20220619002223-zliquo3", - "updated": "20220619002434" + "updated": "20221107214854" }, "Children": [ { "Type": "NodeText", - "Data": "文檔樹 / 搜索列表" + "Data": "文檔樹" } ] }, { "ID": "20220619002223-xwob5s8", "Type": "NodeTable", + "TableAligns": [ + 0, + 0, + 0 + ], + "Properties": { + "colgroup": "||", + "id": "20220619002223-xwob5s8", + "updated": "20221107215259" + }, + "Children": [ + { + "Type": "NodeTableHead", + "Data": "thead", + "Children": [ + { + "Type": "NodeTableRow", + "Data": "tr", + "Children": [ + { + "Type": "NodeTableCell", + "Data": "th", + "Children": [ + { + "Type": "NodeText", + "Data": "名稱" + }, + { + "Type": "NodeBr", + "Data": "br" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "th", + "Children": [ + { + "Type": "NodeText", + "Data": "操作" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "th", + "Children": [ + { + "Type": "NodeText", + "Data": "備註" + } + ] + } + ] + } + ] + }, + { + "Type": "NodeTableRow", + "Data": "tr", + "Children": [ + { + "Type": "NodeTableCell", + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "打開頁簽" + }, + { + "Type": "NodeBr", + "Data": "br" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "Click" + }, + { + "Type": "NodeText", + "Data": "​" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "td" + } + ] + }, + { + "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": "Ctrl+Click" + }, + { + "Type": "NodeText", + "Data": "​ / " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "⌘Click" + }, + { + "Type": "NodeText", + "Data": "​" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "td" + } + ] + }, + { + "Type": "NodeTableRow", + "Data": "tr", + "Children": [ + { + "Type": "NodeTableCell", + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "在右側打開" + }, + { + "Type": "NodeBr", + "Data": "br" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "Alt+Click" + }, + { + "Type": "NodeText", + "Data": "​ / " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "⌥Click" + }, + { + "Type": "NodeText", + "Data": "​" + }, + { + "Type": "NodeBr", + "Data": "br" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "td" + } + ] + }, + { + "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": "Shift+Click" + }, + { + "Type": "NodeText", + "Data": "​ / " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "⇧Click" + }, + { + "Type": "NodeText", + "Data": "​" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "td" + } + ] + }, + { + "Type": "NodeTableRow", + "Data": "tr", + "Children": [ + { + "Type": "NodeTableCell", + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "在新分頁中打開" + }, + { + "Type": "NodeBr", + "Data": "br" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "Ctrl+Alt+Click" + }, + { + "Type": "NodeText", + "Data": "​ / " + }, + { + "Type": "NodeTextMark", + "TextMarkType": "kbd", + "TextMarkTextContent": "⌥⌘Click" + }, + { + "Type": "NodeText", + "Data": "​" + } + ] + }, + { + "Type": "NodeTableCell", + "Data": "td", + "Children": [ + { + "Type": "NodeText", + "Data": "需設置為在當前頁簽中打開" + } + ] + } + ] + } + ] + }, + { + "ID": "20221107214844-w005hal", + "Type": "NodeHeading", + "HeadingLevel": 3, + "Properties": { + "id": "20221107214844-w005hal", + "updated": "20221107214849" + }, + "Children": [ + { + "Type": "NodeText", + "Data": "搜索列表" + } + ] + }, + { + "ID": "20221107214851-ue0nqo6", + "Type": "NodeTable", "TableAligns": [ 0, 0 ], "Properties": { "colgroup": "|", - "id": "20220619002223-xwob5s8", - "updated": "20220619002601" + "id": "20221107214851-ue0nqo6", + "updated": "20221107214851" }, "Children": [ { @@ -8194,10 +8684,18 @@ "Type": "NodeTableCell", "Data": "td", "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeTextMark", "TextMarkType": "kbd", "TextMarkTextContent": "Click" + }, + { + "Type": "NodeText", + "Data": "​" } ] } @@ -8225,6 +8723,10 @@ "Type": "NodeTableCell", "Data": "td", "Children": [ + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeTextMark", "TextMarkType": "kbd", @@ -8232,13 +8734,17 @@ }, { "Type": "NodeText", - "Data": " / " + "Data": "​ / " }, { "Type": "NodeTextMark", "TextMarkType": "kbd", "TextMarkTextContent": "⌥Click" }, + { + "Type": "NodeText", + "Data": "​" + }, { "Type": "NodeBr", "Data": "br" diff --git a/app/src/editor/util.ts b/app/src/editor/util.ts index 278560984..4555a2817 100644 --- a/app/src/editor/util.ts +++ b/app/src/editor/util.ts @@ -31,6 +31,7 @@ export const openFileById = (options: { action?: string[] keepCursor?: boolean zoomIn?: boolean + removeCurrentTab?: boolean }) => { fetchPost("/api/block/getBlockInfo", {id: options.id}, (data) => { if (data.code === 2) { @@ -41,13 +42,14 @@ export const openFileById = (options: { openFile({ fileName: data.data.rootTitle, rootIcon: data.data.rootIcon, - id: options.id, rootID: data.data.rootID, + id: options.id, position: options.position, mode: options.mode, action: options.action, zoomIn: options.zoomIn, - keepCursor: options.keepCursor + keepCursor: options.keepCursor, + removeCurrentTab: options.removeCurrentTab }); }); }; @@ -178,8 +180,8 @@ const openFile = (options: IOpenFileOptions) => { } }); wnd.addTab(newTab(options)); - if (unUpdateTab && !window.siyuan.ctrlIsPressed) { - wnd.removeTab(unUpdateTab.id); + if (unUpdateTab && options.removeCurrentTab) { + wnd.removeTab(unUpdateTab.id, false, true, false); } } else { wnd.addTab(newTab(options)); diff --git a/app/src/layout/dock/Files.ts b/app/src/layout/dock/Files.ts index d47bf8ae5..b714d9301 100644 --- a/app/src/layout/dock/Files.ts +++ b/app/src/layout/dock/Files.ts @@ -231,17 +231,27 @@ export class Files extends Model { break; } else if (target.tagName === "LI") { needFocus = false; - if (!event.metaKey && !event.ctrlKey) { + if ((event.metaKey || event.ctrlKey) && !event.altKey && !event.shiftKey) { + setPanelFocus(this.element.parentElement); + target.classList.toggle("b3-list-item--focus"); + } else { this.setCurrent(target, false); if (target.getAttribute("data-type") === "navigation-file") { - if (window.siyuan.altIsPressed) { + if (event.altKey && !event.metaKey && !event.ctrlKey && !event.shiftKey) { openFileById({ id: target.getAttribute("data-node-id"), position: "right", action: [Constants.CB_GET_FOCUS, Constants.CB_GET_SCROLL] }); + } else if (!event.altKey && !event.metaKey && !event.ctrlKey && event.shiftKey) { + openFileById({ + id: target.getAttribute("data-node-id"), + position: "bottom", + action: [Constants.CB_GET_FOCUS, Constants.CB_GET_SCROLL] + }); } else { openFileById({ + removeCurrentTab: !((event.altKey && (event.metaKey || event.ctrlKey) && !event.shiftKey)), id: target.getAttribute("data-node-id"), action: [Constants.CB_GET_FOCUS, Constants.CB_GET_SCROLL] }); @@ -250,9 +260,6 @@ export class Files extends Model { this.getLeaf(target, notebookId); setPanelFocus(this.element.parentElement); } - } else { - setPanelFocus(this.element.parentElement); - target.classList.toggle("b3-list-item--focus"); } this.element.querySelector('[select-end="true"]')?.removeAttribute("select-end"); this.element.querySelector('[select-start="true"]')?.removeAttribute("select-start"); diff --git a/app/src/menus/navigation.ts b/app/src/menus/navigation.ts index c8b752cf0..8368e1f24 100644 --- a/app/src/menus/navigation.ts +++ b/app/src/menus/navigation.ts @@ -266,6 +266,7 @@ export const initFileMenu = (notebookId: string, pathString: string, liElement: }, { icon: "iconLayoutBottom", label: window.siyuan.languages.insertBottom, + accelerator: "⇧Click", click: () => { openFileById({id, position: "bottom", action: [Constants.CB_GET_FOCUS]}); } @@ -273,14 +274,12 @@ export const initFileMenu = (notebookId: string, pathString: string, liElement: if (window.siyuan.config.fileTree.openFilesUseCurrentTab) { openSubmenus.push({ label: window.siyuan.languages.openInNewTab, - accelerator: "⌘Click", + accelerator: "⌥⌘Click", click: () => { - window.siyuan.ctrlIsPressed = true; - openFileById({id, action: [Constants.CB_GET_FOCUS]}); - setTimeout(() => { - // 勾选在当前页签中打开后,右键在新页签中打开,不重置的话后续点击都会打开新页签 - window.siyuan.ctrlIsPressed = false; - }, Constants.TIMEOUT_INPUT); + openFileById({ + id, action: [Constants.CB_GET_FOCUS], + removeCurrentTab: false + }); } }); } diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts index 6018af9bc..70b07519f 100644 --- a/app/src/types/index.d.ts +++ b/app/src/types/index.d.ts @@ -211,6 +211,7 @@ declare interface IOpenFileOptions { action?: string[] keepCursor?: boolean // file,是否跳转到新 tab 上 zoomIn?: boolean // 是否缩放 + removeCurrentTab?: boolean // 在当前页签打开时需移除原有页签 } declare interface ILayoutOptions {