public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-14 21:12:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(工作台): 修复桌面版工作台搜索存在区分大小、移动端未隐藏等问题

Browse Source
This commit is contained in:
wangjiahao
2024-12-16 18:58:34 +08:00
committed by 王嘉豪
parent 6e88aea472
commit 7aff0c0dbe
5 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-backend/src/main/java/io/dataease/visualization/dao/ext/mapper/ExtDataVisualizationMapper.java
View File

@@ -37,7 +37,7 @@ public interface ExtDataVisualizationMapper {
DataVisualizationVO findDvInfo(@Param("dvId") Long dvId,@Param("dvType") String dvType);
IPage<VisualizationResourcePO> findRecent(IPage<VisualizationResourcePO> page, @Param("uid") Long uid, @Param("ew") QueryWrapper<Object> ew);
IPage<VisualizationResourcePO> findRecent(IPage<VisualizationResourcePO> page, @Param("uid") Long uid, @Param("keyword") String keyword, @Param("ew") QueryWrapper<Object> ew);
void copyLinkJump(@Param("copyId") Long copyId);

5
core/core-backend/src/main/java/io/dataease/visualization/manage/CoreVisualizationManage.java
View File

@@ -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<VisualizationResourcePO> page = new Page<>(goPage, pageSize);
return extDataVisualizationMapper.findRecent(page, uid, queryWrapper);
return extDataVisualizationMapper.findRecent(page, uid, request.getKeyword(), queryWrapper);
}
}

2
core/core-backend/src/main/java/io/dataease/visualization/manage/VisualizationStoreManage.java
View File

@@ -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)) {

6
core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml
View File

@@ -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}
<if test="keyword">
AND LOWER(dvResource.name) LIKE LOWER(CONCAT('%', #{keyword}, '%'))
</if>
${ew.customSqlSegment}
</select>
<insert id="copyLinkJump">

27
core/core-frontend/src/components/dashboard/DbToolbar.vue
View File

@@ -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 => {
/>
</el-tooltip>
<div class="divider"></div>
<el-tooltip
:offset="14"
effect="dark"
:content="t('components.to_mobile_layout')"
placement="bottom"
>
<component-button
:tips="t('components.to_mobile_layout')"
@custom-click="openMobileSetting"
:icon-name="icon_phone_outlined"
/>
</el-tooltip>
<template v-if="!desktop">
<el-tooltip
:offset="14"
effect="dark"
:content="t('components.to_mobile_layout')"
placement="bottom"
>
<component-button
:tips="t('components.to_mobile_layout')"
@custom-click="openMobileSetting"
:icon-name="icon_phone_outlined"
/>
</el-tooltip>
</template>
</template>
<el-dropdown v-if="editMode === 'edit'" trigger="hover">