From 59db0f00dfe95413815f1bed5dbfefdce85fdbb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A2=96=E9=80=B8?= <49649786+Zuoqiu-Yingyi@users.noreply.github.com> Date: Sat, 14 Oct 2023 22:35:47 +0800 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit c8924e37ae8eeffb4b49c30560372722458d4f84 Author: Vanessa Date: Sat Oct 14 12:14:12 2023 +0800 :art: fix https://github.com/siyuan-note/siyuan/issues/9409 commit 879fdd827d8aa1b817c3df7ca2026413e2a916ba Author: Vanessa Date: Sat Oct 14 11:56:16 2023 +0800 :lipstick: dragover commit 9978827389d3ec49e14b7ed9d7dfe506a208e8df Author: Vanessa Date: Sat Oct 14 11:34:42 2023 +0800 :art: 数据库块适配外观和宽度调整 commit a20ffeb12b67e87968676d0d7a1b17b1870e7144 Author: Vanessa Date: Sat Oct 14 11:20:17 2023 +0800 :lipstick: fix https://github.com/siyuan-note/siyuan/issues/9412 commit f2075fafac55e31468d2519ede6dc98675fc8496 Author: Vanessa Date: Sat Oct 14 11:04:23 2023 +0800 :art: https://github.com/siyuan-note/siyuan/issues/9419 commit 5e2910a4e60d61a6b4d64def65aeac9cbdbf8698 Author: Vanessa Date: Sat Oct 14 11:00:46 2023 +0800 :art: https://github.com/siyuan-note/siyuan/issues/9419 commit ac7f8d36dfc7bf73903b4fa3129417475ec6eb9b Merge: 9ae8400b4 d78a0205f Author: Vanessa Date: Sat Oct 14 10:56:40 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 9ae8400b474e913e5ed4b3fc26dae5464a1692fe Author: Vanessa Date: Sat Oct 14 10:56:21 2023 +0800 :art: https://github.com/siyuan-note/siyuan/issues/9419 commit d78a0205f5a04e342b1dd4b2522ff294d30f952f Author: Daniel <845765@qq.com> Date: Sat Oct 14 10:51:46 2023 +0800 :art: Database table view breadcrumb commit 6b1a2925c9c6404b4bf53007aea17f97675aea5a Merge: 25109b906 9766020b8 Author: Vanessa Date: Sat Oct 14 10:49:46 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 25109b906fc4df4d19ea8aa507ed278307b43322 Author: Vanessa Date: Sat Oct 14 10:49:35 2023 +0800 :art: 数据库块适配外观和宽度调整 commit 9766020b8950762b6b1e44de48e4e1159cc8c89c Author: Daniel <845765@qq.com> Date: Sat Oct 14 10:08:57 2023 +0800 :art: Update text commit ab673896505f038d99497ab3880352b100d2d916 Merge: 7d6f9bb0d 39c5744f2 Author: Vanessa Date: Sat Oct 14 10:01:57 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 7d6f9bb0dff9b9cbbc6071a25b25276ab998a652 Author: Vanessa Date: Sat Oct 14 10:01:42 2023 +0800 :art: 数据库不能设置布局 commit 39c5744f2fa1d0c8d07ea14ce6a9dbd72ba3bc03 Author: Daniel <845765@qq.com> Date: Sat Oct 14 09:46:29 2023 +0800 :bug: Database table view export does not display select content Fix https://github.com/siyuan-note/siyuan/issues/9428 commit 87ecb7f24acc3c5a20b763979781e7adfa86134d Author: Daniel <845765@qq.com> Date: Sat Oct 14 09:37:47 2023 +0800 :art: Update text commit 69d8c93c98dfee2aa24b7ed1c8a663dfed6546b6 Merge: 623f30b5f f6780c126 Author: Vanessa Date: Sat Oct 14 09:21:54 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 623f30b5fc3de9e900ab574555c8af0f254f37e4 Author: Vanessa Date: Sat Oct 14 09:21:44 2023 +0800 :art: https://github.com/siyuan-note/siyuan/issues/9419 commit f6780c126abfd4576963470ba11a40933c17246e Author: Daniel <845765@qq.com> Date: Sat Oct 14 09:20:51 2023 +0800 :art: Supports searching database view content https://github.com/siyuan-note/siyuan/issues/9419 commit fd94e9df0cdbaa13cbd5478fdf14d55e29bec42a Author: Vanessa Date: Sat Oct 14 00:04:16 2023 +0800 :art: commit 51f66879ccc5808524c5e65802951cd9bff8eab3 Author: Vanessa Date: Fri Oct 13 23:50:31 2023 +0800 :art: https://github.com/siyuan-note/siyuan/issues/9419 commit 49305b8911249ab5f2548c7433afa816b9506e95 Merge: 2f0f563e1 8399aba10 Author: Vanessa Date: Fri Oct 13 23:26:15 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 2f0f563e121ceacdf0ca0e1f53b6718812f0d5e7 Author: Vanessa Date: Fri Oct 13 23:25:58 2023 +0800 :art: https://github.com/siyuan-note/siyuan/issues/9419 commit 8399aba10b53c701859402432efbd426f137a800 Author: Daniel <845765@qq.com> Date: Fri Oct 13 23:22:17 2023 +0800 :art: Supports searching database view content https://github.com/siyuan-note/siyuan/issues/9419 commit 22efb3d5235fbbe1951fee9caf1009638e4e56c4 Merge: f95084e96 c3d1c04af Author: Vanessa Date: Fri Oct 13 23:07:13 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit f95084e96a3ca62add6cc27ac283132b4e7cd1be Author: Vanessa Date: Fri Oct 13 23:06:53 2023 +0800 :art: https://github.com/siyuan-note/siyuan/issues/9419 commit c3d1c04af4066c231363d72fa18bd65d600b8dca Author: Daniel <845765@qq.com> Date: Fri Oct 13 22:50:11 2023 +0800 :art: Supports searching database view content https://github.com/siyuan-note/siyuan/issues/9419 commit a11ea9c3479aaa74db18ca7a22b0d4616f18f665 Author: Vanessa Date: Fri Oct 13 22:37:15 2023 +0800 :lipstick: commit 99ec5c10a4ed614e13a6a935dace95637716977f Author: Vanessa Date: Fri Oct 13 22:32:17 2023 +0800 :art: showHiddenFiles commit 49426ac916279cc000670580e4586c2b4df51c72 Author: Vanessa Date: Fri Oct 13 22:15:20 2023 +0800 :art: https://github.com/siyuan-note/siyuan/issues/9425 commit d445c5401ffb4a1b2fcf01abc062734efc6c6cb2 Author: Vanessa Date: Fri Oct 13 21:54:35 2023 +0800 :art: https://github.com/siyuan-note/siyuan/issues/9421 commit 0c4aee7388c03202a4bb3d11c7b89b0e21e48d85 Merge: c34d84ce2 daa9ddfd5 Author: Vanessa Date: Fri Oct 13 21:50:28 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit c34d84ce29b8ccbb78dbcc96584804253997c0d1 Author: Vanessa Date: Fri Oct 13 21:50:14 2023 +0800 :art: https://github.com/siyuan-note/siyuan/issues/9421 commit daa9ddfd50eebdc98084d3aba28f09008294ba54 Author: Daniel <845765@qq.com> Date: Fri Oct 13 14:43:43 2023 +0800 :art: Don't load plugin when the user hasn't agreed to trust bazaar content yet Fix https://github.com/siyuan-note/siyuan/issues/9426 commit 01b19ea2c85c7f039ff427b03d6a2f0d7f4b0488 Author: Daniel <845765@qq.com> Date: Fri Oct 13 14:03:41 2023 +0800 :art: Fix database table view loading https://ld246.com/article/1697168944677 commit 7a9a85ea323e79e8a122d5e19a4dfb9618a2ce41 Author: Vanessa Date: Fri Oct 13 13:55:27 2023 +0800 :art: https://github.com/siyuan-note/siyuan/issues/9417 commit 1815ec1b39ba30b427d366d41754582476b8f6a4 Merge: 73edee57a 00ed190ad Author: Vanessa Date: Fri Oct 13 13:37:45 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 73edee57a4f755e293ac7a2b04e2381813839550 Author: Vanessa Date: Fri Oct 13 13:37:32 2023 +0800 :art: https://github.com/siyuan-note/siyuan/issues/9417 commit 00ed190ad76f357ec780d68888a04dbd5f402ea5 Author: Daniel <845765@qq.com> Date: Fri Oct 13 13:21:53 2023 +0800 :art: Fix database table view loading https://ld246.com/article/1697168944677 commit 48e871c75e59cbf7de299e8908a1ba25ddf76278 Author: Vanessa Date: Fri Oct 13 12:33:29 2023 +0800 :art: https://github.com/siyuan-note/siyuan/issues/9417 commit 3554333da9be4b22d844af83b8c540a7b6feb874 Author: Vanessa Date: Fri Oct 13 11:55:51 2023 +0800 :art: https://github.com/siyuan-note/siyuan/issues/9417 commit af810b279d6e6535947a143987627b3aa1e066c0 Author: Vanessa Date: Fri Oct 13 11:34:19 2023 +0800 :art: fix https://github.com/siyuan-note/siyuan/issues/9423 commit 673c952f079d4a7aa42f6bf59a348f27cfcaf360 Author: Vanessa Date: Fri Oct 13 11:30:44 2023 +0800 :art: fix https://github.com/siyuan-note/siyuan/issues/9423 commit 3b87a0d9ed8c313ecc75c29c7c990c7d17d68bab Merge: ed31305d1 3de7781b1 Author: Vanessa Date: Fri Oct 13 11:09:07 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit ed31305d1d291010c3d4b6b223b924823b7be95e Author: Vanessa Date: Fri Oct 13 11:08:56 2023 +0800 :art: https://github.com/siyuan-note/siyuan/issues/9421 commit 3de7781b1c78fb35ba3e90b729015bd0d9cfaa45 Author: Daniel <845765@qq.com> Date: Fri Oct 13 10:44:29 2023 +0800 :art: Supports searching database view content https://github.com/siyuan-note/siyuan/issues/9419 commit 2304921feefff56d34d4b673cba8a491f399f2a6 Author: Daniel <845765@qq.com> Date: Fri Oct 13 10:42:51 2023 +0800 :art: Update flashcard user guide commit 55fb8b19abf9d91f40fd4d177dc5f20758e1a3b3 Author: Vanessa Date: Fri Oct 13 10:14:11 2023 +0800 :art: fix https://github.com/siyuan-note/siyuan/issues/9420 commit 8998de9d812eeb67060a7dd3e7eacec28abea656 Merge: 5b38e79be df9b55c71 Author: Vanessa Date: Fri Oct 13 09:37:35 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 5b38e79be75e32f33332a6f700263e1460d645bf Author: Vanessa Date: Fri Oct 13 09:37:24 2023 +0800 :art: fix https://github.com/siyuan-note/siyuan/issues/9420 commit df9b55c71ba6aea40617a2fc17ad9d4908edc81c Author: Daniel <845765@qq.com> Date: Fri Oct 13 08:46:29 2023 +0800 :art: Database template columns support sort commit 3da9f0f1e133d5e69e5af674d6b8f83b9f6136f2 Author: Vanessa Date: Thu Oct 12 20:40:09 2023 +0800 :bug: 新增行后弹出的输入框 commit 79a88dfbece66248b9eaa39a1821b4e2a8025148 Author: Vanessa Date: Thu Oct 12 20:23:18 2023 +0800 :rotating_light: commit 40a1e6d5cc8107abfa7addb27c347f6677a1e4fe Author: Vanessa Date: Thu Oct 12 20:21:53 2023 +0800 :lipstick: database loading commit 2872dab9eb9c40e06d43886728ddad84c1c18722 Author: Vanessa Date: Thu Oct 12 20:11:59 2023 +0800 :lipstick: fix https://github.com/siyuan-note/siyuan/issues/9418 commit 025a8ea5a7b38b444957a73ddbcde7c2f1a054ed Merge: 02ec0f6e5 0ea9b8f5a Author: Vanessa Date: Thu Oct 12 20:04:13 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 02ec0f6e5a68e7810545f8a5e132465719dc0442 Author: Vanessa Date: Thu Oct 12 20:04:01 2023 +0800 :lipstick: fix https://github.com/siyuan-note/siyuan/issues/9418 commit 0ea9b8f5a7223bcdab3b8f8e5e890d908e164c34 Author: Daniel <845765@qq.com> Date: Thu Oct 12 19:58:32 2023 +0800 :art: Database block loading animation https://github.com/siyuan-note/siyuan/issues/9416 commit 1590913db73d8def51a05544b8a2b5e654285aa3 Author: Daniel <845765@qq.com> Date: Thu Oct 12 19:55:57 2023 +0800 :art: Update attr panel for av commit d257caff8d5d12a1751c3d18d3ca972cd5ef453d Author: Daniel <845765@qq.com> Date: Thu Oct 12 19:38:37 2023 +0800 :art: Database block loading animation https://github.com/siyuan-note/siyuan/issues/9416 commit fdaf8d7e595f11e3e0d67b01427a0485532191c6 Merge: 70e82cd98 238609f25 Author: Vanessa Date: Thu Oct 12 17:34:36 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 70e82cd981e5890aaad782631741521f5cd7ef41 Author: Vanessa Date: Thu Oct 12 17:34:19 2023 +0800 :lipstick: fix https://github.com/siyuan-note/siyuan/issues/9416 commit 238609f25f39c42fa28bf14d4fa767f8c912b41e Author: Daniel <845765@qq.com> Date: Thu Oct 12 17:33:23 2023 +0800 :zap: Improve performance of loading database table view commit 2dd558b6090b96cc77db2dac0002db67b5b772ce Merge: fe0b1e8d6 8fb35f556 Author: Vanessa Date: Thu Oct 12 17:16:45 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit fe0b1e8d6023c5d3e02614bf2515b93dd19b0b5e Author: Vanessa Date: Thu Oct 12 17:16:31 2023 +0800 :lipstick: fix https://github.com/siyuan-note/siyuan/issues/9415 commit 8fb35f5565c197617f57f02def80f8bd6b374d3d Author: Daniel <845765@qq.com> Date: Thu Oct 12 17:15:36 2023 +0800 :art: Database template columns support number filter Fix https://github.com/siyuan-note/siyuan/issues/9414 commit 01670f2b00f31b1421ebdef9795d880863f09cdc Merge: f792d141f ffcdb5d39 Author: Vanessa Date: Thu Oct 12 17:07:48 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit f792d141fc412a54165a9fda87216d497258c5da Author: Vanessa Date: Thu Oct 12 17:07:09 2023 +0800 :art: https://github.com/siyuan-note/siyuan/issues/9408 commit ffcdb5d398da4b70a6cc4c06478a1f97085bf482 Author: Daniel <845765@qq.com> Date: Thu Oct 12 16:37:09 2023 +0800 :bug: SVG images cannot be displayed on some systems https://github.com/siyuan-note/siyuan/issues/9413 commit fb1f80cf4de0bdd45b140facf351c86fa243c757 Author: Vanessa Date: Thu Oct 12 12:22:55 2023 +0800 :lipstick: fix https://github.com/siyuan-note/siyuan/issues/9406 commit da51aded35aaf8b5b0d475b49a98d179865992de Merge: a4bcae87e 09ef5fddf Author: Vanessa Date: Thu Oct 12 12:11:42 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit a4bcae87ee24a2592c8c43b669efc9d284a588c2 Author: Vanessa Date: Thu Oct 12 12:11:29 2023 +0800 :bug: 数据库数字填0无效 commit 09ef5fddf9335f8a2e14b5eb197509ba80324e1f Author: Daniel <845765@qq.com> Date: Thu Oct 12 12:01:53 2023 +0800 :art: Database template columns support calculations https://github.com/siyuan-note/siyuan/issues/9408 commit 1b595d014a739094cede52527606d6d45e3ed35c Author: Vanessa Date: Thu Oct 12 12:01:53 2023 +0800 :art: #9408 commit 21d1a0515ae46352a1bace0e17beac571d32c088 Author: Vanessa Date: Thu Oct 12 11:54:15 2023 +0800 :lipstick: 编辑后表头不固定 commit c5206f70843c866746d4db87c7e33681b98e48d2 Author: Vanessa Date: Thu Oct 12 11:14:29 2023 +0800 :bug: fix https://github.com/siyuan-note/siyuan/issues/9405 commit f0f55d3b026446f996e7c83fd49580d9db8592a9 Merge: 019412404 92151f715 Author: Vanessa Date: Thu Oct 12 10:54:19 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 01941240470a9bac540655507d2aa354bf5f46a1 Author: Vanessa Date: Thu Oct 12 10:54:09 2023 +0800 :lipstick: fix https://github.com/siyuan-note/siyuan/issues/9403 commit 92151f71504332d96456f52087423ba967c02f78 Author: Daniel <845765@qq.com> Date: Thu Oct 12 10:12:44 2023 +0800 :art: Change database template column custom attribute action Fix https://github.com/siyuan-note/siyuan/issues/9401 commit b8e8aa0593576563e9c462df3e18900fb3ec41d6 Author: Daniel <845765@qq.com> Date: Wed Oct 11 17:00:21 2023 +0800 :hammer: Clean code commit b17aff577300a63cf77f63e2a9665cc0a2692f1e Author: Vanessa Date: Wed Oct 11 23:54:40 2023 +0800 :bug: commit 11174958bc87bc00937d957f6004854f5105dd09 Author: Vanessa Date: Wed Oct 11 23:50:28 2023 +0800 :bug: 预览模式下点击只读 commit 130884d758774fac373c41a8540ce6d90c741ba6 Author: Vanessa Date: Wed Oct 11 23:23:01 2023 +0800 :art: fix https://github.com/siyuan-note/siyuan/issues/9404 commit 7486e1a6e22f765cffd4d231b0adb984bfe70089 Author: Vanessa Date: Wed Oct 11 17:28:40 2023 +0800 :art: fix https://github.com/siyuan-note/siyuan/issues/9402 commit eb93255cf32782a93d3c9b3a6d8bb3cb9f0ff7ef Author: Daniel <845765@qq.com> Date: Wed Oct 11 14:57:14 2023 +0800 :hammer: Clean code commit fd46593815f5666f8b08e01d1e3ff9b75eab1ca3 Author: Daniel <845765@qq.com> Date: Wed Oct 11 14:55:06 2023 +0800 :bookmark: Release v2.10.10 commit 337c79571d6e2b073435d95f642634130a5d0bf0 Author: Daniel <845765@qq.com> Date: Wed Oct 11 11:59:25 2023 +0800 :art: Improve install new version on Windows commit f6f1148de11044c5e58ad786722087d631d8cbb4 Author: Daniel <845765@qq.com> Date: Wed Oct 11 11:08:44 2023 +0800 :memo: Update changelogs commit f0ad3268baf62bcc2be569eb21019ceaf4e1861c Author: Vanessa Date: Wed Oct 11 11:30:00 2023 +0800 :art: commit 2eb89f067317cbb1ec13c7c4ae4cc7fc62b7fcac Author: Vanessa Date: Wed Oct 11 11:25:21 2023 +0800 :rotating_light: commit 0db516e4b9455a87e5e29808ea77712adc4b4371 Merge: 23c3f9f15 e43cf4cf5 Author: Vanessa Date: Wed Oct 11 11:24:41 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 23c3f9f154326aefa8743a2d2c9b6596611722af Author: Vanessa Date: Wed Oct 11 11:24:29 2023 +0800 :art: fix https://github.com/siyuan-note/siyuan/issues/9383 commit e43cf4cf55de73c37a5dc603017b957b15a34499 Author: Daniel <845765@qq.com> Date: Wed Oct 11 10:52:10 2023 +0800 :memo: Update changelogs commit b30cb0984aec2ae2248863f056bbef4f701980d5 Author: Daniel <845765@qq.com> Date: Wed Oct 11 10:49:04 2023 +0800 :memo: Update changelogs commit d4a3226a566421d01a0bcf9e9ad00cac1cb38ae3 Author: Daniel <845765@qq.com> Date: Wed Oct 11 10:48:40 2023 +0800 :memo: Update changelogs commit 65adab61c9f63ab0d692890ff977c567d1628845 Author: Daniel <845765@qq.com> Date: Wed Oct 11 10:48:29 2023 +0800 :art: Adding row overwriting data after enabling filter in database https://github.com/siyuan-note/siyuan/issues/9395 commit 210a3ac5472245eed820a7c76aadb09d50029bb0 Author: Daniel <845765@qq.com> Date: Wed Oct 11 10:04:39 2023 +0800 :art: Improve handling of database column filters containing empty values Fix https://github.com/siyuan-note/siyuan/issues/9394 commit 37f950ba4f6028f993786958eb9b3a0d2dca066b Author: Vanessa Date: Wed Oct 11 09:39:22 2023 +0800 :lipstick: icon commit 7b1c30bc26b796116e7bd936436b3f9e3e1cb316 Author: Vanessa Date: Wed Oct 11 09:30:13 2023 +0800 :art: fix https://github.com/siyuan-note/siyuan/issues/9396 commit 6ef13aba784dd6df37b9ac61573b8d8123488743 Merge: acd2eb167 e4907e789 Author: Vanessa Date: Wed Oct 11 09:18:43 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit acd2eb167707ad5cfa7e5cc7d9e06a6adfe8d92d Author: Vanessa Date: Wed Oct 11 09:18:33 2023 +0800 :art: fix https://github.com/siyuan-note/siyuan/issues/9396 commit e4907e7896ceb014a3064565e05631eb621a1f3a Author: Daniel <845765@qq.com> Date: Wed Oct 11 09:16:57 2023 +0800 :art: The block in the editor shows the database icon https://github.com/siyuan-note/siyuan/issues/8894 commit 6f249d768f954e58dad876010927fdcf43b3b05b Author: Daniel <845765@qq.com> Date: Wed Oct 11 09:15:03 2023 +0800 :arrow_up: Upgrade kernel deps commit bb04bf9f705b1169d4efb44c441daf1ecb56cf91 Author: Daniel <845765@qq.com> Date: Wed Oct 11 09:04:39 2023 +0800 :art: Show notebooks in hpath of block ref search list results https://github.com/siyuan-note/siyuan/issues/9378 commit 30b0dd08face947c3a9ad0a8c468862a93424cac Merge: c1de5e148 ccb65454a Author: Vanessa Date: Wed Oct 11 08:58:55 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit c1de5e1488963eb63c9230ff8c691573febb3791 Author: Vanessa Date: Wed Oct 11 08:58:44 2023 +0800 :lipstick: https://github.com/siyuan-note/siyuan/issues/8894 commit ccb65454a2bad059a33cf360aef8f0a895030dbf Author: Daniel <845765@qq.com> Date: Wed Oct 11 08:50:13 2023 +0800 :art: Improve handling of database column filters containing empty values Fix https://github.com/siyuan-note/siyuan/issues/9394 commit 28e4e1ef2fe1c373b9524a2c3f1cca85eb5452f4 Author: Daniel <845765@qq.com> Date: Tue Oct 10 22:31:46 2023 +0800 :art: Rename the .sya annotation file when renaming a PDF asset https://github.com/siyuan-note/siyuan/issues/9390 commit 964c822c2b7322f956234726f0bbb15106da35e4 Author: Daniel <845765@qq.com> Date: Tue Oct 10 22:02:46 2023 +0800 :art: Improve database created and updated column values https://github.com/siyuan-note/siyuan/issues/9391 commit f404d7fe85a66babc255e151fe18ad656dbb5eb2 Merge: ed7084c7b 301b6d9f7 Author: Vanessa Date: Tue Oct 10 22:00:57 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit ed7084c7be222cb76a9567c32a5b3b92897e12b3 Author: Vanessa Date: Tue Oct 10 22:00:43 2023 +0800 :lipstick: commit 301b6d9f70ec0166b0567e925d71d241999a9cd8 Author: Daniel <845765@qq.com> Date: Tue Oct 10 21:55:43 2023 +0800 :art: Improve database created and updated column values https://github.com/siyuan-note/siyuan/issues/9391 commit f62be4719eaba196b83b5972e9c0dcfc1e4b6020 Author: Vanessa Date: Tue Oct 10 21:50:36 2023 +0800 :art: fix https://github.com/siyuan-note/siyuan/issues/9385 commit 8e2565f347337806eaca57489ab0666c314899c4 Author: Vanessa Date: Tue Oct 10 21:39:57 2023 +0800 :art: fix https://github.com/siyuan-note/siyuan/issues/9386 commit e54d8f1a4d2c979f2a3147a292330ad36a83c0fb Author: Vanessa Date: Tue Oct 10 21:31:20 2023 +0800 :art: fix https://github.com/siyuan-note/siyuan/issues/9393 commit 1fb7187936646643216e6ca96344576738f7019b Author: Vanessa Date: Tue Oct 10 21:23:29 2023 +0800 :memo: fix https://github.com/siyuan-note/siyuan/issues/9392 commit ea00753f380f1045ff357447b0e7acc9dd117a28 Author: Vanessa Date: Tue Oct 10 21:18:17 2023 +0800 :art: fix https://github.com/siyuan-note/siyuan/issues/9392 commit 4318aa446369eaf4ea85982ba4919b5d47340552 Author: Vanessa Date: Tue Oct 10 20:51:28 2023 +0800 :art: fix https://github.com/siyuan-note/siyuan/issues/9376 commit f1d4f8472b63c379b0bd51ee973b1505e615b12c Merge: 3f4c00efc 64df2ffa4 Author: Vanessa Date: Tue Oct 10 20:42:43 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 3f4c00efcddb7030e39616eadc9587dc3e1d17d8 Author: Vanessa Date: Tue Oct 10 20:42:14 2023 +0800 :art: https://github.com/siyuan-note/siyuan/issues/9376 commit 64df2ffa42df2804778f401ec75203319fe5cba4 Author: Daniel <845765@qq.com> Date: Tue Oct 10 20:37:51 2023 +0800 :art: Rows in the database without bound blocks should not show created and updated Fix https://github.com/siyuan-note/siyuan/issues/9391 commit 691a0bea33e430f94d46a65f2887e187080c199d Merge: 0e5cae300 7e9243d8d Author: Vanessa Date: Tue Oct 10 20:41:05 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 0e5cae30015f960637b1a22a935d55e64e499ef5 Author: Vanessa Date: Tue Oct 10 20:40:38 2023 +0800 :lipstick: fix https://github.com/siyuan-note/siyuan/issues/9206 commit 7e9243d8dc063bd481e202f73c2b16d367c6cbea Author: Daniel <845765@qq.com> Date: Tue Oct 10 20:05:48 2023 +0800 :art: Rows in the database without bound blocks should not show created and updated Fix https://github.com/siyuan-note/siyuan/issues/9391 commit 7aa4aacfc3e4c356db033305a8e8a9e268c8c427 Author: Vanessa Date: Tue Oct 10 17:30:10 2023 +0800 :lipstick: fix https://github.com/siyuan-note/siyuan/issues/9206 commit d02381d3f2cabe4a0fa7a5518b79c7030dae8c0e Merge: 449d2dbf8 6e9099ea1 Author: Vanessa Date: Tue Oct 10 17:09:14 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 449d2dbf87d838409351fc8c4b7a42af59dc65c3 Author: Vanessa Date: Tue Oct 10 17:09:03 2023 +0800 :recycle: https://github.com/siyuan-note/siyuan/pull/9256 commit 6e9099ea12ba692b4aab7cef34bc61458eb6ec14 Author: Daniel <845765@qq.com> Date: Tue Oct 10 16:52:40 2023 +0800 :lock: Authenticate requests of assets other than 127.0.0.1 Fix https://github.com/siyuan-note/siyuan/issues/9388 commit 11786381cf6b1d5f58c862ab99a0993ac6ab4ad4 Author: Yingyi / 颖逸 <49649786+Zuoqiu-Yingyi@users.noreply.github.com> Date: Tue Oct 10 16:21:50 2023 +0800 Improve event bus `open-siyuan-url-plugin` (#9256) * :art: Improve plugin event bus `open-siyuan-url-plugin` * :bug: Avoid plug-in names with the same prefix * Update onGetConfig.ts commit 2c36af78bc789505c8d2d461c70aa9e36a782d2f Author: Vanessa Date: Tue Oct 10 16:15:24 2023 +0800 :rotating_light: commit b0e3efa774c0d500567c96e1f1720cd11271dd0e Author: Daniel <845765@qq.com> Date: Tue Oct 10 11:41:46 2023 +0800 :bookmark: Release v2.10.9 commit d690475ae63c41f486eb752de203fe2a90b7e2c2 Merge: c8a6f4185 811bac942 Author: Daniel <845765@qq.com> Date: Tue Oct 10 10:58:46 2023 +0800 Merge remote-tracking branch 'origin/master' commit c8a6f4185e25813687883ab241a18d21ae8a5b22 Author: Daniel <845765@qq.com> Date: Tue Oct 10 10:18:57 2023 +0800 :bookmark: Release v2.10.9 commit cdcec7e58dd597b87967c456107e062db90c41e6 Author: Daniel <845765@qq.com> Date: Mon Oct 9 23:29:25 2023 +0800 :memo: Update changelogs commit 1eccb8ba4d6e7f9a9b37f18f9bd444920d93744c Merge: a3094fe3e 3827753b7 Author: Vanessa Date: Mon Oct 9 23:26:13 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit a3094fe3ead644f67886324f165e6157818ed680 Author: Vanessa Date: Mon Oct 9 23:25:48 2023 +0800 :bug: fix https://github.com/siyuan-note/siyuan/issues/9384 commit 3827753b7c7391680af13c9ea5812ab4247e8381 Author: Daniel <845765@qq.com> Date: Mon Oct 9 23:07:34 2023 +0800 :art: Upgrade Electron https://github.com/siyuan-note/siyuan/issues/9342 commit 567394afba01704c66a4e65bc54260becc2eb034 Author: Daniel <845765@qq.com> Date: Mon Oct 9 22:42:39 2023 +0800 :memo: Update changelogs commit ff6220abaa2d8316e4ad1771985e47885eac1a45 Author: Yingyi / 颖逸 <49649786+Zuoqiu-Yingyi@users.noreply.github.com> Date: Mon Oct 9 21:51:39 2023 +0800 :art: add `@electron/remote` dependency (#9381) commit da0fa0853f46a957c35a282235a53c3fd8e10163 Author: Daniel <845765@qq.com> Date: Mon Oct 9 21:45:36 2023 +0800 :art: Replace non-breaking spaces with normal spaces when copying https://github.com/siyuan-note/siyuan/issues/9382 commit 0ed68847618c241704702757c3324493a3fb8c2a Author: Daniel <845765@qq.com> Date: Mon Oct 9 21:09:35 2023 +0800 :bug: Update av Fix https://github.com/siyuan-note/siyuan/issues/9380 commit 288eb24474ed21416c69d6ec366f22ef67189d8e Author: Daniel <845765@qq.com> Date: Mon Oct 9 17:30:19 2023 +0800 :art: Show notebooks in hpath of block ref search list results https://github.com/siyuan-note/siyuan/issues/9378 commit 4965b7b8458edd974efa85483aed8ba4f7a6b106 Merge: 803069d80 902849153 Author: Vanessa Date: Mon Oct 9 17:18:28 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 803069d8071240447567a233c5ad104bb5962511 Author: Vanessa Date: Mon Oct 9 17:18:17 2023 +0800 :art: fix https://github.com/siyuan-note/siyuan/issues/9370 commit 902849153a87eb75b200ab37b9ff674e8ba382d0 Author: Daniel <845765@qq.com> Date: Mon Oct 9 17:17:40 2023 +0800 :art: Add created and updated type column to database https://github.com/siyuan-note/siyuan/issues/9371 commit faadbf5960997f42ad22884d7394d2b3fd6bf3e6 Author: Daniel <845765@qq.com> Date: Mon Oct 9 16:48:28 2023 +0800 :art: Add created and updated type column to database https://github.com/siyuan-note/siyuan/issues/9371 commit 9ca11625bd71b67b50e5091f680932762e02862a Merge: 43f06e57d 644e0319d Author: Vanessa Date: Mon Oct 9 16:45:06 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 43f06e57d9125ed62f2db0e8d0c10f53ef0d8e0a Author: Vanessa Date: Mon Oct 9 16:44:46 2023 +0800 :art: fix https://github.com/siyuan-note/siyuan/issues/9370 commit 811bac942ddbdc48f29e587ea6ffb8f68ce2e4ac Author: Daniel <845765@qq.com> Date: Wed Oct 4 13:03:36 2023 +0800 :art: Free disk space for docker image building GitHub Action commit 66aa802765998feb6af7883e678cc835702d689a Author: Daniel <845765@qq.com> Date: Wed Oct 4 13:03:28 2023 +0800 :art: Free disk space for docker image building GitHub Action --- app/src/editor/util.ts | 3 + app/src/layout/dock/util.ts | 16 +- app/src/menus/protyle.ts | 289 ++++++++++++++++--------------- app/src/protyle/wysiwyg/index.ts | 2 +- scripts/win-build.bat | 10 +- 5 files changed, 171 insertions(+), 149 deletions(-) diff --git a/app/src/editor/util.ts b/app/src/editor/util.ts index acc2d7af9a6..2368bbe60ad 100644 --- a/app/src/editor/util.ts +++ b/app/src/editor/util.ts @@ -40,6 +40,9 @@ export const openFileById = async (options: { afterOpen?: () => void }) => { const response = await fetchSyncPost("/api/block/getBlockInfo", {id: options.id}); + if (response.code === -1) { + return; + } if (response.code === 3) { showMessage(response.msg); return; diff --git a/app/src/layout/dock/util.ts b/app/src/layout/dock/util.ts index c7d6dce9360..4acdb7bd24f 100644 --- a/app/src/layout/dock/util.ts +++ b/app/src/layout/dock/util.ts @@ -32,16 +32,22 @@ export const openBacklink = async (options: { if (!wnd) { wnd = getWndByLayout(window.siyuan.layout.centerLayout); } - const newWnd = wnd.split("lr"); if (!options.rootId) { const response = await fetchSyncPost("api/block/getDocInfo", {id: options.blockId}); + if (response.code === -1) { + return; + } options.rootId = response.data.rootID; options.useBlockId = response.data.rootID !== response.data.id; options.title = response.data.name || "Untitled"; } else if (!options.title) { const response = await fetchSyncPost("api/block/getDocInfo", {id: options.blockId}); + if (response.code === -1) { + return; + } options.title = response.data.name || "Untitled"; } + const newWnd = wnd.split("lr"); newWnd.addTab(new Tab({ icon: "iconLink", title: options.title, @@ -82,16 +88,22 @@ export const openGraph = async (options: { if (!wnd) { wnd = getWndByLayout(window.siyuan.layout.centerLayout); } - const newWnd = wnd.split("lr"); if (!options.rootId) { const response = await fetchSyncPost("api/block/getDocInfo", {id: options.blockId}); + if (response.code === -1) { + return; + } options.rootId = response.data.rootID; options.useBlockId = response.data.rootID !== response.data.id; options.title = response.data.name || "Untitled"; } else if (!options.title) { const response = await fetchSyncPost("api/block/getDocInfo", {id: options.blockId}); + if (response.code === -1) { + return; + } options.title = response.data.name || "Untitled"; } + const newWnd = wnd.split("lr"); newWnd.addTab(new Tab({ icon: "iconGraph", title: options.title, diff --git a/app/src/menus/protyle.ts b/app/src/menus/protyle.ts index 0fe28bb038c..556943f7f5f 100644 --- a/app/src/menus/protyle.ts +++ b/app/src/menus/protyle.ts @@ -155,37 +155,39 @@ export const refMenu = (protyle: IProtyle, element: HTMLElement) => { const id = nodeElement.getAttribute("data-node-id"); let oldHTML = nodeElement.outerHTML; window.siyuan.menus.menu.remove(); - window.siyuan.menus.menu.append(new MenuItem({ - label: ``, - bind(menuItemElement) { - const inputElement = menuItemElement.querySelector("input"); - inputElement.value = element.getAttribute("data-subtype") === "d" ? "" : element.textContent; - inputElement.addEventListener("input", () => { - if (inputElement.value) { - // 不能使用 textContent，否则 < 会变为 < - element.innerHTML = Lute.EscapeHTMLStr(inputElement.value); - } else { - fetchPost("/api/block/getRefText", {id: refBlockId}, (response) => { - element.innerHTML = response.data; - }); - } - element.setAttribute("data-subtype", inputElement.value ? "s" : "d"); - }); - inputElement.addEventListener("keydown", (event) => { - if (event.isComposing) { - return; - } - if (event.key === "Enter" && !event.isComposing) { - window.siyuan.menus.menu.remove(); - } else if (electronUndo(event)) { - return; - } - }); - } - }).element); - window.siyuan.menus.menu.append(new MenuItem({ - type: "separator" - }).element); + if (!protyle.disabled) { + window.siyuan.menus.menu.append(new MenuItem({ + label: ``, + bind(menuItemElement) { + const inputElement = menuItemElement.querySelector("input"); + inputElement.value = element.getAttribute("data-subtype") === "d" ? "" : element.textContent; + inputElement.addEventListener("input", () => { + if (inputElement.value) { + // 不能使用 textContent，否则 < 会变为 < + element.innerHTML = Lute.EscapeHTMLStr(inputElement.value); + } else { + fetchPost("/api/block/getRefText", {id: refBlockId}, (response) => { + element.innerHTML = response.data; + }); + } + element.setAttribute("data-subtype", inputElement.value ? "s" : "d"); + }); + inputElement.addEventListener("keydown", (event) => { + if (event.isComposing) { + return; + } + if (event.key === "Enter" && !event.isComposing) { + window.siyuan.menus.menu.remove(); + } else if (electronUndo(event)) { + return; + } + }); + } + }).element); + window.siyuan.menus.menu.append(new MenuItem({ + type: "separator" + }).element); + } /// #if !MOBILE window.siyuan.menus.menu.append(new MenuItem({ label: window.siyuan.languages.openBy, @@ -282,105 +284,107 @@ export const refMenu = (protyle: IProtyle, element: HTMLElement) => { }).element); window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element); /// #endif - let submenu: IMenu[] = []; - if (element.getAttribute("data-subtype") === "s") { - submenu.push({ - label: window.siyuan.languages.turnToDynamic, - click() { - element.setAttribute("data-subtype", "d"); - fetchPost("/api/block/getRefText", {id: refBlockId}, (response) => { - element.innerHTML = response.data; + if (!protyle.disabled) { + let submenu: IMenu[] = []; + if (element.getAttribute("data-subtype") === "s") { + submenu.push({ + label: window.siyuan.languages.turnToDynamic, + click() { + element.setAttribute("data-subtype", "d"); + fetchPost("/api/block/getRefText", {id: refBlockId}, (response) => { + element.innerHTML = response.data; + nodeElement.setAttribute("updated", dayjs().format("YYYYMMDDHHmmss")); + updateTransaction(protyle, id, nodeElement.outerHTML, oldHTML); + }); + focusByRange(protyle.toolbar.range); + } + }); + } else { + submenu.push({ + label: window.siyuan.languages.turnToStatic, + click() { + element.setAttribute("data-subtype", "s"); nodeElement.setAttribute("updated", dayjs().format("YYYYMMDDHHmmss")); updateTransaction(protyle, id, nodeElement.outerHTML, oldHTML); - }); + focusByRange(protyle.toolbar.range); + } + }); + } + submenu = submenu.concat([{ + label: window.siyuan.languages.text, + click() { + element.outerHTML = `${element.innerHTML}`; + nodeElement.setAttribute("updated", dayjs().format("YYYYMMDDHHmmss")); + updateTransaction(protyle, id, nodeElement.outerHTML, oldHTML); + focusByWbr(nodeElement, protyle.toolbar.range); + } + }, { + label: "*", + click() { + element.setAttribute("data-subtype", "s"); + element.textContent = "*"; + nodeElement.setAttribute("updated", dayjs().format("YYYYMMDDHHmmss")); + updateTransaction(protyle, id, nodeElement.outerHTML, oldHTML); focusByRange(protyle.toolbar.range); } - }); - } else { - submenu.push({ - label: window.siyuan.languages.turnToStatic, + }, { + label: window.siyuan.languages.text + " *", click() { + element.insertAdjacentHTML("beforebegin", element.innerHTML + " "); element.setAttribute("data-subtype", "s"); + element.textContent = "*"; nodeElement.setAttribute("updated", dayjs().format("YYYYMMDDHHmmss")); updateTransaction(protyle, id, nodeElement.outerHTML, oldHTML); focusByRange(protyle.toolbar.range); } - }); - } - submenu = submenu.concat([{ - label: window.siyuan.languages.text, - click() { - element.outerHTML = `${element.innerHTML}`; - nodeElement.setAttribute("updated", dayjs().format("YYYYMMDDHHmmss")); - updateTransaction(protyle, id, nodeElement.outerHTML, oldHTML); - focusByWbr(nodeElement, protyle.toolbar.range); - } - }, { - label: "*", - click() { - element.setAttribute("data-subtype", "s"); - element.textContent = "*"; - nodeElement.setAttribute("updated", dayjs().format("YYYYMMDDHHmmss")); - updateTransaction(protyle, id, nodeElement.outerHTML, oldHTML); - focusByRange(protyle.toolbar.range); - } - }, { - label: window.siyuan.languages.text + " *", - click() { - element.insertAdjacentHTML("beforebegin", element.innerHTML + " "); - element.setAttribute("data-subtype", "s"); - element.textContent = "*"; - nodeElement.setAttribute("updated", dayjs().format("YYYYMMDDHHmmss")); - updateTransaction(protyle, id, nodeElement.outerHTML, oldHTML); - focusByRange(protyle.toolbar.range); - } - }, { - label: window.siyuan.languages.link, - icon: "iconLink", - click() { - element.outerHTML = `${element.innerHTML}`; - nodeElement.setAttribute("updated", dayjs().format("YYYYMMDDHHmmss")); - updateTransaction(protyle, id, nodeElement.outerHTML, oldHTML); - focusByWbr(nodeElement, protyle.toolbar.range); + }, { + label: window.siyuan.languages.link, + icon: "iconLink", + click() { + element.outerHTML = `${element.innerHTML}`; + nodeElement.setAttribute("updated", dayjs().format("YYYYMMDDHHmmss")); + updateTransaction(protyle, id, nodeElement.outerHTML, oldHTML); + focusByWbr(nodeElement, protyle.toolbar.range); + } + }]); + if (element.parentElement.textContent.trim() === element.textContent.trim() && element.parentElement.tagName === "DIV") { + submenu.push({ + label: window.siyuan.languages.blockEmbed, + icon: "iconSQL", + click() { + const html = `
${nodeElement.querySelector(".protyle-attr").outerHTML}
`; + nodeElement.outerHTML = html; + updateTransaction(protyle, id, html, oldHTML); + blockRender(protyle, protyle.wysiwyg.element); + } + }); } - }]); - if (element.parentElement.textContent.trim() === element.textContent.trim() && element.parentElement.tagName === "DIV") { submenu.push({ - label: window.siyuan.languages.blockEmbed, - icon: "iconSQL", + label: window.siyuan.languages.defBlock, + click() { + fetchPost("/api/block/swapBlockRef", { + refID: id, + defID: refBlockId, + includeChildren: false + }); + } + }); + submenu.push({ + label: window.siyuan.languages.defBlockChildren, click() { - const html = `
${nodeElement.querySelector(".protyle-attr").outerHTML}
`; - nodeElement.outerHTML = html; - updateTransaction(protyle, id, html, oldHTML); - blockRender(protyle, protyle.wysiwyg.element); + fetchPost("/api/block/swapBlockRef", { + refID: id, + defID: refBlockId, + includeChildren: true + }); } }); + window.siyuan.menus.menu.append(new MenuItem({ + label: window.siyuan.languages.turnInto, + icon: "iconRefresh", + submenu + }).element); } - submenu.push({ - label: window.siyuan.languages.defBlock, - click() { - fetchPost("/api/block/swapBlockRef", { - refID: id, - defID: refBlockId, - includeChildren: false - }); - } - }); - submenu.push({ - label: window.siyuan.languages.defBlockChildren, - click() { - fetchPost("/api/block/swapBlockRef", { - refID: id, - defID: refBlockId, - includeChildren: true - }); - } - }); - window.siyuan.menus.menu.append(new MenuItem({ - label: window.siyuan.languages.turnInto, - icon: "iconRefresh", - submenu - }).element); window.siyuan.menus.menu.append(new MenuItem({ label: window.siyuan.languages.copy, icon: "iconCopy", @@ -389,18 +393,19 @@ export const refMenu = (protyle: IProtyle, element: HTMLElement) => { writeText(`((${refBlockId} ${quote}${element.textContent}${quote}))`); } }).element); - window.siyuan.menus.menu.append(new MenuItem({ - label: window.siyuan.languages.remove, - icon: "iconTrashcan", - click() { - element.insertAdjacentHTML("afterend", ""); - element.remove(); - nodeElement.setAttribute("updated", dayjs().format("YYYYMMDDHHmmss")); - updateTransaction(protyle, id, nodeElement.outerHTML, oldHTML); - focusByWbr(nodeElement, protyle.toolbar.range); - } - }).element); - + if (!protyle.disabled) { + window.siyuan.menus.menu.append(new MenuItem({ + label: window.siyuan.languages.remove, + icon: "iconTrashcan", + click() { + element.insertAdjacentHTML("afterend", ""); + element.remove(); + nodeElement.setAttribute("updated", dayjs().format("YYYYMMDDHHmmss")); + updateTransaction(protyle, id, nodeElement.outerHTML, oldHTML); + focusByWbr(nodeElement, protyle.toolbar.range); + } + }).element); + } if (protyle?.app?.plugins) { emitOpenMenu({ plugins: protyle.app.plugins, @@ -419,20 +424,22 @@ export const refMenu = (protyle: IProtyle, element: HTMLElement) => { y: rect.top + 26, h: 26 }); - window.siyuan.menus.menu.element.querySelector("input").select(); - window.siyuan.menus.menu.removeCB = () => { - if (nodeElement.outerHTML !== oldHTML) { - nodeElement.setAttribute("updated", dayjs().format("YYYYMMDDHHmmss")); - updateTransaction(protyle, id, nodeElement.outerHTML, oldHTML); - oldHTML = nodeElement.outerHTML; - } - const currentRange = getSelection().rangeCount === 0 ? undefined : getSelection().getRangeAt(0); - if (currentRange && !protyle.element.contains(currentRange.startContainer)) { - protyle.toolbar.range.selectNodeContents(element); - protyle.toolbar.range.collapse(false); - focusByRange(protyle.toolbar.range); - } - }; + if (!protyle.disabled) { + window.siyuan.menus.menu.element.querySelector("input").select(); + window.siyuan.menus.menu.removeCB = () => { + if (nodeElement.outerHTML !== oldHTML) { + nodeElement.setAttribute("updated", dayjs().format("YYYYMMDDHHmmss")); + updateTransaction(protyle, id, nodeElement.outerHTML, oldHTML); + oldHTML = nodeElement.outerHTML; + } + const currentRange = getSelection().rangeCount === 0 ? undefined : getSelection().getRangeAt(0); + if (currentRange && !protyle.element.contains(currentRange.startContainer)) { + protyle.toolbar.range.selectNodeContents(element); + protyle.toolbar.range.collapse(false); + focusByRange(protyle.toolbar.range); + } + }; + } }; export const contentMenu = (protyle: IProtyle, nodeElement: Element) => { @@ -1664,7 +1671,7 @@ export const setFold = (protyle: IProtyle, nodeElement: Element, isOpen?: boolea focusBlock(nodeElement, undefined, false); } } - nodeElement.querySelectorAll(".img--select, .av__cell--select, .av__row--select").forEach((item:HTMLElement) => { + nodeElement.querySelectorAll(".img--select, .av__cell--select, .av__row--select").forEach((item: HTMLElement) => { if (item.classList.contains("av__row--select")) { item.classList.remove("av__row--select"); item.querySelector(".av__firstcol use").setAttribute("xlink:href", "#iconUncheck"); diff --git a/app/src/protyle/wysiwyg/index.ts b/app/src/protyle/wysiwyg/index.ts index bf9570e1d79..c15c16aa216 100644 --- a/app/src/protyle/wysiwyg/index.ts +++ b/app/src/protyle/wysiwyg/index.ts @@ -1302,7 +1302,7 @@ export class WYSIWYG { if (types.length > 0) { removeSearchMark(target); } - if (types.includes("block-ref") && !protyle.disabled) { + if (types.includes("block-ref")) { refMenu(protyle, target); // 阻止 popover target.setAttribute("prevent-popover", "true"); diff --git a/scripts/win-build.bat b/scripts/win-build.bat index 68f1b64acca..8e2f50da4a6 100644 --- a/scripts/win-build.bat +++ b/scripts/win-build.bat @@ -33,9 +33,9 @@ echo 'Building Electron' cd app call pnpm run dist -@REM cd .. +cd .. -@REM echo 'Building Appx' -@REM echo 'Building Appx should be disabled if you do not need it. Not configured correctly will lead to build failures' -@REM cd . > app\build\win-unpacked\resources\ms-store -@REM electron-windows-store --input-directory app\build\win-unpacked --output-directory app\build\ --package-version 1.0.0.0 --package-name SiYuan --manifest app\appx\AppxManifest.xml --assets app\appx\assets\ --make-pri true +echo 'Building Appx' +echo 'Building Appx should be disabled if you do not need it. Not configured correctly will lead to build failures' +cd . > app\build\win-unpacked\resources\ms-store +electron-windows-store --input-directory app\build\win-unpacked --output-directory app\build\ --package-version 1.0.0.0 --package-name SiYuan --manifest app\appx\AppxManifest.xml --assets app\appx\assets\ --make-pri true