github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-24 11:32:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

refactor(图表): 优化跳转联动样式 #14186

Browse Source
This commit is contained in:
wangjiahao 2024-12-24 13:16:03 +08:00 committed by 王嘉豪
parent f1f5d68733
commit 0381ff0e11
2 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
core/core-frontend/src/components/visualization/LinkJumpSet.vue
View File

@ -225,7 +225,13 @@
</el-col>
<el-col :span="8"></el-col>
</el-row>
<div class="main-scrollbar-container">
<div
class="main-scrollbar-container"
:class="{
'main-scrollbar-container-min':
state.linkJumpInfo?.jumpType === 'newPop'
}"
>
<el-scrollbar height="fit-content" max-height="178px">
<div
style="display: flex; margin-bottom: 6px"
@ -358,7 +364,7 @@
text
@click="addLinkJumpField('view')"
>
{{ t('visualization.add_jump_field') }}
{{ t('visualization.add_jump_field') }} 1
</el-button>
</div>
</template>
@ -384,7 +390,13 @@
{{ t('visualization.link_outer_params') }}
</el-col>
</el-row>
<div class="main-scrollbar-container">
<div
class="main-scrollbar-container"
:class="{
'main-scrollbar-container-min':
state.linkJumpInfo?.jumpType === 'newPop'
}"
>
<el-scrollbar height="fit-content" max-height="178px">
<div
style="display: flex; margin-bottom: 6px"
@ -1377,6 +1389,13 @@ span {
}
}
.main-scrollbar-container-min {
:deep(.ed-scrollbar) {
height: fit-content;
max-height: 138px !important;
}
}
.top-area-value {
font-weight: 400;
font-size: 14px;

21
core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue
View File

@ -51,10 +51,6 @@ const props = defineProps({
type: Object,
required: false
},
eventInfo: {
type: Object,
required: false
},
chart: {
type: Object as PropType<ChartObj>,
required: true
@ -139,14 +135,6 @@ const positionComponentShow = computed(() => {
return !batchOptStatus.value && dvInfo.value.type !== 'dashboard'
})
const eventsShow = computed(() => {
return (
!batchOptStatus.value &&
['indicator', 'rich-text'].includes(chart.value.type) &&
props.eventInfo
)
})
const showProperties = (property: EditorProperty) => properties.value?.includes(property)
const onMiscChange = (val, prop) => {
@ -379,15 +367,6 @@ watch(
@onMiscChange="onMiscChange"
/>
</el-collapse-item>
<el-collapse-item
:effect="themes"
name="events"
:title="t('visualization.event')"
v-if="eventsShow"
>
<common-event :themes="themes" :events-info="eventInfo"></common-event>
</el-collapse-item>
<el-collapse-item
:effect="themes"
v-if="showProperties('indicator-value-selector')"