From 64ea12f55d69d413c9c48f8fec6b1067d98cb213 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 11 Aug 2022 15:54:06 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E9=80=8F=E8=A7=86=E8=A1=A8=E8=B7=B3=E8=BD=AC=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=8F=AA=E4=BF=9D=E7=95=99=E6=8C=87=E6=A0=87=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/canvas/components/Editor/SettingMenu.vue | 6 ++---- frontend/src/views/panel/LinkJumpSet/index.vue | 8 ++++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/frontend/src/components/canvas/components/Editor/SettingMenu.vue b/frontend/src/components/canvas/components/Editor/SettingMenu.vue index 899ee824f0..03f610bc6f 100644 --- a/frontend/src/components/canvas/components/Editor/SettingMenu.vue +++ b/frontend/src/components/canvas/components/Editor/SettingMenu.vue @@ -62,8 +62,7 @@ export default { 'gauge', 'text', 'label', - 'word-cloud', - 'table-pivot' + 'word-cloud' ], linkageExcludeViewType: [ 'richTextView', @@ -71,8 +70,7 @@ export default { 'gauge', 'text', 'label', - 'word-cloud', - 'table-pivot' + 'word-cloud' ], copyData: null, hyperlinksSetVisible: false, diff --git a/frontend/src/views/panel/LinkJumpSet/index.vue b/frontend/src/views/panel/LinkJumpSet/index.vue index f071a948b1..293c79c5a8 100644 --- a/frontend/src/views/panel/LinkJumpSet/index.vue +++ b/frontend/src/views/panel/LinkJumpSet/index.vue @@ -359,8 +359,12 @@ export default { init() { const chartDetails = JSON.parse(this.panelViewDetailsInfo[this.viewId]) const checkAllAxisStr = chartDetails.xaxis + chartDetails.xaxisExt + chartDetails.yaxis + chartDetails.yaxisExt + chartDetails.drillFields - const checkJumpStr = chartDetails.type.includes('table') ? checkAllAxisStr : chartDetails.xaxis + chartDetails.xaxisExt + chartDetails.drillFields - + let checkJumpStr + if (chartDetails.type === 'table-pivot') { + checkJumpStr = chartDetails.yaxis + chartDetails.yaxisExt + } else { + checkJumpStr = checkAllAxisStr + } // 获取可关联的仪表板 groupTree({}).then(rsp => { this.panelList = rsp.data