From f85a4ce32be6d6f5e24f2060c4217255f894972d Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Wed, 8 Feb 2023 15:36:07 +0800
Subject: [PATCH 1/7] =?UTF-8?q?feat:=20=E8=A1=80=E7=BC=98=E5=85=B3?=
 =?UTF-8?q?=E7=B3=BB=E6=B7=BB=E5=8A=A0=E6=BB=9A=E5=8A=A8=20=E9=80=89?=
 =?UTF-8?q?=E4=B8=AD=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/relationship/consanguinity.vue     | 68 ++++++++++++++++---
 1 file changed, 58 insertions(+), 10 deletions(-)

diff --git a/frontend/src/views/system/relationship/consanguinity.vue b/frontend/src/views/system/relationship/consanguinity.vue
index 63a5eb0680..769290965e 100644
--- a/frontend/src/views/system/relationship/consanguinity.vue
+++ b/frontend/src/views/system/relationship/consanguinity.vue
@@ -1,5 +1,7 @@
 <template>
-  <div id="main" :style="chartSize"></div>
+  <div :style="chartSize">
+    <div id="main" :style="chartSizeMax"></div>
+  </div>
 </template>
 
 <script>
@@ -20,6 +22,7 @@ export default {
     return {
       measureText: null,
       current: {},
+      maxSize: 0,
       activeId: '',
       treeData: [],
       myChart: null,
@@ -30,12 +33,27 @@ export default {
       }
     }
   },
+  computed: {
+    chartSizeMax() {
+      const { height } = this.chartSize
+      return this.maxSize > parseInt(height)/25  ? {
+        height: this.maxSize * 25  + 'px',
+        width: this.chartSize.width
+      } : this.chartSize
+    }
+  },
   watch: {
     chartSize: {
-      handler(val) {
-        if (this.myChart) {
-          this.myChart.resize(val)
-        }
+      handler() {
+        this.initEchart()
+      },
+      deep: true
+    },
+    chartSizeMax: {
+      handler() {
+        setTimeout(() => {
+          this.initEchart()
+        }, 1000)
       },
       deep: true
     }
@@ -320,11 +338,12 @@ export default {
       }
       return [list, gap]
     },
-    initEchart() {
+    initEchart(clickNode = []) {
       if (this.myChart) {
         this.myChart.dispose()
         this.myChart = null
       }
+
       this.myChart = echarts.init(document.getElementById('main'))
       const that = this
       let [data, gap] = this.calculatedWidth(this.treeData)
@@ -337,6 +356,32 @@ export default {
       gapDetail[this.current.queryType] = 0
       let lineData = this.calculatedLine(data)
       data = this.deleteRepeat(data)
+
+      const lineEnd = [clickNode[0]]
+      lineData = lineData.map(ele => {
+        let arr = [...ele]
+        if (clickNode[0] === ele[0]) {
+          arr.push(1)
+          lineEnd.push(ele[3])
+        } else if(clickNode[0] === ele[3]) {
+          arr.push(1)
+          lineEnd.push(ele[0])
+        } else {
+          arr.push(0)
+        }
+        return arr
+      })
+
+      data = data.map(ele => {
+        let arr = [...ele]
+        arr.push(Boolean(lineEnd.includes(ele[0])))
+        return arr
+      })
+      
+      if (this.maxSize !== data.length) {
+        this.maxSize = data.length
+        return
+      }
       let option = {
         xAxis: {
           show: false, //不显示分隔线,
@@ -413,7 +458,7 @@ export default {
                       width: 15,
                       height: 15,
                       x: 5,
-                      y: 5
+                      y: 3.5
                     }
                   },
                   {
@@ -442,7 +487,7 @@ export default {
                     style: {
                       ...api.style(),
                       fill: api.value(4) === that.activeId ? '#c2d4ff' : 'none',
-                      stroke: '#3370FF'
+                      stroke: api.value(8) ? 'green' : '#3370FF'
                     }
                   }
                 ]
@@ -493,14 +538,14 @@ export default {
                       y1: startPoint[1],
                       x2: endPoint[0] + gapDetail[api.value(5)],
                       y2: endPoint[1],
-                      cpx1:endPoint[0] + gapDetail[api.value(5)] - 100,
+                      cpx1:endPoint[0] + gapDetail[api.value(5)] - 50,
                       cpx2:endPoint[0] + gapDetail[api.value(5)] - 10,
                       cpy1:endPoint[1],
                       cpy2:endPoint[1],
                       percent: 1
                     },
                     style: {
-                      stroke: '#3370FF',
+                      stroke: api.value(7) ? 'green' : '#3370FF',
                       fill: 'transparent',
                       lineWidth: 1
                     }
@@ -513,6 +558,9 @@ export default {
         ]
       }
       this.myChart.setOption(option, true)
+      this.myChart.on('click', function (params) {
+          that.initEchart(params.value)
+      });
     }
   }
 }

From 59f7cfe25776b6b18a5fafc1dbb449b80d494660 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 8 Feb 2023 16:20:54 +0800
Subject: [PATCH 2/7] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E4=BB=AA?=
 =?UTF-8?q?=E8=A1=A8=E6=9D=BF=E6=95=B0=E6=8D=AE=E9=9B=86=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E9=80=BB=E8=BE=91=EF=BC=8C=E9=98=B2=E6=AD=A2?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E9=87=8F=E5=A4=A7=E6=97=B6=E5=8F=AF=E8=83=BD?=
 =?UTF-8?q?=E9=80=A0=E6=88=90=E7=9A=84=E5=8D=A1=E9=A1=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataset/DataSetGroupController.java       |  12 +-
 .../dataset/DataSetTableController.java       |  11 +-
 .../panel/PanelGroupController.java           |   2 +-
 .../io/dataease/ext/ExtPanelGroupMapper.java  |  12 +-
 .../io/dataease/ext/ExtPanelGroupMapper.xml   | 240 ++++++++++--------
 .../io/dataease/ext/ExtVAuthModelMapper.java  |   6 +-
 .../io/dataease/ext/ExtVAuthModelMapper.xml   |  29 ++-
 .../service/authModel/VAuthModelService.java  |  18 +-
 .../service/panel/PanelGroupService.java      |  15 +-
 frontend/src/components/canvas/utils/utils.js | 134 +++++++++-
 frontend/src/views/dataset/add/AddApi.vue     |  21 +-
 frontend/src/views/dataset/add/AddDB.vue      |  24 +-
 .../src/views/dataset/group/CreatDsGroup.vue  |  29 +--
 frontend/src/views/dataset/group/Group.vue    | 155 ++++++-----
 .../views/dataset/group/GroupMoveSelector.vue |  41 +--
 frontend/src/views/panel/list/PanelList.vue   |  43 ++--
 .../src/views/panel/list/editPanel/index.vue  |   2 +-
 17 files changed, 521 insertions(+), 273 deletions(-)

diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetGroupController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetGroupController.java
index 8833cccf3a..b8e3488641 100644
--- a/backend/src/main/java/io/dataease/controller/dataset/DataSetGroupController.java
+++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetGroupController.java
@@ -9,8 +9,10 @@ import io.dataease.commons.constants.SysLogConstants;
 import io.dataease.commons.utils.DeLogUtils;
 import io.dataease.controller.request.dataset.DataSetGroupRequest;
 import io.dataease.dto.SysLogDTO;
+import io.dataease.dto.authModel.VAuthModelDTO;
 import io.dataease.dto.dataset.DataSetGroupDTO;
 import io.dataease.plugins.common.base.domain.DatasetGroup;
+import io.dataease.service.authModel.VAuthModelService;
 import io.dataease.service.dataset.DataSetGroupService;
 import io.dataease.service.kettle.KettleService;
 import io.swagger.annotations.Api;
@@ -18,7 +20,9 @@ import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.authz.annotation.Logical;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
+
 import javax.annotation.Resource;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -35,14 +39,18 @@ public class DataSetGroupController {
     @Resource
     private KettleService kettleService;
 
+    @Resource
+    private VAuthModelService vAuthModelService;
+
     @DePermissions(value = {
             @DePermission(type = DePermissionType.DATASET, value = "id"),
             @DePermission(type = DePermissionType.DATASET, value = "pid", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE)
     }, logical = Logical.AND)
     @ApiOperation("保存")
     @PostMapping("/save")
-    public DataSetGroupDTO save(@RequestBody DatasetGroup datasetGroup) throws Exception {
-        return dataSetGroupService.save(datasetGroup);
+    public VAuthModelDTO save(@RequestBody DatasetGroup datasetGroup) throws Exception {
+        DataSetGroupDTO result = dataSetGroupService.save(datasetGroup);
+        return vAuthModelService.queryAuthModelByIds("dataset", Arrays.asList(result.getId())).get(0);
     }
 
     @ApiIgnore
diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
index 6927f2b870..471297caff 100644
--- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
+++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
@@ -16,6 +16,7 @@ import io.dataease.controller.handler.annotation.I18n;
 import io.dataease.controller.request.dataset.DataSetExportRequest;
 import io.dataease.controller.request.dataset.DataSetTableRequest;
 import io.dataease.controller.response.DataSetDetail;
+import io.dataease.dto.authModel.VAuthModelDTO;
 import io.dataease.dto.dataset.DataSetTableDTO;
 import io.dataease.dto.dataset.ExcelFileData;
 import io.dataease.plugins.common.base.domain.DatasetSqlLog;
@@ -24,6 +25,7 @@ import io.dataease.plugins.common.base.domain.DatasetTableField;
 import io.dataease.plugins.common.base.domain.DatasetTableIncrementalConfig;
 import io.dataease.plugins.common.dto.dataset.SqlVariableDetails;
 import io.dataease.plugins.common.dto.datasource.TableField;
+import io.dataease.service.authModel.VAuthModelService;
 import io.dataease.service.dataset.DataSetTableService;
 import io.swagger.annotations.*;
 import org.apache.shiro.authz.annotation.Logical;
@@ -35,6 +37,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Author gin
@@ -48,14 +51,18 @@ public class DataSetTableController {
     @Resource
     private DataSetTableService dataSetTableService;
 
+    @Resource
+    private VAuthModelService vAuthModelService;
+
     @DePermissions(value = {
             @DePermission(type = DePermissionType.DATASET, value = "id"),
             @DePermission(type = DePermissionType.DATASET, value = "sceneId", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE)
     }, logical = Logical.AND)
     @ApiOperation("批量保存")
     @PostMapping("batchAdd")
-    public List<DatasetTable> batchAdd(@RequestBody List<DataSetTableRequest> datasetTable) throws Exception {
-        return dataSetTableService.batchInsert(datasetTable);
+    public List<VAuthModelDTO> batchAdd(@RequestBody List<DataSetTableRequest> datasetTable) throws Exception {
+        List<String> ids = dataSetTableService.batchInsert(datasetTable).stream().map(DatasetTable::getId).collect(Collectors.toList());
+        return vAuthModelService.queryAuthModelByIds("dataset", ids);
     }
 
     @DePermissions(value = {
diff --git a/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java b/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java
index dbe2e68035..2e46bab9ef 100644
--- a/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java
+++ b/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java
@@ -88,7 +88,7 @@ public class PanelGroupController {
             @DePermission(type = DePermissionType.PANEL, value = "pid", level = ResourceAuthLevel.PANEL_LEVEL_MANAGE)
     }, logical = Logical.AND)
     @I18n
-    public String update(@RequestBody PanelGroupRequest request) {
+    public PanelGroupDTO update(@RequestBody PanelGroupRequest request) {
         return panelGroupService.update(request);
     }
 
diff --git a/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.java b/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.java
index 30dbcd2c75..a1fdf5af1a 100644
--- a/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.java
+++ b/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.java
@@ -15,18 +15,20 @@ public interface ExtPanelGroupMapper {
     List<PanelGroupDTO> panelGroupListDefault(PanelGroupRequest request);
 
     //会级联删除pid 下的所有数据
-    int deleteCircle(@Param("pid") String pid);
+    int deleteCircle(@Param("pid") String pid, @Param("nodeType") String nodeType);
 
-    int deleteCircleView(@Param("pid") String pid);
+    int deleteCircleView(@Param("pid") String pid, @Param("nodeType") String nodeType);
 
-    int deleteCircleViewCache(@Param("pid") String pid);
+    int deleteCircleViewCache(@Param("pid") String pid, @Param("nodeType") String nodeType);
 
-    PanelGroupDTO findOneWithPrivileges(@Param("panelId") String panelId,@Param("userId") String userId);
+    PanelGroupDTO findOneWithPrivileges(@Param("panelId") String panelId, @Param("userId") String userId);
+
+    PanelGroupDTO findShortOneWithPrivileges(@Param("panelId") String panelId, @Param("userId") String userId);
 
     void copyPanelView(@Param("pid") String panelId);
 
     //移除未使用的视图
-    void removeUselessViews(@Param("panelId") String panelId,@Param("viewIds") List<String> viewIds);
+    void removeUselessViews(@Param("panelId") String panelId, @Param("viewIds") List<String> viewIds);
 
     List<PanelGroupDTO> panelGroupInit();
 
diff --git a/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml b/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml
index 2f99cbe477..6b3d058df8 100644
--- a/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml
+++ b/backend/src/main/java/io/dataease/ext/ExtPanelGroupMapper.xml
@@ -31,6 +31,26 @@
           and panel_type = 'self'
     </select>
 
+    <select id="findShortOneWithPrivileges" resultMap="BaseResultMapDTO">
+        SELECT panel_group.id,
+               panel_group.`name`,
+               panel_group.pid,
+               panel_group.`level`,
+               panel_group.node_type,
+               panel_group.create_by,
+               panel_group.create_time,
+               panel_group.panel_type,
+               panel_group.`name`                            AS label,
+               panel_group.`source`,
+               panel_group.`panel_type`,
+               panel_group.`status`,
+               panel_group.`mobile_layout`,
+               panel_group.`name`                            as source_panel_name,
+               get_auths(panel_group.id, 'panel', #{userId}) as `privileges`
+        from panel_group
+        where id = #{panelId}
+    </select>
+
     <select id="panelGroupListDefault" resultMap="BaseResultMapDTO">
         SELECT
         panel_group.id,
@@ -185,20 +205,34 @@
     <delete id="deleteCircle">
         delete
         from panel_group
-        where FIND_IN_SET(panel_group.id, GET_PANEL_GROUP_WITH_CHILDREN(#{pid}))
-           or FIND_IN_SET(panel_group.source, GET_PANEL_GROUP_WITH_CHILDREN(#{pid}))
+        where
+        panel_group.id = #{pid}
+        or
+        panel_group.source = #{pid}
+        <if test="nodeType == 'folder'">
+            or FIND_IN_SET(panel_group.id, GET_PANEL_GROUP_WITH_CHILDREN(#{pid}))
+            or FIND_IN_SET(panel_group.source, GET_PANEL_GROUP_WITH_CHILDREN(#{pid}))
+        </if>
     </delete>
 
     <delete id="deleteCircleView">
         delete
         from chart_view
-        where FIND_IN_SET(chart_view.scene_id, GET_PANEL_GROUP_WITH_CHILDREN(#{pid}))
+        where
+        chart_view.scene_id = #{pid}
+        <if test="nodeType == 'folder'">
+            or FIND_IN_SET(chart_view.scene_id, GET_PANEL_GROUP_WITH_CHILDREN(#{pid}))
+        </if>
     </delete>
 
     <delete id="deleteCircleViewCache">
         delete
         from chart_view_cache
-        where FIND_IN_SET(chart_view_cache.scene_id, GET_PANEL_GROUP_WITH_CHILDREN(#{pid}))
+        where
+        chart_view_cache.scene_id = #{pid}
+        <if test="nodeType == 'folder'">
+            or FIND_IN_SET(chart_view_cache.scene_id, GET_PANEL_GROUP_WITH_CHILDREN(#{pid}))
+        </if>
     </delete>
 
     <insert id="copyPanelView">
@@ -226,120 +260,106 @@
 
     </delete>
 
-    <select id="queryPanelRelation" resultType="io.dataease.dto.RelationDTO" resultMap="io.dataease.ext.ExtDataSourceMapper.RelationResultMap">
-        select
-            ifnull(ds.id,'') `id`,
-            ds.name,
-            ds_auth.auths,
-            'link' `type`,
-            dt.id sub_id,
-            dt.name sub_name,
-            dt_auth.auths sub_auths,
-            if(dt.id is not null,'dataset',null) sub_type
-        from
-            panel_group pg
-        join
-            chart_view cv on cv.scene_id = pg.id
-        join
-            dataset_table dt on cv.table_id = dt.id
-        left join
-        (
-            select
-                t_dt.id,group_concat(distinct sad.privilege_type) auths
-            from
-                dataset_table t_dt
-            left join sys_auth sa on sa.auth_source = t_dt.id
-            left join sys_auth_detail sad on sa.id = sad.auth_id
-            where
-                sa.auth_source_type = 'dataset'
-            and
-                sad.privilege_value = 1
-            and
-            (
-                (
-                    sa.auth_target_type = 'dept'
-                    AND sa.auth_target in ( SELECT dept_id FROM sys_user WHERE user_id = #{userId,jdbcType=BIGINT} )
-                )
-            or
-                (
-                    sa.auth_target_type = 'user'
-                    AND sa.auth_target =  #{userId,jdbcType=BIGINT}
-                )
-            or
-                (
-                    sa.auth_target_type = 'role'
-                    AND sa.auth_target in ( SELECT role_id FROM sys_users_roles WHERE user_id =  #{userId,jdbcType=BIGINT} )
-                )
-            )
-            group by sa.auth_source
-        ) dt_auth on dt.id = dt_auth.id
-        left join datasource ds on dt.data_source_id = ds.id
-        left join
-        (
-            select
-                t_pg.id,group_concat(distinct sad.privilege_type) auths
-            from
-                panel_group t_pg
-            left join sys_auth sa on sa.auth_source = t_pg.id
-            left join sys_auth_detail sad on sa.id = sad.auth_id
-            where
-                sa.auth_source_type = 'link'
-            and
-                sad.privilege_value = 1
-            and
-            (
-                (
-                    sa.auth_target_type = 'dept'
-                    AND sa.auth_target in ( SELECT dept_id FROM sys_user WHERE user_id = #{userId,jdbcType=BIGINT} )
-                )
-            OR
-                (
-                    sa.auth_target_type = 'user'
-                    AND sa.auth_target =  #{userId,jdbcType=BIGINT}
-                )
-            OR
-                (
-                    sa.auth_target_type = 'role'
-                    AND sa.auth_target in ( SELECT role_id FROM sys_users_roles WHERE user_id = #{userId,jdbcType=BIGINT} )
-                )
-            )
-            group by sa.auth_source
-        ) ds_auth on ds_auth.id = ds.id
-        where pg.id=#{panelId,jdbcType=VARCHAR}
-        group by id,sub_id
+    <select id="queryPanelRelation" resultType="io.dataease.dto.RelationDTO"
+            resultMap="io.dataease.ext.ExtDataSourceMapper.RelationResultMap">
+        select ifnull(ds.id, '')                      `id`,
+               ds.name,
+               ds_auth.auths,
+               'link'                                 `type`,
+               dt.id                                  sub_id,
+               dt.name                                sub_name,
+               dt_auth.auths                          sub_auths,
+               if(dt.id is not null, 'dataset', null) sub_type
+        from panel_group pg
+                 join
+             chart_view cv on cv.scene_id = pg.id
+                 join
+             dataset_table dt on cv.table_id = dt.id
+                 left join
+             (select t_dt.id,
+                     group_concat(distinct sad.privilege_type) auths
+              from dataset_table t_dt
+                       left join sys_auth sa on sa.auth_source = t_dt.id
+                       left join sys_auth_detail sad on sa.id = sad.auth_id
+              where sa.auth_source_type = 'dataset'
+                and sad.privilege_value = 1
+                and (
+                      (
+                                  sa.auth_target_type = 'dept'
+                              AND sa.auth_target in
+                                  (SELECT dept_id FROM sys_user WHERE user_id = #{userId,jdbcType=BIGINT})
+                          )
+                      or
+                      (
+                                  sa.auth_target_type = 'user'
+                              AND sa.auth_target = #{userId,jdbcType=BIGINT}
+                          )
+                      or
+                      (
+                                  sa.auth_target_type = 'role'
+                              AND sa.auth_target in
+                                  (SELECT role_id FROM sys_users_roles WHERE user_id = #{userId,jdbcType=BIGINT})
+                          )
+                  )
+              group by sa.auth_source) dt_auth on dt.id = dt_auth.id
+                 left join datasource ds on dt.data_source_id = ds.id
+                 left join
+             (select t_pg.id,
+                     group_concat(distinct sad.privilege_type) auths
+              from panel_group t_pg
+                       left join sys_auth sa on sa.auth_source = t_pg.id
+                       left join sys_auth_detail sad on sa.id = sad.auth_id
+              where sa.auth_source_type = 'link'
+                and sad.privilege_value = 1
+                and (
+                      (
+                                  sa.auth_target_type = 'dept'
+                              AND sa.auth_target in
+                                  (SELECT dept_id FROM sys_user WHERE user_id = #{userId,jdbcType=BIGINT})
+                          )
+                      OR
+                      (
+                                  sa.auth_target_type = 'user'
+                              AND sa.auth_target = #{userId,jdbcType=BIGINT}
+                          )
+                      OR
+                      (
+                                  sa.auth_target_type = 'role'
+                              AND sa.auth_target in
+                                  (SELECT role_id FROM sys_users_roles WHERE user_id = #{userId,jdbcType=BIGINT})
+                          )
+                  )
+              group by sa.auth_source) ds_auth on ds_auth.id = ds.id
+        where pg.id = #{panelId,jdbcType=VARCHAR}
+        group by id, sub_id
         order by id
     </select>
 
     <select id="listPanelByUser" resultType="io.dataease.plugins.common.base.domain.PanelGroup"
             resultMap="io.dataease.plugins.common.base.mapper.PanelGroupMapper.BaseResultMap">
-        select
-            pg.*
-        from
-            panel_group pg
-        join sys_auth sa on sa.auth_source = pg.id
-        join sys_auth_detail sad on sa.id = sad.auth_id
-        where
-            pg.node_type = 'panel'
-        and
-            sa.auth_source_type = 'panel'
-        and
-            sad.privilege_value = 1
-        and
-            (
+        select pg.*
+        from panel_group pg
+                 join sys_auth sa on sa.auth_source = pg.id
+                 join sys_auth_detail sad on sa.id = sad.auth_id
+        where pg.node_type = 'panel'
+          and sa.auth_source_type = 'panel'
+          and sad.privilege_value = 1
+          and (
                 (
-                    sa.auth_target_type = 'dept'
-                    AND sa.auth_target in ( SELECT dept_id FROM sys_user WHERE user_id = #{userId,jdbcType=BIGINT} )
-                )
-            OR
+                            sa.auth_target_type = 'dept'
+                        AND sa.auth_target in (SELECT dept_id FROM sys_user WHERE user_id = #{userId,jdbcType=BIGINT})
+                    )
+                OR
                 (
-                    sa.auth_target_type = 'user'
-                    AND sa.auth_target =  #{userId,jdbcType=BIGINT}
-                )
-            OR
+                            sa.auth_target_type = 'user'
+                        AND sa.auth_target = #{userId,jdbcType=BIGINT}
+                    )
+                OR
                 (
-                    sa.auth_target_type = 'role'
-                    AND sa.auth_target in ( SELECT role_id FROM sys_users_roles WHERE user_id = #{userId,jdbcType=BIGINT} )
-                )
+                            sa.auth_target_type = 'role'
+                        AND sa.auth_target in
+                            (SELECT role_id FROM sys_users_roles WHERE user_id = #{userId,jdbcType=BIGINT})
+                    )
             )
         group by pg.id
     </select>
diff --git a/backend/src/main/java/io/dataease/ext/ExtVAuthModelMapper.java b/backend/src/main/java/io/dataease/ext/ExtVAuthModelMapper.java
index 6c58a2807e..be71d05844 100644
--- a/backend/src/main/java/io/dataease/ext/ExtVAuthModelMapper.java
+++ b/backend/src/main/java/io/dataease/ext/ExtVAuthModelMapper.java
@@ -10,7 +10,9 @@ public interface ExtVAuthModelMapper {
 
     List<VAuthModelDTO> queryAuthModel(@Param("record") VAuthModelRequest record);
 
-    List<VAuthModelDTO> queryAuthModelViews (@Param("record") VAuthModelRequest record);
+    List<VAuthModelDTO> queryAuthModelByIds(@Param("userId") String userId, @Param("modelType") String modelType, @Param("ids") List<String> ids);
 
-    List<VAuthModelDTO> queryAuthViewsOriginal (@Param("record") VAuthModelRequest record);
+    List<VAuthModelDTO> queryAuthModelViews(@Param("record") VAuthModelRequest record);
+
+    List<VAuthModelDTO> queryAuthViewsOriginal(@Param("record") VAuthModelRequest record);
 }
diff --git a/backend/src/main/java/io/dataease/ext/ExtVAuthModelMapper.xml b/backend/src/main/java/io/dataease/ext/ExtVAuthModelMapper.xml
index 9363041cda..0ae460a5e7 100644
--- a/backend/src/main/java/io/dataease/ext/ExtVAuthModelMapper.xml
+++ b/backend/src/main/java/io/dataease/ext/ExtVAuthModelMapper.xml
@@ -8,6 +8,29 @@
         <result column="is_plugin" jdbcType="VARCHAR" property="isPlugin"/>
     </resultMap>
 
+    <select id="queryAuthModelByIds" resultMap="ExtResultMap">
+        SELECT
+        v_auth_model.id,
+        v_auth_model.name,
+        v_auth_model.label,
+        v_auth_model.pid,
+        v_auth_model.node_type,
+        v_auth_model.model_type,
+        v_auth_model.model_inner_type,
+        v_auth_model.auth_type,
+        v_auth_model.create_by,
+        v_auth_model.level,
+        v_auth_model.mode,
+        v_auth_model.data_source_id,
+        get_auths(v_auth_model.id, #{modelType}, #{userId}) as `privileges`
+        FROM
+        v_auth_model where v_auth_model.model_type = #{modelType} and v_auth_model.id in
+        <foreach collection="ids" item="id" separator="," open="(" close=")">
+            #{id}
+        </foreach>
+        ORDER BY v_auth_model.node_type desc, CONVERT(v_auth_model.label using gbk) asc
+    </select>
+
     <select id="queryAuthModel" resultMap="ExtResultMap">
         SELECT
         v_auth_model.id,
@@ -137,10 +160,8 @@
 
 
     <select id="queryAuthViewsOriginal" resultMap="ExtResultMap">
-        SELECT
-            *
-        FROM
-            v_history_chart_view viewsOriginal
+        SELECT *
+        FROM v_history_chart_view viewsOriginal
         ORDER BY viewsOriginal.node_type desc, CONVERT(viewsOriginal.label using gbk) asc
     </select>
 
diff --git a/backend/src/main/java/io/dataease/service/authModel/VAuthModelService.java b/backend/src/main/java/io/dataease/service/authModel/VAuthModelService.java
index 5273a13743..87d09f4fb0 100644
--- a/backend/src/main/java/io/dataease/service/authModel/VAuthModelService.java
+++ b/backend/src/main/java/io/dataease/service/authModel/VAuthModelService.java
@@ -4,7 +4,7 @@ import io.dataease.commons.utils.AuthUtils;
 import io.dataease.commons.utils.TreeUtils;
 import io.dataease.controller.request.authModel.VAuthModelRequest;
 import io.dataease.dto.authModel.VAuthModelDTO;
-import io.dataease.ext.*;
+import io.dataease.ext.ExtVAuthModelMapper;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 
@@ -25,10 +25,22 @@ public class VAuthModelService {
     @Resource
     private ExtVAuthModelMapper extVAuthModelMapper;
 
+    public List<VAuthModelDTO> queryAuthModelByIds(String modelType, List<String> ids) {
+        if (CollectionUtils.isEmpty(ids)) {
+            return new ArrayList<>();
+        }
+        List<VAuthModelDTO> result = extVAuthModelMapper.queryAuthModelByIds(String.valueOf(AuthUtils.getUser().getUserId()), modelType, ids);
+        if (CollectionUtils.isEmpty(result)) {
+            return new ArrayList<>();
+        } else {
+            return result;
+        }
+    }
+
     public List<VAuthModelDTO> queryAuthModel(VAuthModelRequest request) {
         request.setUserId(String.valueOf(AuthUtils.getUser().getUserId()));
         List<VAuthModelDTO> result = extVAuthModelMapper.queryAuthModel(request);
-        if(CollectionUtils.isEmpty(result)){
+        if (CollectionUtils.isEmpty(result)) {
             return new ArrayList<>();
         }
         if (request.getPrivileges() != null) {
@@ -44,7 +56,7 @@ public class VAuthModelService {
     }
 
     private List<VAuthModelDTO> filterPrivileges(VAuthModelRequest request, List<VAuthModelDTO> result) {
-        if(AuthUtils.getUser().getIsAdmin()){
+        if (AuthUtils.getUser().getIsAdmin()) {
             return result;
         }
         if (request.getPrivileges() != null) {
diff --git a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
index 125abb63c0..288ecffe74 100644
--- a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
+++ b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
@@ -182,7 +182,7 @@ public class PanelGroupService {
     }
 
 
-    public String update(PanelGroupRequest request) {
+    public PanelGroupDTO update(PanelGroupRequest request) {
         String panelId = request.getId();
         request.setUpdateTime(System.currentTimeMillis());
         request.setUpdateBy(AuthUtils.getUser().getUsername());
@@ -254,7 +254,7 @@ public class PanelGroupService {
             DeLogUtils.save(SysLogConstants.OPERATE_TYPE.MODIFY, sourceType, request.getId(), request.getPid(), null, sourceType);
         }
         this.removePanelAllCache(panelId);
-        return panelId;
+        return extPanelGroupMapper.findShortOneWithPrivileges(panelId, String.valueOf(AuthUtils.getUser().getUserId()));
     }
 
     public void move(PanelGroupRequest request) {
@@ -294,14 +294,17 @@ public class PanelGroupService {
 
     public void deleteCircle(String id) {
         Assert.notNull(id, "id cannot be null");
-        sysAuthService.checkTreeNoManageCount("panel", id);
         PanelGroupWithBLOBs panel = panelGroupMapper.selectByPrimaryKey(id);
         SysLogDTO sysLogDTO = DeLogUtils.buildLog(SysLogConstants.OPERATE_TYPE.DELETE, sourceType, panel.getId(), panel.getPid(), null, null);
+        String nodeType = panel.getNodeType();
+        if ("folder".equals(nodeType)) {
+            sysAuthService.checkTreeNoManageCount("panel", id);
+        }
         //清理view 和 view cache
-        extPanelGroupMapper.deleteCircleView(id);
-        extPanelGroupMapper.deleteCircleViewCache(id);
+        extPanelGroupMapper.deleteCircleView(id, nodeType);
+        extPanelGroupMapper.deleteCircleViewCache(id, nodeType);
         // 同时会删除对应默认仪表盘
-        extPanelGroupMapper.deleteCircle(id);
+        extPanelGroupMapper.deleteCircle(id, nodeType);
         storeService.removeByPanelId(id);
         shareService.delete(id, null);
         panelLinkService.deleteByResourceId(id);
diff --git a/frontend/src/components/canvas/utils/utils.js b/frontend/src/components/canvas/utils/utils.js
index 220e083b0f..c39fd6efa2 100644
--- a/frontend/src/components/canvas/utils/utils.js
+++ b/frontend/src/components/canvas/utils/utils.js
@@ -8,7 +8,7 @@ import {
 import { ApplicationContext } from '@/utils/ApplicationContext'
 import { uuid } from 'vue-uuid'
 import store from '@/store'
-import { AIDED_DESIGN, MOBILE_SETTING, PANEL_CHART_INFO, TAB_COMMON_STYLE, PAGE_LINE_DESIGN } from '@/views/panel/panel'
+import { AIDED_DESIGN, MOBILE_SETTING, PAGE_LINE_DESIGN, PANEL_CHART_INFO, TAB_COMMON_STYLE } from '@/views/panel/panel'
 import html2canvas from 'html2canvasde'
 
 export function deepCopy(target) {
@@ -271,3 +271,135 @@ export function findCurComponentIndex(componentData, curComponent) {
   }
   return curIndex
 }
+
+export function deleteTreeNode(nodeId, tree, nodeTarget) {
+  if (!nodeId || !tree || !tree.length) {
+    return
+  }
+  for (let i = 0, len = tree.length; i < len; i++) {
+    if (tree[i].id === nodeId) {
+      if (nodeTarget) {
+        nodeTarget['target'] = tree[i]
+      }
+      tree.splice(i, 1)
+      return
+    } else if (tree[i].children && tree[i].children.length) {
+      deleteTreeNode(nodeId, tree[i].children, nodeTarget)
+    }
+  }
+}
+
+export function moveTreeNode(nodeInfo, tree) {
+  const nodeTarget = { target: null }
+  deleteTreeNode(nodeInfo.id, tree, nodeTarget)
+  if (nodeTarget.target) {
+    nodeTarget.target.pid = nodeInfo.pid
+    insertTreeNode(nodeTarget.target, tree)
+  }
+}
+
+export function updateTreeNode(nodeInfo, tree) {
+  if (!nodeInfo) {
+    return
+  }
+  for (let i = 0, len = tree.length; i < len; i++) {
+    if (tree[i].id === nodeInfo.id) {
+      tree[i].name = nodeInfo.name
+      tree[i].label = nodeInfo.label
+      if (tree[i].isDefault) {
+        tree[i].isDefault = nodeInfo.isDefault
+      }
+      return
+    } else if (tree[i].children && tree[i].children.length) {
+      updateTreeNode(nodeInfo, tree[i].children)
+    }
+  }
+}
+
+export function toDefaultTree(nodeId, tree) {
+  if (!nodeId) {
+    return
+  }
+  for (let i = 0, len = tree.length; i < len; i++) {
+    if (tree[i].id === nodeId) {
+      tree[i].isDefault = true
+      return
+    } else if (tree[i].children && tree[i].children.length) {
+      toDefaultTree(nodeId, tree[i].children)
+    }
+  }
+}
+
+export function insertTreeNode(nodeInfo, tree) {
+  if (!nodeInfo) {
+    return
+  }
+  if (nodeInfo.pid === 0 || nodeInfo.pid === '0') {
+    tree.push(nodeInfo)
+    return
+  }
+  for (let i = 0, len = tree.length; i < len; i++) {
+    if (tree[i].id === nodeInfo.pid) {
+      if (!tree[i].children) {
+        tree[i].children = []
+      }
+      tree[i].children.push(nodeInfo)
+      return
+    } else if (tree[i].children && tree[i].children.length) {
+      insertTreeNode(nodeInfo, tree[i].children)
+    }
+  }
+}
+
+export function insertBatchTreeNode(nodeInfoArray, tree) {
+  if (!nodeInfoArray || nodeInfoArray.size === 0) {
+    return
+  }
+  const pid = nodeInfoArray[0].pid
+  for (let i = 0, len = tree.length; i < len; i++) {
+    if (tree[i].id === pid) {
+      if (!tree[i].children) {
+        tree[i].children = []
+      }
+      tree[i].children = tree[i].children.concat(nodeInfoArray)
+      return
+    } else if (tree[i].children && tree[i].children.length) {
+      insertBatchTreeNode(nodeInfoArray, tree[i].children)
+    }
+  }
+}
+
+export function updateCacheTree(opt, treeName, nodeInfo, tree) {
+  if (opt === 'new' || opt === 'copy') {
+    insertTreeNode(nodeInfo, tree)
+  } else if (opt === 'move') {
+    moveTreeNode(nodeInfo, tree)
+  } else if (opt === 'rename') {
+    updateTreeNode(nodeInfo, tree)
+  } else if (opt === 'delete') {
+    deleteTreeNode(nodeInfo, tree)
+  } else if (opt === 'newFirstFolder') {
+    tree.push(nodeInfo)
+  } else if (opt === 'batchNew') {
+    insertBatchTreeNode(nodeInfo, tree)
+  } else if (opt === 'toDefaultPanel') {
+    toDefaultTree(nodeInfo.source, tree)
+  }
+  localStorage.setItem(treeName, JSON.stringify(tree))
+}
+
+export function formatDatasetTreeFolder(tree) {
+  if (tree && tree.length) {
+    for (let len = tree.length - 1; len > -1; len--) {
+      if (tree[len].modelInnerType !== 'group') {
+        tree.splice(len, 1)
+      } else if (tree[len].children && tree[len].children.length) {
+        formatDatasetTreeFolder(tree[len].children)
+      }
+    }
+  }
+}
+
+export function getCacheTree(treeName) {
+  return JSON.parse(localStorage.getItem(treeName))
+}
diff --git a/frontend/src/views/dataset/add/AddApi.vue b/frontend/src/views/dataset/add/AddApi.vue
index 1224414b3c..8001c55ee1 100644
--- a/frontend/src/views/dataset/add/AddApi.vue
+++ b/frontend/src/views/dataset/add/AddApi.vue
@@ -9,7 +9,7 @@
       class="arrow-right"
       @click="showLeft = true"
     >
-      <i class="el-icon-d-arrow-right" />
+      <i class="el-icon-d-arrow-right"/>
     </p>
     <div
       v-show="showLeft"
@@ -172,8 +172,8 @@
           class="data"
         >
           <span class="result-num">{{
-            `${$t('dataset.preview_show')} 1000 ${$t('dataset.preview_item')}`
-          }}</span>
+              `${$t('dataset.preview_show')} 1000 ${$t('dataset.preview_item')}`
+            }}</span>
           <div class="table-grid">
             <ux-grid
               ref="plxTable"
@@ -214,11 +214,12 @@
 </template>
 
 <script>
-import { listApiDatasource, post, isKettleRunning } from '@/api/dataset/dataset'
+import { isKettleRunning, listApiDatasource, post } from '@/api/dataset/dataset'
 import { dbPreview, engineMode } from '@/api/system/engine'
 import cancelMix from './cancelMix'
 import msgCfm from '@/components/msgCfm/index'
 import { pySort } from './util'
+import { updateCacheTree } from '@/components/canvas/utils/utils'
 
 export default {
   name: 'AddApi',
@@ -442,6 +443,7 @@ export default {
       post('/dataset/table/batchAdd', tables)
         .then((response) => {
           this.openMessageSuccess('deDataset.set_saved_successfully')
+          updateCacheTree('batchNew', 'dataset-tree', response.data, JSON.parse(localStorage.getItem('dataset-tree')))
           this.cancel(response.data)
         })
         .finally(() => {
@@ -485,10 +487,12 @@ export default {
     border-top-right-radius: 13px;
     border-bottom-right-radius: 13px;
   }
+
   .table-list {
     p {
       margin: 0;
     }
+
     height: 100%;
     width: 240px;
     padding: 16px 12px;
@@ -501,6 +505,7 @@ export default {
       display: flex;
       justify-content: space-between;
       color: var(--deTextPrimary, #1f2329);
+
       i {
         cursor: pointer;
         font-size: 12px;
@@ -511,6 +516,7 @@ export default {
     .search {
       margin: 12px 0;
     }
+
     .ds-list {
       margin: 12px 0 24px 0;
       width: 100%;
@@ -519,6 +525,7 @@ export default {
     .table-checkbox-list {
       height: calc(100% - 190px);
       overflow-y: auto;
+
       .item {
         height: 40px;
         width: 100%;
@@ -556,12 +563,14 @@ export default {
           text-overflow: ellipsis;
           white-space: nowrap;
         }
+
         .error-name-exist {
           position: absolute;
           top: 10px;
           right: 10px;
         }
       }
+
       .not-allow {
         cursor: not-allowed;
         color: var(--deTextDisable, #bbbfc4);
@@ -573,6 +582,7 @@ export default {
     font-family: PingFang SC;
     flex: 1;
     overflow: hidden;
+
     .top-table-detail {
       height: 64px;
       width: 100%;
@@ -580,6 +590,7 @@ export default {
       background: #f5f6f7;
       display: flex;
       align-items: center;
+
       .el-select {
         width: 120px;
         margin-right: 12px;
@@ -593,6 +604,7 @@ export default {
       display: flex;
       align-items: center;
       position: relative;
+
       .name {
         font-size: 14px;
         font-weight: 400;
@@ -611,6 +623,7 @@ export default {
       height: calc(100% - 140px);
       width: 100%;
       box-sizing: border-box;
+
       .result-num {
         font-weight: 400;
         display: inline-block;
diff --git a/frontend/src/views/dataset/add/AddDB.vue b/frontend/src/views/dataset/add/AddDB.vue
index e7774cbc41..f613e85486 100644
--- a/frontend/src/views/dataset/add/AddDB.vue
+++ b/frontend/src/views/dataset/add/AddDB.vue
@@ -9,7 +9,7 @@
       class="arrow-right"
       @click="showLeft = true"
     >
-      <i class="el-icon-d-arrow-right" />
+      <i class="el-icon-d-arrow-right"/>
     </p>
     <div
       v-show="showLeft"
@@ -179,8 +179,8 @@
           class="data"
         >
           <span class="result-num">{{
-            `${$t('dataset.preview_show')} 1000 ${$t('dataset.preview_item')}`
-          }}</span>
+              `${$t('dataset.preview_show')} 1000 ${$t('dataset.preview_item')}`
+            }}</span>
           <div class="table-grid">
             <ux-grid
               ref="plxTable"
@@ -221,12 +221,14 @@
 </template>
 
 <script>
-import { listDatasource, post, isKettleRunning } from '@/api/dataset/dataset'
-import { engineMode, dbPreview } from '@/api/system/engine'
+import { isKettleRunning, listDatasource, post } from '@/api/dataset/dataset'
+import { dbPreview, engineMode } from '@/api/system/engine'
 import msgCfm from '@/components/msgCfm/index'
 import cancelMix from './cancelMix'
 
 import { pySort } from './util'
+import { updateCacheTree } from '@/components/canvas/utils/utils'
+
 export default {
   name: 'AddDB',
   mixins: [msgCfm, cancelMix],
@@ -460,6 +462,7 @@ export default {
       post('/dataset/table/batchAdd', tables)
         .then((response) => {
           this.openMessageSuccess('deDataset.set_saved_successfully')
+          updateCacheTree('batchNew', 'dataset-tree', response.data, JSON.parse(localStorage.getItem('dataset-tree')))
           this.cancel(response.data)
         })
         .finally(() => {
@@ -503,10 +506,12 @@ export default {
     border-top-right-radius: 13px;
     border-bottom-right-radius: 13px;
   }
+
   .table-list {
     p {
       margin: 0;
     }
+
     height: 100%;
     width: 240px;
     padding: 16px 12px;
@@ -519,6 +524,7 @@ export default {
       display: flex;
       justify-content: space-between;
       color: var(--deTextPrimary, #1f2329);
+
       i {
         cursor: pointer;
         font-size: 12px;
@@ -529,6 +535,7 @@ export default {
     .search {
       margin: 12px 0;
     }
+
     .ds-list {
       margin: 12px 0 24px 0;
       width: 100%;
@@ -537,6 +544,7 @@ export default {
     .table-checkbox-list {
       height: calc(100% - 190px);
       overflow-y: auto;
+
       .item {
         height: 40px;
         width: 100%;
@@ -574,12 +582,14 @@ export default {
           text-overflow: ellipsis;
           white-space: nowrap;
         }
+
         .error-name-exist {
           position: absolute;
           top: 10px;
           right: 10px;
         }
       }
+
       .not-allow {
         cursor: not-allowed;
         color: var(--deTextDisable, #bbbfc4);
@@ -591,6 +601,7 @@ export default {
     font-family: PingFang SC;
     flex: 1;
     overflow: hidden;
+
     .top-table-detail {
       height: 64px;
       width: 100%;
@@ -598,6 +609,7 @@ export default {
       background: #f5f6f7;
       display: flex;
       align-items: center;
+
       .el-select {
         width: 120px;
         margin-right: 12px;
@@ -611,6 +623,7 @@ export default {
       display: flex;
       align-items: center;
       position: relative;
+
       .name {
         font-size: 14px;
         font-weight: 400;
@@ -629,6 +642,7 @@ export default {
       height: calc(100% - 140px);
       width: 100%;
       box-sizing: border-box;
+
       .result-num {
         font-weight: 400;
         display: inline-block;
diff --git a/frontend/src/views/dataset/group/CreatDsGroup.vue b/frontend/src/views/dataset/group/CreatDsGroup.vue
index 1047fd269a..42e62edcb2 100644
--- a/frontend/src/views/dataset/group/CreatDsGroup.vue
+++ b/frontend/src/views/dataset/group/CreatDsGroup.vue
@@ -18,7 +18,7 @@
         :label="$t('dataset.name')"
         prop="name"
       >
-        <el-input v-model="datasetForm.name" />
+        <el-input v-model="datasetForm.name"/>
       </el-form-item>
       <el-form-item
         :label="$t('deDataset.folder')"
@@ -44,8 +44,8 @@
               slot-scope="{ data }"
               class="custom-tree-node-dataset"
             >
-              <span v-if="data.type === 'group'">
-                <svg-icon icon-class="scene" />
+              <span v-if="data.modelInnerType === 'group'">
+                <svg-icon icon-class="scene"/>
               </span>
               <span
                 style="
@@ -84,7 +84,8 @@
       <deBtn
         secondary
         @click="resetForm"
-      >{{ $t('dataset.cancel') }}</deBtn>
+      >{{ $t('dataset.cancel') }}
+      </deBtn>
       <deBtn
         type="primary"
         @click="saveDataset"
@@ -97,7 +98,8 @@
 <script>
 import { post } from '@/api/dataset/dataset'
 import { datasetTypeMap } from './options'
-import { groupTree } from '@/api/dataset/dataset'
+import { formatDatasetTreeFolder, getCacheTree } from '@/components/canvas/utils/utils'
+
 export default {
   data() {
     return {
@@ -203,21 +205,8 @@ export default {
       )
     },
     tree() {
-      this.loading = true
-      groupTree({
-        name: '',
-        pid: '0',
-        level: 0,
-        type: 'group',
-        children: [],
-        sort: 'type desc,name asc'
-      })
-        .then((res) => {
-          this.tData = res.data
-        })
-        .finally(() => {
-          this.loading = false
-        })
+      this.tData = getCacheTree('dataset-tree')
+      formatDatasetTreeFolder(this.tData)
     },
     nodeClick({ id, label }) {
       this.selectDatasets = [
diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue
index 11a7277c0e..822cec1e01 100644
--- a/frontend/src/views/dataset/group/Group.vue
+++ b/frontend/src/views/dataset/group/Group.vue
@@ -111,8 +111,8 @@
               class="no-tdata-new"
               @click="() => clickAdd()"
             >{{
-              $t('deDataset.create')
-            }}</span>
+                $t('deDataset.create')
+              }}</span>
           </div>
           <el-tree
             v-else
@@ -134,7 +134,7 @@
             >
               <span style="display: flex; flex: 1; width: 0">
                 <span>
-                  <svg-icon icon-class="scene" />
+                  <svg-icon icon-class="scene"/>
                 </span>
                 <span
                   style="
@@ -242,15 +242,15 @@
                       class="de-card-dropdown"
                     >
                       <el-dropdown-item command="rename">
-                        <svg-icon icon-class="de-ds-rename" />
+                        <svg-icon icon-class="de-ds-rename"/>
                         {{ $t('dataset.rename') }}
                       </el-dropdown-item>
                       <el-dropdown-item command="move">
-                        <svg-icon icon-class="de-ds-move" />
+                        <svg-icon icon-class="de-ds-move"/>
                         {{ $t('dataset.move_to') }}
                       </el-dropdown-item>
                       <el-dropdown-item command="delete">
-                        <svg-icon icon-class="de-ds-trash" />
+                        <svg-icon icon-class="de-ds-trash"/>
                         {{ $t('dataset.delete') }}
                       </el-dropdown-item>
                     </el-dropdown-menu>
@@ -353,15 +353,15 @@
                       class="de-card-dropdown"
                     >
                       <el-dropdown-item command="editTable">
-                        <svg-icon icon-class="de-ds-rename" />
+                        <svg-icon icon-class="de-ds-rename"/>
                         {{ $t('dataset.rename') }}
                       </el-dropdown-item>
                       <el-dropdown-item command="moveDs">
-                        <svg-icon icon-class="de-ds-move" />
+                        <svg-icon icon-class="de-ds-move"/>
                         {{ $t('dataset.move_to') }}
                       </el-dropdown-item>
                       <el-dropdown-item command="deleteTable">
-                        <svg-icon icon-class="de-ds-trash" />
+                        <svg-icon icon-class="de-ds-trash"/>
                         {{ $t('dataset.delete') }}
                       </el-dropdown-item>
                     </el-dropdown-menu>
@@ -405,7 +405,8 @@
           <deBtn
             secondary
             @click="close()"
-          >{{ $t('dataset.cancel') }}</deBtn>
+          >{{ $t('dataset.cancel') }}
+          </deBtn>
           <deBtn
             type="primary"
             @click="saveGroup(groupForm)"
@@ -433,7 +434,7 @@
           :label="$t('dataset.name')"
           prop="name"
         >
-          <el-input v-model="tableForm.name" />
+          <el-input v-model="tableForm.name"/>
         </el-form-item>
       </el-form>
       <div
@@ -444,8 +445,9 @@
           secondary
           @click="closeTable()"
         >{{
-          $t('dataset.cancel')
-        }}</deBtn>
+            $t('dataset.cancel')
+          }}
+        </deBtn>
         <deBtn
           type="primary"
           @click="saveTable(tableForm)"
@@ -467,8 +469,8 @@
           :title="moveDialogTitle"
           class="text-overflow"
         >{{
-          moveDialogTitle
-        }}</span>
+            moveDialogTitle
+          }}</span>
         {{ $t('dataset.m2') }}
       </template>
       <group-move-selector
@@ -481,8 +483,9 @@
           secondary
           @click="closeMoveGroup()"
         >{{
-          $t('dataset.cancel')
-        }}</deBtn>
+            $t('dataset.cancel')
+          }}
+        </deBtn>
         <deBtn
           :disabled="groupMoveConfirmDisabled"
           type="primary"
@@ -505,8 +508,8 @@
           :title="moveDialogTitle"
           class="text-overflow"
         >{{
-          moveDialogTitle
-        }}</span>
+            moveDialogTitle
+          }}</span>
         {{ $t('dataset.m2') }}
       </template>
       <group-move-selector
@@ -518,8 +521,9 @@
           secondary
           @click="closeMoveDs()"
         >{{
-          $t('dataset.cancel')
-        }}</deBtn>
+            $t('dataset.cancel')
+          }}
+        </deBtn>
         <deBtn
           :disabled="dsMoveConfirmDisabled"
           type="primary"
@@ -530,21 +534,12 @@
     </el-drawer>
 
     <!-- 新增数据集文件夹 -->
-    <CreatDsGroup ref="CreatDsGroup" />
+    <CreatDsGroup ref="CreatDsGroup"/>
   </el-col>
 </template>
 
 <script>
-import {
-  loadTable,
-  getScene,
-  addGroup,
-  delGroup,
-  delTable,
-  post,
-  isKettleRunning,
-  alter
-} from '@/api/dataset/dataset'
+import { addGroup, alter, delGroup, delTable, getScene, isKettleRunning, loadTable, post } from '@/api/dataset/dataset'
 import { getDatasetRelationship } from '@/api/chart/chart.js'
 
 import msgContent from '@/views/system/datasource/MsgContent.vue'
@@ -555,6 +550,7 @@ import { engineMode } from '@/api/system/engine'
 import _ from 'lodash'
 import msgCfm from '@/components/msgCfm/index'
 import { checkPermission } from '@/utils/permission'
+import { updateCacheTree } from '@/components/canvas/utils/utils'
 
 export default {
   name: 'Group',
@@ -688,34 +684,49 @@ export default {
     })
   },
   mounted() {
-    const { id, name } = this.$route.params
-    this.treeLoading = true
-    queryAuthModel({ modelType: 'dataset' }, true)
-      .then((res) => {
-        localStorage.setItem('dataset-tree', JSON.stringify(res.data))
-        this.tData = res.data || []
-        this.$nextTick(() => {
-          this.$refs.datasetTreeRef?.filter(this.filterText)
-          if (id && name.includes(this.filterText)) {
-            this.dfsTableData(this.tData, id)
-          } else {
-            const currentNodeId = sessionStorage.getItem('dataset-current-node')
-            if (currentNodeId) {
-              sessionStorage.setItem('dataset-current-node', '')
-              this.dfsTableData(this.tData, currentNodeId)
-            }
-          }
-        })
-      })
-      .finally(() => {
-        this.treeLoading = false
-      })
-    this.refresh()
+    this.init(true)
   },
   beforeDestroy() {
     sessionStorage.setItem('dataset-current-node', this.currentNodeId)
   },
   methods: {
+    init(cache = true) {
+      const { id, name } = this.$route.params
+      const modelInfo = localStorage.getItem('dataset-tree')
+      const userCache = modelInfo && cache
+      if (userCache) {
+        this.tData = JSON.parse(modelInfo)
+        this.queryAfter(id)
+      } else {
+        this.treeLoading = true
+      }
+      queryAuthModel({ modelType: 'dataset' }, !userCache)
+        .then((res) => {
+          localStorage.setItem('dataset-tree', JSON.stringify(res.data))
+          if (!userCache) {
+            this.tData = res.data || []
+            this.queryAfter(id)
+          }
+        })
+        .finally(() => {
+          this.treeLoading = false
+        })
+      this.refresh()
+    },
+    queryAfter(id) {
+      this.$nextTick(() => {
+        this.$refs.datasetTreeRef?.filter(this.filterText)
+        if (id && name.includes(this.filterText)) {
+          this.dfsTableData(this.tData, id)
+        } else {
+          const currentNodeId = sessionStorage.getItem('dataset-current-node')
+          if (currentNodeId) {
+            sessionStorage.setItem('dataset-current-node', '')
+            this.dfsTableData(this.tData, currentNodeId)
+          }
+        }
+      })
+    },
     getDatasetRelationship({ queryType, label, id }) {
       return getDatasetRelationship(id).then((res) => {
         const arr = res.data ? [res.data] : []
@@ -852,7 +863,8 @@ export default {
             this.close()
             this.openMessageSuccess('dataset.save_success')
             this.expandedArray.push(group.pid)
-            this.treeNode()
+            const opt = group.id ? 'rename' : 'new'
+            updateCacheTree(opt, 'dataset-tree', res.data, this.tData)
           })
         } else {
           return false
@@ -872,7 +884,9 @@ export default {
             this.openMessageSuccess('dataset.save_success')
             _this.expandedArray.push(table.sceneId)
             _this.$refs.datasetTreeRef.setCurrentKey(table.id)
-            _this.treeNode()
+            const renameNode = { id: table.id, name: table.name, label: table.name }
+            updateCacheTree('rename', 'dataset-tree', renameNode, this.tData)
+            ('rename', 'dataset-tree', response.data, this.tData)
             this.$emit('switchComponent', { name: '' })
           })
         } else {
@@ -894,11 +908,12 @@ export default {
         .then(() => {
           delGroup(data.id).then((response) => {
             this.openMessageSuccess('dataset.delete_success')
-            this.treeNode()
+            updateCacheTree('delete', 'dataset-tree', data.id, this.tData)
             this.$emit('switchComponent', { name: '' })
           })
         })
-        .catch(() => {})
+        .catch(() => {
+        })
     },
 
     async deleteTable(data) {
@@ -916,7 +931,7 @@ export default {
         cb: () => {
           delTable(data.id).then((response) => {
             this.openMessageSuccess('dataset.delete_success')
-            this.treeNode()
+            updateCacheTree('delete', 'dataset-tree', data.id, this.tData)
             this.$emit('switchComponent', { name: '' })
             this.$store.dispatch('dataset/setTable', new Date().getTime())
           })
@@ -1108,7 +1123,7 @@ export default {
       addGroup(this.groupForm).then((res) => {
         this.openMessageSuccess('dept.move_success')
         this.closeMoveGroup()
-        this.treeNode()
+        updateCacheTree('move', 'dataset-tree', res.data, this.tData)
       })
     },
     targetGroup(val) {
@@ -1133,12 +1148,14 @@ export default {
     },
     saveMoveDs() {
       const newSceneId = this.tDs.id
+      const nodeId = this.dsForm.id
       this.dsForm.sceneId = newSceneId
       this.dsForm.isRename = true
       alter(this.dsForm).then((res) => {
         this.closeMoveDs()
         this.expandedArray.push(newSceneId)
-        this.treeNode()
+        const moveNode = { id: nodeId, pid: newSceneId }
+        updateCacheTree('move', 'dataset-tree', moveNode, this.tData)
         this.openMessageSuccess('移动成功')
       })
     },
@@ -1213,6 +1230,7 @@ export default {
 
 .custom-tree-container {
   margin-top: 10px;
+
   .no-tdata {
     text-align: center;
     margin-top: 80px;
@@ -1220,6 +1238,7 @@ export default {
     font-size: 14px;
     color: var(--deTextSecondary, #646a73);
     font-weight: 400;
+
     .no-tdata-new {
       cursor: pointer;
       color: var(--primary, #3370ff);
@@ -1273,6 +1292,7 @@ export default {
   width: 100%;
   display: flex;
 }
+
 .scene-title-name {
   width: 100%;
   overflow: hidden;
@@ -1280,9 +1300,11 @@ export default {
   white-space: nowrap;
   text-overflow: ellipsis;
 }
+
 .father .child {
   visibility: hidden;
 }
+
 .father:hover .child {
   visibility: visible;
 }
@@ -1299,19 +1321,25 @@ export default {
   padding: 10px 24px;
   height: 100%;
   overflow-y: auto;
+
   .main-area-input {
+    //width: calc(100% - 80px);
+
     .el-input-group__append {
       width: 70px;
       background: transparent;
+
       .el-input__inner {
         padding-left: 12px;
       }
     }
   }
+
   .title-css {
     display: flex;
     justify-content: space-between;
   }
+
   .el-icon-plus {
     width: 28px;
     height: 28px;
@@ -1332,6 +1360,7 @@ export default {
     }
   }
 }
+
 .de-dataset-dropdown {
   .el-dropdown-menu__item {
     height: 40px;
@@ -1342,6 +1371,7 @@ export default {
     font-family: PingFang SC;
     font-size: 14px;
     font-weight: 400;
+
     .svg-icon {
       margin-right: 8.75px;
       width: 16.5px;
@@ -1358,6 +1388,7 @@ export default {
       color: #fff;
     }
   }
+
   .de-top-border {
     border-top: 1px solid rgba(31, 35, 41, 0.15);
   }
diff --git a/frontend/src/views/dataset/group/GroupMoveSelector.vue b/frontend/src/views/dataset/group/GroupMoveSelector.vue
index 57d4e247d9..83bc0328aa 100644
--- a/frontend/src/views/dataset/group/GroupMoveSelector.vue
+++ b/frontend/src/views/dataset/group/GroupMoveSelector.vue
@@ -23,8 +23,8 @@
           :class="treeClass(data, node)"
         >
           <span style="display: flex; flex: 1; width: 0">
-            <span v-if="data.type === 'group'">
-              <svg-icon icon-class="scene" />
+            <span v-if="data.modelInnerType === 'group'">
+              <svg-icon icon-class="scene"/>
             </span>
             <span
               style="
@@ -44,7 +44,7 @@
 </template>
 
 <script>
-import { groupTree } from '@/api/dataset/dataset'
+import { formatDatasetTreeFolder, getCacheTree } from '@/components/canvas/utils/utils'
 
 export default {
   name: 'GroupMoveSelector',
@@ -87,22 +87,23 @@ export default {
   },
   methods: {
     tree(group) {
-      groupTree(group).then((res) => {
-        if (this.moveDir) {
-          this.tData = [
-            {
-              id: '0',
-              name: this.$t('dataset.dataset_group'),
-              pid: '0',
-              privileges: 'grant,manage,use',
-              type: 'group',
-              children: res.data
-            }
-          ]
-          return
-        }
-        this.tData = res.data
-      })
+      const treeData = getCacheTree('dataset-tree')
+      formatDatasetTreeFolder(treeData)
+      if (this.moveDir) {
+        this.tData = [
+          {
+            id: '0',
+            name: this.$t('dataset.dataset_group'),
+            pid: '0',
+            privileges: 'grant,manage,use',
+            modelInnerType: 'group',
+            children: treeData
+          }
+        ]
+        return
+      } else {
+        this.tData = treeData
+      }
     },
     filterNode(value, data) {
       if (!value) return true
@@ -143,10 +144,12 @@ export default {
 <style lang="scss">
 .ds-move-tree {
   height: 100%;
+
   .tree {
     height: calc(100% - 115px);
     overflow-y: auto;
   }
+
   .select-tree-keywords {
     color: var(--primary, #3370ff);
   }
diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue
index 3fd29d0e30..d272855a9f 100644
--- a/frontend/src/views/panel/list/PanelList.vue
+++ b/frontend/src/views/panel/list/PanelList.vue
@@ -459,6 +459,7 @@ import { DEFAULT_COMMON_CANVAS_STYLE_STRING } from '@/views/panel/panel'
 import TreeSelector from '@/components/treeSelector'
 import { queryAuthModel } from '@/api/authModel/authModel'
 import msgCfm from '@/components/msgCfm/index'
+import { updateCacheTree } from '@/components/canvas/utils/utils'
 
 export default {
   name: 'PanelList',
@@ -469,7 +470,7 @@ export default {
       lastActiveDefaultPanelId: null, // 激活的节点 在这个节点下面动态放置子节点
       responseSource: 'panelQuery',
       defaultExpansion: false,
-      clearLocalStorage: ['chart-tree', 'dataset-tree'],
+      clearLocalStorage: ['dataset-tree'],
       historyRequestId: null,
       lastActiveNode: null, // 激活的节点 在这个节点下面动态放置子节点
       lastActiveNodeData: null,
@@ -578,7 +579,7 @@ export default {
         all: this.$t('commons.all'),
         folder: this.$t('commons.folder')
       },
-      initLocalStorage: ['chart', 'dataset']
+      initLocalStorage: ['dataset']
     }
   },
   computed: {
@@ -611,7 +612,6 @@ export default {
     }
   },
   beforeDestroy() {
-    bus.$off('newPanelFromMarket', this.newPanelFromMarket)
   },
   mounted() {
     this.clearCanvas()
@@ -654,18 +654,12 @@ export default {
       })
       this.responseSource = 'panelQuery'
     },
-    newPanelFromMarket(panelInfo) {
-      if (panelInfo) {
-        this.tree()
-        this.edit(panelInfo, null)
-      }
-    },
     initCache() {
       // 初始化时提前加载视图和数据集的缓存
       this.initLocalStorage.forEach((item) => {
         if (!localStorage.getItem(item + '-tree')) {
           queryAuthModel({ modelType: item }, false).then((res) => {
-            localStorage.setItem(item + '-tree', JSON.stringify(res.data))
+            localStorage.setItem(item + '-tree', JSON.stringify(res.data || []))
           })
         }
       })
@@ -673,8 +667,10 @@ export default {
     closeEditPanelDialog(panelInfo) {
       this.editPanel.visible = false
       if (panelInfo) {
-        this.defaultTree(false)
-        this.tree()
+        if (this.editPanel.optType === 'toDefaultPanel') {
+          this.defaultTree(false)
+        }
+        updateCacheTree(this.editPanel.optType, 'panel-main-tree', panelInfo, this.tData)
         if (this.editPanel.optType === 'rename' && panelInfo.id === this.$store.state.panel.panelInfo.id) {
           this.$store.state.panel.panelInfo.name = panelInfo.name
         }
@@ -689,13 +685,7 @@ export default {
             return
           }
           // 复制后的仪表板 放在父节点下面
-          if (this.editPanel.optType === 'copy') {
-            this.lastActiveNode.parent.data.children.push(panelInfo)
-          } else {
-            if (!this.lastActiveNodeData.children) {
-              this.$set(this.lastActiveNodeData, 'children', [])
-            }
-            this.lastActiveNodeData.children.push(panelInfo)
+          if (this.editPanel.optType !== 'copy') {
             this.lastActiveNode.expanded = true
           }
           this.activeNodeAndClick(panelInfo)
@@ -745,6 +735,7 @@ export default {
           this.editPanel = {
             visible: true,
             titlePre: this.$t('panel.to_default'),
+            optType: 'toDefaultPanel',
             panelInfo: {
               id: param.data.id,
               name: param.data.name,
@@ -869,7 +860,7 @@ export default {
               showClose: true
             })
             this.clearCanvas()
-            this.tree()
+            updateCacheTree('delete', 'panel-main-tree', data.id, this.tData)
             this.defaultTree(false)
           })
         }
@@ -906,7 +897,7 @@ export default {
         this.tData = JSON.parse(modelInfo)
       }
       groupTree(this.groupForm, !userCache).then((res) => {
-        localStorage.setItem('panel-main-tree', JSON.stringify(res.data))
+        localStorage.setItem('panel-main-tree', JSON.stringify(res.data || []))
         if (!userCache) {
           this.tData = res.data
         }
@@ -937,7 +928,7 @@ export default {
       defaultTree(requestInfo, false).then((res) => {
         localStorage.setItem('panel-default-tree', JSON.stringify(res.data))
         if (!userCache) {
-          this.defaultData = res.data
+          this.defaultData = res.data || []
           if (showFirst && this.defaultData && this.defaultData.length > 0) {
             this.activeDefaultNodeAndClickOnly(this.defaultData[0].id)
           }
@@ -1054,7 +1045,7 @@ export default {
           _this.$nextTick(() => {
             document.querySelector('.is-current').firstChild.click()
             // 如果是仪表板列表的仪表板 直接进入编辑界面
-            if (panelInfo.nodeType === 'panel') {
+            if (panelInfo.nodeType === 'panel' && this.editPanel.optType !== 'copy') {
               _this.edit(this.lastActiveNodeData, this.lastActiveNode)
             }
           })
@@ -1109,11 +1100,11 @@ export default {
               id: 'panel_list',
               name: _this.$t('panel.panel_list'),
               label: _this.$t('panel.panel_list'),
-              children: res.data
+              children: res.data || []
             }
           ]
         } else {
-          _this.tGroupData = res.data
+          _this.tGroupData = res.data || []
         }
         _this.moveGroup = true
       })
@@ -1126,7 +1117,7 @@ export default {
       this.moveInfo.pid = this.tGroup.id
       this.moveInfo['optType'] = 'move'
       panelUpdate(this.moveInfo).then((response) => {
-        this.tree()
+        updateCacheTree('move', 'panel-main-tree', response.data, this.tData)
         this.closeMoveGroup()
       })
     },
diff --git a/frontend/src/views/panel/list/editPanel/index.vue b/frontend/src/views/panel/list/editPanel/index.vue
index 03a5e89aee..27c89fc0e8 100644
--- a/frontend/src/views/panel/list/editPanel/index.vue
+++ b/frontend/src/views/panel/list/editPanel/index.vue
@@ -240,7 +240,7 @@ export default {
             showClose: true
           })
           this.loading = false
-          this.$emit('closeEditPanelDialog', { id: response.data, name: this.editPanel.panelInfo.name })
+          this.$emit('closeEditPanelDialog', response.data)
         }).catch(() => {
           this.loading = false
         })

From fff56effdc42f3f7c46d4b20a07bdd88992b1e95 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Wed, 8 Feb 2023 16:28:25 +0800
Subject: [PATCH 3/7] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E6=BA=90=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=90=8D=E7=A7=B0=E5=90=8E=EF=BC=8C=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E6=95=B0=E6=8D=AE=E6=BA=90=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=B8=8D=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/system/datasource/DsTable.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/src/views/system/datasource/DsTable.vue b/frontend/src/views/system/datasource/DsTable.vue
index b3feee97f7..dbf2b96ed1 100644
--- a/frontend/src/views/system/datasource/DsTable.vue
+++ b/frontend/src/views/system/datasource/DsTable.vue
@@ -67,6 +67,7 @@
             @editeTodisable="editDatasource"
             :canEdit="canEdit"
             ref="DsFormContent"
+            @refresh-type="refreshType"
             :config-from-tabs="configFromTabs"
           />
         </div>
@@ -101,6 +102,9 @@ export default {
     }
   },
   methods: {
+    refreshType(form) {
+      this.$emit('refresh-type', form)
+    },
     editDatasource(type = false) {
       this.$refs.DsFormContent.editDatasource(type)
       this.canEdit = type

From c9c4ee4a617cc77652b5260df488be443b9aadc4 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 8 Feb 2023 18:19:45 +0800
Subject: [PATCH 4/7] =?UTF-8?q?refactor(=E8=A7=86=E5=9B=BE):=20=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E8=A1=A8=E6=A0=BC=E5=AF=BC=E5=87=BA=E6=97=B6=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=AF=BC=E5=87=BA=E5=85=A8=E9=87=8F=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request/chart/ChartExtRequest.java        |   3 +
 .../panel/PanelViewDetailsRequest.java        |   5 +
 .../service/chart/ChartViewService.java       |   8 +-
 .../service/panel/PanelGroupService.java      |  28 +++++
 .../canvas/customComponent/UserView.vue       |   3 +
 .../canvas/customComponent/UserViewDialog.vue | 101 +++++++++++-------
 frontend/src/store/index.js                   |   6 +-
 7 files changed, 109 insertions(+), 45 deletions(-)

diff --git a/backend/src/main/java/io/dataease/controller/request/chart/ChartExtRequest.java b/backend/src/main/java/io/dataease/controller/request/chart/ChartExtRequest.java
index 51d5cc3c74..b593df605b 100644
--- a/backend/src/main/java/io/dataease/controller/request/chart/ChartExtRequest.java
+++ b/backend/src/main/java/io/dataease/controller/request/chart/ChartExtRequest.java
@@ -5,6 +5,7 @@ import io.dataease.plugins.common.request.chart.ChartExtFilterRequest;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+
 import java.util.List;
 
 /**
@@ -48,4 +49,6 @@ public class ChartExtRequest {
 
     private Long pageSize;
 
+    private Boolean excelExportFlag = false;
+
 }
diff --git a/backend/src/main/java/io/dataease/controller/request/panel/PanelViewDetailsRequest.java b/backend/src/main/java/io/dataease/controller/request/panel/PanelViewDetailsRequest.java
index dc2293f938..41e3c09e0b 100644
--- a/backend/src/main/java/io/dataease/controller/request/panel/PanelViewDetailsRequest.java
+++ b/backend/src/main/java/io/dataease/controller/request/panel/PanelViewDetailsRequest.java
@@ -1,5 +1,6 @@
 package io.dataease.controller.request.panel;
 
+import io.dataease.controller.request.chart.ChartExtRequest;
 import lombok.Data;
 
 import java.util.List;
@@ -30,4 +31,8 @@ public class PanelViewDetailsRequest {
 
     private ViewDetailField[] detailFields;
 
+    private ChartExtRequest componentFilterInfo;
+
+    private List<String> excelHeaderKeys;
+
 }
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 2cb580c952..582eae1a61 100644
--- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
+++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
@@ -526,7 +526,8 @@ public class ChartViewService {
                 }
             }
             List<ChartViewFieldDTO> xAxisForRequest = new ArrayList<>();
-            xAxisForRequest.addAll(xAxis); xAxisForRequest.addAll(extStack);
+            xAxisForRequest.addAll(xAxis);
+            xAxisForRequest.addAll(extStack);
             datasourceRequest.setXAxis(xAxisForRequest);
             data = datasourceProvider.getData(datasourceRequest);
         } else if (table.getMode() == 1) {// 抽取
@@ -655,7 +656,7 @@ public class ChartViewService {
         Map<String, Object> mapAttr = gson.fromJson(view.getCustomAttr(), Map.class);
         Map<String, Object> mapSize = (Map<String, Object>) mapAttr.get("size");
         if (StringUtils.equalsIgnoreCase(view.getType(), "table-info") && table.getMode() == 0) {
-            if (StringUtils.equalsIgnoreCase((String) mapSize.get("tablePageMode"), "page")) {
+            if (StringUtils.equalsIgnoreCase((String) mapSize.get("tablePageMode"), "page") && !chartExtRequest.getExcelExportFlag()) {
                 if (chartExtRequest.getGoPage() == null) {
                     chartExtRequest.setGoPage(1L);
                 }
@@ -1043,7 +1044,8 @@ public class ChartViewService {
 
             datasourceRequest.setQuery(querySql);
             List<ChartViewFieldDTO> xAxisForRequest = new ArrayList<>();
-            xAxisForRequest.addAll(xAxis); xAxisForRequest.addAll(extStack);
+            xAxisForRequest.addAll(xAxis);
+            xAxisForRequest.addAll(extStack);
             datasourceRequest.setXAxis(xAxisForRequest);
             data = datasourceProvider.getData(datasourceRequest);
             if (CollectionUtils.isNotEmpty(assistFields)) {
diff --git a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
index 288ecffe74..3aac71fbe5 100644
--- a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
+++ b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
@@ -10,6 +10,7 @@ import io.dataease.auth.api.dto.CurrentUserDto;
 import io.dataease.commons.constants.*;
 import io.dataease.commons.utils.*;
 import io.dataease.controller.request.authModel.VAuthModelRequest;
+import io.dataease.controller.request.chart.ChartExtRequest;
 import io.dataease.controller.request.dataset.DataSetTableRequest;
 import io.dataease.controller.request.panel.*;
 import io.dataease.dto.DatasourceDTO;
@@ -652,6 +653,7 @@ public class PanelGroupService {
     public void exportPanelViewDetails(PanelViewDetailsRequest request, HttpServletResponse response) throws IOException {
         OutputStream outputStream = response.getOutputStream();
         try {
+            findExcelData(request);
             String snapshot = request.getSnapshot();
             List<Object[]> details = request.getDetails();
             Integer[] excelTypes = request.getExcelTypes();
@@ -1089,6 +1091,32 @@ public class PanelGroupService {
         request.setUpdateTime(time);
         request.setUpdateBy(AuthUtils.getUser().getUsername());
         panelGroupMapper.updateByPrimaryKeySelective(request);
+    }
+
+    public void findExcelData(PanelViewDetailsRequest request) {
+        ChartViewWithBLOBs viewInfo = chartViewService.get(request.getViewId());
+        if ("table-info".equals(viewInfo.getType())) {
+            try {
+                List<String> excelHeaderKeys = request.getExcelHeaderKeys();
+                ChartExtRequest componentFilterInfo = request.getComponentFilterInfo();
+                componentFilterInfo.setGoPage(1l);
+                componentFilterInfo.setPageSize(1000000l);
+                componentFilterInfo.setExcelExportFlag(true);
+                ChartViewDTO chartViewInfo = chartViewService.getData(request.getViewId(), componentFilterInfo);
+                List<Map> tableRow = (List) chartViewInfo.getData().get("tableRow");
+                List<Object[]> result = new ArrayList<>();
+                for (Map detailMap : tableRow) {
+                    List<Object> detailObj = new ArrayList<>();
+                    for (String key : excelHeaderKeys) {
+                        detailObj.add(detailMap.get(key));
+                    }
+                    result.add(detailObj.toArray());
+                }
+                request.setDetails(result);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
 
     }
 }
diff --git a/frontend/src/components/canvas/customComponent/UserView.vue b/frontend/src/components/canvas/customComponent/UserView.vue
index ea90bbee57..74d5ca469e 100644
--- a/frontend/src/components/canvas/customComponent/UserView.vue
+++ b/frontend/src/components/canvas/customComponent/UserView.vue
@@ -770,6 +770,9 @@ export default {
           if (response.success) {
             this.chart = response.data
             this.view = response.data
+            if (this.chart.type.includes('table')) {
+              this.$store.commit('setLastViewRequestInfo', { viewId: id, requestInfo: requestInfo })
+            }
             this.buildInnerRefreshTimer(this.chart.refreshViewEnable, this.chart.refreshUnit, this.chart.refreshTime)
             this.$emit('fill-chart-2-parent', this.chart)
             this.getDataOnly(response.data, dataBroadcast)
diff --git a/frontend/src/components/canvas/customComponent/UserViewDialog.vue b/frontend/src/components/canvas/customComponent/UserViewDialog.vue
index a61588c35e..a3a4d023ce 100644
--- a/frontend/src/components/canvas/customComponent/UserViewDialog.vue
+++ b/frontend/src/components/canvas/customComponent/UserViewDialog.vue
@@ -87,9 +87,20 @@ import html2canvas from 'html2canvasde'
 import { hexColorToRGBA } from '@/views/chart/chart/util'
 import { deepCopy, exportImg, imgUrlTrans } from '@/components/canvas/utils/utils'
 import { getLinkToken, getToken } from '@/utils/auth'
+
 export default {
   name: 'UserViewDialog',
-  components: { LabelNormalText, ChartComponentS2, ChartComponentG2, DeMainContainer, DeContainer, ChartComponent, TableNormal, LabelNormal, PluginCom },
+  components: {
+    LabelNormalText,
+    ChartComponentS2,
+    ChartComponentG2,
+    DeMainContainer,
+    DeContainer,
+    ChartComponent,
+    TableNormal,
+    LabelNormal,
+    PluginCom
+  },
   props: {
     chart: {
       type: Object,
@@ -123,8 +134,7 @@ export default {
       return this.chart.type === 'table-normal' || this.chart.type === 'table-info'
     },
     customStyle() {
-      let style = {
-      }
+      let style = {}
       if (this.canvasStyleData.openCommonStyle) {
         if (this.canvasStyleData.panel.backgroundType === 'image' && this.canvasStyleData.panel.imageUrl) {
           style = {
@@ -186,7 +196,8 @@ export default {
       'isClickComponent',
       'curComponent',
       'componentData',
-      'canvasStyleData'
+      'canvasStyleData',
+      'lastViewRequestInfo'
     ]),
     mapChart() {
       if (this.chart.type && (this.chart.type === 'map' || this.chart.type === 'buddle-map')) {
@@ -211,7 +222,7 @@ export default {
             }
           })
         }
-        const result = { ...temp, ...{ DetailAreaCode: DetailAreaCode }}
+        const result = { ...temp, ...{ DetailAreaCode: DetailAreaCode } }
         this.setLastMapChart(result)
         return result
       }
@@ -285,6 +296,8 @@ export default {
         snapshot: snapshot,
         snapshotWidth: width,
         snapshotHeight: height,
+        componentFilterInfo: this.lastViewRequestInfo[this.chart.id],
+        excelHeaderKeys: excelHeaderKeys,
         detailFields
       }
       let method = innerExportDetails
@@ -313,43 +326,49 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  .ms-aside-container {
-    height: 70vh;
-    min-width: 400px;
-    max-width: 400px;
-    padding: 0 0;
-  }
-  .ms-main-container {
-    height: 70vh;
-    border: 1px solid #E6E6E6;
-  }
-  .chart-class{
-    height: 100%;
-  }
-  .table-class{
-    height: 100%;
-  }
-  .canvas-class{
-    position: relative;
-    width: 100%;
-    height: 100%;
-    background-size: 100% 100% !important;
-  }
-  .abs-container {
-    position: absolute;
-    width: 100%;
-    margin-left: -20px;
-    .ms-main-container {
-      padding: 0px !important;
-    }
-  }
+.ms-aside-container {
+  height: 70vh;
+  min-width: 400px;
+  max-width: 400px;
+  padding: 0 0;
+}
 
-  .svg-background {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
+.ms-main-container {
+  height: 70vh;
+  border: 1px solid #E6E6E6;
+}
+
+.chart-class {
+  height: 100%;
+}
+
+.table-class {
+  height: 100%;
+}
+
+.canvas-class {
+  position: relative;
+  width: 100%;
+  height: 100%;
+  background-size: 100% 100% !important;
+}
+
+.abs-container {
+  position: absolute;
+  width: 100%;
+  margin-left: -20px;
+
+  .ms-main-container {
+    padding: 0px !important;
   }
+}
+
+.svg-background {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}
 
 </style>
diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js
index 72622c1890..1b8bed91f8 100644
--- a/frontend/src/store/index.js
+++ b/frontend/src/store/index.js
@@ -152,7 +152,8 @@ const data = {
     },
     previewVisible: false,
     previewComponentData: [],
-    currentCanvasNewId: []
+    currentCanvasNewId: [],
+    lastViewRequestInfo: {}
   },
   mutations: {
     ...animation.mutations,
@@ -610,6 +611,9 @@ const data = {
     resetViewEditInfo(state) {
       state.panelViewEditInfo = {}
     },
+    setLastViewRequestInfo(state, viewRequestInfo) {
+      state.lastViewRequestInfo[viewRequestInfo.viewId] = viewRequestInfo.requestInfo
+    },
     removeCurBatchComponentWithId(state, id) {
       for (let index = 0; index < state.curBatchOptComponents.length; index++) {
         const element = state.curBatchOptComponents[index]

From 157d66523f0d06d7f547fedfad8d0e086e88cdab Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 9 Feb 2023 11:11:04 +0800
Subject: [PATCH 5/7] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=98=8E=E7=BB=86=E5=AF=BC=E5=87=BA=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E5=BA=95=E9=83=A8=E6=97=A0=E7=94=A8=E7=BF=BB=E9=A1=B5?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/canvas/customComponent/UserView.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/components/canvas/customComponent/UserView.vue b/frontend/src/components/canvas/customComponent/UserView.vue
index 74d5ca469e..da4713b75f 100644
--- a/frontend/src/components/canvas/customComponent/UserView.vue
+++ b/frontend/src/components/canvas/customComponent/UserView.vue
@@ -915,6 +915,7 @@ export default {
       tableChart.customAttr.color.tableHeaderFontColor = '#7c7e81'
       tableChart.customAttr.color.tableFontColor = '#7c7e81'
       tableChart.customAttr.color.tableStripe = true
+      tableChart.customAttr.size.tablePageMode = 'pull'
       tableChart.customStyle.text.show = false
       tableChart.customAttr = JSON.stringify(tableChart.customAttr)
       tableChart.customStyle = JSON.stringify(tableChart.customStyle)

From 4dc3e3d8770f37b61ec28c2a31753c4a12e2628c Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 9 Feb 2023 15:55:32 +0800
Subject: [PATCH 6/7] =?UTF-8?q?refactor(=E6=95=B0=E6=8D=AE=E9=9B=86):=20?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E5=AF=BC=E5=87=BA=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E7=94=B1=E7=AE=A1=E7=90=86=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/dataset/data/ViewTable.vue | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/frontend/src/views/dataset/data/ViewTable.vue b/frontend/src/views/dataset/data/ViewTable.vue
index 72c9a87188..feaf71e105 100644
--- a/frontend/src/views/dataset/data/ViewTable.vue
+++ b/frontend/src/views/dataset/data/ViewTable.vue
@@ -17,14 +17,14 @@
             v-if="table.mode === 0"
             class="de-tag primary"
           >{{
-            $t('dataset.direct_connect')
-          }}</span>
+              $t('dataset.direct_connect')
+            }}</span>
           <span
             v-if="table.mode === 1"
             class="de-tag warning"
           >{{
-            $t('dataset.sync_data')
-          }}</span>
+              $t('dataset.sync_data')
+            }}</span>
         </template>
         <span
           v-if="syncStatus === 'Underway'"
@@ -33,7 +33,7 @@
         >
           {{ $t('dataset.dataset_sync') }}
         </span>
-        <el-divider direction="vertical" />
+        <el-divider direction="vertical"/>
         <span class="create-by">{{ $t('dataset.create_by') }}</span>
         <span class="create-by">:{{ table.creatorName || 'N/A' }}</span>
         <el-popover
@@ -59,6 +59,7 @@
         :span="8"
       >
         <deBtn
+          v-if="hasDataPermission('manage', param.privileges)"
           :disabled="!previewDataSuccess"
           type="primary"
           icon="el-icon-download"
@@ -79,11 +80,11 @@
           </deBtn>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item command="0">
-              <svg-icon icon-class="icon_add-entry_outlined" />
+              <svg-icon icon-class="icon_add-entry_outlined"/>
               {{ $t('dataset.excel_replace') + $t('chart.chart_data') }}
             </el-dropdown-item>
             <el-dropdown-item command="1">
-              <svg-icon icon-class="icon_doc-replace_outlined" />
+              <svg-icon icon-class="icon_doc-replace_outlined"/>
               {{ $t('dataset.excel_add') + $t('chart.chart_data') }}
             </el-dropdown-item>
           </el-dropdown-menu>
@@ -220,7 +221,7 @@
         >
           <div class="tree-cont">
             <div class="content">
-              <rowAuth ref="rowAuth" />
+              <rowAuth ref="rowAuth"/>
             </div>
           </div>
         </el-form-item>
@@ -233,7 +234,8 @@
         <deBtn
           secondary
           @click="closeExport"
-        >{{ $t('dataset.cancel') }}</deBtn>
+        >{{ $t('dataset.cancel') }}
+        </deBtn>
         <deBtn
           type="primary"
           @click="exportDatasetRequest"
@@ -520,12 +522,14 @@ export default {
     border-radius: 4px;
     border: 1px solid var(--deBorderBase, #DCDFE6);
     overflow: auto;
+
     .content {
       height: 100%;
       width: 100%;
     }
   }
 }
+
 .icon-class {
   color: #6c6c6c;
 }
@@ -546,6 +550,7 @@ export default {
   overflow-y: hidden;
   width: 100%;
   box-sizing: border-box;
+
   .de-dataset-name {
     display: flex;
     font-family: PingFang SC;

From 699aafaf30697182e8a841882ec5e5f79116fff0 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 9 Feb 2023 17:14:28 +0800
Subject: [PATCH 7/7] =?UTF-8?q?perf(=E7=99=BB=E5=BD=95):=20=E5=8F=8A?=
 =?UTF-8?q?=E6=97=B6=E5=88=A0=E9=99=A4=E5=BA=9F=E5=BC=83=E7=9A=84token?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/dataease/auth/filter/JWTFilter.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java b/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java
index 464e0c0979..973b0fced2 100644
--- a/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java
+++ b/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java
@@ -71,9 +71,11 @@ public class JWTFilter extends BasicHttpAuthenticationFilter {
         }
         // 当没有出现登录超时 且需要刷新token 则执行刷新token
         if (JWTUtils.loginExpire(authorization)) {
+            TokenCacheUtils.remove(authorization);
             throw new AuthenticationException(expireMessage);
         }
         if (JWTUtils.needRefresh(authorization)) {
+            TokenCacheUtils.remove(authorization);
             authorization = refreshToken(request, response);
         }
         JWTToken token = new JWTToken(authorization);