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 1/7] =?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;
   }
 

From 827d0823aa5d3f1ae52765bca8ddfd73a3c00018 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 29 Mar 2022 11:46:48 +0800
Subject: [PATCH 2/7] =?UTF-8?q?feat:=20=E6=B5=8F=E8=A7=88=E5=99=A8?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E9=A1=B5=E9=9D=A2=E5=88=86=E5=89=B2=E7=BA=BF?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/dataease/DeAsideContainer.vue  | 16 ++++++++++++---
 .../dataease/dragbar/DeLeft2RightDragBar.vue  | 10 ++++++++--
 frontend/src/directive/index.js               |  5 ++++-
 frontend/src/layout/index.vue                 |  2 +-
 frontend/src/utils/LayoutUtil.js              | 17 ++++++++++++++++
 frontend/src/views/dataset/index.vue          |  4 ++--
 frontend/src/views/panel/list/PanelMain.vue   |  2 +-
 .../src/views/system/datasource/DsMain.vue    | 20 ++++++++++++-------
 .../src/views/system/datasource/index.vue     |  4 ++--
 9 files changed, 61 insertions(+), 19 deletions(-)
 create mode 100644 frontend/src/utils/LayoutUtil.js

diff --git a/frontend/src/components/dataease/DeAsideContainer.vue b/frontend/src/components/dataease/DeAsideContainer.vue
index 32a90322fd..7b53d3a455 100644
--- a/frontend/src/components/dataease/DeAsideContainer.vue
+++ b/frontend/src/components/dataease/DeAsideContainer.vue
@@ -1,16 +1,17 @@
 <template>
   <el-aside
-    :width="width"
+    :width="currentWidth"
     class="ms-aside-container"
-    :style="{'margin-left': !asideHidden ? 0 : '-' + width}"
+    :style="{'margin-left': !asideHidden ? 0 : '-' + currentWidth}"
   >
     <slot />
-    <de-horizontal-drag-bar v-if="showDragBar" />
+    <de-horizontal-drag-bar v-if="showDragBar" :type="type" />
   </el-aside>
 </template>
 
 <script>
 import DeHorizontalDragBar from './dragbar/DeLeft2RightDragBar'
+import { getLayout } from '@/utils/LayoutUtil'
 export default {
   name: 'DeAsideContainer',
   components: { DeHorizontalDragBar },
@@ -26,12 +27,21 @@ export default {
     showDragBar: {
       type: Boolean,
       default: true
+    },
+    type: {
+      type: String,
+      default: null
     }
   },
   data() {
     return {
       asideHidden: false
     }
+  },
+  computed: {
+    currentWidth() {
+      return this.type && getLayout(this.type) || this.width
+    }
   }
 }
 </script>
diff --git a/frontend/src/components/dataease/dragbar/DeLeft2RightDragBar.vue b/frontend/src/components/dataease/dragbar/DeLeft2RightDragBar.vue
index 9d26739bae..9a11e677d1 100644
--- a/frontend/src/components/dataease/dragbar/DeLeft2RightDragBar.vue
+++ b/frontend/src/components/dataease/dragbar/DeLeft2RightDragBar.vue
@@ -1,10 +1,16 @@
 <template>
-  <div v-left-to-right-drag class="drag-bar" />
+  <div v-left-to-right-drag="type" class="drag-bar" />
 </template>
 
 <script>
 export default {
-  name: 'DeLeft2RightDragBar'
+  name: 'DeLeft2RightDragBar',
+  props: {
+    type: {
+      type: String,
+      default: null
+    }
+  }
 }
 </script>
 
diff --git a/frontend/src/directive/index.js b/frontend/src/directive/index.js
index f26cb177cf..1273bd4c9e 100644
--- a/frontend/src/directive/index.js
+++ b/frontend/src/directive/index.js
@@ -1,8 +1,9 @@
 import permission from '@/directive/Permission'
-// import dataPermission from '@/directive/DataPermission'
+import { setLayout } from '@/utils/LayoutUtil'
 
 export const left2RightDrag = {
   inserted(el, binding) {
+    const value = binding.value
     el.onmousedown = function(e) {
       const init = e.clientX
       const parent = el.parentNode
@@ -15,6 +16,8 @@ export const left2RightDrag = {
         }
       }
       document.onmouseup = function() {
+        value && setLayout(value, parent.style.width)
+
         document.onmousemove = document.onmouseup = null
       }
     }
diff --git a/frontend/src/layout/index.vue b/frontend/src/layout/index.vue
index 2d609a192b..763b188d4c 100644
--- a/frontend/src/layout/index.vue
+++ b/frontend/src/layout/index.vue
@@ -4,7 +4,7 @@
     <topbar v-if="!fullHeightFlag && finishLoad" :show-tips="showTips" />
 
     <de-container :style="mainStyle">
-      <de-aside-container v-if="!sidebar.hide" class="le-aside-container">
+      <de-aside-container v-if="!sidebar.hide" type="system" class="le-aside-container">
         <sidebar class="sidebar-container" />
       </de-aside-container>
 
diff --git a/frontend/src/utils/LayoutUtil.js b/frontend/src/utils/LayoutUtil.js
new file mode 100644
index 0000000000..5ffce3e9c6
--- /dev/null
+++ b/frontend/src/utils/LayoutUtil.js
@@ -0,0 +1,17 @@
+const defaultLayout = {
+  panel: '260px',
+  dataset: '260px',
+  datasource: '260px',
+  system: '260px'
+}
+const STORAGE_KEY = 'global_layout'
+
+export const getLayout = (type) => {
+  const key = STORAGE_KEY + '_' + type
+  return localStorage.getItem(key) || defaultLayout[type]
+}
+
+export const setLayout = (type, val) => {
+  const key = STORAGE_KEY + '_' + type
+  localStorage.setItem(key, val || defaultLayout[type])
+}
diff --git a/frontend/src/views/dataset/index.vue b/frontend/src/views/dataset/index.vue
index 328d47a505..46eb2fa035 100644
--- a/frontend/src/views/dataset/index.vue
+++ b/frontend/src/views/dataset/index.vue
@@ -1,7 +1,7 @@
 <template>
   <de-container v-loading="$store.getters.loadingMap[$store.getters.currentPath]">
 
-    <de-aside-container>
+    <de-aside-container type="dataset">
       <group :save-status="saveStatus" @switchComponent="switchComponent" />
     </de-aside-container>
 
@@ -30,7 +30,7 @@ import { removeClass } from '@/utils'
 import { checkCustomDs } from '@/api/dataset/dataset'
 export default {
   name: 'DataSet',
-  components: { DeMainContainer, DeContainer, DeAsideContainer, Group, DataHome, ViewTable, AddDB, AddSQL, AddExcel, AddCustom, AddApi},
+  components: { DeMainContainer, DeContainer, DeAsideContainer, Group, DataHome, ViewTable, AddDB, AddSQL, AddExcel, AddCustom, AddApi },
   data() {
     return {
       component: DataHome,
diff --git a/frontend/src/views/panel/list/PanelMain.vue b/frontend/src/views/panel/list/PanelMain.vue
index be1103fc41..4ebd93cf69 100644
--- a/frontend/src/views/panel/list/PanelMain.vue
+++ b/frontend/src/views/panel/list/PanelMain.vue
@@ -1,6 +1,6 @@
 <template>
   <de-container>
-    <de-aside-container>
+    <de-aside-container type="panel">
       <el-tabs v-model="activeName" class="tab-panel" :stretch="true" @tab-click="handleClick">
         <el-tab-pane name="PanelList">
           <span slot="label"><i class="el-icon-document tablepanel-i" />{{ $t('panel.panel_list') }}</span>
diff --git a/frontend/src/views/system/datasource/DsMain.vue b/frontend/src/views/system/datasource/DsMain.vue
index 19eb5076d3..ec203261dc 100644
--- a/frontend/src/views/system/datasource/DsMain.vue
+++ b/frontend/src/views/system/datasource/DsMain.vue
@@ -1,11 +1,17 @@
 <template>
   <de-container v-loading="$store.getters.loadingMap[$store.getters.currentPath]">
-    <de-aside-container style="padding: 0 0;">
-      <ds-tree ref="dsTree" :datasource="datasource" @switch-main="switchMain"/>
+    <de-aside-container style="padding: 0 0;" type="datasource">
+      <ds-tree ref="dsTree" :datasource="datasource" @switch-main="switchMain" />
     </de-aside-container>
     <de-main-container>
-      <component :is="component" v-if="!!component" :params="param" :tData="tData" @refresh-type="refreshType"
-                 @switch-component="switchMain"/>
+      <component
+        :is="component"
+        v-if="!!component"
+        :params="param"
+        :t-data="tData"
+        @refresh-type="refreshType"
+        @switch-component="switchMain"
+      />
     </de-main-container>
   </de-container>
 </template>
@@ -20,7 +26,7 @@ import DataHome from './DataHome'
 
 export default {
   name: 'DsMain',
-  components: {DeMainContainer, DeContainer, DeAsideContainer, DsTree, DataHome},
+  components: { DeMainContainer, DeContainer, DeAsideContainer, DsTree, DataHome },
   data() {
     return {
       component: DataHome,
@@ -37,7 +43,7 @@ export default {
   methods: {
     // 切换main区内容
     switchMain(param) {
-      const {component, componentParam, tData} = param
+      const { component, componentParam, tData } = param
       this.component = DataHome
       this.param = null
       this.$nextTick(() => {
@@ -55,7 +61,7 @@ export default {
       })
     },
     refreshType(datasource) {
-      this.datasource = datasource;
+      this.datasource = datasource
       this.$refs.dsTree && this.$refs.dsTree.refreshType(datasource)
     },
     msg2Current(sourceParam) {
diff --git a/frontend/src/views/system/datasource/index.vue b/frontend/src/views/system/datasource/index.vue
index e53c1b1857..d5b1b6cfbb 100644
--- a/frontend/src/views/system/datasource/index.vue
+++ b/frontend/src/views/system/datasource/index.vue
@@ -1,7 +1,7 @@
 <template>
   <de-container v-loading="$store.getters.loadingMap[$store.getters.currentPath]">
     <de-main-container>
-      <ds-main ref="dsMain"/>
+      <ds-main ref="dsMain" />
     </de-main-container>
   </de-container>
 </template>
@@ -14,7 +14,7 @@ import bus from '@/utils/bus'
 
 export default {
   name: 'Panel',
-  components: {DeMainContainer, DeContainer, DsMain},
+  components: { DeMainContainer, DeContainer, DsMain },
   data() {
     return {
       component: DsMain,

From 2cfaa55440627fd90bd6a2b4154b4e8e91cd9830 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 29 Mar 2022 12:02:21 +0800
Subject: [PATCH 3/7] =?UTF-8?q?fix:=20=E5=85=AC=E5=85=B1=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E6=98=BE=E7=A4=BA=E6=B0=94=E6=B3=A1=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/dataease/service/chart/ChartViewService.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
index 8ba30de0d4..cac787eb48 100644
--- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
+++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
@@ -803,7 +803,7 @@ public class ChartViewService {
         pluginViewParam.setPluginChartFieldCustomFilters(fieldFilters);
         pluginViewParam.setPluginChartExtFilters(panelFilters);
         pluginViewParam.setPluginViewLimit(pluginViewLimit);
-        pluginViewParam.setUserId(AuthUtils.getUser().getUserId());
+        // pluginViewParam.setUserId(AuthUtils.getUser().getUserId());
         return pluginViewParam;
     }
 

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 4/7] =?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 5/7] =?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)
           }
         }

From 81dc5fb7936a493bde81568d5880f8c3695870d6 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 29 Mar 2022 13:24:50 +0800
Subject: [PATCH 6/7] =?UTF-8?q?fix:=20tab=E7=BB=84=E4=BB=B6=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE=E7=BC=96=E8=BE=91=E6=A1=86=E5=BC=B9=E5=87=BA=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/components/Editor/ContextMenu.vue       |  2 +-
 .../canvas/components/Editor/EditBarView.vue       |  7 ++-----
 .../canvas/components/Editor/SettingMenuTest.vue   |  3 ---
 .../canvas/custom-component/UserView.vue           |  2 +-
 frontend/src/views/panel/edit/index.vue            | 14 +-------------
 frontend/src/views/panel/list/PanelList.vue        |  3 ---
 6 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/frontend/src/components/canvas/components/Editor/ContextMenu.vue b/frontend/src/components/canvas/components/Editor/ContextMenu.vue
index 873117ae63..65a0f1372a 100644
--- a/frontend/src/components/canvas/components/Editor/ContextMenu.vue
+++ b/frontend/src/components/canvas/components/Editor/ContextMenu.vue
@@ -50,7 +50,7 @@ export default {
       if (this.curComponent.type === 'view') {
         this.$store.dispatch('chart/setViewId', null)
         this.$store.dispatch('chart/setViewId', this.curComponent.propValue.viewId)
-        bus.$emit('PanelSwitchComponent', { name: 'ChartEdit', param: { 'id': this.curComponent.propValue.viewId, 'optType': 'edit' }})
+        bus.$emit('change_panel_right_draw', true)
       }
       if (this.curComponent.type === 'custom') {
         bus.$emit('component-dialog-edit')
diff --git a/frontend/src/components/canvas/components/Editor/EditBarView.vue b/frontend/src/components/canvas/components/Editor/EditBarView.vue
index 9f03b0daba..469ac4aede 100644
--- a/frontend/src/components/canvas/components/Editor/EditBarView.vue
+++ b/frontend/src/components/canvas/components/Editor/EditBarView.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="bar-main">
-    <div v-if="!linkageSettingStatus">
+    <div>
       <span v-if="isEdit" :title="$t('panel.edit')">
         <i class="icon iconfont icon-edit" @click.stop="edit" />
       </span>
@@ -51,12 +51,9 @@ export default {
   },
   methods: {
     edit() {
-      // 编辑时临时保存 当前修改的画布
-      this.$store.dispatch('panel/setComponentDataTemp', JSON.stringify(this.componentData))
-      this.$store.dispatch('panel/setCanvasStyleDataTemp', JSON.stringify(this.canvasStyleData))
       this.$store.dispatch('chart/setViewId', null)
       this.$store.dispatch('chart/setViewId', this.viewId)
-      bus.$emit('PanelSwitchComponent', { name: 'ChartEdit', param: { 'id': this.viewId, 'optType': 'edit' }})
+      bus.$emit('change_panel_right_draw', true)
     },
     linkageEdit() {
 
diff --git a/frontend/src/components/canvas/components/Editor/SettingMenuTest.vue b/frontend/src/components/canvas/components/Editor/SettingMenuTest.vue
index 53e57d220e..9af209dd06 100644
--- a/frontend/src/components/canvas/components/Editor/SettingMenuTest.vue
+++ b/frontend/src/components/canvas/components/Editor/SettingMenuTest.vue
@@ -46,9 +46,6 @@ export default {
       this.$refs.trackButton.$el.click()
     },
     edit() {
-      // 编辑时临时保存 当前修改的画布
-      this.$store.dispatch('panel/setComponentDataTemp', JSON.stringify(this.componentData))
-      this.$store.dispatch('panel/setCanvasStyleDataTemp', JSON.stringify(this.canvasStyleData))
       if (this.curComponent.type === 'view') {
         this.$store.dispatch('chart/setViewId', null)
         this.$store.dispatch('chart/setViewId', this.curComponent.propValue.viewId)
diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue
index 40bd7e0bfa..cfb9e7c787 100644
--- a/frontend/src/components/canvas/custom-component/UserView.vue
+++ b/frontend/src/components/canvas/custom-component/UserView.vue
@@ -372,7 +372,7 @@ export default {
         this.destroyTimeMachine()
         this.changeIndex++
         this.chartResize(this.changeIndex)
-      } else {
+      } else if (this.$refs[this.element.propValue.id]) {
         this.chart.isPlugin
           ? this.$refs[this.element.propValue.id].callPluginInner({ methodName: 'chartResize' })
           : this.$refs[this.element.propValue.id].chartResize()
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 5ccaf9b911..fe648333aa 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -634,15 +634,7 @@ export default {
     init(panelId) {
       const _this = this
       _this.initHasStar()
-      // 如果临时画布有数据 则使用临时画布数据（视图编辑的时候 会保存临时画布数据）
-      const componentDataTemp = this.$store.state.panel.componentDataTemp
-      const canvasStyleDataTemp = this.$store.state.panel.canvasStyleDataTemp
-      if (componentDataTemp && canvasStyleDataTemp) {
-        panelInit(JSON.parse(componentDataTemp), JSON.parse(canvasStyleDataTemp))
-        // 清空临时画布数据
-        _this.$store.dispatch('panel/setComponentDataTemp', null)
-        _this.$store.dispatch('panel/setCanvasStyleDataTemp', null)
-      } else if (panelId) {
+      if (panelId) {
         initPanelData(panelId, function() {
           // 初始化视图缓存
           initViewCache(panelId)
@@ -650,10 +642,6 @@ export default {
           setTimeout(() => {
             _this.$store.commit('refreshSaveStatus')
           }, 500)
-          // initPanelComponentsData(panelId, function(rsp) {
-          //   _this.$store.commit('initPanelComponents', rsp)// 初始化仪表板组件视图数据
-          //   _this.$store.commit('recordSnapshot', 'init')// 记录快照
-          // })
         })
       }
     },
diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue
index 93ec8eb71b..1a6f159c9f 100644
--- a/frontend/src/views/panel/list/PanelList.vue
+++ b/frontend/src/views/panel/list/PanelList.vue
@@ -690,9 +690,6 @@ export default {
       this.$store.commit('refreshSnapshot')
       this.$store.commit('setComponentData', [])
       this.$store.commit('setCanvasStyle', DEFAULT_COMMON_CANVAS_STYLE_STRING)
-      // 清空临时画布数据
-      this.$store.dispatch('panel/setComponentDataTemp', null)
-      this.$store.dispatch('panel/setCanvasStyleDataTemp', null)
       this.$store.dispatch('panel/setPanelInfo', data)
       bus.$emit('PanelSwitchComponent', { name: 'PanelEdit' })
     },

From 6fa87d825845e2bee6f62746e287d4881e5cc245 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 29 Mar 2022 14:49:36 +0800
Subject: [PATCH 7/7] =?UTF-8?q?fix:=20api=E6=9D=83=E9=99=90=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E9=80=BB=E8=BE=91=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/auth/aop/DePermissionAnnotationHandler.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/main/java/io/dataease/auth/aop/DePermissionAnnotationHandler.java b/backend/src/main/java/io/dataease/auth/aop/DePermissionAnnotationHandler.java
index b051f06ad5..cd676f3de4 100644
--- a/backend/src/main/java/io/dataease/auth/aop/DePermissionAnnotationHandler.java
+++ b/backend/src/main/java/io/dataease/auth/aop/DePermissionAnnotationHandler.java
@@ -41,6 +41,7 @@ public class DePermissionAnnotationHandler {
             DePermission[] dePermissions = annotation.value();
             Object[] args = point.getArgs();
             if (logical == Logical.AND) {
+                access = true;
                 for (int i = 0; i < dePermissions.length; i++) {
                     DePermission permission = dePermissions[i];
                     boolean currentAccess = access(args[permission.paramIndex()], permission, 0);