From c646fbda44a7248449efcf5244aee991de91f5ca Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 11 Sep 2024 09:26:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF?= =?UTF-8?q?=E3=80=81=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=B7=B3=E8=BD=AC=E9=9D=9E=E6=B3=95url=E5=91=8A?= =?UTF-8?q?=E8=AD=A6=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/views/chart/components/views/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/core-frontend/src/views/chart/components/views/index.vue b/core/core-frontend/src/views/chart/components/views/index.vue index 4ff271bf23..872b39a056 100644 --- a/core/core-frontend/src/views/chart/components/views/index.vue +++ b/core/core-frontend/src/views/chart/components/views/index.vue @@ -378,7 +378,7 @@ const windowsJump = (url, jumpType) => { const newWindow = window.open(url, jumpType) initOpenHandler(newWindow) } catch (e) { - ElMessage.error(t('visualization.url_check_error') + ':' + url) + console.warn(t('visualization.url_check_error') + ':' + url) } } From 3e6c65d30a2bb7d9819506172d46532549961783 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 11 Sep 2024 10:19:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(=E4=BB=AA=E8=A1=A8=E6=9D=BF=E3=80=81?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=BC=B9=E7=AA=97=E6=89=93=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/visualization/LinkJumpSet.vue | 2 ++ core/core-frontend/src/locales/zh-CN.ts | 1 + .../src/views/chart/components/views/index.vue | 11 ++++++++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/core/core-frontend/src/components/visualization/LinkJumpSet.vue b/core/core-frontend/src/components/visualization/LinkJumpSet.vue index e5a18bf34f..777952fb42 100644 --- a/core/core-frontend/src/components/visualization/LinkJumpSet.vue +++ b/core/core-frontend/src/components/visualization/LinkJumpSet.vue @@ -106,10 +106,12 @@ > {{ t('visualization.now_window') }} {{ t('visualization.new_window') }} + {{ t('visualization.pop_window') }} {{ t('visualization.now_window') }} {{ t('visualization.new_window') }} + {{ t('visualization.pop_window') }} diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index cd3fea3096..d3dad42e75 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -2352,6 +2352,7 @@ export default { open_mode: '打开方式', new_window: '新开页面', now_window: '当前页面', + pop_window: '弹窗页面', hyperLinks: '目标地址', link_open_tips: '仪表板非编辑状态可打开链接', data_loading: '数据准备中...', diff --git a/core/core-frontend/src/views/chart/components/views/index.vue b/core/core-frontend/src/views/chart/components/views/index.vue index 872b39a056..1c9a812ba4 100644 --- a/core/core-frontend/src/views/chart/components/views/index.vue +++ b/core/core-frontend/src/views/chart/components/views/index.vue @@ -375,7 +375,16 @@ const divEmbedded = type => { const windowsJump = (url, jumpType) => { try { - const newWindow = window.open(url, jumpType) + let newWindow + if ('newPop' === jumpType) { + window.open( + url, + '_blank', + 'width=800,height=600,left=200,top=100,toolbar=no,scrollbars=yes,resizable=yes,location=no' + ) + } else { + newWindow = window.open(url, jumpType) + } initOpenHandler(newWindow) } catch (e) { console.warn(t('visualization.url_check_error') + ':' + url)