From 4af3d69cfc6903eaecef4377356f3d09334afd2e Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 2 Aug 2021 15:24:09 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E5=85=AC=E5=85=B1=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=E5=88=86=E4=BA=AB=E6=9C=AA=E5=90=AF=E7=94=A8=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E4=BF=9D=E6=8A=A4=E5=87=BA=E7=8E=B0=E7=A9=BA=E7=99=BD=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/dataease/auth/filter/F2CLinkFilter.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/auth/filter/F2CLinkFilter.java b/backend/src/main/java/io/dataease/auth/filter/F2CLinkFilter.java
index 8cca8edbf7..94a43bce52 100644
--- a/backend/src/main/java/io/dataease/auth/filter/F2CLinkFilter.java
+++ b/backend/src/main/java/io/dataease/auth/filter/F2CLinkFilter.java
@@ -34,10 +34,14 @@ public class F2CLinkFilter extends AnonymousFilter {
             String id = resourceId.asString();
             PanelLink panelLink = LinkUtil.queryLink(id);
             if (ObjectUtil.isEmpty(panelLink)) return false;
+            String pwd;
             if (!panelLink.getEnablePwd()) {
                 panelLink.setPwd("dataease");
+                pwd = panelLink.getPwd();
+            }else {
+                pwd = RsaUtil.decryptByPrivateKey(RsaProperties.privateKey, panelLink.getPwd());
             }
-            return JWTUtils.verifyLink(link_token, id, RsaUtil.decryptByPrivateKey(RsaProperties.privateKey, panelLink.getPwd()));
+            return JWTUtils.verifyLink(link_token, id, pwd);
         }catch (Exception e) {
             LogUtil.error(e);
         }

From 7c4a1c596186e81f03edc09452a9b210d413d15e Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 2 Aug 2021 15:37:47 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E5=8E=BB=E9=99=A4=E5=B7=B2=E8=AF=BB?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/msg/readed.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/frontend/src/views/msg/readed.vue b/frontend/src/views/msg/readed.vue
index f573391921..b3b9e40c00 100644
--- a/frontend/src/views/msg/readed.vue
+++ b/frontend/src/views/msg/readed.vue
@@ -8,7 +8,9 @@
     <complex-table
       :data="data"
       :columns="columns"
+      :hide-columns="true"
       :pagination-config="paginationConfig"
+      :search-config="searchConfig"
       @select="select"
       @search="search"
       @selection-change="handleSelectionChange"
@@ -93,7 +95,11 @@ export default {
         pageSize: 10,
         total: 0
       },
-      multipleSelection: []
+      multipleSelection: [],
+      searchConfig: {
+        useQuickSearch: false,
+        useComplexSearch: false
+      }
     }
   },
   computed: {

From 8f68ad73363bf3c6bfb1f079a9be3ff18e48b83e Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Mon, 2 Aug 2021 15:58:03 +0800
Subject: [PATCH 3/4] =?UTF-8?q?refactor:=20=E8=A7=86=E5=9B=BE=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E5=8F=B0=E6=8A=A5=E9=94=99=EF=BC=9Btree=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=90=8E=E5=8F=B3=E4=BE=A7=E7=95=8C=E9=9D=A2=E4=BF=9D?=
 =?UTF-8?q?=E6=8C=81=E5=8E=9F=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/group/Group.vue    |  3 +--
 frontend/src/views/chart/view/ChartEdit.vue | 26 ++++++++++-----------
 frontend/src/views/dataset/group/Group.vue  |  1 -
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue
index 0667f01606..d426e0b8e6 100644
--- a/frontend/src/views/chart/group/Group.vue
+++ b/frontend/src/views/chart/group/Group.vue
@@ -315,7 +315,6 @@
 
 <script>
 import { post, chartGroupTree } from '@/api/chart/chart'
-import { authModel } from '@/api/system/sysAuth'
 import TableSelector from '../view/TableSelector'
 import GroupMoveSelector from '../components/TreeSelector/GroupMoveSelector'
 import ChartMoveSelector from '../components/TreeSelector/ChartMoveSelector'
@@ -611,7 +610,7 @@ export default {
           // this.chartTree()
           this.refreshNodeBy(data.sceneId)
           // this.$router.push('/chart/home')
-          this.$emit('switchComponent', { name: '' })
+          // this.$emit('switchComponent', { name: '' })
           this.$store.dispatch('chart/setTable', null)
         })
       }).catch(() => {
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 73b02504d0..4412f6d7ba 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -212,13 +212,13 @@
               </div>
               <div style="overflow:auto;border-top: 1px solid #e6e6e6" class="attr-style">
                 <el-row style="height: 100%;">
-                  <el-row v-if="chart.type !=='text' && chart.type !== 'gauge'" class="padding-lr">
+                  <el-row v-if="chart.type && chart.type !=='text' && chart.type !== 'gauge'" class="padding-lr">
                     <span style="width: 80px;text-align: right;">
-                      <span v-if="chart.type.includes('table')">{{ $t('chart.drag_block_table_data_column') }}</span>
-                      <span v-else-if="chart.type.includes('bar') || chart.type.includes('line')">{{ $t('chart.drag_block_type_axis') }}</span>
-                      <span v-else-if="chart.type.includes('pie')">{{ $t('chart.drag_block_pie_label') }}</span>
-                      <span v-else-if="chart.type.includes('funnel')">{{ $t('chart.drag_block_funnel_split') }}</span>
-                      <span v-else-if="chart.type.includes('radar')">{{ $t('chart.drag_block_radar_label') }}</span>
+                      <span v-if="chart.type && chart.type.includes('table')">{{ $t('chart.drag_block_table_data_column') }}</span>
+                      <span v-else-if="chart.type && (chart.type.includes('bar') || chart.type.includes('line'))">{{ $t('chart.drag_block_type_axis') }}</span>
+                      <span v-else-if="chart.type && chart.type.includes('pie')">{{ $t('chart.drag_block_pie_label') }}</span>
+                      <span v-else-if="chart.type && chart.type.includes('funnel')">{{ $t('chart.drag_block_funnel_split') }}</span>
+                      <span v-else-if="chart.type && chart.type.includes('radar')">{{ $t('chart.drag_block_radar_label') }}</span>
                       /
                       <span>{{ $t('chart.dimension') }}</span>
                     </span>
@@ -238,13 +238,13 @@
                   </el-row>
                   <el-row class="padding-lr" style="margin-top: 6px;">
                     <span style="width: 80px;text-align: right;">
-                      <span v-if="chart.type.includes('table')">{{ $t('chart.drag_block_table_data_column') }}</span>
-                      <span v-else-if="chart.type.includes('bar') || chart.type.includes('line')">{{ $t('chart.drag_block_value_axis') }}</span>
-                      <span v-else-if="chart.type.includes('pie')">{{ $t('chart.drag_block_pie_angel') }}</span>
-                      <span v-else-if="chart.type.includes('funnel')">{{ $t('chart.drag_block_funnel_width') }}</span>
-                      <span v-else-if="chart.type.includes('radar')">{{ $t('chart.drag_block_radar_length') }}</span>
-                      <span v-else-if="chart.type.includes('gauge')">{{ $t('chart.drag_block_gauge_angel') }}</span>
-                      <span v-else-if="chart.type.includes('text')">{{ $t('chart.drag_block_label_value') }}</span>
+                      <span v-if="chart.type && chart.type.includes('table')">{{ $t('chart.drag_block_table_data_column') }}</span>
+                      <span v-else-if="chart.type && (chart.type.includes('bar') || chart.type.includes('line'))">{{ $t('chart.drag_block_value_axis') }}</span>
+                      <span v-else-if="chart.type && chart.type.includes('pie')">{{ $t('chart.drag_block_pie_angel') }}</span>
+                      <span v-else-if="chart.type && chart.type.includes('funnel')">{{ $t('chart.drag_block_funnel_width') }}</span>
+                      <span v-else-if="chart.type && chart.type.includes('radar')">{{ $t('chart.drag_block_radar_length') }}</span>
+                      <span v-else-if="chart.type && chart.type.includes('gauge')">{{ $t('chart.drag_block_gauge_angel') }}</span>
+                      <span v-else-if="chart.type && chart.type.includes('text')">{{ $t('chart.drag_block_label_value') }}</span>
                       /
                       <span>{{ $t('chart.quota') }}</span>
                     </span>
diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue
index 93d8476d6f..3f5b8c37af 100644
--- a/frontend/src/views/dataset/group/Group.vue
+++ b/frontend/src/views/dataset/group/Group.vue
@@ -342,7 +342,6 @@
 
 <script>
 import { loadTable, getScene, addGroup, delGroup, addTable, delTable, post, isKettleRunning } from '@/api/dataset/dataset'
-import { authModel } from '@/api/system/sysAuth'
 import GroupMoveSelector from './GroupMoveSelector'
 import DsMoveSelector from './DsMoveSelector'
 

From b9f3d0c41c5e520e9398e4f1d295de21ebac622b Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Mon, 2 Aug 2021 16:26:19 +0800
Subject: [PATCH 4/4] =?UTF-8?q?refactor:=20tree=E7=BC=96=E8=BE=91=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E7=95=8C=E9=9D=A2=E4=BF=9D=E6=8C=81=E5=8E=9F?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/group/Group.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue
index d426e0b8e6..cb401db247 100644
--- a/frontend/src/views/chart/group/Group.vue
+++ b/frontend/src/views/chart/group/Group.vue
@@ -562,7 +562,7 @@ export default {
             // this.chartTree()
             this.refreshNodeBy(view.sceneId)
             // this.$router.push('/chart/home')
-            this.$emit('switchComponent', { name: '' })
+            // this.$emit('switchComponent', { name: '' })
             this.$store.dispatch('chart/setTable', null)
           })
         } else {
@@ -610,7 +610,7 @@ export default {
           // this.chartTree()
           this.refreshNodeBy(data.sceneId)
           // this.$router.push('/chart/home')
-          // this.$emit('switchComponent', { name: '' })
+          this.$emit('switchComponent', { name: '' })
           this.$store.dispatch('chart/setTable', null)
         })
       }).catch(() => {