Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit c8924e3
Author: Vanessa <[email protected]>
Date:   Sat Oct 14 12:14:12 2023 +0800

    :art: fix siyuan-note#9409

commit 879fdd8
Author: Vanessa <[email protected]>
Date:   Sat Oct 14 11:56:16 2023 +0800

    :lipstick: dragover

commit 9978827
Author: Vanessa <[email protected]>
Date:   Sat Oct 14 11:34:42 2023 +0800

    :art: 数据库块适配外观和宽度调整

commit a20ffeb
Author: Vanessa <[email protected]>
Date:   Sat Oct 14 11:20:17 2023 +0800

    :lipstick: fix siyuan-note#9412

commit f2075fa
Author: Vanessa <[email protected]>
Date:   Sat Oct 14 11:04:23 2023 +0800

    :art: siyuan-note#9419

commit 5e2910a
Author: Vanessa <[email protected]>
Date:   Sat Oct 14 11:00:46 2023 +0800

    :art: siyuan-note#9419

commit ac7f8d3
Merge: 9ae8400 d78a020
Author: Vanessa <[email protected]>
Date:   Sat Oct 14 10:56:40 2023 +0800

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

commit 9ae8400
Author: Vanessa <[email protected]>
Date:   Sat Oct 14 10:56:21 2023 +0800

    :art: siyuan-note#9419

commit d78a020
Author: Daniel <[email protected]>
Date:   Sat Oct 14 10:51:46 2023 +0800

    :art: Database table view breadcrumb

commit 6b1a292
Merge: 25109b9 9766020
Author: Vanessa <[email protected]>
Date:   Sat Oct 14 10:49:46 2023 +0800

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

commit 25109b9
Author: Vanessa <[email protected]>
Date:   Sat Oct 14 10:49:35 2023 +0800

    :art: 数据库块适配外观和宽度调整

commit 9766020
Author: Daniel <[email protected]>
Date:   Sat Oct 14 10:08:57 2023 +0800

    :art: Update text

commit ab67389
Merge: 7d6f9bb 39c5744
Author: Vanessa <[email protected]>
Date:   Sat Oct 14 10:01:57 2023 +0800

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

commit 7d6f9bb
Author: Vanessa <[email protected]>
Date:   Sat Oct 14 10:01:42 2023 +0800

    :art: 数据库不能设置布局

commit 39c5744
Author: Daniel <[email protected]>
Date:   Sat Oct 14 09:46:29 2023 +0800

    :bug: Database table view export does not display select content Fix siyuan-note#9428

commit 87ecb7f
Author: Daniel <[email protected]>
Date:   Sat Oct 14 09:37:47 2023 +0800

    :art: Update text

commit 69d8c93
Merge: 623f30b f6780c1
Author: Vanessa <[email protected]>
Date:   Sat Oct 14 09:21:54 2023 +0800

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

commit 623f30b
Author: Vanessa <[email protected]>
Date:   Sat Oct 14 09:21:44 2023 +0800

    :art: siyuan-note#9419

commit f6780c1
Author: Daniel <[email protected]>
Date:   Sat Oct 14 09:20:51 2023 +0800

    :art: Supports searching database view content siyuan-note#9419

commit fd94e9d
Author: Vanessa <[email protected]>
Date:   Sat Oct 14 00:04:16 2023 +0800

    :art:

commit 51f6687
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 23:50:31 2023 +0800

    :art: siyuan-note#9419

commit 49305b8
Merge: 2f0f563 8399aba
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 23:26:15 2023 +0800

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

commit 2f0f563
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 23:25:58 2023 +0800

    :art: siyuan-note#9419

commit 8399aba
Author: Daniel <[email protected]>
Date:   Fri Oct 13 23:22:17 2023 +0800

    :art: Supports searching database view content siyuan-note#9419

commit 22efb3d
Merge: f95084e c3d1c04
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 23:07:13 2023 +0800

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

commit f95084e
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 23:06:53 2023 +0800

    :art: siyuan-note#9419

commit c3d1c04
Author: Daniel <[email protected]>
Date:   Fri Oct 13 22:50:11 2023 +0800

    :art: Supports searching database view content siyuan-note#9419

commit a11ea9c
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 22:37:15 2023 +0800

    :lipstick:

commit 99ec5c1
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 22:32:17 2023 +0800

    :art: showHiddenFiles

commit 49426ac
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 22:15:20 2023 +0800

    :art: siyuan-note#9425

commit d445c54
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 21:54:35 2023 +0800

    :art: siyuan-note#9421

commit 0c4aee7
Merge: c34d84c daa9ddf
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 21:50:28 2023 +0800

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

commit c34d84c
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 21:50:14 2023 +0800

    :art: siyuan-note#9421

commit daa9ddf
Author: Daniel <[email protected]>
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 siyuan-note#9426

commit 01b19ea
Author: Daniel <[email protected]>
Date:   Fri Oct 13 14:03:41 2023 +0800

    :art: Fix database table view loading https://ld246.com/article/1697168944677

commit 7a9a85e
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 13:55:27 2023 +0800

    :art: siyuan-note#9417

commit 1815ec1
Merge: 73edee5 00ed190
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 13:37:45 2023 +0800

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

commit 73edee5
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 13:37:32 2023 +0800

    :art: siyuan-note#9417

commit 00ed190
Author: Daniel <[email protected]>
Date:   Fri Oct 13 13:21:53 2023 +0800

    :art: Fix database table view loading https://ld246.com/article/1697168944677

commit 48e871c
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 12:33:29 2023 +0800

    :art: siyuan-note#9417

commit 3554333
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 11:55:51 2023 +0800

    :art: siyuan-note#9417

commit af810b2
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 11:34:19 2023 +0800

    :art: fix siyuan-note#9423

commit 673c952
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 11:30:44 2023 +0800

    :art: fix siyuan-note#9423

commit 3b87a0d
Merge: ed31305 3de7781
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 11:09:07 2023 +0800

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

commit ed31305
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 11:08:56 2023 +0800

    :art: siyuan-note#9421

commit 3de7781
Author: Daniel <[email protected]>
Date:   Fri Oct 13 10:44:29 2023 +0800

    :art: Supports searching database view content siyuan-note#9419

commit 2304921
Author: Daniel <[email protected]>
Date:   Fri Oct 13 10:42:51 2023 +0800

    :art: Update flashcard user guide

commit 55fb8b1
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 10:14:11 2023 +0800

    :art: fix siyuan-note#9420

commit 8998de9
Merge: 5b38e79 df9b55c
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 09:37:35 2023 +0800

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

commit 5b38e79
Author: Vanessa <[email protected]>
Date:   Fri Oct 13 09:37:24 2023 +0800

    :art: fix siyuan-note#9420

commit df9b55c
Author: Daniel <[email protected]>
Date:   Fri Oct 13 08:46:29 2023 +0800

    :art: Database template columns support sort

commit 3da9f0f
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 20:40:09 2023 +0800

    :bug: 新增行后弹出的输入框

commit 79a88df
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 20:23:18 2023 +0800

    :rotating_light:

commit 40a1e6d
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 20:21:53 2023 +0800

    :lipstick: database loading

commit 2872dab
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 20:11:59 2023 +0800

    :lipstick: fix siyuan-note#9418

commit 025a8ea
Merge: 02ec0f6 0ea9b8f
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 20:04:13 2023 +0800

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

commit 02ec0f6
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 20:04:01 2023 +0800

    :lipstick: fix siyuan-note#9418

commit 0ea9b8f
Author: Daniel <[email protected]>
Date:   Thu Oct 12 19:58:32 2023 +0800

    :art: Database block loading animation siyuan-note#9416

commit 1590913
Author: Daniel <[email protected]>
Date:   Thu Oct 12 19:55:57 2023 +0800

    :art: Update attr panel for av

commit d257caf
Author: Daniel <[email protected]>
Date:   Thu Oct 12 19:38:37 2023 +0800

    :art: Database block loading animation siyuan-note#9416

commit fdaf8d7
Merge: 70e82cd 238609f
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 17:34:36 2023 +0800

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

commit 70e82cd
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 17:34:19 2023 +0800

    :lipstick: fix siyuan-note#9416

commit 238609f
Author: Daniel <[email protected]>
Date:   Thu Oct 12 17:33:23 2023 +0800

    :zap: Improve performance of loading database table view

commit 2dd558b
Merge: fe0b1e8 8fb35f5
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 17:16:45 2023 +0800

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

commit fe0b1e8
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 17:16:31 2023 +0800

    :lipstick: fix siyuan-note#9415

commit 8fb35f5
Author: Daniel <[email protected]>
Date:   Thu Oct 12 17:15:36 2023 +0800

    :art: Database template columns support number filter Fix siyuan-note#9414

commit 01670f2
Merge: f792d14 ffcdb5d
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 17:07:48 2023 +0800

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

commit f792d14
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 17:07:09 2023 +0800

    :art: siyuan-note#9408

commit ffcdb5d
Author: Daniel <[email protected]>
Date:   Thu Oct 12 16:37:09 2023 +0800

    :bug: SVG images cannot be displayed on some systems siyuan-note#9413

commit fb1f80c
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 12:22:55 2023 +0800

    :lipstick: fix siyuan-note#9406

commit da51ade
Merge: a4bcae8 09ef5fd
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 12:11:42 2023 +0800

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

commit a4bcae8
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 12:11:29 2023 +0800

    :bug: 数据库数字填0无效

commit 09ef5fd
Author: Daniel <[email protected]>
Date:   Thu Oct 12 12:01:53 2023 +0800

    :art: Database template columns support calculations siyuan-note#9408

commit 1b595d0
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 12:01:53 2023 +0800

    :art: siyuan-note#9408

commit 21d1a05
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 11:54:15 2023 +0800

    :lipstick: 编辑后表头不固定

commit c5206f7
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 11:14:29 2023 +0800

    :bug: fix siyuan-note#9405

commit f0f55d3
Merge: 0194124 92151f7
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 10:54:19 2023 +0800

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

commit 0194124
Author: Vanessa <[email protected]>
Date:   Thu Oct 12 10:54:09 2023 +0800

    :lipstick: fix siyuan-note#9403

commit 92151f7
Author: Daniel <[email protected]>
Date:   Thu Oct 12 10:12:44 2023 +0800

    :art: Change database template column custom attribute action Fix siyuan-note#9401

commit b8e8aa0
Author: Daniel <[email protected]>
Date:   Wed Oct 11 17:00:21 2023 +0800

    :hammer: Clean code

commit b17aff5
Author: Vanessa <[email protected]>
Date:   Wed Oct 11 23:54:40 2023 +0800

    :bug:

commit 1117495
Author: Vanessa <[email protected]>
Date:   Wed Oct 11 23:50:28 2023 +0800

    :bug: 预览模式下点击只读

commit 130884d
Author: Vanessa <[email protected]>
Date:   Wed Oct 11 23:23:01 2023 +0800

    :art: fix siyuan-note#9404

commit 7486e1a
Author: Vanessa <[email protected]>
Date:   Wed Oct 11 17:28:40 2023 +0800

    :art: fix siyuan-note#9402

commit eb93255
Author: Daniel <[email protected]>
Date:   Wed Oct 11 14:57:14 2023 +0800

    :hammer: Clean code

commit fd46593
Author: Daniel <[email protected]>
Date:   Wed Oct 11 14:55:06 2023 +0800

    :bookmark: Release v2.10.10

commit 337c795
Author: Daniel <[email protected]>
Date:   Wed Oct 11 11:59:25 2023 +0800

    :art: Improve install new version on Windows

commit f6f1148
Author: Daniel <[email protected]>
Date:   Wed Oct 11 11:08:44 2023 +0800

    :memo: Update changelogs

commit f0ad326
Author: Vanessa <[email protected]>
Date:   Wed Oct 11 11:30:00 2023 +0800

    :art:

commit 2eb89f0
Author: Vanessa <[email protected]>
Date:   Wed Oct 11 11:25:21 2023 +0800

    :rotating_light:

commit 0db516e
Merge: 23c3f9f e43cf4c
Author: Vanessa <[email protected]>
Date:   Wed Oct 11 11:24:41 2023 +0800

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

commit 23c3f9f
Author: Vanessa <[email protected]>
Date:   Wed Oct 11 11:24:29 2023 +0800

    :art: fix siyuan-note#9383

commit e43cf4c
Author: Daniel <[email protected]>
Date:   Wed Oct 11 10:52:10 2023 +0800

    :memo: Update changelogs

commit b30cb09
Author: Daniel <[email protected]>
Date:   Wed Oct 11 10:49:04 2023 +0800

    :memo: Update changelogs

commit d4a3226
Author: Daniel <[email protected]>
Date:   Wed Oct 11 10:48:40 2023 +0800

    :memo: Update changelogs

commit 65adab6
Author: Daniel <[email protected]>
Date:   Wed Oct 11 10:48:29 2023 +0800

    :art: Adding row overwriting data after enabling filter in database siyuan-note#9395

commit 210a3ac
Author: Daniel <[email protected]>
Date:   Wed Oct 11 10:04:39 2023 +0800

    :art: Improve handling of database column filters containing empty values Fix siyuan-note#9394

commit 37f950b
Author: Vanessa <[email protected]>
Date:   Wed Oct 11 09:39:22 2023 +0800

    :lipstick: icon

commit 7b1c30b
Author: Vanessa <[email protected]>
Date:   Wed Oct 11 09:30:13 2023 +0800

    :art: fix siyuan-note#9396

commit 6ef13ab
Merge: acd2eb1 e4907e7
Author: Vanessa <[email protected]>
Date:   Wed Oct 11 09:18:43 2023 +0800

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

commit acd2eb1
Author: Vanessa <[email protected]>
Date:   Wed Oct 11 09:18:33 2023 +0800

    :art: fix siyuan-note#9396

commit e4907e7
Author: Daniel <[email protected]>
Date:   Wed Oct 11 09:16:57 2023 +0800

    :art: The block in the editor shows the database icon siyuan-note#8894

commit 6f249d7
Author: Daniel <[email protected]>
Date:   Wed Oct 11 09:15:03 2023 +0800

    :arrow_up: Upgrade kernel deps

commit bb04bf9
Author: Daniel <[email protected]>
Date:   Wed Oct 11 09:04:39 2023 +0800

    :art: Show notebooks in hpath of block ref search list results siyuan-note#9378

commit 30b0dd0
Merge: c1de5e1 ccb6545
Author: Vanessa <[email protected]>
Date:   Wed Oct 11 08:58:55 2023 +0800

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

commit c1de5e1
Author: Vanessa <[email protected]>
Date:   Wed Oct 11 08:58:44 2023 +0800

    :lipstick: siyuan-note#8894

commit ccb6545
Author: Daniel <[email protected]>
Date:   Wed Oct 11 08:50:13 2023 +0800

    :art: Improve handling of database column filters containing empty values Fix siyuan-note#9394

commit 28e4e1e
Author: Daniel <[email protected]>
Date:   Tue Oct 10 22:31:46 2023 +0800

    :art: Rename the .sya annotation file when renaming a PDF asset siyuan-note#9390

commit 964c822
Author: Daniel <[email protected]>
Date:   Tue Oct 10 22:02:46 2023 +0800

    :art: Improve database created and updated column values siyuan-note#9391

commit f404d7f
Merge: ed7084c 301b6d9
Author: Vanessa <[email protected]>
Date:   Tue Oct 10 22:00:57 2023 +0800

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

commit ed7084c
Author: Vanessa <[email protected]>
Date:   Tue Oct 10 22:00:43 2023 +0800

    :lipstick:

commit 301b6d9
Author: Daniel <[email protected]>
Date:   Tue Oct 10 21:55:43 2023 +0800

    :art: Improve database created and updated column values siyuan-note#9391

commit f62be47
Author: Vanessa <[email protected]>
Date:   Tue Oct 10 21:50:36 2023 +0800

    :art: fix siyuan-note#9385

commit 8e2565f
Author: Vanessa <[email protected]>
Date:   Tue Oct 10 21:39:57 2023 +0800

    :art: fix siyuan-note#9386

commit e54d8f1
Author: Vanessa <[email protected]>
Date:   Tue Oct 10 21:31:20 2023 +0800

    :art: fix siyuan-note#9393

commit 1fb7187
Author: Vanessa <[email protected]>
Date:   Tue Oct 10 21:23:29 2023 +0800

    :memo: fix siyuan-note#9392

commit ea00753
Author: Vanessa <[email protected]>
Date:   Tue Oct 10 21:18:17 2023 +0800

    :art: fix siyuan-note#9392

commit 4318aa4
Author: Vanessa <[email protected]>
Date:   Tue Oct 10 20:51:28 2023 +0800

    :art: fix siyuan-note#9376

commit f1d4f84
Merge: 3f4c00e 64df2ff
Author: Vanessa <[email protected]>
Date:   Tue Oct 10 20:42:43 2023 +0800

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

commit 3f4c00e
Author: Vanessa <[email protected]>
Date:   Tue Oct 10 20:42:14 2023 +0800

    :art: siyuan-note#9376

commit 64df2ff
Author: Daniel <[email protected]>
Date:   Tue Oct 10 20:37:51 2023 +0800

    :art: Rows in the database without bound blocks should not show created and updated Fix siyuan-note#9391

commit 691a0be
Merge: 0e5cae3 7e9243d
Author: Vanessa <[email protected]>
Date:   Tue Oct 10 20:41:05 2023 +0800

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

commit 0e5cae3
Author: Vanessa <[email protected]>
Date:   Tue Oct 10 20:40:38 2023 +0800

    :lipstick: fix siyuan-note#9206

commit 7e9243d
Author: Daniel <[email protected]>
Date:   Tue Oct 10 20:05:48 2023 +0800

    :art: Rows in the database without bound blocks should not show created and updated Fix siyuan-note#9391

commit 7aa4aac
Author: Vanessa <[email protected]>
Date:   Tue Oct 10 17:30:10 2023 +0800

    :lipstick: fix siyuan-note#9206

commit d02381d
Merge: 449d2db 6e9099e
Author: Vanessa <[email protected]>
Date:   Tue Oct 10 17:09:14 2023 +0800

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

commit 449d2db
Author: Vanessa <[email protected]>
Date:   Tue Oct 10 17:09:03 2023 +0800

    :recycle: siyuan-note#9256

commit 6e9099e
Author: Daniel <[email protected]>
Date:   Tue Oct 10 16:52:40 2023 +0800

    :lock: Authenticate requests of assets other than 127.0.0.1 Fix siyuan-note#9388

commit 1178638
Author: Yingyi / 颖逸 <[email protected]>
Date:   Tue Oct 10 16:21:50 2023 +0800

    Improve event bus `open-siyuan-url-plugin` (siyuan-note#9256)

    * 🎨 Improve plugin event bus `open-siyuan-url-plugin`

    * 🐛 Avoid plug-in names with the same prefix

    * Update onGetConfig.ts

commit 2c36af7
Author: Vanessa <[email protected]>
Date:   Tue Oct 10 16:15:24 2023 +0800

    :rotating_light:

commit b0e3efa
Author: Daniel <[email protected]>
Date:   Tue Oct 10 11:41:46 2023 +0800

    :bookmark: Release v2.10.9

commit d690475
Merge: c8a6f41 811bac9
Author: Daniel <[email protected]>
Date:   Tue Oct 10 10:58:46 2023 +0800

    Merge remote-tracking branch 'origin/master'

commit c8a6f41
Author: Daniel <[email protected]>
Date:   Tue Oct 10 10:18:57 2023 +0800

    :bookmark: Release v2.10.9

commit cdcec7e
Author: Daniel <[email protected]>
Date:   Mon Oct 9 23:29:25 2023 +0800

    :memo: Update changelogs

commit 1eccb8b
Merge: a3094fe 3827753
Author: Vanessa <[email protected]>
Date:   Mon Oct 9 23:26:13 2023 +0800

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

commit a3094fe
Author: Vanessa <[email protected]>
Date:   Mon Oct 9 23:25:48 2023 +0800

    :bug: fix siyuan-note#9384

commit 3827753
Author: Daniel <[email protected]>
Date:   Mon Oct 9 23:07:34 2023 +0800

    :art: Upgrade Electron siyuan-note#9342

commit 567394a
Author: Daniel <[email protected]>
Date:   Mon Oct 9 22:42:39 2023 +0800

    :memo: Update changelogs

commit ff6220a
Author: Yingyi / 颖逸 <[email protected]>
Date:   Mon Oct 9 21:51:39 2023 +0800

    :art: add `@electron/remote` dependency (siyuan-note#9381)

commit da0fa08
Author: Daniel <[email protected]>
Date:   Mon Oct 9 21:45:36 2023 +0800

    :art: Replace non-breaking spaces with normal spaces when copying siyuan-note#9382

commit 0ed6884
Author: Daniel <[email protected]>
Date:   Mon Oct 9 21:09:35 2023 +0800

    :bug: Update av Fix siyuan-note#9380

commit 288eb24
Author: Daniel <[email protected]>
Date:   Mon Oct 9 17:30:19 2023 +0800

    :art: Show notebooks in hpath of block ref search list results siyuan-note#9378

commit 4965b7b
Merge: 803069d 9028491
Author: Vanessa <[email protected]>
Date:   Mon Oct 9 17:18:28 2023 +0800

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

commit 803069d
Author: Vanessa <[email protected]>
Date:   Mon Oct 9 17:18:17 2023 +0800

    :art: fix siyuan-note#9370

commit 9028491
Author: Daniel <[email protected]>
Date:   Mon Oct 9 17:17:40 2023 +0800

    :art: Add created and updated type column to database siyuan-note#9371

commit faadbf5
Author: Daniel <[email protected]>
Date:   Mon Oct 9 16:48:28 2023 +0800

    :art: Add created and updated type column to database siyuan-note#9371

commit 9ca1162
Merge: 43f06e5 644e031
Author: Vanessa <[email protected]>
Date:   Mon Oct 9 16:45:06 2023 +0800

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

commit 43f06e5
Author: Vanessa <[email protected]>
Date:   Mon Oct 9 16:44:46 2023 +0800

    :art: fix siyuan-note#9370

commit 811bac9
Author: Daniel <[email protected]>
Date:   Wed Oct 4 13:03:36 2023 +0800

    :art: Free disk space for docker image building GitHub Action

commit 66aa802
Author: Daniel <[email protected]>
Date:   Wed Oct 4 13:03:28 2023 +0800

    :art: Free disk space for docker image building GitHub Action
  • Loading branch information
@Zuoqiu-Yingyi
Zuoqiu-Yingyi committed Oct 14, 2023
1 parent cd115ad commit 59db0f0
Show file tree
Hide file tree
Showing 5 changed files with 171 additions and 149 deletions.
3 changes: 3 additions & 0 deletions app/src/editor/util.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
16 changes: 14 additions & 2 deletions app/src/layout/dock/util.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
289 changes: 148 additions & 141 deletions app/src/menus/protyle.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: `<input style="margin: 4px 0" class="b3-text-field fn__block" placeholder="${window.siyuan.languages.anchor}">`,
bind(menuItemElement) {
const inputElement = menuItemElement.querySelector("input");
inputElement.value = element.getAttribute("data-subtype") === "d" ? "" : element.textContent;
inputElement.addEventListener("input", () => {
if (inputElement.value) {
// 不能使用 textContent，否则 < 会变为 &lt;
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: `<input style="margin: 4px 0" class="b3-text-field fn__block" placeholder="${window.siyuan.languages.anchor}">`,
bind(menuItemElement) {
const inputElement = menuItemElement.querySelector("input");
inputElement.value = element.getAttribute("data-subtype") === "d" ? "" : element.textContent;
inputElement.addEventListener("input", () => {
if (inputElement.value) {
// 不能使用 textContent，否则 < 会变为 &lt;
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,
Expand Down Expand Up @@ -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}<wbr>`;
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}<wbr>`;
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 = `<span data-type="a" data-href="siyuan://blocks/${element.getAttribute("data-id")}">${element.innerHTML}</span><wbr>`;
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 = `<span data-type="a" data-href="siyuan://blocks/${element.getAttribute("data-id")}">${element.innerHTML}</span><wbr>`;
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 = `<div data-content="select * from blocks where id='${refBlockId}'" data-node-id="${id}" data-type="NodeBlockQueryEmbed" class="render-node" updated="${dayjs().format("YYYYMMDDHHmmss")}">${nodeElement.querySelector(".protyle-attr").outerHTML}</div>`;
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 = `<div data-content="select * from blocks where id='${refBlockId}'" data-node-id="${id}" data-type="NodeBlockQueryEmbed" class="render-node" updated="${dayjs().format("YYYYMMDDHHmmss")}">${nodeElement.querySelector(".protyle-attr").outerHTML}</div>`;
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",
Expand All @@ -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", "<wbr>");
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", "<wbr>");
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,
Expand All @@ -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) => {
Expand Down Expand Up @@ -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");
Expand Down
Loading

0 comments on commit 59db0f0

Please sign in to comment.