From ef1affe9f136e42ee15ea3349c2a7a2677ae78c2 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 29 Mar 2022 11:32:59 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E5=85=AC?=
 =?UTF-8?q?=E5=85=B1=E9=93=BE=E6=8E=A5=E7=AC=AC=E4=B8=89=E6=96=B9=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/auth/service/impl/ShiroServiceImpl.java     | 4 ++++
 .../dataease/base/mapper/ext/ExtPanelOuterParamsMapper.xml  | 2 +-
 frontend/public/link.html                                   | 4 +++-
 frontend/src/views/link/view/index.vue                      | 2 +-
 frontend/src/views/panel/OuterParamsSet/index.vue           | 6 +++---
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java b/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java
index 26c74635c7..d6eb70a6f9 100644
--- a/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java
+++ b/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java
@@ -55,6 +55,10 @@ public class ShiroServiceImpl implements ShiroService {
         filterChainDefinitionMap.put("/linkJump/queryPanelJumpInfo/**", ANON);
         filterChainDefinitionMap.put("/linkJump/queryTargetPanelJumpInfo", ANON);
 
+        //外部跳转参数
+        filterChainDefinitionMap.put("/outerParams/**", ANON);
+
+
         filterChainDefinitionMap.put("/tempMobileLink/**", ANON);
         filterChainDefinitionMap.put("/de-app/**", ANON);
         filterChainDefinitionMap.put("/app.html", ANON);
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 ced559f72c..1287a93c02 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
@@ -92,7 +92,7 @@
             LEFT JOIN panel_outer_params_info popi ON pop.params_id = popi.params_id
             LEFT JOIN panel_outer_params_target_view_info poptvi ON popi.params_info_id = poptvi.params_info_id
         WHERE
-            pop.panel_id = #{panelId}
+            pop.panel_id = #{panelId} and pop.checked=1
     </select>
 
 
diff --git a/frontend/public/link.html b/frontend/public/link.html
index 895e75ec1e..c25c7c22fd 100644
--- a/frontend/public/link.html
+++ b/frontend/public/link.html
@@ -41,7 +41,9 @@
     url += '&user=' + encodeURIComponent(user)
   }
   if (attachParams) {
-    url += '&attachParams=' + attachParams
+    console.log('attachParams-bf:'+attachParams+';-af:'+encodeURIComponent(attachParams))
+    url += '&attachParams=' + encodeURIComponent(attachParams)
+
   }
   window.location.href = url
 </script>
diff --git a/frontend/src/views/link/view/index.vue b/frontend/src/views/link/view/index.vue
index edf37188a0..9a5f2a7862 100644
--- a/frontend/src/views/link/view/index.vue
+++ b/frontend/src/views/link/view/index.vue
@@ -69,7 +69,7 @@ export default {
         if (attachParamsEncode) {
           try {
             const Base64 = require('js-base64').Base64
-            const attachParam = JSON.parse(Base64.decode(attachParamsEncode))
+            const attachParam = JSON.parse(decodeURIComponent(Base64.decode(attachParamsEncode)))
             getOuterParamsInfo(this.resourceId).then(rsp => {
               if (--loadingCount === 0) {
                 this.show = true
diff --git a/frontend/src/views/panel/OuterParamsSet/index.vue b/frontend/src/views/panel/OuterParamsSet/index.vue
index 531fa3e1ea..7212e40826 100644
--- a/frontend/src/views/panel/OuterParamsSet/index.vue
+++ b/frontend/src/views/panel/OuterParamsSet/index.vue
@@ -259,7 +259,7 @@ export default {
       this.$emit('outerParamsSetVisibleChange', false)
     },
     save() {
-      if (checkRepeat(this.outerParams.outerParamsInfoArray, 'name')) {
+      if (checkRepeat(this.outerParams.outerParamsInfoArray, 'paramName')) {
         this.$message({
           message: this.$t('panel.repeat_params'),
           type: 'warn',
@@ -389,7 +389,7 @@ export default {
   }
 
   .bottom {
-    margin-top: 20px;
+    margin-top: 15px;
     text-align: center;
   }
 
@@ -482,7 +482,7 @@ export default {
   }
 
   .tree-bottom {
-    margin-top: 12px;
+    margin-top: 7px;
     text-align: center;
   }