dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6446 from dataease/pr@dev@feat_sub_dimension_jump

Browse Source 
feat: 子维度跳转#5739
This commit is contained in:
wisonic-s 2023-10-31 12:02:08 +08:00 committed by GitHub
commit 793f989119
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/frontend/src/components/canvas/customComponent/UserView.vue
View File

@ -1007,6 +1007,12 @@ export default {
sourceInfo = param.viewId + '#' + dimension.id sourceInfo = param.viewId + '#' + dimension.id
jumpInfo = this.nowPanelJumpInfo[sourceInfo] jumpInfo = this.nowPanelJumpInfo[sourceInfo]
} }
// 没有主维度，子维度相等
if (!jumpInfo && dimensionItem.value === param.category) {
dimension = dimensionItem
sourceInfo = param.viewId + '#' + dimension.id
jumpInfo = this.nowPanelJumpInfo[sourceInfo]
}
}) })
} else { } else {
for (let i = param.dimensionList.length - 1; i >= 0; i--) { for (let i = param.dimensionList.length - 1; i >= 0; i--) {

11
core/frontend/src/views/chart/components/ChartComponentG2.vue
View File

@ -355,7 +355,8 @@ export default {
} }
this.linkageActiveParam = { this.linkageActiveParam = {
category: this.pointParam.data.category ? this.pointParam.data.category : 'NO_DATA', category: this.pointParam.data.category ? this.pointParam.data.category : 'NO_DATA',
name: this.pointParam.data.name ? this.pointParam.data.name : 'NO_DATA' name: this.pointParam.data.name ? this.pointParam.data.name : 'NO_DATA',
group: this.pointParam.data.group ? this.pointParam.data.group : 'NO_DATA'
} }
if (this.trackMenu.length < 2) { // 只有一个事件直接调用 if (this.trackMenu.length < 2) { // 只有一个事件直接调用
this.trackClick(this.trackMenu[0]) this.trackClick(this.trackMenu[0])
@ -392,14 +393,18 @@ export default {
name: this.pointParam.data.name, name: this.pointParam.data.name,
viewId: this.chart.id, viewId: this.chart.id,
dimensionList: this.pointParam.data.dimensionList, dimensionList: this.pointParam.data.dimensionList,
quotaList: quotaList quotaList: quotaList,
category: this.pointParam.data.category,
group: this.pointParam.data.group
} }
const jumpParam = { const jumpParam = {
option: 'jump', option: 'jump',
name: this.pointParam.data.name, name: this.pointParam.data.name,
viewId: this.chart.id, viewId: this.chart.id,
dimensionList: this.pointParam.data.dimensionList, dimensionList: this.pointParam.data.dimensionList,
quotaList: quotaList quotaList: quotaList,
category: this.pointParam.data.category,
group: this.pointParam.data.group
} }
switch (trackAction) { switch (trackAction) {