From 0cea8a41ae5b00834d0c408322059eb1515bb68e Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 30 Dec 2022 13:48:18 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=AA=E8=A1=A8=E6=9D=BF=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E5=A4=96=E9=83=A8=E9=93=BE=E6=8E=A5URL=E9=9D=9E=E6=B3=95?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/customComponent/UserView.vue         | 17 ++++++++++++++---
 frontend/src/lang/en.js                         |  1 +
 frontend/src/lang/tw.js                         |  1 +
 frontend/src/lang/zh.js                         |  1 +
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/canvas/customComponent/UserView.vue b/frontend/src/components/canvas/customComponent/UserView.vue
index 2e8af43ea0..0c4ffe0fed 100644
--- a/frontend/src/components/canvas/customComponent/UserView.vue
+++ b/frontend/src/components/canvas/customComponent/UserView.vue
@@ -966,7 +966,7 @@ export default {
               // 判断是否有公共链接ID
               if (jumpInfo.publicJumpId) {
                 const url = '/link/' + jumpInfo.publicJumpId
-                window.open(url, jumpInfo.jumpType)
+                this.windowsJump(url, jumpInfo.jumpType)
               } else {
                 this.$message({
                   type: 'warn',
@@ -976,7 +976,7 @@ export default {
               }
             } else {
               const url = '#/preview/' + jumpInfo.targetPanelId
-              window.open(url, jumpInfo.jumpType)
+              this.windowsJump(url, jumpInfo.jumpType)
             }
           } else {
             this.$message({
@@ -989,7 +989,7 @@ export default {
           const colList = [...param.dimensionList, ...param.quotaList]
           let url = this.setIdValueTrans('id', 'value', jumpInfo.content, colList)
           url = checkAddHttp(url)
-          window.open(url, jumpInfo.jumpType)
+          this.windowsJump(url, jumpInfo.jumpType)
         }
       } else {
         if (this.chart.type.indexOf('table') === -1) {
@@ -1019,6 +1019,17 @@ export default {
       }
       return name2Id
     },
+    windowsJump(url, jumpType) {
+      try {
+        window.open(url, jumpType)
+      } catch (e) {
+        this.$message({
+          message: this.$t('panel.url_check_error') + ':' + url,
+          type: 'error',
+          showClose: true
+        })
+      }
+    },
 
     resetDrill() {
       const length = this.drillClickDimensionList.length
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index e546369cd5..58a68082c6 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -1954,6 +1954,7 @@ export default {
     back_parent: 'Back to previous'
   },
   panel: {
+    url_check_error: 'Jump error, Illegal URL',
     view_style: 'View Style',
     view_color_setting: 'View Color Setting',
     border_color_setting: 'Border Color',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 2c12bd832c..878ed570e4 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -1948,6 +1948,7 @@ export default {
     back_parent: '返回上一級'
   },
   panel: {
+    url_check_error: '跳轉錯誤，URL不合法',
     view_style: '視圖樣式',
     view_color_setting: '視圖配色',
     border_color_setting: '邊框配色',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 5264fcc78c..7f684f59a3 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -1948,6 +1948,7 @@ export default {
     back_parent: '返回上一级'
   },
   panel: {
+    url_check_error: '跳转错误，URL不合法',
     view_style: '视图样式',
     view_color_setting: '视图配色',
     border_color_setting: '边框配色',