Merge pull request #1990 from dataease/pr@dev@fix_panel-style

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>
 
 

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',

frontend/src/lang/tw.js

@@ -1391,6 +1391,7 @@ export default {
     sure_bt: '確定'
   },
   panel: {
+    json_params_error: '第三方参数解析失败，请检查参数格式是否正确',
     inner_padding: '内边距',
     board_radio: '边框半径',
     background: '背景',

frontend/src/lang/zh.js

@@ -1399,6 +1399,7 @@ export default {
     sure_bt: '确定'
   },
   panel: {
+    json_params_error: '第三方参数解析失败，请检查参数格式是否正确',
     inner_padding: '内边距',
     board_radio: '边框半径',
     background: '背景',

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)
           }
         }