Merge pull request #9895 from dataease/pr@dev@fix_auth

Pr@dev@fix auth

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

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>

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') {