From 8330d90b1a3eca5c0f655f3600b04714b5a3ec9f Mon Sep 17 00:00:00 2001 From: lizijiee <562949697@qq.com> Date: Sat, 23 Mar 2024 08:58:45 +0800 Subject: [PATCH 01/16] =?UTF-8?q?fix:=202566=20=E3=80=90AI=E4=B8=80?= =?UTF-8?q?=E9=94=AE=E6=9F=A5=E9=87=8D--=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E3=80=91=E8=87=AA=E5=AE=9A=E4=B9=89=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E5=BC=B9=E7=AA=97=E7=95=8C=E9=9D=A2=EF=BC=8C=E5=B7=A6?= =?UTF-8?q?=E4=BE=A7=E5=85=A8=E9=83=A8=E6=95=B0=E9=87=8F=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=9C=89=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/aside/comp/modals/CustomFilterModal.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/home/aside/comp/modals/CustomFilterModal.vue b/src/views/home/aside/comp/modals/CustomFilterModal.vue index 1fd4558..bb07a3e 100644 --- a/src/views/home/aside/comp/modals/CustomFilterModal.vue +++ b/src/views/home/aside/comp/modals/CustomFilterModal.vue @@ -29,7 +29,9 @@ const offList = ref([]) const onList = ref([]) const allCount = computed(() => { - return `全部筛选(共${offList.value.length - 1}个)` + let result = offList.value.filter(item1 => !onList.value.some(item2 => item1.id === item2.id)); + + return `全部筛选(共${offList.value.length}个)` }) const selectCount = computed(() => { From d027ee6d8d04e02e948899ef11578fd6bf2ca7cd Mon Sep 17 00:00:00 2001 From: lizijiee <562949697@qq.com> Date: Sat, 23 Mar 2024 10:03:21 +0800 Subject: [PATCH 02/16] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/aside/comp/modals/CustomFilterModal.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/views/home/aside/comp/modals/CustomFilterModal.vue b/src/views/home/aside/comp/modals/CustomFilterModal.vue index bb07a3e..b238060 100644 --- a/src/views/home/aside/comp/modals/CustomFilterModal.vue +++ b/src/views/home/aside/comp/modals/CustomFilterModal.vue @@ -29,8 +29,6 @@ const offList = ref([]) const onList = ref([]) const allCount = computed(() => { - let result = offList.value.filter(item1 => !onList.value.some(item2 => item1.id === item2.id)); - return `全部筛选(共${offList.value.length}个)` }) From e3c2e3e20a4cf0003127b3bc8221d874f6c77e3a Mon Sep 17 00:00:00 2001 From: lizijiee <562949697@qq.com> Date: Sat, 23 Mar 2024 10:25:27 +0800 Subject: [PATCH 03/16] =?UTF-8?q?fix:=202577=20=E3=80=90AI=E4=B8=80?= =?UTF-8?q?=E9=94=AE=E6=9F=A5=E9=87=8D--=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E3=80=91=E5=AD=97=E4=BD=93=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E4=B8=8D=E5=AF=B9=EF=BC=8C=E8=A6=81=E6=B1=82#333333=EF=BC=9B?= =?UTF-8?q?=E8=92=99=E7=89=88=E9=A2=9C=E8=89=B2=E4=B8=8D=E5=AF=B9=EF=BC=8C?= =?UTF-8?q?=E8=A6=81=E6=B1=82#F8F8F8=E3=80=82=E8=80=8C=E4=B8=94=E8=92=99?= =?UTF-8?q?=E7=89=88=E6=9C=80=E5=8F=B3=E4=BE=A7=E6=9C=AA=E4=B8=8E=E5=8F=B3?= =?UTF-8?q?=E4=BE=A7=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=E8=BE=B9=E6=A1=86?= =?UTF-8?q?=E5=AF=B9=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/aside/comp/modals/CustomFilterModal.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/home/aside/comp/modals/CustomFilterModal.vue b/src/views/home/aside/comp/modals/CustomFilterModal.vue index b238060..f683320 100644 --- a/src/views/home/aside/comp/modals/CustomFilterModal.vue +++ b/src/views/home/aside/comp/modals/CustomFilterModal.vue @@ -366,9 +366,10 @@ onMounted(()=>{ } &-bar { - background-color: #e8e8e8; - width: 100%; + background-color: #f8f8f8; + width: calc(100% + 12px); margin-top: 20px; + color: #333333; } &-footer { From ba1934bcc890ad40ed94cc584f0abbff5be7b684 Mon Sep 17 00:00:00 2001 From: lizijiee <562949697@qq.com> Date: Sat, 23 Mar 2024 11:05:22 +0800 Subject: [PATCH 04/16] =?UTF-8?q?fix:=202591=20=E3=80=90AI=E4=B8=80?= =?UTF-8?q?=E9=94=AE=E6=9F=A5=E9=87=8D--=E9=AB=98=E7=BA=A7=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E3=80=91=E6=9C=AA=E6=94=B6=E8=97=8F=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E9=BC=A0=E6=A0=87=E6=82=AC=E5=81=9C=E6=97=B6?= =?UTF-8?q?=E5=8F=AF=E6=8B=96=E6=9B=B3=E6=9B=B4=E6=8D=A2=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=8C=E4=BB=85=E9=99=90=E6=9C=AA=E6=94=B6=E8=97=8F=E8=8C=83?= =?UTF-8?q?=E5=9B=B4=E5=86=85=EF=BC=8C=E4=B8=8D=E5=8F=AF=E6=8B=96=E5=8A=A8?= =?UTF-8?q?=E8=87=B3=E6=94=B6=E8=97=8F=E6=9D=A1=E4=BB=B6=E4=B8=8A=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/aside/comp/AdvanceFilter.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/home/aside/comp/AdvanceFilter.vue b/src/views/home/aside/comp/AdvanceFilter.vue index f6b0b62..55c1af3 100644 --- a/src/views/home/aside/comp/AdvanceFilter.vue +++ b/src/views/home/aside/comp/AdvanceFilter.vue @@ -272,10 +272,10 @@ const moveEnd = () => { />
+ Date: Sat, 23 Mar 2024 14:27:23 +0800 Subject: [PATCH 05/16] =?UTF-8?q?fix:=202574=20=E3=80=90AI=E4=B8=80?= =?UTF-8?q?=E9=94=AE=E6=9F=A5=E9=87=8D--=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E3=80=91=E5=8F=B3=E4=BE=A7=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=A8=A1=E5=9D=97=E7=82=B9=E5=87=BB=E6=B8=85?= =?UTF-8?q?=E7=A9=BA=E6=8C=89=E9=92=AE=E5=90=8E=EF=BC=8C=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=8C=89=E9=92=AE=E5=85=B3=E9=97=AD=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=EF=BC=8C=E5=86=8D=E6=AC=A1=E6=89=93=E5=BC=80=E5=90=8E?= =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=E5=B7=B2?= =?UTF-8?q?=E8=A2=AB=E6=B8=85=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aside/comp/modals/CustomFilterModal.vue | 39 +++++++++++++------ 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/src/views/home/aside/comp/modals/CustomFilterModal.vue b/src/views/home/aside/comp/modals/CustomFilterModal.vue index f683320..88cd2fb 100644 --- a/src/views/home/aside/comp/modals/CustomFilterModal.vue +++ b/src/views/home/aside/comp/modals/CustomFilterModal.vue @@ -17,6 +17,18 @@ const selectIds = ref([]) function showModal() { show.value = true + + // 重置左右列表数据 + const config = configStore.getConfig + const customConfig = configStore.getCustomConfig + + if (config == null || customConfig == null) + return + const { showList, hideList } = generatList(config, customConfig) + onList.value = showList + offList.value = hideList + // 重置全选状态 + checkAll.value = hideList.every(item => item.checked); } function closeModal() { @@ -83,8 +95,9 @@ function generatList(config, customConfig) { fix: isDefaultFilter, checked: isChecked, }) - - isChecked && selectIds.value.push(key) + if (isChecked && selectIds.value.indexOf(key) === -1) { + isChecked && selectIds.value.push(key) + } } } @@ -156,7 +169,9 @@ function onCheckChange(checked: any, item: any) { if (index === -1 && checked) selectIds.value.push(item.id) else - selectIds.value.splice(index, 1) + index !== -1 && selectIds.value.splice(index, 1) + + checkAll.value = offList.value.every(item => item.checked); } const showIds = computed(() => { @@ -180,11 +195,13 @@ watch( if (action === 'add') { for (const item of offList.value) { if (!item.fix && diff.includes(item.id)) { - onList.value.push({ - id: item.id, - name: item.name || '未配置', - fix: item.fix || false, - }) + if (item.checked) { + onList.value.push({ + id: item.id, + name: item.name || '未配置', + fix: item.fix || false, + }) + } } } } @@ -248,15 +265,15 @@ const rightInputHandler = debounce((keyword) => { onKeyword.value = keyword }, 300) -async function getfield(){ +async function getfield() { let res; res = await getAllfieldList(3) const userStore = useUser(); const userInfo = userStore.getUserInfo; - res = await getfieldList(3,userInfo.id) + res = await getfieldList(3, userInfo.id) } -onMounted(()=>{ +onMounted(() => { getfield(); }) From fe0cabe352fe322ec534ab4c20b68462646d4b23 Mon Sep 17 00:00:00 2001 From: lizijiee <562949697@qq.com> Date: Sat, 23 Mar 2024 16:19:19 +0800 Subject: [PATCH 06/16] =?UTF-8?q?feat:=20=E5=BC=B9=E6=A1=86=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E6=B8=85=E7=A9=BA=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/aside/comp/modals/CustomFilterModal.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/home/aside/comp/modals/CustomFilterModal.vue b/src/views/home/aside/comp/modals/CustomFilterModal.vue index 88cd2fb..b7de223 100644 --- a/src/views/home/aside/comp/modals/CustomFilterModal.vue +++ b/src/views/home/aside/comp/modals/CustomFilterModal.vue @@ -29,6 +29,9 @@ function showModal() { offList.value = hideList // 重置全选状态 checkAll.value = hideList.every(item => item.checked); + // 重置输入框查询条件 + offKeyword.value = '' + onKeyword.value = '' } function closeModal() { From eefb5a64eb4c78702e261971bfa86e11872a0e91 Mon Sep 17 00:00:00 2001 From: lizijiee <562949697@qq.com> Date: Sat, 23 Mar 2024 16:33:17 +0800 Subject: [PATCH 07/16] =?UTF-8?q?fix:=202592=20=E3=80=90AI=E4=B8=80?= =?UTF-8?q?=E9=94=AE=E6=9F=A5=E9=87=8D--=E9=AB=98=E7=BA=A7=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E3=80=91=E9=BC=A0=E6=A0=87=E6=BB=91=E8=87=B3=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E9=9D=A2=E6=97=B6=EF=BC=8C=E9=BC=A0=E6=A0=87?= =?UTF-8?q?=E6=8C=87=E9=92=88=E6=98=AF=E4=BB=A5=E5=B0=8F=E6=89=8B=E5=BD=A2?= =?UTF-8?q?=E5=BC=8F=E5=B1=95=E7=8E=B0=EF=BC=8C=E8=80=8C=E4=B8=8D=E6=98=AF?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E7=AC=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/aside/comp/Search.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/home/aside/comp/Search.vue b/src/views/home/aside/comp/Search.vue index 9aa087c..97d2472 100644 --- a/src/views/home/aside/comp/Search.vue +++ b/src/views/home/aside/comp/Search.vue @@ -109,6 +109,7 @@ function selectHandler(item: SearchEntity) { &:hover { background-color: #f3f8ff; + cursor: pointer; } } } From c80b122273ca85624e739b8b3e92afa7ee38c659 Mon Sep 17 00:00:00 2001 From: lizijiee <562949697@qq.com> Date: Sat, 23 Mar 2024 17:06:50 +0800 Subject: [PATCH 08/16] =?UTF-8?q?fix:=202600=20=E3=80=90AI=E4=B8=80?= =?UTF-8?q?=E9=94=AE=E6=9F=A5=E9=87=8D--=E9=AB=98=E7=BA=A7=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E3=80=91=E8=BF=9B=E5=85=A5=E5=85=A8=E9=83=A8=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E6=9D=A1=E4=BB=B6=E8=AE=BE=E7=BD=AE=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E5=BA=95=E9=83=A8=E7=A1=AE=E5=AE=9A=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F=E6=9C=89=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/aside/comp/modals/FilterModal.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/home/aside/comp/modals/FilterModal.vue b/src/views/home/aside/comp/modals/FilterModal.vue index 31e194f..6f47171 100644 --- a/src/views/home/aside/comp/modals/FilterModal.vue +++ b/src/views/home/aside/comp/modals/FilterModal.vue @@ -20,7 +20,7 @@ const show = ref(false); const cardStyle = { width: "800px", - height: "800px", + height: "830px", "--n-padding-bottom": "10px", "--n-padding-left": "10px", }; @@ -63,6 +63,7 @@ const columns: DataTableColumns = [ { title: "创建时间", key: "createtime", + width: 180 }, { title: "更新者", @@ -71,6 +72,7 @@ const columns: DataTableColumns = [ { title: "更新时间", key: "updatetime", + width: 180 }, ]; @@ -317,6 +319,7 @@ const inputHandler = debounce((word) => {
Date: Sat, 23 Mar 2024 17:23:39 +0800 Subject: [PATCH 09/16] =?UTF-8?q?fix:=202564=20=E3=80=90AI=E4=B8=80?= =?UTF-8?q?=E9=94=AE=E6=9F=A5=E9=87=8D=E3=80=91=E5=BD=93=E5=89=8D=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E4=B8=8ERP=E8=AE=BE=E8=AE=A1=E5=9B=BE=E4=B8=8D=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/home.ts | 4 ++++ src/views/home/content/Content.vue | 9 +++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/config/home.ts b/src/config/home.ts index 93de47e..a6635ef 100644 --- a/src/config/home.ts +++ b/src/config/home.ts @@ -1,4 +1,8 @@ export const timeOptions = [ + { + label: '全部', + value: '', + }, { label: '近3个月', value: '3', diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue index 50313e5..5e22d73 100644 --- a/src/views/home/content/Content.vue +++ b/src/views/home/content/Content.vue @@ -97,7 +97,7 @@ onUpdated(() => { layout() }) -const timeRange = ref('99') +const timeRange = ref('') const timeLabel = computed(() => { const item = timeOptions.find((option) => { return option.value === timeRange.value @@ -333,14 +333,15 @@ function previewHandler(index: number,event: MouseEvent) {
- {{ viewLabel || '请选择' }} + + 视图
-
+
共 {{ totalCount }} 项
From f01d063e73d2fc6bd8801c38ec80a84f72d3bcdb Mon Sep 17 00:00:00 2001 From: lizijiee <562949697@qq.com> Date: Sat, 23 Mar 2024 17:38:43 +0800 Subject: [PATCH 10/16] =?UTF-8?q?fix:=202568=20=E3=80=90AI=E4=B8=80?= =?UTF-8?q?=E9=94=AE=E6=9F=A5=E9=87=8D--=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E3=80=91=E5=8F=B3=E4=BE=A7=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=E5=90=8E=EF=BC=8C=E5=AF=B9?= =?UTF-8?q?=E5=85=B6=E8=BF=9B=E8=A1=8C=E6=8B=96=E5=8A=A8=EF=BC=8C=E6=8B=96?= =?UTF-8?q?=E5=8A=A8=E4=B8=80=E6=AC=A1=E5=90=8E=E6=97=A0=E6=B3=95=E5=86=8D?= =?UTF-8?q?=E6=AC=A1=E6=8B=96=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/aside/comp/modals/CustomFilterModal.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/home/aside/comp/modals/CustomFilterModal.vue b/src/views/home/aside/comp/modals/CustomFilterModal.vue index b7de223..1084bb1 100644 --- a/src/views/home/aside/comp/modals/CustomFilterModal.vue +++ b/src/views/home/aside/comp/modals/CustomFilterModal.vue @@ -342,7 +342,8 @@ onMounted(() => { - + +
Date: Sat, 23 Mar 2024 18:27:51 +0800 Subject: [PATCH 11/16] =?UTF-8?q?fix:=202568=20=E3=80=90AI=E4=B8=80?= =?UTF-8?q?=E9=94=AE=E6=9F=A5=E9=87=8D--=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E3=80=91=E5=8F=B3=E4=BE=A7=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=E5=90=8E=EF=BC=8C=E5=AF=B9?= =?UTF-8?q?=E5=85=B6=E8=BF=9B=E8=A1=8C=E6=8B=96=E5=8A=A8=EF=BC=8C=E6=8B=96?= =?UTF-8?q?=E5=8A=A8=E4=B8=80=E6=AC=A1=E5=90=8E=E6=97=A0=E6=B3=95=E5=86=8D?= =?UTF-8?q?=E6=AC=A1=E6=8B=96=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aside/comp/modals/CustomFilterModal.vue | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/views/home/aside/comp/modals/CustomFilterModal.vue b/src/views/home/aside/comp/modals/CustomFilterModal.vue index 1084bb1..6728098 100644 --- a/src/views/home/aside/comp/modals/CustomFilterModal.vue +++ b/src/views/home/aside/comp/modals/CustomFilterModal.vue @@ -275,6 +275,12 @@ async function getfield() { const userInfo = userStore.getUserInfo; res = await getfieldList(3, userInfo.id) } +function onMove(e) { + // 这里的e表示即将停靠的元素。 + if (e?.related?.className?.indexOf('fix') !== -1) { + return false; + } +} onMounted(() => { getfield(); @@ -342,18 +348,14 @@ onMounted(() => { - - -
+ +
{{ item.name }} - +
@@ -444,6 +446,10 @@ onMounted(() => { align-items: center; } + .fix { + cursor: default !important; + } + .disable-check { color: gainsboro; } From 198329061e61d172d4cf24d3476b296c19f560aa Mon Sep 17 00:00:00 2001 From: lizijiee <562949697@qq.com> Date: Sat, 23 Mar 2024 19:03:00 +0800 Subject: [PATCH 12/16] =?UTF-8?q?feat:=202570=20=E3=80=90AI=E4=B8=80?= =?UTF-8?q?=E9=94=AE=E6=9F=A5=E9=87=8D--=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E3=80=91=E8=87=AA=E5=AE=9A=E4=B9=89=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E5=9B=BA=E5=AE=9A=E5=80=BC=E4=B8=8ERp=E8=A6=81?= =?UTF-8?q?=E6=B1=82=E4=B8=8D=E7=AC=A6=EF=BC=8C=E5=B0=91=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E7=9B=B8=E4=BC=BC=E5=BA=A6=E9=98=99=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/aside.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/aside.ts b/src/config/aside.ts index 3d3aec4..6e339ea 100644 --- a/src/config/aside.ts +++ b/src/config/aside.ts @@ -45,7 +45,7 @@ export const asideMap: Recordable = { izsimilarity: { label: '相似度阈值', defaultValue: [0, 100], - isDefaultFilter: false, + isDefaultFilter: true, key: 'izsimilarity', component: SimilarityVue, }, From 0bbf434d22c86ff943f47dbde946ff16548300a9 Mon Sep 17 00:00:00 2001 From: lizijiee <562949697@qq.com> Date: Sat, 23 Mar 2024 19:04:18 +0800 Subject: [PATCH 13/16] =?UTF-8?q?fix:=202578=20=E3=80=90AI=E4=B8=80?= =?UTF-8?q?=E9=94=AE=E6=9F=A5=E9=87=8D--=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E3=80=91=E6=8F=90=E7=A4=BA=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E6=98=AF=E6=90=9C=E7=B4=A2=E5=85=B3=E9=94=AE?= =?UTF-8?q?=E8=AF=8D=EF=BC=8C=E4=B8=8D=E6=98=AF=E5=85=B3=E9=94=AE=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/aside/comp/modals/CustomFilterModal.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/home/aside/comp/modals/CustomFilterModal.vue b/src/views/home/aside/comp/modals/CustomFilterModal.vue index 6728098..abb3378 100644 --- a/src/views/home/aside/comp/modals/CustomFilterModal.vue +++ b/src/views/home/aside/comp/modals/CustomFilterModal.vue @@ -306,7 +306,7 @@ onMounted(() => { :bordered="false" >
- + @@ -342,7 +342,7 @@ onMounted(() => { 清空
- + From 0066010257059956456a76ae39fd9b09f573d74f Mon Sep 17 00:00:00 2001 From: lizijiee <562949697@qq.com> Date: Sun, 24 Mar 2024 09:22:53 +0800 Subject: [PATCH 14/16] =?UTF-8?q?fix:=20=E9=AB=98=E7=BA=A7=E7=AD=9B?= =?UTF-8?q?=E9=80=89=20=E8=87=AA=E5=AE=9A=E4=B9=89=E7=AD=9B=E9=80=89=20?= =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E9=80=89=E4=B8=AD=E9=A1=B9***=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=8F=AF=E4=BB=A5=E6=8B=96=E6=8B=BD=E6=95=88?= =?UTF-8?q?=E6=9E=9C***?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../home/aside/comp/modals/CustomFilterModal.vue | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/views/home/aside/comp/modals/CustomFilterModal.vue b/src/views/home/aside/comp/modals/CustomFilterModal.vue index abb3378..f8ddaf7 100644 --- a/src/views/home/aside/comp/modals/CustomFilterModal.vue +++ b/src/views/home/aside/comp/modals/CustomFilterModal.vue @@ -141,8 +141,7 @@ configStore.$subscribe(() => { async function handleSumbit(e: MouseEvent) { e.preventDefault() - - const param = onList.value.filter(item => !asideMap[item.id].isDefaultFilter).map((item) => { + const param = onList.value.map((item) => { return item.id }).join(',') @@ -348,13 +347,11 @@ onMounted(() => { - -
- + +
+ {{ item.name }} -
From 0c2a2b350f1c25fa9dbd0f77c39f8536395a32cb Mon Sep 17 00:00:00 2001 From: lizijiee <562949697@qq.com> Date: Sun, 24 Mar 2024 09:55:45 +0800 Subject: [PATCH 15/16] =?UTF-8?q?fix:=202579=20=E3=80=90AI=E4=B8=80?= =?UTF-8?q?=E9=94=AE=E6=9F=A5=E9=87=8D--=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E3=80=91=E6=9F=A5=E8=AF=A2=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=E5=BA=94=E8=AF=A5=E6=98=AF#999999?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/aside/comp/modals/CustomFilterModal.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/home/aside/comp/modals/CustomFilterModal.vue b/src/views/home/aside/comp/modals/CustomFilterModal.vue index f8ddaf7..ce3c89e 100644 --- a/src/views/home/aside/comp/modals/CustomFilterModal.vue +++ b/src/views/home/aside/comp/modals/CustomFilterModal.vue @@ -307,7 +307,7 @@ onMounted(() => {
@@ -343,7 +343,7 @@ onMounted(() => {
From 89680bcd818bfceb49fec28edc656cfafedebe95 Mon Sep 17 00:00:00 2001 From: lizijiee <562949697@qq.com> Date: Sun, 24 Mar 2024 09:56:22 +0800 Subject: [PATCH 16/16] =?UTF-8?q?fix:=202579=20=E3=80=90AI=E4=B8=80?= =?UTF-8?q?=E9=94=AE=E6=9F=A5=E9=87=8D--=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E3=80=91=E6=9F=A5=E8=AF=A2=E5=9B=BE=E6=A0=87?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=E5=BA=94=E8=AF=A5=E6=98=AF#999999?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icons/magnifying-1-color999.svg | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 src/assets/icons/magnifying-1-color999.svg diff --git a/src/assets/icons/magnifying-1-color999.svg b/src/assets/icons/magnifying-1-color999.svg new file mode 100644 index 0000000..1a04d84 --- /dev/null +++ b/src/assets/icons/magnifying-1-color999.svg @@ -0,0 +1,23 @@ + + + 搜索 + + + + + + + + + + + + + + + + + + + + \ No newline at end of file