From fdd295769f49085df7551beff6d1703421b6da03 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 27 May 2024 15:25:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=A8=E5=B1=8F=E9=A2=84=E8=A7=88=E4=B8=8B?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6=E4=BD=8D=E4=BA=8E=E4=BB=AA?=
 =?UTF-8?q?=E8=A1=A8=E6=9D=BF=E4=B8=8B=E6=96=B9=E7=9A=84=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E6=97=A0=E6=B3=95=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20#9833?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/frontend/src/components/dataease/DeOutWidget.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/frontend/src/components/dataease/DeOutWidget.vue b/core/frontend/src/components/dataease/DeOutWidget.vue
index e2ae137c92..68b6175c41 100644
--- a/core/frontend/src/components/dataease/DeOutWidget.vue
+++ b/core/frontend/src/components/dataease/DeOutWidget.vue
@@ -62,7 +62,6 @@
                 :is-relation="isRelation"
                 :element="element"
                 :in-draw="inDraw"
-                :in-screen="inScreen"
                 @filter-loaded="filterLoaded"
               />
             </div>

From a9b79e05ffd67334ba95885cd7fd4b176bb8c21e Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 28 May 2024 09:53:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=AA=E6=8E=88=E6=9D=83=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E6=9D=BF=E7=AE=A1=E7=90=86=E6=9D=83=E9=99=90=E6=97=B6=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E5=9C=A8=E6=A0=B9=E7=9B=AE=E5=BD=95=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/service/panel/PanelGroupService.java   |  2 +-
 core/frontend/src/views/panel/list/PanelList.vue       | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/core/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/core/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
index fd8c8f1e74..14e849d996 100644
--- a/core/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
+++ b/core/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
@@ -159,7 +159,7 @@ public class PanelGroupService {
         panelGroupRequest.setUserId(userId);
         panelGroupRequest.setIsAdmin(AuthUtils.getUser().getIsAdmin());
         List<PanelGroupDTO> panelGroupDTOList = extPanelGroupMapper.panelGroupList(panelGroupRequest);
-        return TreeUtils.mergeTree(panelGroupDTOList, "panel_list");
+        return TreeUtils.mergeTree(panelGroupDTOList, "0");
     }
 
     public List<PanelGroupDTO> defaultTree(PanelGroupRequest panelGroupRequest) {
diff --git a/core/frontend/src/views/panel/list/PanelList.vue b/core/frontend/src/views/panel/list/PanelList.vue
index ba07286efe..9ba4421a26 100644
--- a/core/frontend/src/views/panel/list/PanelList.vue
+++ b/core/frontend/src/views/panel/list/PanelList.vue
@@ -201,7 +201,8 @@
         <span class="header-title">
           {{ $t('panel.panel_list') }}
           <el-button
-            style="float: right; padding-right: 7px; margin-top: -8px"
+            v-if="hasDataPermission('manage', rootAuth)"
+            style="float: right; padding-right: 7px; margin-top: -8px; height: 12px"
             icon="el-icon-plus"
             type="text"
             @click="showEditPanel(newFolder)"
@@ -534,6 +535,7 @@ export default {
   mixins: [msgCfm],
   data() {
     return {
+      rootAuth: '',
       originResourceTree: [],
       curSortType: 'time_desc',
       localSortParams: null,
@@ -993,9 +995,11 @@ export default {
         this.sortTypeChange(this.localSortParams)
       }
       groupTree(this.groupForm, !userCache).then((res) => {
-        localStorage.setItem('panel-main-tree', JSON.stringify(res.data || []))
+        this.rootAuth = res.data ? res.data[0]?.privileges||'':''
+        const resMainData = res.data ? res.data[0]?.children || [] : []
+        localStorage.setItem('panel-main-tree', JSON.stringify(resMainData))
         if (!userCache) {
-          this.originResourceTree = res.data || []
+          this.originResourceTree = resMainData
           this.sortTypeChange(this.localSortParams)
         }
         if (this.responseSource === 'appApply') {