Merge pull request #9032 from dataease/pr@dev-v2@feat_linkage2

refactor(仪表板): 优化联动跳转下钻同时配置时弹出界面显示逻辑,当联动配置同时触发下钻时,在弹出界面选择联动依然适用此逻辑 #8701
This commit is contained in:
王嘉豪 2024-04-10 12:45:08 +08:00 committed by GitHub
commit aebaac3baf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 30 additions and 1 deletions

View File

@ -20,6 +20,14 @@ const dvMainStore = dvMainStoreWithOut()
const { nowPanelTrackInfo, nowPanelJumpInfo, mobileInPc } = storeToRefs(dvMainStore)
const props = defineProps({
element: {
type: Object,
default() {
return {
propValue: null
}
}
},
view: {
type: Object,
default() {
@ -192,6 +200,12 @@ const action = param => {
if (trackMenu.value.length < 2) {
//
trackClick(trackMenu.value[0])
} else if (
props.element.actionSelection.linkageActive === 'auto' &&
trackMenu.value.length === 2 &&
!trackMenu.value.includes('jump')
) {
trackClickPre('linkage')
} else {
//
state.trackBarStyle.left = param.x - 50 + 'px'
@ -199,6 +213,20 @@ const action = param => {
viewTrack.value.trackButtonClick()
}
}
const trackClickPre = trackAction => {
if (
props.element.actionSelection.linkageActive === 'auto' &&
trackMenu.value.length === 2 &&
trackAction === 'linkage' &&
!trackMenu.value.includes('jump')
) {
trackMenu.value.forEach(action => {
trackClick(action)
})
} else {
trackClick(trackAction)
}
}
const trackClick = trackAction => {
const param = state.pointParam
@ -312,7 +340,7 @@ onBeforeUnmount(() => {
:track-menu="trackMenu"
class="track-bar"
:style="state.trackBarStyle"
@trackClick="trackClick"
@trackClick="trackClickPre"
/>
<div v-if="!isError" ref="chartContainer" class="canvas-content" :id="containerId"></div>
<chart-error v-else :err-msg="errMsg" />

View File

@ -674,6 +674,7 @@ const iconSize = computed<string>(() => {
:dynamic-area-id="dynamicAreaId"
:view="view"
:show-position="showPosition"
:element="element"
v-else-if="showChartView(ChartLibraryType.G2_PLOT, ChartLibraryType.L7_PLOT)"
ref="chartComponent"
@onChartClick="chartClick"