13
0
forked from github/dataease

fix(仪表板): 过滤组件-查询条件名称过长-hover提示未显示完整,过长应换行显示

This commit is contained in:
dataeaseShu 2024-08-28 16:16:57 +08:00
parent 01be529ec4
commit f4d84f0b04
3 changed files with 16 additions and 10 deletions
core/core-frontend/src
custom-component/v-query
views
chart/components/editor/dataset-select
visualized/data/dataset/form

@ -577,7 +577,13 @@ const autoStyle = computed(() => {
<div class="label" :style="marginRight"> <div class="label" :style="marginRight">
<div class="label-wrapper" v-show="customStyle.labelShow"> <div class="label-wrapper" v-show="customStyle.labelShow">
<div class="label-wrapper-text" :style="labelStyle"> <div class="label-wrapper-text" :style="labelStyle">
<el-tooltip effect="dark" :content="ele.name" placement="top"> <el-tooltip
popper-class="label-wrapper-text_tooltip"
effect="dark"
:content="ele.name"
:show-arrow="false"
placement="top-start"
>
{{ ele.name }} {{ ele.name }}
</el-tooltip> </el-tooltip>
</div> </div>
@ -857,6 +863,10 @@ const autoStyle = computed(() => {
} }
</style> </style>
<style lang="less"> <style lang="less">
.label-wrapper-text_tooltip {
max-width: 200px;
white-space: wrap;
}
.load-select { .load-select {
.ed-select-dropdown__list { .ed-select-dropdown__list {
& > div { & > div {

@ -319,6 +319,7 @@ onMounted(() => {
<template #default="{ node, data }"> <template #default="{ node, data }">
<div <div
class="tree-row-item" class="tree-row-item"
:title="node.label"
:class="{ dark: themes === 'dark', active: _modelValue === data.id }" :class="{ dark: themes === 'dark', active: _modelValue === data.id }"
> >
<div class="m-icon"> <div class="m-icon">
@ -329,15 +330,7 @@ onMounted(() => {
<Icon name="icon_dataset" /> <Icon name="icon_dataset" />
</el-icon> </el-icon>
</div> </div>
<el-tooltip {{ node.label }}
:effect="toolTip"
:show-after="1000"
:content="node.label"
placement="top"
:enterable="false"
>
{{ node.label }}
</el-tooltip>
<el-icon class="checked-item" v-if="_modelValue === data.id"> <el-icon class="checked-item" v-if="_modelValue === data.id">
<Icon name="icon_done_outlined" /> <Icon name="icon_done_outlined" />

@ -114,6 +114,9 @@ const dfsForDsId = (arr, datasourceId) => {
if (ele.children?.length) { if (ele.children?.length) {
return dfsForDsId(ele.children, datasourceId) return dfsForDsId(ele.children, datasourceId)
} }
if (!ele.datasourceId) {
return true
}
return ele.datasourceId === datasourceId return ele.datasourceId === datasourceId
}) })
} }