From 21301dccc0cb33bece56f1cf8d6871a5694a8a0c Mon Sep 17 00:00:00 2001 From: liushilong <2224574157@qq.com> Date: Thu, 21 Mar 2024 18:12:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E5=A4=9A=E9=80=89=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E4=B8=80=E8=87=B4=EF=BC=8C=E4=BF=AE=E5=A4=8D=E9=AB=98?= =?UTF-8?q?=E7=BA=A7=E7=AD=9B=E9=80=89=E6=B5=81=E7=A8=8B=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 15 ++++++++- src/views/task/aside/Aside.vue | 56 ++++++++++++++++++++++------------ 2 files changed, 50 insertions(+), 21 deletions(-) diff --git a/src/App.vue b/src/App.vue index 04f400a..73d2274 100644 --- a/src/App.vue +++ b/src/App.vue @@ -54,4 +54,17 @@ const getThemeOverrides = computed(() => { - + diff --git a/src/views/task/aside/Aside.vue b/src/views/task/aside/Aside.vue index 7ac8ab7..8e276a7 100644 --- a/src/views/task/aside/Aside.vue +++ b/src/views/task/aside/Aside.vue @@ -1,18 +1,23 @@ @@ -176,9 +181,13 @@ function editFilter(filter: any) { --> + v-show="!showSearch" + :type="2" + @select="filterHandler" + @update:search="setShowSearch(true)" + @show-custom="showModal(CustomFieldModalRef)" + @show-filter="showModal(filterModalRef)" + />
- + + + + From 552dc36fec6558ab7bef902e0b817681b0bd3539 Mon Sep 17 00:00:00 2001 From: lizijiee <562949697@qq.com> Date: Thu, 21 Mar 2024 19:47:42 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E6=9F=A5=E9=87=8D=E9=A1=B5?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=AE=BE=E7=BD=AE=E4=B8=BA=E5=B9=B3=E9=93=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/content/Content.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue index 0a5cfdd..9b6ba34 100644 --- a/src/views/home/content/Content.vue +++ b/src/views/home/content/Content.vue @@ -23,7 +23,7 @@ let _masonry: null | Masonry = null let _imagesload: any const masonryRef = ref(null) const el = ref(null) -const viewMode = ref('tile') +const viewMode = ref('masonry') const pagination = reactive({ pageNo: 0, pageSize: 30, From 507367c674bef127ede9c06a4171bcca33e58701 Mon Sep 17 00:00:00 2001 From: liushilong <2224574157@qq.com> Date: Thu, 21 Mar 2024 21:22:58 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/final/comp/FilterModal.vue | 340 ++++++++++-------- src/views/final/comp/RepeatTaskTableModal.vue | 28 ++ src/views/final/content/Content.vue | 28 ++ .../home/aside/comp/modals/FilterModal.vue | 28 ++ 4 files changed, 283 insertions(+), 141 deletions(-) diff --git a/src/views/final/comp/FilterModal.vue b/src/views/final/comp/FilterModal.vue index 17cd96f..afbe8f1 100644 --- a/src/views/final/comp/FilterModal.vue +++ b/src/views/final/comp/FilterModal.vue @@ -1,255 +1,302 @@