From 2e46bee776de95e973cca9ad5c66ce2ce314fa72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yingyi=20/=20=E9=A2=96=E9=80=B8?= <49649786+Zuoqiu-Yingyi@users.noreply.github.com> Date: Thu, 9 Nov 2023 16:35:49 +0800 Subject: [PATCH] Improve adaptive width for `Attributes View` (#9280) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * :art: Attrs View adaptive width * :art: Add CSS class `av__body` * :art: add margins for attribute view * :art: add max-width for attribute view * Squashed commit of the following: commit 642d041513898c9c3fc551f7a8625dc075c6d08a Author: Daniel <845765@qq.com> Date: Tue Oct 3 13:36:25 2023 +0800 :bookmark: Release v2.10.8 commit 43e53672b023ad6c13c28d1d2911bfddfa7e9435 Merge: 6b0f8e00a 0e3b78020 Author: Vanessa Date: Tue Oct 3 13:28:32 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 6b0f8e00a8a30c313fbc88fa36334eba971cb2f4 Author: Vanessa Date: Tue Oct 3 13:28:08 2023 +0800 :art: fix https://github.com/siyuan-note/siyuan/issues/9334 commit 0e3b7802015cf0ef4834f9bbab471f358c3c726e Author: Daniel <845765@qq.com> Date: Tue Oct 3 13:03:48 2023 +0800 :memo: Update changelogs commit cc3b4e320ef8d57df43a3bea9adc4630d58dcdf5 Author: Daniel <845765@qq.com> Date: Tue Oct 3 13:01:11 2023 +0800 :art: Database template column support using values from other columns https://github.com/siyuan-note/siyuan/issues/9327 commit 29f34fe8b8abe05d07bb0c4a2056af4ea6e74896 Author: Daniel <845765@qq.com> Date: Tue Oct 3 12:56:13 2023 +0800 :art: Database template column support using values from other columns https://github.com/siyuan-note/siyuan/issues/9327 commit 7556d1c3a28c152ebb5f6655236694d6083c9306 Author: Daniel <845765@qq.com> Date: Tue Oct 3 11:49:12 2023 +0800 :art: Database template column support using values from other columns https://github.com/siyuan-note/siyuan/issues/9327 commit 558422c4079bc79f4b9997f0cf1183e5ea8ad1c0 Author: Daniel <845765@qq.com> Date: Tue Oct 3 11:46:25 2023 +0800 :art: Database template column support using values from other columns https://github.com/siyuan-note/siyuan/issues/9327 commit 433cb91d7515ccfa5ba9dbb279902187d3c820e0 Author: Daniel <845765@qq.com> Date: Tue Oct 3 10:33:41 2023 +0800 :arrow_up: Upgrade kernel deps commit c5a25fe88f1497f55d5bb4979093c831c572c0e1 Author: Daniel <845765@qq.com> Date: Tue Oct 3 08:52:33 2023 +0800 :bug: Database render deleted block https://ld246.com/article/1695790906050/comment/1696234209062?r=88250#comments commit f6a8ca20cdc7a5df253b202ff637b8bea655e612 Author: Vanessa Date: Tue Oct 3 08:39:36 2023 +0800 :art: https://github.com/siyuan-note/siyuan/issues/8766 commit 11cc108893b325774e78a4d1f7ba80a2b76bbc8a Author: Daniel <845765@qq.com> Date: Tue Oct 3 07:57:36 2023 +0800 :bug: Create doc with ref Fix https://github.com/siyuan-note/siyuan/issues/9329 commit d869aef346ccdab9044edf8e832be5fb6026b143 Author: Daniel <845765@qq.com> Date: Mon Oct 2 22:46:36 2023 +0800 :art: The access authorization code command line parameter must be set when deploying via Docker https://github.com/siyuan-note/siyuan/issues/9328 commit 3d7bf2eb0fd1c4f9d033970997687030e478fb53 Author: Daniel <845765@qq.com> Date: Mon Oct 2 22:39:08 2023 +0800 :art: Remove the access authorization code setting item on the browser-end https://github.com/siyuan-note/siyuan/issues/9331 commit 279e17e8b587694b83b58d730eeb774278ecc670 Author: Daniel <845765@qq.com> Date: Mon Oct 2 22:15:33 2023 +0800 :art: The access authorization code command line parameter must be set when deploying via Docker https://github.com/siyuan-note/siyuan/issues/9328 commit d2356754ddd4d4c9e99e74e50e691ce8c26c1824 Author: Daniel <845765@qq.com> Date: Sun Oct 1 18:41:51 2023 +0800 :memo: Update changelogs commit 4fdd0ddef046cefd8f0149e7198020d2677e9af2 Author: Daniel <845765@qq.com> Date: Sun Oct 1 18:37:39 2023 +0800 :art: Add template type column to Attribute View https://github.com/siyuan-note/siyuan/issues/8766 commit b4bded40e3a5134e4387b090c56f83567a8942ab Author: Daniel <845765@qq.com> Date: Sun Oct 1 18:24:16 2023 +0800 :art: Add template type column to Attribute View https://github.com/siyuan-note/siyuan/issues/8766 commit bfd27a62d1ec270cd52594a55f766862e9961c05 Author: Daniel <845765@qq.com> Date: Sun Oct 1 18:22:39 2023 +0800 :art: Add template type column to Attribute View https://github.com/siyuan-note/siyuan/issues/8766 commit 0aa61fe5b7eb44941410c5591e654ce7850b46d0 Author: Daniel <845765@qq.com> Date: Sun Oct 1 18:14:31 2023 +0800 :art: Add template type column to Attribute View https://github.com/siyuan-note/siyuan/issues/8766 commit 7d1e1bf2e59b3ea77986309ac872d1ef4e16dbdf Author: Daniel <845765@qq.com> Date: Sun Oct 1 18:02:31 2023 +0800 :art: Add template type column to Attribute View https://github.com/siyuan-note/siyuan/issues/8766 commit 8c31eb0eac956e63b8e172617ee5cdc783b7658a Author: Vanessa Date: Sun Oct 1 17:59:16 2023 +0800 :art: https://github.com/siyuan-note/siyuan/issues/8766 commit 37892e786b511dd4bd4d5cedc603cc0a438bb651 Author: Vanessa Date: Sun Oct 1 17:58:48 2023 +0800 :art: https://github.com/siyuan-note/siyuan/issues/8766 commit f965ef0945c65f2affa5180cf762c0d498681aac Merge: b709c8458 b2f5ab570 Author: Vanessa Date: Sun Oct 1 17:41:15 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit b709c8458508b1955ddcef020457e643990e0bb0 Author: Vanessa Date: Sun Oct 1 17:41:00 2023 +0800 :art: https://github.com/siyuan-note/siyuan/issues/8766 commit b2f5ab5700f4ad30d04c645a466512448225b5d8 Author: Daniel <845765@qq.com> Date: Sun Oct 1 17:36:22 2023 +0800 :art: Add template type column to Attribute View https://github.com/siyuan-note/siyuan/issues/8766 commit b833087cb6287cd4e7a39d6b50ad42e9394df930 Author: Daniel <845765@qq.com> Date: Sun Oct 1 17:33:53 2023 +0800 :art: Add template type column to Attribute View https://github.com/siyuan-note/siyuan/issues/8766 commit dbdddd7ff36da2da3ff03a779ef3af5f4fcc2a69 Author: Daniel <845765@qq.com> Date: Sun Oct 1 17:16:08 2023 +0800 :art: Add template type column to Attribute View https://github.com/siyuan-note/siyuan/issues/8766 commit b981fa08a04e769793a19862e8916985beefc13f Author: Vanessa Date: Sun Oct 1 17:05:06 2023 +0800 :art: https://github.com/siyuan-note/siyuan/issues/8766 commit 6e475e185709e81b39a6ef5d0eae028a3c034369 Author: Daniel <845765@qq.com> Date: Sun Oct 1 11:05:24 2023 +0800 :memo: Update changelogs commit df38f89f4077e30ccafb0fae8da1ca38b781fb4f Merge: 465375422 b69e8d335 Author: Vanessa Date: Sun Oct 1 11:02:11 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 46537542210a82aab15b991692bfe3b63da31b8f Author: Vanessa Date: Sun Oct 1 11:01:57 2023 +0800 :art: fix https://github.com/siyuan-note/siyuan/issues/9291 commit b69e8d335726fb64e35b4d80b844e4e30e5d6344 Author: Daniel <845765@qq.com> Date: Sun Oct 1 10:58:46 2023 +0800 :art: Add template type column to Attribute View https://github.com/siyuan-note/siyuan/issues/8766 commit df487a7c6aace2accba9d3fd576c38f3705d021f Author: Vanessa Date: Sun Oct 1 10:49:52 2023 +0800 :bug: flash card zoomin status commit c0424caf679ae463aef8b39e003b256263f0e978 Author: Daniel <845765@qq.com> Date: Sun Oct 1 10:42:12 2023 +0800 :art: Add template type column to Attribute View https://github.com/siyuan-note/siyuan/issues/8766 commit e8359edebc8867e79dce7b918bf709de15e28242 Author: Vanessa Date: Sun Oct 1 10:27:07 2023 +0800 :rotating_light: commit c3212235b75352cc23da2e42e14435a3f0ab7aa4 Merge: 64900706b 702926430 Author: Vanessa Date: Sun Oct 1 10:26:51 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 64900706b21df441edbe91db3887a81008c19286 Author: Vanessa Date: Sun Oct 1 10:26:31 2023 +0800 :art: fix https://github.com/siyuan-note/siyuan/issues/9313 commit 702926430014c14fd3dbec9fa3a7cbb8fde0122e Author: Daniel <845765@qq.com> Date: Sun Oct 1 10:03:07 2023 +0800 :memo: Update changelogs commit 29d155d0cd617a22a0aa0b65e27c2ae0dc428390 Author: Daniel <845765@qq.com> Date: Sun Oct 1 09:37:46 2023 +0800 :art: Improve missing line breaks when exporting RTF Fix https://github.com/siyuan-note/siyuan/issues/9325 commit 05cfcf7c2b8bda82eb9d0ccd67a4707b9da18a65 Author: Vanessa Date: Sat Sep 30 20:46:00 2023 +0800 :art: https://ld246.com/article/1695361968294 commit 67e0dad0a750e6c34caa2628e652d294de600ea7 Merge: 856445a6e fee908d01 Author: Vanessa Date: Sat Sep 30 20:30:21 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 856445a6ef7af178818ec33ce28ea337ed53e35a Author: Vanessa Date: Sat Sep 30 20:30:06 2023 +0800 :art: fix https://github.com/siyuan-note/siyuan/issues/9323 commit fee908d01e23b692b5ee8da73611e1205f7be95f Author: Daniel <845765@qq.com> Date: Sat Sep 30 20:19:26 2023 +0800 :bug: The image does not display after pasting some PDF rectangular annotations Fix https://github.com/siyuan-note/siyuan/issues/9321 commit 11d2f7c580176c94dc1708a37d322c752425a08f Author: Daniel <845765@qq.com> Date: Sat Sep 30 20:18:27 2023 +0800 :bug: The image does not display after pasting some PDF rectangular annotations Fix https://github.com/siyuan-note/siyuan/issues/9321 commit 83dce4f3e6577152f931a80bd47e436118af7e61 Merge: 1f2faecf4 49d92538d Author: Vanessa Date: Sat Sep 30 19:55:15 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 1f2faecf4d63202cb3087d988400dea06dfe8082 Author: Vanessa Date: Sat Sep 30 19:55:01 2023 +0800 :zap: breadcrumb commit 49d92538dfa76a70afa5f057274bb2afb99384d3 Author: Daniel <845765@qq.com> Date: Sat Sep 30 19:52:26 2023 +0800 :bug: The subdoc creation path is unstable when a parent doc with the same name exists Fix https://github.com/siyuan-note/siyuan/issues/9322 commit 17dd264479cd0aa40320cb69592af848a751378a Author: Daniel <845765@qq.com> Date: Sat Sep 30 19:34:28 2023 +0800 :art: Improve handling of copy block ref when including images https://github.com/siyuan-note/siyuan/issues/9317 commit e74733b4e1af49977fd77b3df6e37277089ec2de Author: Daniel <845765@qq.com> Date: Sat Sep 30 17:57:23 2023 +0800 :recycle: Refactor create doc by hpath commit f608da26a5d572c981b73d7b53e189f558512a4a Merge: 6b2a4ff0a 121d33e74 Author: Vanessa Date: Sat Sep 30 19:25:39 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 6b2a4ff0aa2e1aeae2f7afedf2e3f752ef7c6cb6 Author: Vanessa Date: Sat Sep 30 19:25:20 2023 +0800 :art: fix https://github.com/siyuan-note/siyuan/issues/9317 commit 121d33e74d773def64c35d6f9476ad8aa238fa8b Author: Daniel <845765@qq.com> Date: Sat Sep 30 17:56:47 2023 +0800 :art: Improve handling of copy block ref when including images https://github.com/siyuan-note/siyuan/issues/9317 commit 82bed847e6c327cd4bbb3b5cf77e1726ebfe4fff Author: Vanessa Date: Sat Sep 30 14:40:45 2023 +0800 :art: https://github.com/siyuan-note/siyuan/issues/9320 commit f8b272d596f67cafbd83e3d4d69a2fc4d5c90fae Merge: 2dae1200b ca855c1fa Author: Vanessa Date: Sat Sep 30 13:57:55 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit 2dae1200b48b3813252e9fbcbeb1d77dffd275e6 Author: Vanessa Date: Sat Sep 30 13:57:40 2023 +0800 :art: https://github.com/siyuan-note/siyuan/issues/9316 commit ca855c1fa54756b5ff9afd1270f4c4d7aa444b9f Author: Daniel <845765@qq.com> Date: Sat Sep 30 11:57:37 2023 +0800 :art: Attribute Panel - Database sort attributes by view column order https://github.com/siyuan-note/siyuan/issues/9319 commit 1063f503756f89afe12125bb59b256e8b9a201b3 Author: Vanessa Date: Sat Sep 30 11:21:46 2023 +0800 :lipstick: https://github.com/siyuan-note/siyuan/issues/9318 commit 1f899aaf3c3a9aa4d566a51584a4165d8b8b24bd Author: Vanessa Date: Fri Sep 29 21:41:14 2023 +0800 :lipstick: fix https://github.com/siyuan-note/siyuan/issues/9281 commit 2b9bec8e8b07c9fc6280b272a2ea31569ebf0b2f Author: Daniel <845765@qq.com> Date: Fri Sep 29 17:33:18 2023 +0800 :art: Ctrl+N should follow notebook create save path https://ld246.com/article/1695965429553 commit 41e35ea795fd4fe1408e99e5c2b5b1b6c91f2c9b Author: Vanessa Date: Thu Sep 28 23:45:23 2023 +0800 :rotating_light: commit 6a37b8661304a6afa9a95716203c407dc2f9c688 Author: Vanessa Date: Thu Sep 28 23:41:44 2023 +0800 :rotating_light: commit 4c6b695dae9e132cce01c4f36ed7657a89c322ff Merge: df3f444e4 dc03a5cf3 Author: Vanessa Date: Thu Sep 28 23:41:18 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev commit df3f444e480057ea3bb7582eb180a72cc0f842cd Author: Vanessa Date: Thu Sep 28 23:40:44 2023 +0800 :recycle: https://github.com/siyuan-note/siyuan/pull/9300 commit dc03a5cf38601690649b1536624d3bb6f8985cc2 Author: Daniel <845765@qq.com> Date: Thu Sep 28 22:46:29 2023 +0800 :arrow_up: Upgrade kernel deps commit 172b7ed0180d573ad796f1ff6dd6c1aea9384064 Author: Daniel <845765@qq.com> Date: Thu Sep 28 22:39:12 2023 +0800 :art: Apply result optimized by FSRS optimizer https://github.com/siyuan-note/siyuan/issues/9309 commit 6354d04e4bae7a5184847baa30bcba24397b18d8 Author: Daniel <845765@qq.com> Date: Thu Sep 28 22:22:17 2023 +0800 :art: Apply result optimized by FSRS optimizer https://github.com/siyuan-note/siyuan/issues/9309 commit b2a27bb54ca2f761fdfe6c182b463a58132b1861 Author: Yingyi / 颖逸 <49649786+Zuoqiu-Yingyi@users.noreply.github.com> Date: Thu Sep 28 22:38:49 2023 +0800 Refactor code language and ts types (#9300) * :art: Code block language list adds custom languages * Update index.d.ts * :art: Improve global variable type definition * :art: Improve global variable type definition * :art: Add constant `EXTRA_CODE_LANGUAGES` commit 17d2a16a9477453691c325bbabf47c1a42d9b4ea Author: Vanessa Date: Thu Sep 28 22:31:33 2023 +0800 :art: fix https://github.com/siyuan-note/siyuan/issues/9264 commit ceb9aef1d6710c806728dd08289906a93d775344 Author: Vanessa Date: Thu Sep 28 17:25:18 2023 +0800 :art: fix https://github.com/siyuan-note/siyuan/issues/9303 * :art: Improve the width of image in attribute view cell * :art: Adjust the style of rows' gutter * Merge tag 'v2.10.9-dev2' into feat/attrs-view-adaptive-width * :art: Improve the style of rows' gutter * :bug: Improve the style of icon in attribute view * :art: Improve preview text fields * Revert Merge tag 'v2.10.9-dev2' into feat/attrs-view-adaptive-width * :art: Improve the style of image in attribute view cell * :art: Improve the style of firstcol * :bug: Fix check icon click event handle * Merge tag 'v2.10.9-dev3' into feat/attrs-view-adaptive-width * Merge tag 'v2.10.9' into feat/attrs-view-adaptive-width * Merge tag 'v2.10.10' into feat/attrs-view-adaptive-width * Squashed commit of the following: 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 * Update anno.ts * Update index.ts * :art: Adapt to align styles * :art: Adapt to using arrow keys/Esc to select a cell/row * Update row.ts * :art: Adjusted the cell width in attribute view * :bug: Fixed the issue that the first column was misaligned * Update index.ts * Update action.ts --- app/src/assets/scss/business/_av.scss | 102 +++++++++------- app/src/assets/scss/business/_custom.scss | 4 + app/src/assets/scss/component/_tooltips.scss | 1 + app/src/plugin/loader.ts | 12 +- app/src/plugin/require.ts | 11 ++ app/src/protyle/gutter/index.ts | 21 ++-- app/src/protyle/render/av/action.ts | 116 +++++++++++-------- app/src/protyle/render/av/render.ts | 38 +++--- app/src/protyle/render/av/row.ts | 20 ++-- app/src/protyle/scroll/event.ts | 24 ---- app/src/protyle/util/resize.ts | 38 +----- app/src/protyle/wysiwyg/index.ts | 6 - app/src/protyle/wysiwyg/keydown.ts | 10 +- 13 files changed, 199 insertions(+), 204 deletions(-) create mode 100644 app/src/plugin/require.ts diff --git a/app/src/assets/scss/business/_av.scss b/app/src/assets/scss/business/_av.scss index 2ce1b7870..84431171b 100644 --- a/app/src/assets/scss/business/_av.scss +++ b/app/src/assets/scss/business/_av.scss @@ -1,4 +1,8 @@ .av { + display: flex; + flex-direction: column; + align-items: center; + user-select: none; box-sizing: border-box; @@ -27,6 +31,11 @@ opacity: 1; } + &__container { + // width: fit-content; + max-width: 100%; + } + &__header { top: -43px; z-index: 2; @@ -60,14 +69,15 @@ &__gutters { @extend .protyle-gutters; - position: fixed; + position: absolute; + line-height: normal; top: 0; - left: -44px; + left: 0; opacity: 0; - display: flex; + width: 24px; - svg { - height: 25px; + button { + padding: 0; } } @@ -84,6 +94,10 @@ cursor: pointer; } + &__body { + float: left; + } + &__row { display: flex; border-bottom: 1px solid var(--b3-theme-surface-lighter); @@ -111,10 +125,6 @@ &--select { background-color: var(--b3-theme-primary-lightest); - - .av__firstcol svg { - opacity: 1; - } } &--header { @@ -181,18 +191,15 @@ &--add { color: var(--b3-theme-on-surface); - padding: 5px 5px 5px 7px; display: flex; - align-items: center; transition: background 20ms ease-in 0s; font-size: 87.5%; - svg { - height: 12px; - width: 12px; - color: var(--b3-theme-on-surface); - margin-right: 5px; - flex-shrink: 0; + .av__calc { + padding: 0 5px; + align-items: center; + position: sticky; + left: 49px; } &:hover { @@ -201,6 +208,27 @@ } } + &__firstcol { + display: flex; + flex-direction: row-reverse; + + position: sticky; + left: 0; + z-index: 1; + width: 48px; + background-color: var(--b3-theme-background); + border-right: 1px solid var(--b3-theme-surface-lighter); + + svg { + color: var(--b3-theme-on-surface); + height: 36px; + width: 24px; + padding: 5px; + box-sizing: border-box; + float: left; + } + } + &__cell { box-sizing: border-box; position: relative; @@ -234,6 +262,18 @@ top: 5px; } + &[data-wrap=true] { + white-space: pre-wrap; + } + + &[data-wrap=false] { + white-space: nowrap; + + img.av__cellassetimg { + max-height: 26px; + } + } + &:hover .block__icon { opacity: 1; background-color: var(--b3-theme-background-light) !important; @@ -259,6 +299,7 @@ &__celltext { overflow: hidden; + line-height: normal; .b3-chip { margin: 1px 2px; @@ -276,22 +317,6 @@ } } - &__firstcol { - svg { - color: var(--b3-theme-on-surface); - height: 33px; - width: 24px; - opacity: 0; - padding: 5px; - box-sizing: border-box; - float: left; - } - - &:hover svg { - opacity: 1; - } - } - &__widthdrag { position: absolute; cursor: col-resize; @@ -373,20 +398,13 @@ &.protyle-wysiwyg--select, &.protyle-wysiwyg--hl { .av__row--header, - .av__row--footer { + .av__row--footer, + .av__firstcol { background-color: transparent; } } } -img.av__cellassetimg { - max-height: 20px; - border-radius: var(--b3-border-radius); - margin: 1px 2px; - max-width: none; - vertical-align: top; -} - html[data-theme-mode="dark"] .av__panel .b3-menu__item { mix-blend-mode: lighten; } diff --git a/app/src/assets/scss/business/_custom.scss b/app/src/assets/scss/business/_custom.scss index 4b56e8287..4b010b9f1 100644 --- a/app/src/assets/scss/business/_custom.scss +++ b/app/src/assets/scss/business/_custom.scss @@ -69,6 +69,10 @@ line-height: 26px; min-height: 26px; + img.av__cellassetimg { + height: 32px; + } + &:hover { background-color: var(--b3-theme-background); } diff --git a/app/src/assets/scss/component/_tooltips.scss b/app/src/assets/scss/component/_tooltips.scss index 09abc9137..bd4424485 100644 --- a/app/src/assets/scss/component/_tooltips.scss +++ b/app/src/assets/scss/component/_tooltips.scss @@ -8,6 +8,7 @@ -webkit-font-smoothing: subpixel-antialiased; color: var(--b3-tooltips-color); word-wrap: break-word; + white-space: pre; background-color: var(--b3-tooltips-background); border-radius: var(--b3-border-radius); line-height: 17px; diff --git a/app/src/plugin/loader.ts b/app/src/plugin/loader.ts index b0cf39aea..12f1a838d 100644 --- a/app/src/plugin/loader.ts +++ b/app/src/plugin/loader.ts @@ -4,18 +4,10 @@ import {Plugin} from "./index"; /// #if !MOBILE import {exportLayout, resizeTopBar} from "../layout/util"; /// #endif -import {API} from "./API"; +import {PluginRequire} from "./require"; import {getFrontend, isMobile, isWindow} from "../util/functions"; import {Constants} from "../constants"; -const getObject = (key: string) => { - const api = { - siyuan: API - }; - // @ts-ignore - return api[key]; -}; - const runCode = (code: string, sourceURL: string) => { return window.eval("(function anonymous(require, module, exports){".concat(code, "\n})\n//# sourceURL=").concat(sourceURL, "\n")); }; @@ -40,7 +32,7 @@ const loadPluginJS = async (app: App, item: IPluginData) => { const exportsObj: { [key: string]: any } = {}; const moduleObj = {exports: exportsObj}; try { - runCode(item.js, "plugin:" + encodeURIComponent(item.name))(getObject, moduleObj, exportsObj); + runCode(item.js, "plugin:" + encodeURIComponent(item.name))(PluginRequire.require, moduleObj, exportsObj); } catch (e) { console.error(`plugin ${item.name} run error:`, e); return; diff --git a/app/src/plugin/require.ts b/app/src/plugin/require.ts new file mode 100644 index 000000000..b988b311f --- /dev/null +++ b/app/src/plugin/require.ts @@ -0,0 +1,11 @@ +import {API as siyuan} from "./API"; + +const libs: Record = { + siyuan, +} as const; + +export const PluginRequire = { + require(module: string) { + return libs[module]; + } +} diff --git a/app/src/protyle/gutter/index.ts b/app/src/protyle/gutter/index.ts index c57fa7296..42d7d2028 100644 --- a/app/src/protyle/gutter/index.ts +++ b/app/src/protyle/gutter/index.ts @@ -1616,8 +1616,7 @@ export class Gutter { click: () => { this.genClick(nodeElements, protyle, (e: HTMLElement) => { if (e.classList.contains("av")) { - e.style.margin = ""; - resizeAV(e); + e.style.alignItems = "flex-start"; } else { e.style.textAlign = "left"; } @@ -1630,8 +1629,7 @@ export class Gutter { click: () => { this.genClick(nodeElements, protyle, (e: HTMLElement) => { if (e.classList.contains("av")) { - e.style.margin = "0 auto"; - resizeAV(e); + e.style.alignItems = "center"; } else { e.style.textAlign = "center"; } @@ -1644,8 +1642,7 @@ export class Gutter { click: () => { this.genClick(nodeElements, protyle, (e: HTMLElement) => { if (e.classList.contains("av")) { - e.style.margin = "0 0 0 auto"; - resizeAV(e); + e.style.alignItems = "flex-end"; } else { e.style.textAlign = "right"; } @@ -1656,7 +1653,11 @@ export class Gutter { icon: "iconMenu", click: () => { this.genClick(nodeElements, protyle, (e: HTMLElement) => { - e.style.textAlign = "justify"; + if (e.classList.contains("av")) { + e.style.alignItems = "stretch"; + } else { + e.style.textAlign = "justify"; + } }); } }, { @@ -1686,12 +1687,11 @@ export class Gutter { icon: "iconTrashcan", click: () => { this.genClick(nodeElements, protyle, (e: HTMLElement) => { + e.style.direction = ""; if (e.classList.contains("av")) { - e.style.margin = ""; - resizeAV(e); + e.style.alignItems = ""; } else { e.style.textAlign = ""; - e.style.direction = ""; } }); } @@ -1754,7 +1754,6 @@ export class Gutter { id: e.getAttribute("data-node-id"), data: e.outerHTML }); - resizeAV(e); }); transaction(protyle, operations, undoOperations); window.siyuan.menus.menu.remove(); diff --git a/app/src/protyle/render/av/action.ts b/app/src/protyle/render/av/action.ts index a8daeba91..632cb1267 100644 --- a/app/src/protyle/render/av/action.ts +++ b/app/src/protyle/render/av/action.ts @@ -24,6 +24,25 @@ import {unicode2Emoji} from "../../../emoji"; import {selectRow} from "./row"; import * as dayjs from "dayjs"; +export const avAdd = (protyle: IProtyle, blockElement: HTMLElement, rowElement: HTMLElement, above: boolean) => { + const avID = blockElement.getAttribute("data-av-id"); + const srcIDs = [Lute.NewNodeID()]; + const previousID = above ? (rowElement.previousElementSibling.getAttribute("data-id") || "") : rowElement.getAttribute("data-id"); + transaction(protyle, [{ + action: "insertAttrViewBlock", + avID, + previousID, + srcIDs, + isDetached: true, + }], [{ + action: "removeAttrViewBlock", + srcIDs, + avID, + }]); + insertAttrViewBlockAnimation(blockElement, 1, previousID, avID); + popTextCell(protyle, [rowElement[above ? "previousElementSibling" : "nextElementSibling"].querySelector('[data-detached="true"]')], "block"); +} + export const avClick = (protyle: IProtyle, event: MouseEvent & { target: HTMLElement }) => { const blockElement = hasClosestBlock(event.target); if (!blockElement) { @@ -37,6 +56,29 @@ export const avClick = (protyle: IProtyle, event: MouseEvent & { target: HTMLEle } } + const addRowElement = hasClosestByClassName(event.target, "av__row--add"); + if (addRowElement) { + const avID = blockElement.getAttribute("data-av-id"); + const srcIDs = [Lute.NewNodeID()]; + const previousID = addRowElement.previousElementSibling.getAttribute("data-id") || ""; + transaction(protyle, [{ + action: "insertAttrViewBlock", + avID, + previousID, + srcIDs, + isDetached: true, + }], [{ + action: "removeAttrViewBlock", + srcIDs, + avID, + }]); + insertAttrViewBlockAnimation(blockElement, 1, previousID, avID); + popTextCell(protyle, [addRowElement.previousElementSibling.querySelector('[data-detached="true"]')], "block"); + event.preventDefault(); + event.stopPropagation(); + return true; + } + const copyElement = hasClosestByAttribute(event.target, "data-type", "copy"); if (copyElement) { writeText(copyElement.previousElementSibling.textContent.trim()); @@ -63,26 +105,11 @@ export const avClick = (protyle: IProtyle, event: MouseEvent & { target: HTMLEle return true; } - const gutterElement = hasClosestByClassName(event.target, "ariaLabel"); + const gutterElement = hasClosestByClassName(event.target, "av__gutter"); if (gutterElement && gutterElement.parentElement.classList.contains("av__gutters")) { - const rowElement = gutterElement.parentElement.parentElement; + const rowElement = gutterElement.parentElement.parentElement.parentElement; if (gutterElement.dataset.action === "add") { - const avID = blockElement.getAttribute("data-av-id"); - const srcIDs = [Lute.NewNodeID()]; - const previousID = event.altKey ? (rowElement.previousElementSibling.getAttribute("data-id") || "") : rowElement.getAttribute("data-id"); - transaction(protyle, [{ - action: "insertAttrViewBlock", - avID, - previousID, - srcIDs, - isDetached: true, - }], [{ - action: "removeAttrViewBlock", - srcIDs, - avID, - }]); - insertAttrViewBlockAnimation(blockElement, 1, previousID, avID); - popTextCell(protyle, [rowElement[event.altKey ? "previousElementSibling" : "nextElementSibling"].querySelector('[data-detached="true"]')], "block"); + avAdd(protyle, blockElement, rowElement, event.altKey); } else { const gutterRect = gutterElement.getBoundingClientRect(); avContextmenu(protyle, rowElement, { @@ -97,10 +124,10 @@ export const avClick = (protyle: IProtyle, event: MouseEvent & { target: HTMLEle return true; } - const checkElement = hasClosestByClassName(event.target, "av__firstcol"); - if (checkElement) { + const firstcolElement = hasClosestByClassName(event.target, "av__firstcol"); + if (firstcolElement) { window.siyuan.menus.menu.remove(); - selectRow(checkElement, "toggle"); + selectRow(firstcolElement, "toggle"); event.preventDefault(); event.stopPropagation(); return true; @@ -202,7 +229,7 @@ export const avClick = (protyle: IProtyle, event: MouseEvent & { target: HTMLEle selectRow(cellElement.parentElement.querySelector(".av__firstcol"), "toggle"); } else { cellElement.parentElement.parentElement.querySelectorAll(".av__row--select").forEach(item => { - item.querySelector(".av__firstcol use").setAttribute("xlink:href", "#iconUncheck"); + item.querySelector(".av__firstcol .icon__check use").setAttribute("xlink:href", "#iconUncheck"); item.classList.remove("av__row--select"); }); updateHeader(cellElement.parentElement); @@ -221,29 +248,6 @@ export const avClick = (protyle: IProtyle, event: MouseEvent & { target: HTMLEle return true; } - const addRowElement = hasClosestByClassName(event.target, "av__row--add"); - if (addRowElement) { - const avID = blockElement.getAttribute("data-av-id"); - const srcIDs = [Lute.NewNodeID()]; - const previousID = addRowElement.previousElementSibling.getAttribute("data-id") || ""; - transaction(protyle, [{ - action: "insertAttrViewBlock", - avID, - previousID, - srcIDs, - isDetached: true, - }], [{ - action: "removeAttrViewBlock", - srcIDs, - avID, - }]); - insertAttrViewBlockAnimation(blockElement, 1, previousID, avID); - popTextCell(protyle, [addRowElement.previousElementSibling.querySelector('[data-detached="true"]')], "block"); - event.preventDefault(); - event.stopPropagation(); - return true; - } - return false; }; @@ -259,7 +263,7 @@ export const avContextmenu = (protyle: IProtyle, rowElement: HTMLElement, positi blockElement.querySelectorAll(".av__row--select").forEach(item => { item.classList.remove("av__row--select"); }); - blockElement.querySelectorAll(".av__firstcol use").forEach(item => { + blockElement.querySelectorAll(".av__firstcol .icon__check use").forEach(item => { item.setAttribute("xlink:href", "#iconUncheck"); }); } @@ -269,7 +273,7 @@ export const avContextmenu = (protyle: IProtyle, rowElement: HTMLElement, positi return true; } rowElement.classList.add("av__row--select"); - rowElement.querySelector(".av__firstcol use").setAttribute("xlink:href", "#iconCheck"); + rowElement.querySelector(".av__firstcol .icon__check use").setAttribute("xlink:href", "#iconCheck"); const rowIds: string[] = []; const blockIds: string[] = []; const rowElements = blockElement.querySelectorAll(".av__row--select:not(.av__row--header)"); @@ -305,6 +309,24 @@ export const avContextmenu = (protyle: IProtyle, rowElement: HTMLElement, positi } }); if (rowIds.length === 1) { + menu.addSeparator(); + menu.addItem({ + label: window.siyuan.languages.addAttr, + icon: "iconAdd", + type: "submenu", + submenu: [ + { + label: window.siyuan.languages.insertRowAbove, + icon: "iconBefore", + click: () => avAdd(protyle, blockElement, rowElement, true), + }, + { + label: window.siyuan.languages.insertRowBelow, + icon: "iconAfter", + click: () => avAdd(protyle, blockElement, rowElement, false), + }, + ] + }); menu.addSeparator(); openEditorTab(protyle.app, rowIds[0]); menu.addItem({ diff --git a/app/src/protyle/render/av/render.ts b/app/src/protyle/render/av/render.ts index 42ed89242..9df03e9a8 100644 --- a/app/src/protyle/render/av/render.ts +++ b/app/src/protyle/render/av/render.ts @@ -53,13 +53,13 @@ export const avRender = (element: Element, protyle: IProtyle, cb?: () => void) = }, (response) => { const data = response.data.view as IAVTable; // header - let tableHTML = '
'; + let tableHTML = '
'; let calcHTML = ""; data.columns.forEach((column: IAVColumn) => { if (column.hidden) { return; } - tableHTML += `
@@ -80,11 +80,17 @@ style="width: ${column.width || "200px"}">${getCalcValue(column) || ' { tableHTML += `
-
- - -
-
`; +
+ +
+ + +
+
`; row.cells.forEach((cell, index) => { if (data.columns[index].hidden) { return; @@ -154,12 +160,12 @@ style="width: ${column.width || "200px"}">${getCalcValue(column) || '`; } } - tableHTML += `
${text}
`; }); @@ -173,7 +179,7 @@ ${cell.color ? `color:${cell.color};` : ""}">${text}
`;
`; }); setTimeout(() => { - e.firstElementChild.outerHTML = `
+ e.firstElementChild.outerHTML = `
${tabHTML} @@ -197,13 +203,17 @@ ${cell.color ? `color:${cell.color};` : ""}">${text}
`;
-
+
${tableHTML}
- - ${window.siyuan.languages.addAttr} +
+ +
+
+ ${window.siyuan.languages.addAttr} +
-
${calcHTML}
+
${calcHTML}
`; diff --git a/app/src/protyle/render/av/row.ts b/app/src/protyle/render/av/row.ts index 5a2646ba9..bea06a194 100644 --- a/app/src/protyle/render/av/row.ts +++ b/app/src/protyle/render/av/row.ts @@ -1,27 +1,27 @@ import {hasClosestBlock} from "../../util/hasClosest"; import {focusBlock} from "../../util/selection"; -export const selectRow = (checkElement: Element, type: "toggle" | "select" | "unselect" | "unselectAll") => { - const rowElement = checkElement.parentElement; - const useElement = checkElement.querySelector("use"); +export const selectRow = (firstcolElement: Element, type: "toggle" | "select" | "unselect" | "unselectAll") => { + const rowElement = firstcolElement.parentElement; + const useElement = firstcolElement.querySelector(".icon__check use"); if (rowElement.classList.contains("av__row--header") || type === "unselectAll") { if ("#iconCheck" === useElement.getAttribute("xlink:href")) { - rowElement.parentElement.querySelectorAll(".av__firstcol").forEach(item => { - item.querySelector("use").setAttribute("xlink:href", "#iconUncheck"); + rowElement.parentElement.querySelectorAll(".av__row .av__firstcol").forEach(item => { + item.querySelector(".icon__check use").setAttribute("xlink:href", "#iconUncheck"); item.parentElement.classList.remove("av__row--select"); }); } else { - rowElement.parentElement.querySelectorAll(".av__firstcol").forEach(item => { - item.querySelector("use").setAttribute("xlink:href", "#iconCheck"); + rowElement.parentElement.querySelectorAll(".av__row .av__firstcol").forEach(item => { + item.querySelector(".icon__check use").setAttribute("xlink:href", "#iconCheck"); item.parentElement.classList.add("av__row--select"); }); } } else { if (type === "select" || (useElement.getAttribute("xlink:href") === "#iconUncheck" && type === "toggle")) { - checkElement.parentElement.classList.add("av__row--select"); + firstcolElement.parentElement.classList.add("av__row--select"); useElement.setAttribute("xlink:href", "#iconCheck"); } else if (type === "unselect" || (useElement.getAttribute("xlink:href") === "#iconCheck" && type === "toggle")) { - checkElement.parentElement.classList.remove("av__row--select"); + firstcolElement.parentElement.classList.remove("av__row--select"); useElement.setAttribute("xlink:href", "#iconUncheck"); } } @@ -37,7 +37,7 @@ export const updateHeader = (rowElement: HTMLElement) => { const selectCount = rowElement.parentElement.querySelectorAll(".av__row--select:not(.av__row--header)").length; const diffCount = rowElement.parentElement.childElementCount - 3 - selectCount; const headElement = rowElement.parentElement.firstElementChild; - const headUseElement = headElement.querySelector("use"); + const headUseElement = headElement.querySelector(".icon__check use"); const counterElement = blockElement.querySelector(".av__counter"); const avHeadElement = blockElement.querySelector(".av__header") as HTMLElement; if (diffCount === 0 && rowElement.parentElement.childElementCount - 3 !== 0) { diff --git a/app/src/protyle/scroll/event.ts b/app/src/protyle/scroll/event.ts index 99fb14f50..1694f3fda 100644 --- a/app/src/protyle/scroll/event.ts +++ b/app/src/protyle/scroll/event.ts @@ -24,30 +24,6 @@ export const scrollEvent = (protyle: IProtyle, element: HTMLElement) => { } } - protyle.wysiwyg.element.querySelectorAll(".av").forEach((item: HTMLElement) => { - if (item.parentElement.classList.contains("protyle-wysiwyg")) { - const headerTop = item.offsetTop + 43; - const headerElement = item.querySelector(".av__row--header") as HTMLElement; - if (headerElement) { - if (headerTop < element.scrollTop && headerTop + headerElement.parentElement.clientHeight > element.scrollTop) { - headerElement.style.transform = `translateY(${element.scrollTop - headerTop}px)`; - } else { - headerElement.style.transform = ""; - } - } - const footerElement = item.querySelector(".av__row--footer") as HTMLElement; - if (footerElement) { - const footerBottom = headerTop + footerElement.parentElement.clientHeight; - const scrollBottom = element.scrollTop + element.clientHeight + 5; - if (headerTop + 42 + 36 * 2 < scrollBottom && footerBottom > scrollBottom) { - footerElement.style.transform = `translateY(${scrollBottom - footerBottom}px)`; - } else { - footerElement.style.transform = ""; - } - } - } - }); - if (!protyle.element.classList.contains("block__edit") && !isMobile()) { protyle.contentElement.setAttribute("data-scrolltop", element.scrollTop.toString()); } diff --git a/app/src/protyle/util/resize.ts b/app/src/protyle/util/resize.ts index aa4a06970..889c9d5ec 100644 --- a/app/src/protyle/util/resize.ts +++ b/app/src/protyle/util/resize.ts @@ -42,11 +42,6 @@ export const resize = (protyle: IProtyle) => { } } } - if (abs.padding > MIN_ABS || abs.width > MIN_ABS || isNaN(abs.padding)) { - protyle.wysiwyg.element.querySelectorAll(".av").forEach((item: HTMLElement) => { - resizeAV(item); - }); - } }, Constants.TIMEOUT_TRANSITION); // 等待 setPadding 动画结束 }; @@ -54,34 +49,11 @@ export const resizeAV = (item: HTMLElement) => { if (!item.classList.contains("av") || item.getAttribute("data-render") !== "true") { return; } - const attrElement = item.querySelector(".protyle-attr") as HTMLElement - if (item.style.width.endsWith("%") || item.style.margin) { - const avHeaderElement = item.firstElementChild.firstElementChild as HTMLElement; - avHeaderElement.style.paddingLeft = ""; - avHeaderElement.style.paddingRight = ""; - const avBodyElement = item.querySelector(".av__scroll").firstElementChild as HTMLElement; - avBodyElement.style.paddingLeft = ""; - avBodyElement.style.paddingRight = ""; - attrElement.style.paddingRight = ""; - item.style.alignSelf = ""; - if (!item.style.width.endsWith("%")) { - item.style.width = ""; - item.style.maxWidth = "100%"; - } + + const containerElement = item.querySelector(".av__container"); + if (item.style.width.endsWith("%")) { + containerElement.style.width = "auto"; } else { - const paddingLeft = item.parentElement.style.paddingLeft; - const paddingRight = item.parentElement.style.paddingRight; - const avHeaderElement = item.firstElementChild.firstElementChild as HTMLElement; - avHeaderElement.style.paddingLeft = paddingLeft; - avHeaderElement.style.paddingRight = paddingRight; - const avBodyElement = item.querySelector(".av__scroll").firstElementChild as HTMLElement; - avBodyElement.style.paddingLeft = paddingLeft; - avBodyElement.style.paddingRight = paddingRight; - attrElement.style.paddingRight = paddingRight; - item.style.alignSelf = "center"; - if (item.parentElement.clientWidth > 0) { - item.style.width = item.parentElement.clientWidth + "px"; - item.style.maxWidth = ""; - } + containerElement.style.width = ""; } }; diff --git a/app/src/protyle/wysiwyg/index.ts b/app/src/protyle/wysiwyg/index.ts index 9789d372e..55634d49a 100644 --- a/app/src/protyle/wysiwyg/index.ts +++ b/app/src/protyle/wysiwyg/index.ts @@ -1452,12 +1452,6 @@ export class WYSIWYG { if (embedElement) { protyle.gutter.render(protyle, embedElement, this.element); } else { - // database 行块标 - const rowElement = hasClosestByClassName(event.target, "av__row"); - if (rowElement && rowElement.dataset.id) { - const rowRect = rowElement.getBoundingClientRect(); - rowElement.firstElementChild.setAttribute("style", `left:${rowRect.left - 44}px;top:${rowRect.top}px`); - } protyle.gutter.render(protyle, nodeElement, this.element); } } diff --git a/app/src/protyle/wysiwyg/keydown.ts b/app/src/protyle/wysiwyg/keydown.ts index bb365b6c0..79b92b60b 100644 --- a/app/src/protyle/wysiwyg/keydown.ts +++ b/app/src/protyle/wysiwyg/keydown.ts @@ -69,7 +69,6 @@ import {escapeHtml} from "../../util/escape"; import {insertHTML} from "../util/insertHTML"; import {removeSearchMark} from "../toolbar/util"; import {avKeydown} from "../render/av/keydown"; -import {resizeAV} from "../util/resize"; export const getContentByInlineHTML = (range: Range, cb: (content: string) => void) => { @@ -1147,8 +1146,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => { } updateBatchTransaction(selectElements, protyle, (e: HTMLElement) => { if (e.classList.contains("av")) { - e.style.margin = ""; - resizeAV(e); + e.style.alignItems = "flex-start"; } else { e.style.textAlign = "left"; } @@ -1169,8 +1167,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => { } updateBatchTransaction(selectElements, protyle, (e: HTMLElement) => { if (e.classList.contains("av")) { - e.style.margin = "0 auto"; - resizeAV(e); + e.style.alignItems = "center"; } else { e.style.textAlign = "center"; } @@ -1187,8 +1184,7 @@ export const keydown = (protyle: IProtyle, editorElement: HTMLElement) => { } updateBatchTransaction(selectElements, protyle, (e: HTMLElement) => { if (e.classList.contains("av")) { - e.style.margin = "0 0 0 auto"; - resizeAV(e); + e.style.alignItems = "flex-end"; } else { e.style.textAlign = "right"; }