From 0b786a07212cb3f6a086320781f3f508247f3472 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 29 Mar 2022 12:26:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=AC=AC=E4=B8=89?=
 =?UTF-8?q?=E6=96=B9=E5=8F=82=E6=95=B0=E6=9C=AA=E5=90=AF=E7=94=A8=E4=BE=9D?=
 =?UTF-8?q?=E7=84=B6=E6=9C=89=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/base/mapper/ext/ExtPanelOuterParamsMapper.xml    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelOuterParamsMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelOuterParamsMapper.xml
index 1287a93c02..0f1dc2627c 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelOuterParamsMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelOuterParamsMapper.xml
@@ -93,6 +93,7 @@
             LEFT JOIN panel_outer_params_target_view_info poptvi ON popi.params_info_id = poptvi.params_info_id
         WHERE
             pop.panel_id = #{panelId} and pop.checked=1
+            and popi.checked=1
     </select>
 
 

From 68ac2a0d1ef25c96c748c03ebe26a4236b6592a8 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 29 Mar 2022 12:38:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=E7=AC=AC=E4=B8=89=E6=96=B9?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=A7=A3=E6=9E=90=E5=A4=B1=E8=B4=A5=E6=97=B6?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/lang/en.js                | 1 +
 frontend/src/lang/tw.js                | 1 +
 frontend/src/lang/zh.js                | 1 +
 frontend/src/views/link/view/index.vue | 6 ++++++
 4 files changed, 9 insertions(+)

diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index d0ffa43cec..eb37e57c89 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -1390,6 +1390,7 @@ export default {
     sure_bt: 'Confirm'
   },
   panel: {
+    json_params_error: 'Third Party Parameters Parsing Failed. Please Check Whether The Parameters Format Is Correct',
     inner_padding: 'Inner Padding',
     board_radio: 'Board Radio',
     background: 'Background',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index abf0e72f3c..6b25732cb4 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -1391,6 +1391,7 @@ export default {
     sure_bt: '確定'
   },
   panel: {
+    json_params_error: '第三方参数解析失败，请检查参数格式是否正确',
     inner_padding: '内边距',
     board_radio: '边框半径',
     background: '背景',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index f21957f42d..d9608d703b 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -1399,6 +1399,7 @@ export default {
     sure_bt: '确定'
   },
   panel: {
+    json_params_error: '第三方参数解析失败，请检查参数格式是否正确',
     inner_padding: '内边距',
     board_radio: '边框半径',
     background: '背景',
diff --git a/frontend/src/views/link/view/index.vue b/frontend/src/views/link/view/index.vue
index 9a5f2a7862..a0ea7a06d1 100644
--- a/frontend/src/views/link/view/index.vue
+++ b/frontend/src/views/link/view/index.vue
@@ -81,6 +81,12 @@ export default {
             if (--loadingCount === 0) {
               this.show = true
             }
+
+            this.$message({
+              message: this.$t('panel.json_params_error'),
+              type: 'error',
+              showClose: true
+            })
             console.log('outerParams Decode error：', e)
           }
         }