From 7aff0c0dbe8687e12621026acebbb55d549c9638 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 16 Dec 2024 18:58:34 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=B7=A5=E4=BD=9C=E5=8F=B0):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=A1=8C=E9=9D=A2=E7=89=88=E5=B7=A5=E4=BD=9C=E5=8F=B0?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=AD=98=E5=9C=A8=E5=8C=BA=E5=88=86=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F=E3=80=81=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=9C=AA=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E7=AD=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/ExtDataVisualizationMapper.java | 2 +- .../manage/CoreVisualizationManage.java | 5 +--- .../manage/VisualizationStoreManage.java | 2 +- .../mybatis/ExtDataVisualizationMapper.xml | 6 ++++- .../src/components/dashboard/DbToolbar.vue | 27 ++++++++++--------- 5 files changed, 23 insertions(+), 19 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtDataVisualizationMapper.java b/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtDataVisualizationMapper.java index 270a91819e..866d87b58b 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtDataVisualizationMapper.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtDataVisualizationMapper.java @@ -37,7 +37,7 @@ public interface ExtDataVisualizationMapper { DataVisualizationVO findDvInfo(@Param("dvId") Long dvId,@Param("dvType") String dvType); - IPage findRecent(IPage page, @Param("uid") Long uid, @Param("ew") QueryWrapper ew); + IPage findRecent(IPage page, @Param("uid") Long uid, @Param("keyword") String keyword, @Param("ew") QueryWrapper ew); void copyLinkJump(@Param("copyId") Long copyId); diff --git a/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationManage.java b/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationManage.java index 7b55e015af..9d4fe99f6e 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationManage.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationManage.java @@ -199,15 +199,12 @@ public class CoreVisualizationManage { } queryWrapper.eq("dvResource.type", request.getType()); } - if (StringUtils.isNotBlank(request.getKeyword())) { - queryWrapper.like("dvResource.name", request.getKeyword()); - } String info = CommunityUtils.getInfo(); if (StringUtils.isNotBlank(info)) { queryWrapper.notExists(String.format(info, "core_opt_recent.resource_id")); } queryWrapper.orderBy(true, request.isAsc(), "core_opt_recent.time"); Page page = new Page<>(goPage, pageSize); - return extDataVisualizationMapper.findRecent(page, uid, queryWrapper); + return extDataVisualizationMapper.findRecent(page, uid, request.getKeyword(), queryWrapper); } } diff --git a/core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationStoreManage.java b/core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationStoreManage.java index f05aaacb63..3ce84d207d 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationStoreManage.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationStoreManage.java @@ -106,7 +106,7 @@ public class VisualizationStoreManage { queryWrapper.eq("s.resource_type", busiResourceEnum.getFlag()); } if (StringUtils.isNotBlank(request.getKeyword())) { - queryWrapper.like("v.name", request.getKeyword()); + queryWrapper.apply("LOWER(v.name) LIKE LOWER(CONCAT('%', {0}, '%'))", request.getKeyword()); } String info = CommunityUtils.getInfo(); if (StringUtils.isNotBlank(info)) { diff --git a/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml b/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml index 1eaac4ce15..97c13ba1c1 100644 --- a/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml +++ b/core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml @@ -233,7 +233,11 @@ LEFT JOIN core_store ON dvResource.id = core_store.resource_id AND core_store.uid = #{uid} INNER JOIN core_opt_recent ON dvResource.resource_id = core_opt_recent.resource_id - AND core_opt_recent.uid = #{uid} ${ew.customSqlSegment} + AND core_opt_recent.uid = #{uid} + + AND LOWER(dvResource.name) LIKE LOWER(CONCAT('%', #{keyword}, '%')) + + ${ew.customSqlSegment} diff --git a/core/core-frontend/src/components/dashboard/DbToolbar.vue b/core/core-frontend/src/components/dashboard/DbToolbar.vue index 88dc7311d2..10e6cd2fa2 100644 --- a/core/core-frontend/src/components/dashboard/DbToolbar.vue +++ b/core/core-frontend/src/components/dashboard/DbToolbar.vue @@ -81,6 +81,7 @@ const outerParamsSetRef = ref(null) const { wsCache } = useCache('localStorage') const userStore = useUserStoreWithOut() const isIframe = computed(() => appStore.getIsIframe) +const desktop = wsCache.get('app.desktop') const props = defineProps({ createType: { @@ -619,18 +620,20 @@ const initOpenHandler = newWindow => { />
- - - +