From 2ea9678dd8978cf1a1d684fe8047a75ea5d7db6d Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 14 Dec 2021 15:22:03 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF=E5=A4=84?= =?UTF-8?q?=E4=BA=8E=E5=85=AC=E5=85=B1=E9=93=BE=E6=8E=A5=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=EF=BC=8C=E8=B7=B3=E8=BD=AC=E7=9A=84=E7=9B=AE=E6=A0=87=E4=BB=AA?= =?UTF-8?q?=E8=A1=A8=E6=9D=BF=E4=B9=9F=E4=BB=A5=E5=85=AC=E5=85=B1=E9=93=BE?= =?UTF-8?q?=E6=8E=A5=E8=B7=B3=E8=BD=AC=EF=BC=8C=E5=90=8C=E6=97=B6=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E4=BC=A0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/canvas/custom-component/UserView.vue | 2 +- frontend/src/lang/en.js | 3 ++- frontend/src/lang/tw.js | 3 ++- frontend/src/lang/zh.js | 3 ++- frontend/src/views/link/view/index.vue | 6 +++++- frontend/src/views/panel/LinkJumpSet/index.vue | 4 ++-- 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue index a4775a72e3..cc8c702f86 100644 --- a/frontend/src/components/canvas/custom-component/UserView.vue +++ b/frontend/src/components/canvas/custom-component/UserView.vue @@ -409,7 +409,7 @@ export default { } else { this.$message({ type: 'warn', - message: '当前是公共链接模式，目标仪表板未设置公共链接，无法跳转', + message: this.$t('panel.public_link_tips'), showClose: true }) } diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index cebf8c5376..83b6f52052 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1460,7 +1460,8 @@ export default { panel_view_result_tips: 'Chose "Panel" Will Overwrite View`s Result,Range 1~10000', timeout_refresh: 'Timeout，Will Refresh...', mobile_layout: 'Mobile Layout', - component_hidden: 'Component Hidden' + component_hidden: 'Component Hidden', + public_link_tips: 'New Is Public Link,The Target Panel Have Not Set Public Link,Can Not Jump' }, plugin: { local_install: 'Local installation', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 3f8d8291f2..067bec6119 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1462,7 +1462,8 @@ export default { panel_view_result_tips: '選擇儀表板會覆蓋視圖的結果展示數量，取值範圍1~10000', timeout_refresh: '请求超时，稍后刷新...', mobile_layout: '移动端布局', - component_hidden: '隐藏的组件' + component_hidden: '隐藏的组件', + public_link_tips: '当前是公共链接模式，目标仪表板未设置公共链接，无法跳转' }, plugin: { local_install: '本地安裝', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 7ee3a045bb..8f7bb6ffd0 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1471,7 +1471,8 @@ export default { panel_view_result_tips: '选择仪表板会覆盖视图的结果展示数量，取值范围1~10000', timeout_refresh: '请求超时，稍后刷新...', mobile_layout: '移动端布局', - component_hidden: '隐藏的组件' + component_hidden: '隐藏的组件', + public_link_tips: '当前是公共链接模式，目标仪表板未设置公共链接，无法跳转' }, plugin: { local_install: '本地安装', diff --git a/frontend/src/views/link/view/index.vue b/frontend/src/views/link/view/index.vue index 3a9c2b95f0..3bb41636bc 100644 --- a/frontend/src/views/link/view/index.vue +++ b/frontend/src/views/link/view/index.vue @@ -32,6 +32,10 @@ export default { methods: { setPanelInfo() { loadResource(this.resourceId).then(res => { + this.$store.dispatch('panel/setPanelInfo', { + id: res.data.id, + name: res.data.name + }) // 刷新联动信息 getPanelAllLinkageInfo(this.resourceId).then(rsp => { this.$store.commit('setNowPanelTrackInfo', rsp.data) @@ -52,7 +56,7 @@ export default { sourcePanelId: jumpParam.sourcePanelId, sourceViewId: jumpParam.sourceViewId, sourceFieldId: jumpParam.sourceFieldId, - targetPanelId: this.panelId + targetPanelId: this.resourceId } this.show = false // 刷新跳转目标仪表板联动信息 diff --git a/frontend/src/views/panel/LinkJumpSet/index.vue b/frontend/src/views/panel/LinkJumpSet/index.vue index ff12c25556..dbdb016174 100644 --- a/frontend/src/views/panel/LinkJumpSet/index.vue +++ b/frontend/src/views/panel/LinkJumpSet/index.vue @@ -82,7 +82,7 @@
- +
- +