Skip to content

Commit

Permalink
Improve adaptive width for Attributes View (#9280)
Browse files Browse the repository at this point in the history
* 🎨 Attrs View adaptive width

* 🎨 Add CSS class `av__body`

* 🎨 add margins for attribute view

* 🎨 add max-width for attribute view

* Squashed commit of the following:

commit 642d041
Author: Daniel <845765@qq.com>
Date:   Tue Oct 3 13:36:25 2023 +0800

    :bookmark: Release v2.10.8

commit 43e5367
Merge: 6b0f8e0 0e3b780
Author: Vanessa <lly219@gmail.com>
Date:   Tue Oct 3 13:28:32 2023 +0800

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

commit 6b0f8e0
Author: Vanessa <lly219@gmail.com>
Date:   Tue Oct 3 13:28:08 2023 +0800

    :art: fix #9334

commit 0e3b780
Author: Daniel <845765@qq.com>
Date:   Tue Oct 3 13:03:48 2023 +0800

    :memo: Update changelogs

commit cc3b4e3
Author: Daniel <845765@qq.com>
Date:   Tue Oct 3 13:01:11 2023 +0800

    :art: Database template column support using values from other columns #9327

commit 29f34fe
Author: Daniel <845765@qq.com>
Date:   Tue Oct 3 12:56:13 2023 +0800

    :art: Database template column support using values from other columns #9327

commit 7556d1c
Author: Daniel <845765@qq.com>
Date:   Tue Oct 3 11:49:12 2023 +0800

    :art: Database template column support using values from other columns #9327

commit 558422c
Author: Daniel <845765@qq.com>
Date:   Tue Oct 3 11:46:25 2023 +0800

    :art: Database template column support using values from other columns #9327

commit 433cb91
Author: Daniel <845765@qq.com>
Date:   Tue Oct 3 10:33:41 2023 +0800

    :arrow_up: Upgrade kernel deps

commit c5a25fe
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 f6a8ca2
Author: Vanessa <lly219@gmail.com>
Date:   Tue Oct 3 08:39:36 2023 +0800

    :art: #8766

commit 11cc108
Author: Daniel <845765@qq.com>
Date:   Tue Oct 3 07:57:36 2023 +0800

    :bug: Create doc with ref Fix #9329

commit d869aef
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 #9328

commit 3d7bf2e
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 #9331

commit 279e17e
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 #9328

commit d235675
Author: Daniel <845765@qq.com>
Date:   Sun Oct 1 18:41:51 2023 +0800

    :memo: Update changelogs

commit 4fdd0dd
Author: Daniel <845765@qq.com>
Date:   Sun Oct 1 18:37:39 2023 +0800

    :art: Add template type column to Attribute View #8766

commit b4bded4
Author: Daniel <845765@qq.com>
Date:   Sun Oct 1 18:24:16 2023 +0800

    :art: Add template type column to Attribute View #8766

commit bfd27a6
Author: Daniel <845765@qq.com>
Date:   Sun Oct 1 18:22:39 2023 +0800

    :art: Add template type column to Attribute View #8766

commit 0aa61fe
Author: Daniel <845765@qq.com>
Date:   Sun Oct 1 18:14:31 2023 +0800

    :art: Add template type column to Attribute View #8766

commit 7d1e1bf
Author: Daniel <845765@qq.com>
Date:   Sun Oct 1 18:02:31 2023 +0800

    :art: Add template type column to Attribute View #8766

commit 8c31eb0
Author: Vanessa <lly219@gmail.com>
Date:   Sun Oct 1 17:59:16 2023 +0800

    :art: #8766

commit 37892e7
Author: Vanessa <lly219@gmail.com>
Date:   Sun Oct 1 17:58:48 2023 +0800

    :art: #8766

commit f965ef0
Merge: b709c84 b2f5ab5
Author: Vanessa <lly219@gmail.com>
Date:   Sun Oct 1 17:41:15 2023 +0800

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

commit b709c84
Author: Vanessa <lly219@gmail.com>
Date:   Sun Oct 1 17:41:00 2023 +0800

    :art: #8766

commit b2f5ab5
Author: Daniel <845765@qq.com>
Date:   Sun Oct 1 17:36:22 2023 +0800

    :art: Add template type column to Attribute View #8766

commit b833087
Author: Daniel <845765@qq.com>
Date:   Sun Oct 1 17:33:53 2023 +0800

    :art: Add template type column to Attribute View #8766

commit dbdddd7
Author: Daniel <845765@qq.com>
Date:   Sun Oct 1 17:16:08 2023 +0800

    :art: Add template type column to Attribute View #8766

commit b981fa0
Author: Vanessa <lly219@gmail.com>
Date:   Sun Oct 1 17:05:06 2023 +0800

    :art: #8766

commit 6e475e1
Author: Daniel <845765@qq.com>
Date:   Sun Oct 1 11:05:24 2023 +0800

    :memo: Update changelogs

commit df38f89
Merge: 4653754 b69e8d3
Author: Vanessa <lly219@gmail.com>
Date:   Sun Oct 1 11:02:11 2023 +0800

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

commit 4653754
Author: Vanessa <lly219@gmail.com>
Date:   Sun Oct 1 11:01:57 2023 +0800

    :art: fix #9291

commit b69e8d3
Author: Daniel <845765@qq.com>
Date:   Sun Oct 1 10:58:46 2023 +0800

    :art: Add template type column to Attribute View #8766

commit df487a7
Author: Vanessa <lly219@gmail.com>
Date:   Sun Oct 1 10:49:52 2023 +0800

    :bug: flash card zoomin status

commit c0424ca
Author: Daniel <845765@qq.com>
Date:   Sun Oct 1 10:42:12 2023 +0800

    :art: Add template type column to Attribute View #8766

commit e8359ed
Author: Vanessa <lly219@gmail.com>
Date:   Sun Oct 1 10:27:07 2023 +0800

    :rotating_light:

commit c321223
Merge: 6490070 7029264
Author: Vanessa <lly219@gmail.com>
Date:   Sun Oct 1 10:26:51 2023 +0800

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

commit 6490070
Author: Vanessa <lly219@gmail.com>
Date:   Sun Oct 1 10:26:31 2023 +0800

    :art: fix #9313

commit 7029264
Author: Daniel <845765@qq.com>
Date:   Sun Oct 1 10:03:07 2023 +0800

    :memo: Update changelogs

commit 29d155d
Author: Daniel <845765@qq.com>
Date:   Sun Oct 1 09:37:46 2023 +0800

    :art: Improve missing line breaks when exporting RTF Fix #9325

commit 05cfcf7
Author: Vanessa <lly219@gmail.com>
Date:   Sat Sep 30 20:46:00 2023 +0800

    :art: https://ld246.com/article/1695361968294

commit 67e0dad
Merge: 856445a fee908d
Author: Vanessa <lly219@gmail.com>
Date:   Sat Sep 30 20:30:21 2023 +0800

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

commit 856445a
Author: Vanessa <lly219@gmail.com>
Date:   Sat Sep 30 20:30:06 2023 +0800

    :art: fix #9323

commit fee908d
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 #9321

commit 11d2f7c
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 #9321

commit 83dce4f
Merge: 1f2faec 49d9253
Author: Vanessa <lly219@gmail.com>
Date:   Sat Sep 30 19:55:15 2023 +0800

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

commit 1f2faec
Author: Vanessa <lly219@gmail.com>
Date:   Sat Sep 30 19:55:01 2023 +0800

    :zap: breadcrumb

commit 49d9253
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 #9322

commit 17dd264
Author: Daniel <845765@qq.com>
Date:   Sat Sep 30 19:34:28 2023 +0800

    :art: Improve handling of copy block ref when including images #9317

commit e74733b
Author: Daniel <845765@qq.com>
Date:   Sat Sep 30 17:57:23 2023 +0800

    :recycle: Refactor create doc by hpath

commit f608da2
Merge: 6b2a4ff 121d33e
Author: Vanessa <lly219@gmail.com>
Date:   Sat Sep 30 19:25:39 2023 +0800

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

commit 6b2a4ff
Author: Vanessa <lly219@gmail.com>
Date:   Sat Sep 30 19:25:20 2023 +0800

    :art: fix #9317

commit 121d33e
Author: Daniel <845765@qq.com>
Date:   Sat Sep 30 17:56:47 2023 +0800

    :art: Improve handling of copy block ref when including images #9317

commit 82bed84
Author: Vanessa <lly219@gmail.com>
Date:   Sat Sep 30 14:40:45 2023 +0800

    :art: #9320

commit f8b272d
Merge: 2dae120 ca855c1
Author: Vanessa <lly219@gmail.com>
Date:   Sat Sep 30 13:57:55 2023 +0800

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

commit 2dae120
Author: Vanessa <lly219@gmail.com>
Date:   Sat Sep 30 13:57:40 2023 +0800

    :art: #9316

commit ca855c1
Author: Daniel <845765@qq.com>
Date:   Sat Sep 30 11:57:37 2023 +0800

    :art: Attribute Panel - Database sort attributes by view column order #9319

commit 1063f50
Author: Vanessa <lly219@gmail.com>
Date:   Sat Sep 30 11:21:46 2023 +0800

    :lipstick: #9318

commit 1f899aa
Author: Vanessa <lly219@gmail.com>
Date:   Fri Sep 29 21:41:14 2023 +0800

    :lipstick: fix #9281

commit 2b9bec8
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 41e35ea
Author: Vanessa <lly219@gmail.com>
Date:   Thu Sep 28 23:45:23 2023 +0800

    :rotating_light:

commit 6a37b86
Author: Vanessa <lly219@gmail.com>
Date:   Thu Sep 28 23:41:44 2023 +0800

    :rotating_light:

commit 4c6b695
Merge: df3f444 dc03a5c
Author: Vanessa <lly219@gmail.com>
Date:   Thu Sep 28 23:41:18 2023 +0800

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

commit df3f444
Author: Vanessa <lly219@gmail.com>
Date:   Thu Sep 28 23:40:44 2023 +0800

    :recycle: #9300

commit dc03a5c
Author: Daniel <845765@qq.com>
Date:   Thu Sep 28 22:46:29 2023 +0800

    :arrow_up: Upgrade kernel deps

commit 172b7ed
Author: Daniel <845765@qq.com>
Date:   Thu Sep 28 22:39:12 2023 +0800

    :art: Apply result optimized by FSRS optimizer #9309

commit 6354d04
Author: Daniel <845765@qq.com>
Date:   Thu Sep 28 22:22:17 2023 +0800

    :art: Apply result optimized by FSRS optimizer #9309

commit b2a27bb
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)

    * 🎨 Code block language list adds custom languages

    * Update index.d.ts

    * 🎨 Improve global variable type definition

    * 🎨 Improve global variable type definition

    * 🎨 Add constant `EXTRA_CODE_LANGUAGES`

commit 17d2a16
Author: Vanessa <lly219@gmail.com>
Date:   Thu Sep 28 22:31:33 2023 +0800

    :art: fix #9264

commit ceb9aef
Author: Vanessa <lly219@gmail.com>
Date:   Thu Sep 28 17:25:18 2023 +0800

    :art: fix #9303

* 🎨 Improve the width of image in attribute view cell

* 🎨 Adjust the style of rows' gutter

* Merge tag 'v2.10.9-dev2' into feat/attrs-view-adaptive-width

* 🎨 Improve the style of rows' gutter

* 🐛 Improve the style of icon in attribute view

* 🎨 Improve preview text fields

* Revert Merge tag 'v2.10.9-dev2' into feat/attrs-view-adaptive-width

* 🎨 Improve the style of image in attribute view cell

* 🎨 Improve the style of firstcol

* 🐛 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 c8924e3
Author: Vanessa <lly219@gmail.com>
Date:   Sat Oct 14 12:14:12 2023 +0800

    :art: fix #9409

commit 879fdd8
Author: Vanessa <lly219@gmail.com>
Date:   Sat Oct 14 11:56:16 2023 +0800

    :lipstick: dragover

commit 9978827
Author: Vanessa <lly219@gmail.com>
Date:   Sat Oct 14 11:34:42 2023 +0800

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

commit a20ffeb
Author: Vanessa <lly219@gmail.com>
Date:   Sat Oct 14 11:20:17 2023 +0800

    :lipstick: fix #9412

commit f2075fa
Author: Vanessa <lly219@gmail.com>
Date:   Sat Oct 14 11:04:23 2023 +0800

    :art: #9419

commit 5e2910a
Author: Vanessa <lly219@gmail.com>
Date:   Sat Oct 14 11:00:46 2023 +0800

    :art: #9419

commit ac7f8d3
Merge: 9ae8400 d78a020
Author: Vanessa <lly219@gmail.com>
Date:   Sat Oct 14 10:56:40 2023 +0800

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

commit 9ae8400
Author: Vanessa <lly219@gmail.com>
Date:   Sat Oct 14 10:56:21 2023 +0800

    :art: #9419

commit d78a020
Author: Daniel <845765@qq.com>
Date:   Sat Oct 14 10:51:46 2023 +0800

    :art: Database table view breadcrumb

commit 6b1a292
Merge: 25109b9 9766020
Author: Vanessa <lly219@gmail.com>
Date:   Sat Oct 14 10:49:46 2023 +0800

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

commit 25109b9
Author: Vanessa <lly219@gmail.com>
Date:   Sat Oct 14 10:49:35 2023 +0800

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

commit 9766020
Author: Daniel <845765@qq.com>
Date:   Sat Oct 14 10:08:57 2023 +0800

    :art: Update text

commit ab67389
Merge: 7d6f9bb 39c5744
Author: Vanessa <lly219@gmail.com>
Date:   Sat Oct 14 10:01:57 2023 +0800

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

commit 7d6f9bb
Author: Vanessa <lly219@gmail.com>
Date:   Sat Oct 14 10:01:42 2023 +0800

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

commit 39c5744
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 #9428

commit 87ecb7f
Author: Daniel <845765@qq.com>
Date:   Sat Oct 14 09:37:47 2023 +0800

    :art: Update text

commit 69d8c93
Merge: 623f30b f6780c1
Author: Vanessa <lly219@gmail.com>
Date:   Sat Oct 14 09:21:54 2023 +0800

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

commit 623f30b
Author: Vanessa <lly219@gmail.com>
Date:   Sat Oct 14 09:21:44 2023 +0800

    :art: #9419

commit f6780c1
Author: Daniel <845765@qq.com>
Date:   Sat Oct 14 09:20:51 2023 +0800

    :art: Supports searching database view content #9419

commit fd94e9d
Author: Vanessa <lly219@gmail.com>
Date:   Sat Oct 14 00:04:16 2023 +0800

    :art:

commit 51f6687
Author: Vanessa <lly219@gmail.com>
Date:   Fri Oct 13 23:50:31 2023 +0800

    :art: #9419

commit 49305b8
Merge: 2f0f563 8399aba
Author: Vanessa <lly219@gmail.com>
Date:   Fri Oct 13 23:26:15 2023 +0800

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

commit 2f0f563
Author: Vanessa <lly219@gmail.com>
Date:   Fri Oct 13 23:25:58 2023 +0800

    :art: #9419

commit 8399aba
Author: Daniel <845765@qq.com>
Date:   Fri Oct 13 23:22:17 2023 +0800

    :art: Supports searching database view content #9419

commit 22efb3d
Merge: f95084e c3d1c04
Author: Vanessa <lly219@gmail.com>
Date:   Fri Oct 13 23:07:13 2023 +0800

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

commit f95084e
Author: Vanessa <lly219@gmail.com>
Date:   Fri Oct 13 23:06:53 2023 +0800

    :art: #9419

commit c3d1c04
Author: Daniel <845765@qq.com>
Date:   Fri Oct 13 22:50:11 2023 +0800

    :art: Supports searching database view content #9419

commit a11ea9c
Author: Vanessa <lly219@gmail.com>
Date:   Fri Oct 13 22:37:15 2023 +0800

    :lipstick:

commit 99ec5c1
Author: Vanessa <lly219@gmail.com>
Date:   Fri Oct 13 22:32:17 2023 +0800

    :art: showHiddenFiles

commit 49426ac
Author: Vanessa <lly219@gmail.com>
Date:   Fri Oct 13 22:15:20 2023 +0800

    :art: #9425

commit d445c54
Author: Vanessa <lly219@gmail.com>
Date:   Fri Oct 13 21:54:35 2023 +0800

    :art: #9421

commit 0c4aee7
Merge: c34d84c daa9ddf
Author: Vanessa <lly219@gmail.com>
Date:   Fri Oct 13 21:50:28 2023 +0800

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

commit c34d84c
Author: Vanessa <lly219@gmail.com>
Date:   Fri Oct 13 21:50:14 2023 +0800

    :art: #9421

commit daa9ddf
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 #9426

commit 01b19ea
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 7a9a85e
Author: Vanessa <lly219@gmail.com>
Date:   Fri Oct 13 13:55:27 2023 +0800

    :art: #9417

commit 1815ec1
Merge: 73edee5 00ed190
Author: Vanessa <lly219@gmail.com>
Date:   Fri Oct 13 13:37:45 2023 +0800

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

commit 73edee5
Author: Vanessa <lly219@gmail.com>
Date:   Fri Oct 13 13:37:32 2023 +0800

    :art: #9417

commit 00ed190
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 48e871c
Author: Vanessa <lly219@gmail.com>
Date:   Fri Oct 13 12:33:29 2023 +0800

    :art: #9417

commit 3554333
Author: Vanessa <lly219@gmail.com>
Date:   Fri Oct 13 11:55:51 2023 +0800

    :art: #9417

commit af810b2
Author: Vanessa <lly219@gmail.com>
Date:   Fri Oct 13 11:34:19 2023 +0800

    :art: fix #9423

commit 673c952
Author: Vanessa <lly219@gmail.com>
Date:   Fri Oct 13 11:30:44 2023 +0800

    :art: fix #9423

commit 3b87a0d
Merge: ed31305 3de7781
Author: Vanessa <lly219@gmail.com>
Date:   Fri Oct 13 11:09:07 2023 +0800

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

commit ed31305
Author: Vanessa <lly219@gmail.com>
Date:   Fri Oct 13 11:08:56 2023 +0800

    :art: #9421

commit 3de7781
Author: Daniel <845765@qq.com>
Date:   Fri Oct 13 10:44:29 2023 +0800

    :art: Supports searching database view content #9419

commit 2304921
Author: Daniel <845765@qq.com>
Date:   Fri Oct 13 10:42:51 2023 +0800

    :art: Update flashcard user guide

commit 55fb8b1
Author: Vanessa <lly219@gmail.com>
Date:   Fri Oct 13 10:14:11 2023 +0800

    :art: fix #9420

commit 8998de9
Merge: 5b38e79 df9b55c
Author: Vanessa <lly219@gmail.com>
Date:   Fri Oct 13 09:37:35 2023 +0800

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

commit 5b38e79
Author: Vanessa <lly219@gmail.com>
Date:   Fri Oct 13 09:37:24 2023 +0800

    :art: fix #9420

commit df9b55c
Author: Daniel <845765@qq.com>
Date:   Fri Oct 13 08:46:29 2023 +0800

    :art: Database template columns support sort

commit 3da9f0f
Author: Vanessa <lly219@gmail.com>
Date:   Thu Oct 12 20:40:09 2023 +0800

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

commit 79a88df
Author: Vanessa <lly219@gmail.com>
Date:   Thu Oct 12 20:23:18 2023 +0800

    :rotating_light:

commit 40a1e6d
Author: Vanessa <lly219@gmail.com>
Date:   Thu Oct 12 20:21:53 2023 +0800

    :lipstick: database loading

commit 2872dab
Author: Vanessa <lly219@gmail.com>
Date:   Thu Oct 12 20:11:59 2023 +0800

    :lipstick: fix #9418

commit 025a8ea
Merge: 02ec0f6 0ea9b8f
Author: Vanessa <lly219@gmail.com>
Date:   Thu Oct 12 20:04:13 2023 +0800

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

commit 02ec0f6
Author: Vanessa <lly219@gmail.com>
Date:   Thu Oct 12 20:04:01 2023 +0800

    :lipstick: fix #9418

commit 0ea9b8f
Author: Daniel <845765@qq.com>
Date:   Thu Oct 12 19:58:32 2023 +0800

    :art: Database block loading animation #9416

commit 1590913
Author: Daniel <845765@qq.com>
Date:   Thu Oct 12 19:55:57 2023 +0800

    :art: Update attr panel for av

commit d257caf
Author: Daniel <845765@qq.com>
Date:   Thu Oct 12 19:38:37 2023 +0800

    :art: Database block loading animation #9416

commit fdaf8d7
Merge: 70e82cd 238609f
Author: Vanessa <lly219@gmail.com>
Date:   Thu Oct 12 17:34:36 2023 +0800

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

commit 70e82cd
Author: Vanessa <lly219@gmail.com>
Date:   Thu Oct 12 17:34:19 2023 +0800

    :lipstick: fix #9416

commit 238609f
Author: Daniel <845765@qq.com>
Date:   Thu Oct 12 17:33:23 2023 +0800

    :zap: Improve performance of loading database table view

commit 2dd558b
Merge: fe0b1e8 8fb35f5
Author: Vanessa <lly219@gmail.com>
Date:   Thu Oct 12 17:16:45 2023 +0800

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

commit fe0b1e8
Author: Vanessa <lly219@gmail.com>
Date:   Thu Oct 12 17:16:31 2023 +0800

    :lipstick: fix #9415

commit 8fb35f5
Author: Daniel <845765@qq.com>
Date:   Thu Oct 12 17:15:36 2023 +0800

    :art: Database template columns support number filter Fix #9414

commit 01670f2
Merge: f792d14 ffcdb5d
Author: Vanessa <lly219@gmail.com>
Date:   Thu Oct 12 17:07:48 2023 +0800

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

commit f792d14
Author: Vanessa <lly219@gmail.com>
Date:   Thu Oct 12 17:07:09 2023 +0800

    :art: #9408

commit ffcdb5d
Author: Daniel <845765@qq.com>
Date:   Thu Oct 12 16:37:09 2023 +0800

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

commit fb1f80c
Author: Vanessa <lly219@gmail.com>
Date:   Thu Oct 12 12:22:55 2023 +0800

    :lipstick: fix #9406

commit da51ade
Merge: a4bcae8 09ef5fd
Author: Vanessa <lly219@gmail.com>
Date:   Thu Oct 12 12:11:42 2023 +0800

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

commit a4bcae8
Author: Vanessa <lly219@gmail.com>
Date:   Thu Oct 12 12:11:29 2023 +0800

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

commit 09ef5fd
Author: Daniel <845765@qq.com>
Date:   Thu Oct 12 12:01:53 2023 +0800

    :art: Database template columns support calculations #9408

commit 1b595d0
Author: Vanessa <lly219@gmail.com>
Date:   Thu Oct 12 12:01:53 2023 +0800

    :art: #9408

commit 21d1a05
Author: Vanessa <lly219@gmail.com>
Date:   Thu Oct 12 11:54:15 2023 +0800

    :lipstick: 编辑后表头不固定

commit c5206f7
Author: Vanessa <lly219@gmail.com>
Date:   Thu Oct 12 11:14:29 2023 +0800

    :bug: fix #9405

commit f0f55d3
Merge: 0194124 92151f7
Author: Vanessa <lly219@gmail.com>
Date:   Thu Oct 12 10:54:19 2023 +0800

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

commit 0194124
Author: Vanessa <lly219@gmail.com>
Date:   Thu Oct 12 10:54:09 2023 +0800

    :lipstick: fix #9403

commit 92151f7
Author: Daniel <845765@qq.com>
Date:   Thu Oct 12 10:12:44 2023 +0800

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

commit b8e8aa0
Author: Daniel <845765@qq.com>
Date:   Wed Oct 11 17:00:21 2023 +0800

    :hammer: Clean code

commit b17aff5
Author: Vanessa <lly219@gmail.com>
Date:   Wed Oct 11 23:54:40 2023 +0800

    :bug:

commit 1117495
Author: Vanessa <lly219@gmail.com>
Date:   Wed Oct 11 23:50:28 2023 +0800

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

commit 130884d
Author: Vanessa <lly219@gmail.com>
Date:   Wed Oct 11 23:23:01 2023 +0800

    :art: fix #9404

commit 7486e1a
Author: Vanessa <lly219@gmail.com>
Date:   Wed Oct 11 17:28:40 2023 +0800

    :art: fix #9402

commit eb93255
Author: Daniel <845765@qq.com>
Date:   Wed Oct 11 14:57:14 2023 +0800

    :hammer: Clean code

commit fd46593
Author: Daniel <845765@qq.com>
Date:   Wed Oct 11 14:55:06 2023 +0800

    :bookmark: Release v2.10.10

commit 337c795
Author: Daniel <845765@qq.com>
Date:   Wed Oct 11 11:59:25 2023 +0800

    :art: Improve install new version on Windows

commit f6f1148
Author: Daniel <845765@qq.com>
Date:   Wed Oct 11 11:08:44 2023 +0800

    :memo: Update changelogs

commit f0ad326
Author: Vanessa <lly219@gmail.com>
Date:   Wed Oct 11 11:30:00 2023 +0800

    :art:

commit 2eb89f0
Author: Vanessa <lly219@gmail.com>
Date:   Wed Oct 11 11:25:21 2023 +0800

    :rotating_light:

commit 0db516e
Merge: 23c3f9f e43cf4c
Author: Vanessa <lly219@gmail.com>
Date:   Wed Oct 11 11:24:41 2023 +0800

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

commit 23c3f9f
Author: Vanessa <lly219@gmail.com>
Date:   Wed Oct 11 11:24:29 2023 +0800

    :art: fix #9383

commit e43cf4c
Author: Daniel <845765@qq.com>
Date:   Wed Oct 11 10:52:10 2023 +0800

    :memo: Update changelogs

commit b30cb09
Author: Daniel <845765@qq.com>
Date:   Wed Oct 11 10:49:04 2023 +0800

    :memo: Update changelogs

commit d4a3226
Author: Daniel <845765@qq.com>
Date:   Wed Oct 11 10:48:40 2023 +0800

    :memo: Update changelogs

commit 65adab6
Author: Daniel <845765@qq.com>
Date:   Wed Oct 11 10:48:29 2023 +0800

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

commit 210a3ac
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 #9394

commit 37f950b
Author: Vanessa <lly219@gmail.com>
Date:   Wed Oct 11 09:39:22 2023 +0800

    :lipstick: icon

commit 7b1c30b
Author: Vanessa <lly219@gmail.com>
Date:   Wed Oct 11 09:30:13 2023 +0800

    :art: fix #9396

commit 6ef13ab
Merge: acd2eb1 e4907e7
Author: Vanessa <lly219@gmail.com>
Date:   Wed Oct 11 09:18:43 2023 +0800

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

commit acd2eb1
Author: Vanessa <lly219@gmail.com>
Date:   Wed Oct 11 09:18:33 2023 +0800

    :art: fix #9396

commit e4907e7
Author: Daniel <845765@qq.com>
Date:   Wed Oct 11 09:16:57 2023 +0800

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

commit 6f249d7
Author: Daniel <845765@qq.com>
Date:   Wed Oct 11 09:15:03 2023 +0800

    :arrow_up: Upgrade kernel deps

commit bb04bf9
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 #9378

commit 30b0dd0
Merge: c1de5e1 ccb6545
Author: Vanessa <lly219@gmail.com>
Date:   Wed Oct 11 08:58:55 2023 +0800

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

commit c1de5e1
Author: Vanessa <lly219@gmail.com>
Date:   Wed Oct 11 08:58:44 2023 +0800

    :lipstick: #8894

commit ccb6545
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 #9394

commit 28e4e1e
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 #9390

commit 964c822
Author: Daniel <845765@qq.com>
Date:   Tue Oct 10 22:02:46 2023 +0800

    :art: Improve database created and updated column values #9391

commit f404d7f
Merge: ed7084c 301b6d9
Author: Vanessa <lly219@gmail.com>
Date:   Tue Oct 10 22:00:57 2023 +0800

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

commit ed7084c
Author: Vanessa <lly219@gmail.com>
Date:   Tue Oct 10 22:00:43 2023 +0800

    :lipstick:

commit 301b6d9
Author: Daniel <845765@qq.com>
Date:   Tue Oct 10 21:55:43 2023 +0800

    :art: Improve database created and updated column values #9391

commit f62be47
Author: Vanessa <lly219@gmail.com>
Date:   Tue Oct 10 21:50:36 2023 +0800

    :art: fix #9385

commit 8e2565f
Author: Vanessa <lly219@gmail.com>
Date:   Tue Oct 10 21:39:57 2023 +0800

    :art: fix #9386

commit e54d8f1
Author: Vanessa <lly219@gmail.com>
Date:   Tue Oct 10 21:31:20 2023 +0800

    :art: fix #9393

commit 1fb7187
Author: Vanessa <lly219@gmail.com>
Date:   Tue Oct 10 21:23:29 2023 +0800

    :memo: fix #9392

commit ea00753
Author: Vanessa <lly219@gmail.com>
Date:   Tue Oct 10 21:18:17 2023 +0800

    :art: fix #9392

commit 4318aa4
Author: Vanessa <lly219@gmail.com>
Date:   Tue Oct 10 20:51:28 2023 +0800

    :art: fix #9376

commit f1d4f84
Merge: 3f4c00e 64df2ff
Author: Vanessa <lly219@gmail.com>
Date:   Tue Oct 10 20:42:43 2023 +0800

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

commit 3f4c00e
Author: Vanessa <lly219@gmail.com>
Date:   Tue Oct 10 20:42:14 2023 +0800

    :art: #9376

commit 64df2ff
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 #9391

commit 691a0be
Merge: 0e5cae3 7e9243d
Author: Vanessa <lly219@gmail.com>
Date:   Tue Oct 10 20:41:05 2023 +0800

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

commit 0e5cae3
Author: Vanessa <lly219@gmail.com>
Date:   Tue Oct 10 20:40:38 2023 +0800

    :lipstick: fix #9206

commit 7e9243d
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 #9391

commit 7aa4aac
Author: Vanessa <lly219@gmail.com>
Date:   Tue Oct 10 17:30:10 2023 +0800

    :lipstick: fix #9206

commit d02381d
Merge: 449d2db 6e9099e
Author: Vanessa <lly219@gmail.com>
Date:   Tue Oct 10 17:09:14 2023 +0800

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

commit 449d2db
Author: Vanessa <lly219@gmail.com>
Date:   Tue Oct 10 17:09:03 2023 +0800

    :recycle: #9256

commit 6e9099e
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 #9388

commit 1178638
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)

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

    * 🐛 Avoid plug-in names with the same prefix

    * Update onGetConfig.ts

commit 2c36af7
Author: Vanessa <lly219@gmail.com>
Date:   Tue Oct 10 16:15:24 2023 +0800

    :rotating_light:

commit b0e3efa
Author: Daniel <845765@qq.com>
Date:   Tue Oct 10 11:41:46 2023 +0800

    :bookmark: Release v2.10.9

commit d690475
Merge: c8a6f41 811bac9
Author: Daniel <845765@qq.com>
Date:   Tue Oct 10 10:58:46 2023 +0800

    Merge remote-tracking branch 'origin/master'

commit c8a6f41
Author: Daniel <845765@qq.com>
Date:   Tue Oct 10 10:18:57 2023 +0800

    :bookmark: Release v2.10.9

commit cdcec7e
Author: Daniel <845765@qq.com>
Date:   Mon Oct 9 23:29:25 2023 +0800

    :memo: Update changelogs

commit 1eccb8b
Merge: a3094fe 3827753
Author: Vanessa <lly219@gmail.com>
Date:   Mon Oct 9 23:26:13 2023 +0800

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

commit a3094fe
Author: Vanessa <lly219@gmail.com>
Date:   Mon Oct 9 23:25:48 2023 +0800

    :bug: fix #9384

commit 3827753
Author: Daniel <845765@qq.com>
Date:   Mon Oct 9 23:07:34 2023 +0800

    :art: Upgrade Electron #9342

commit 567394a
Author: Daniel <845765@qq.com>
Date:   Mon Oct 9 22:42:39 2023 +0800

    :memo: Update changelogs

commit ff6220a
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 da0fa08
Author: Daniel <845765@qq.com>
Date:   Mon Oct 9 21:45:36 2023 +0800

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

commit 0ed6884
Author: Daniel <845765@qq.com>
Date:   Mon Oct 9 21:09:35 2023 +0800

    :bug: Update av Fix #9380

commit 288eb24
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 #9378

commit 4965b7b
Merge: 803069d 9028491
Author: Vanessa <lly219@gmail.com>
Date:   Mon Oct 9 17:18:28 2023 +0800

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

commit 803069d
Author: Vanessa <lly219@gmail.com>
Date:   Mon Oct 9 17:18:17 2023 +0800

    :art: fix #9370

commit 9028491
Author: Daniel <845765@qq.com>
Date:   Mon Oct 9 17:17:40 2023 +0800

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

commit faadbf5
Author: Daniel <845765@qq.com>
Date:   Mon Oct 9 16:48:28 2023 +0800

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

commit 9ca1162
Merge: 43f06e5 644e031
Author: Vanessa <lly219@gmail.com>
Date:   Mon Oct 9 16:45:06 2023 +0800

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

commit 43f06e5
Author: Vanessa <lly219@gmail.com>
Date:   Mon Oct 9 16:44:46 2023 +0800

    :art: fix #9370

commit 811bac9
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 66aa802
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
  • Loading branch information
Zuoqiu-Yingyi authored Nov 9, 2023
1 parent 6950297 commit 2e46bee
Show file tree
Hide file tree
Showing 13 changed files with 199 additions and 204 deletions.
102 changes: 60 additions & 42 deletions app/src/assets/scss/business/_av.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
.av {
display: flex;
flex-direction: column;
align-items: center;

user-select: none;
box-sizing: border-box;

Expand Down Expand Up @@ -27,6 +31,11 @@
opacity: 1;
}

&__container {
// width: fit-content;
max-width: 100%;
}

&__header {
top: -43px;
z-index: 2;
Expand Down Expand Up @@ -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;
}
}

Expand All @@ -84,6 +94,10 @@
cursor: pointer;
}

&__body {
float: left;
}

&__row {
display: flex;
border-bottom: 1px solid var(--b3-theme-surface-lighter);
Expand Down Expand Up @@ -111,10 +125,6 @@

&--select {
background-color: var(--b3-theme-primary-lightest);

.av__firstcol svg {
opacity: 1;
}
}

&--header {
Expand Down Expand Up @@ -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 {
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -259,6 +299,7 @@

&__celltext {
overflow: hidden;
line-height: normal;

.b3-chip {
margin: 1px 2px;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down
4 changes: 4 additions & 0 deletions app/src/assets/scss/business/_custom.scss
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@
line-height: 26px;
min-height: 26px;

img.av__cellassetimg {
height: 32px;
}

&:hover {
background-color: var(--b3-theme-background);
}
Expand Down
1 change: 1 addition & 0 deletions app/src/assets/scss/component/_tooltips.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 2 additions & 10 deletions app/src/plugin/loader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
};
Expand All @@ -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;
Expand Down
11 changes: 11 additions & 0 deletions app/src/plugin/require.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import {API as siyuan} from "./API";

const libs: Record<string, any> = {
siyuan,
} as const;

export const PluginRequire = {
require(module: string) {
return libs[module];
}
}
21 changes: 10 additions & 11 deletions app/src/protyle/gutter/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
Expand All @@ -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";
}
Expand All @@ -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";
}
Expand All @@ -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";
}
});
}
}, {
Expand Down Expand Up @@ -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 = "";
}
});
}
Expand Down Expand Up @@ -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();
Expand Down
Loading

0 comments on commit 2e46bee

Please sign in to comment.