feat(feat):数据集，视图分组树优化，去除场景

backend/src/main/java/io/dataease/base/mapper/ext/ExtChartGroupMapper.java

 package io.dataease.base.mapper.ext;
 
-import io.dataease.controller.request.BaseTreeRequest;
 import io.dataease.controller.request.chart.ChartGroupRequest;
 import io.dataease.dto.chart.ChartGroupDTO;
 

backend/src/main/java/io/dataease/controller/chart/ChartGroupController.java

@@ -26,6 +26,11 @@ public class ChartGroupController {
         return chartGroupService.tree(ChartGroup);
     }
 
+    @PostMapping("/treeNode")
+    public List<ChartGroupDTO> treeNode(@RequestBody ChartGroupRequest ChartGroup) {
+        return chartGroupService.tree(ChartGroup);
+    }
+
     @PostMapping("/delete/{id}")
     public void tree(@PathVariable String id) {
         chartGroupService.delete(id);

backend/src/main/java/io/dataease/controller/chart/ChartViewController.java

@@ -32,6 +32,11 @@ public class ChartViewController {
         return chartViewService.list(chartViewRequest);
     }
 
+    @PostMapping("/listAndGroup")
+    public List<ChartViewDTO> listAndGroup(@RequestBody ChartViewRequest chartViewRequest) {
+        return chartViewService.listAndGroup(chartViewRequest);
+    }
+
     @PostMapping("/get/{id}")
     public ChartViewWithBLOBs get(@PathVariable String id) {
         return chartViewService.get(id);

backend/src/main/java/io/dataease/controller/dataset/DataSetGroupController.java

@@ -21,6 +21,7 @@ public class DataSetGroupController {
     private DataSetGroupService dataSetGroupService;
     @Resource
     private ExtractDataService extractDataService;
+
     @PostMapping("/save")
     public DataSetGroupDTO save(@RequestBody DatasetGroup datasetGroup) {
         return dataSetGroupService.save(datasetGroup);
@@ -31,8 +32,13 @@ public class DataSetGroupController {
         return dataSetGroupService.tree(datasetGroup);
     }
 
+    @PostMapping("/treeNode")
+    public List<DataSetGroupDTO> treeNode(@RequestBody DataSetGroupRequest datasetGroup) {
+        return dataSetGroupService.treeNode(datasetGroup);
+    }
+
     @PostMapping("/delete/{id}")
-    public void tree(@PathVariable String id) throws Exception{
+    public void tree(@PathVariable String id) throws Exception {
         dataSetGroupService.delete(id);
     }
 
@@ -42,7 +48,7 @@ public class DataSetGroupController {
     }
 
     @PostMapping("/isKettleRunning")
-    public  boolean isKettleRunning(){
+    public boolean isKettleRunning() {
         return extractDataService.isKettleRunning();
     }
 }

backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java

@@ -44,6 +44,11 @@ public class DataSetTableController {
         return dataSetTableService.list(dataSetTableRequest);
     }
 
+    @PostMapping("listAndGroup")
+    public List<DataSetTableDTO> listAndGroup(@RequestBody DataSetTableRequest dataSetTableRequest) {
+        return dataSetTableService.listAndGroup(dataSetTableRequest);
+    }
+
     @PostMapping("get/{id}")
     public DatasetTable get(@PathVariable String id) {
         return dataSetTableService.get(id);

backend/src/main/java/io/dataease/dto/chart/ChartViewDTO.java

@@ -16,4 +16,7 @@ public class ChartViewDTO extends ChartViewWithBLOBs {
     private Map<String, Object> data;
 
     private String privileges;
+
+    private Boolean isLeaf;
+    private String pid;
 }

backend/src/main/java/io/dataease/dto/dataset/DataSetTableDTO.java

@@ -15,4 +15,7 @@ import java.util.List;
 public class DataSetTableDTO extends DatasetTable {
     private List<DataSetTableDTO> children;
     private String privileges;
+
+    private Boolean isLeaf;
+    private String pid;
 }

backend/src/main/java/io/dataease/service/chart/ChartGroupService.java

@@ -81,6 +81,16 @@ public class ChartGroupService {
     }
 
     public List<ChartGroupDTO> tree(ChartGroupRequest chartGroup) {
+        chartGroup.setLevel(null);
+        chartGroup.setPid("0");
+        chartGroup.setType("group");
+        chartGroup.setUserId(String.valueOf(AuthUtils.getUser().getUserId()));
+        List<ChartGroupDTO> treeInfo = extChartGroupMapper.search(chartGroup);
+        List<ChartGroupDTO> result = TreeUtils.mergeTree(treeInfo);
+        return result;
+    }
+
+    public List<ChartGroupDTO> treeNode(ChartGroupRequest chartGroup) {
         chartGroup.setLevel(null);
         chartGroup.setPid(null);
         chartGroup.setUserId(String.valueOf(AuthUtils.getUser().getUserId()));

backend/src/main/java/io/dataease/service/chart/ChartViewService.java

@@ -4,21 +4,23 @@ import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import io.dataease.base.domain.*;
 import io.dataease.base.mapper.ChartViewMapper;
+import io.dataease.base.mapper.ext.ExtChartGroupMapper;
 import io.dataease.base.mapper.ext.ExtChartViewMapper;
 import io.dataease.commons.utils.AuthUtils;
 import io.dataease.commons.utils.BeanUtils;
 import io.dataease.commons.utils.CommonBeanFactory;
 import io.dataease.controller.request.chart.ChartExtFilterRequest;
 import io.dataease.controller.request.chart.ChartExtRequest;
+import io.dataease.controller.request.chart.ChartGroupRequest;
 import io.dataease.controller.request.chart.ChartViewRequest;
+import io.dataease.controller.request.dataset.DataSetGroupRequest;
 import io.dataease.datasource.provider.DatasourceProvider;
 import io.dataease.datasource.provider.ProviderFactory;
 import io.dataease.datasource.request.DatasourceRequest;
 import io.dataease.datasource.service.DatasourceService;
-import io.dataease.dto.chart.ChartCustomFilterDTO;
-import io.dataease.dto.chart.ChartViewDTO;
-import io.dataease.dto.chart.ChartViewFieldDTO;
-import io.dataease.dto.chart.Series;
+import io.dataease.dto.chart.*;
+import io.dataease.dto.dataset.DataSetGroupDTO;
+import io.dataease.dto.dataset.DataSetTableDTO;
 import io.dataease.dto.dataset.DataTableInfoDTO;
 import io.dataease.i18n.Translator;
 import io.dataease.provider.QueryProvider;
@@ -51,6 +53,8 @@ public class ChartViewService {
     private DatasourceService datasourceService;
     @Resource
     private DataSetTableFieldsService dataSetTableFieldsService;
+    @Resource
+    private ExtChartGroupMapper extChartGroupMapper;
 
     public ChartViewWithBLOBs save(ChartViewWithBLOBs chartView) {
         checkName(chartView);
@@ -72,6 +76,30 @@ public class ChartViewService {
         return extChartViewMapper.search(chartViewRequest);
     }
 
+    public List<ChartViewDTO> listAndGroup(ChartViewRequest chartViewRequest) {
+        chartViewRequest.setUserId(String.valueOf(AuthUtils.getUser().getUserId()));
+        List<ChartViewDTO> charts = extChartViewMapper.search(chartViewRequest);
+        charts.forEach(ele -> ele.setIsLeaf(true));
+        // 获取group下的子group
+        ChartGroupRequest chartGroupRequest = new ChartGroupRequest();
+        chartGroupRequest.setLevel(null);
+        chartGroupRequest.setType("group");
+        chartGroupRequest.setPid(chartViewRequest.getSceneId());
+        chartGroupRequest.setUserId(String.valueOf(AuthUtils.getUser().getUserId()));
+        List<ChartGroupDTO> groups = extChartGroupMapper.search(chartGroupRequest);
+        List<ChartViewDTO> group = groups.stream().map(ele -> {
+            ChartViewDTO dto = new ChartViewDTO();
+            dto.setId(ele.getId());
+            dto.setName(ele.getName());
+            dto.setIsLeaf(false);
+            dto.setType("group");
+            dto.setPid(ele.getPid());
+            return dto;
+        }).collect(Collectors.toList());
+        group.addAll(charts);
+        return group;
+    }
+
     public ChartViewWithBLOBs get(String id) {
         return chartViewMapper.selectByPrimaryKey(id);
     }

backend/src/main/java/io/dataease/service/dataset/DataSetGroupService.java

@@ -87,6 +87,16 @@ public class DataSetGroupService {
         }
     }
 
+    public List<DataSetGroupDTO> treeNode(DataSetGroupRequest datasetGroup) {
+        datasetGroup.setLevel(null);
+        datasetGroup.setPid("0");
+        datasetGroup.setType("group");
+        datasetGroup.setUserId(String.valueOf(AuthUtils.getUser().getUserId()));
+        List<DataSetGroupDTO> treeInfo = extDataSetGroupMapper.search(datasetGroup);
+        List<DataSetGroupDTO> result = TreeUtils.mergeTree(treeInfo);
+        return result;
+    }
+
     public List<DataSetGroupDTO> tree(DataSetGroupRequest datasetGroup) {
         datasetGroup.setLevel(null);
         datasetGroup.setPid(null);

backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java

@@ -5,21 +5,19 @@ import com.fit2cloud.quartz.anno.QuartzScheduled;
 import com.google.gson.Gson;
 import io.dataease.base.domain.*;
 import io.dataease.base.mapper.*;
+import io.dataease.base.mapper.ext.ExtDataSetGroupMapper;
 import io.dataease.base.mapper.ext.ExtDataSetTableMapper;
 import io.dataease.base.mapper.ext.UtilMapper;
 import io.dataease.commons.constants.JobStatus;
 import io.dataease.commons.utils.*;
+import io.dataease.controller.request.dataset.DataSetGroupRequest;
 import io.dataease.controller.request.dataset.DataSetTableRequest;
 import io.dataease.datasource.dto.TableFiled;
 import io.dataease.datasource.provider.DatasourceProvider;
 import io.dataease.datasource.provider.JdbcProvider;
 import io.dataease.datasource.provider.ProviderFactory;
 import io.dataease.datasource.request.DatasourceRequest;
-import io.dataease.dto.dataset.DataSetPreviewPage;
-import io.dataease.dto.dataset.DataSetTableDTO;
-import io.dataease.dto.dataset.DataSetTableUnionDTO;
-import io.dataease.dto.dataset.DataTableInfoCustomUnion;
-import io.dataease.dto.dataset.DataTableInfoDTO;
+import io.dataease.dto.dataset.*;
 import io.dataease.i18n.Translator;
 import io.dataease.provider.DDLProvider;
 import io.dataease.provider.QueryProvider;
@@ -81,6 +79,8 @@ public class DataSetTableService {
     private QrtzSchedulerStateMapper qrtzSchedulerStateMapper;
     @Resource
     private DatasetTableTaskLogMapper datasetTableTaskLogMapper;
+    @Resource
+    private ExtDataSetGroupMapper extDataSetGroupMapper;
     private static String lastUpdateTime = "${__last_update_time__}";
     private static String currentUpdateTime = "${__current_update_time__}";
 
@@ -186,6 +186,31 @@ public class DataSetTableService {
         return extDataSetTableMapper.search(dataSetTableRequest);
     }
 
+    public List<DataSetTableDTO> listAndGroup(DataSetTableRequest dataSetTableRequest) {
+        dataSetTableRequest.setUserId(String.valueOf(AuthUtils.getUser().getUserId()));
+        dataSetTableRequest.setTypeFilter(dataSetTableRequest.getTypeFilter());
+        List<DataSetTableDTO> ds = extDataSetTableMapper.search(dataSetTableRequest);
+        ds.forEach(ele -> ele.setIsLeaf(true));
+        // 获取group下的子group
+        DataSetGroupRequest datasetGroup = new DataSetGroupRequest();
+        datasetGroup.setLevel(null);
+        datasetGroup.setType("group");
+        datasetGroup.setPid(dataSetTableRequest.getSceneId());
+        datasetGroup.setUserId(String.valueOf(AuthUtils.getUser().getUserId()));
+        List<DataSetGroupDTO> groups = extDataSetGroupMapper.search(datasetGroup);
+        List<DataSetTableDTO> group = groups.stream().map(ele -> {
+            DataSetTableDTO dto = new DataSetTableDTO();
+            dto.setId(ele.getId());
+            dto.setName(ele.getName());
+            dto.setIsLeaf(false);
+            dto.setType("group");
+            dto.setPid(ele.getPid());
+            return dto;
+        }).collect(Collectors.toList());
+        group.addAll(ds);
+        return group;
+    }
+
     public DatasetTable get(String id) {
         return datasetTableMapper.selectByPrimaryKey(id);
     }

frontend/src/views/chart/index.vue

@@ -2,12 +2,12 @@
   <de-container v-loading="$store.getters.loadingMap[$store.getters.currentPath]" style="background-color: #f7f8fa">
 
     <de-aside-container>
-      <group @switchComponent="switchComponent" />
+      <group :save-status="saveStatus" @switchComponent="switchComponent" />
     </de-aside-container>
 
     <de-main-container>
       <!--        <router-view />-->
-      <component :is="component" :param="param" @switchComponent="switchComponent" />
+      <component :is="component" :param="param" @switchComponent="switchComponent" @saveSuccess="saveSuccess" />
     </de-main-container>
   </de-container>
 </template>
@@ -28,7 +28,8 @@ export default {
   data() {
     return {
       component: ChartHome,
-      param: {}
+      param: {},
+      saveStatus: null
     }
   },
   mounted() {
@@ -45,6 +46,9 @@ export default {
           this.component = ChartHome
           break
       }
+    },
+    saveSuccess(val) {
+      this.saveStatus = val
     }
   }
 }

frontend/src/views/chart/view/ChartEdit.vue

@@ -98,7 +98,7 @@
               <el-radio-group
                 v-model="view.type"
                 style="width: 100%"
-                @change="save(true,'chart')"
+                @change="save(true,'chart',true)"
               >
                 <div style="width: 100%;display: flex;display: -webkit-flex;justify-content: space-between;flex-direction: row;flex-wrap: wrap;">
                   <el-radio value="table-normal" label="table-normal">
@@ -481,7 +481,7 @@ export default {
         return true
       })
     },
-    save(getData, trigger) {
+    save(getData, trigger, needRefreshGroup = false) {
       const view = JSON.parse(JSON.stringify(this.view))
       view.id = this.view.id
       view.sceneId = this.view.sceneId
@@ -549,8 +549,11 @@ export default {
           this.getChart(response.data.id)
         }
 
-        this.$store.dispatch('chart/setChartSceneData', null)
-        this.$store.dispatch('chart/setChartSceneData', response.data)
+        // this.$store.dispatch('chart/setChartSceneData', null)
+        // this.$store.dispatch('chart/setChartSceneData', response.data)
+        if (needRefreshGroup) {
+          this.refreshGroup(view)
+        }
       })
     },
 
@@ -797,7 +800,7 @@ export default {
     onTextChange(val) {
       this.view.customStyle.text = val
       this.view.title = val.title
-      this.save()
+      this.save(false, '', true)
     },
 
     onLegendChange(val) {
@@ -921,6 +924,10 @@ export default {
         yAxis: [],
         type: ''
       }
+    },
+
+    refreshGroup(view) {
+      this.$emit('saveSuccess', view)
     }
   }
 }

frontend/src/views/chart/view/TableSelector.vue

 <template>
   <de-container>
     <de-aside-container>
-      <dataset-group-selector @getTable="getTable" />
+      <dataset-group-selector-tree @getTable="getTable" />
     </de-aside-container>
 
     <de-main-container>
@@ -15,14 +15,15 @@ import DeMainContainer from '@/components/dataease/DeMainContainer'
 import DeContainer from '@/components/dataease/DeContainer'
 import DeAsideContainer from '@/components/dataease/DeAsideContainer'
 
-import DatasetGroupSelector from '../../dataset/common/DatasetGroupSelector'
+// import DatasetGroupSelector from '../../dataset/common/DatasetGroupSelector'
+import DatasetGroupSelectorTree from '../../dataset/common/DatasetGroupSelectorTree'
 import DatasetTableData from '../../dataset/common/DatasetTableData'
 
 export default {
   name: 'TableSelector',
   components: {
     DatasetTableData,
-    DeMainContainer, DeContainer, DeAsideContainer, DatasetGroupSelector
+    DeMainContainer, DeContainer, DeAsideContainer, DatasetGroupSelectorTree
   },
   data() {
     return {

frontend/src/views/dataset/add/AddCustom.vue

@@ -208,7 +208,8 @@ export default {
         info: '{"list":' + JSON.stringify(this.checkedList) + '}'
       }
       post('/dataset/table/update', table).then(response => {
-        this.$store.dispatch('dataset/setSceneData', new Date().getTime())
+        // this.$store.dispatch('dataset/setSceneData', new Date().getTime())
+        this.$emit('saveSuccess', table)
         this.cancel()
       })
     },

frontend/src/views/dataset/add/AddDB.vue

@@ -141,7 +141,8 @@ export default {
         })
       })
       post('/dataset/table/batchAdd', tables).then(response => {
-        this.$store.dispatch('dataset/setSceneData', new Date().getTime())
+        // this.$store.dispatch('dataset/setSceneData', new Date().getTime())
+        this.$emit('saveSuccess', tables[0])
         this.cancel()
       })
     },

frontend/src/views/dataset/add/AddExcel.vue

@@ -202,7 +202,8 @@ export default {
         }
       }
       post('/dataset/table/update', table).then(response => {
-        this.$store.dispatch('dataset/setSceneData', new Date().getTime())
+        // this.$store.dispatch('dataset/setSceneData', new Date().getTime())
+        this.$emit('saveSuccess', table)
         this.cancel()
       })
     },

frontend/src/views/dataset/add/AddSQL.vue

@@ -265,7 +265,8 @@ export default {
         info: JSON.stringify({ sql: this.sql })
       }
       post('/dataset/table/update', table).then(response => {
-        this.$store.dispatch('dataset/setSceneData', new Date().getTime())
+        // this.$store.dispatch('dataset/setSceneData', new Date().getTime())
+        this.$emit('saveSuccess', table)
         this.cancel()
       })
     },

frontend/src/views/dataset/common/DatasetGroupSelector.vue

@@ -29,8 +29,10 @@
             :default-expanded-keys="expandedArray"
             :data="data"
             node-key="id"
-            :expand-on-click-node="true"
+            :expand-on-click-node="false"
             @node-click="nodeClick"
+            @node-expand="nodeExpand"
+            @node-collapse="nodeCollapse"
           >
             <span slot-scope="{ node, data }" class="custom-tree-node">
               <span style="display: flex;flex: 1;width: 0;">
@@ -234,7 +236,7 @@ export default {
       if (this.currGroup) {
         this.dsLoading = true
         post('/dataset/table/list', {
-          sort: 'type asc,create_time desc,name asc',
+          sort: 'type asc,name asc,create_time desc',
           sceneId: this.currGroup.id,
           mode: this.mode < 0 ? null : this.mode,
           typeFilter: this.customType ? this.customType : null
@@ -258,19 +260,19 @@ export default {
     },
 
     nodeClick(data, node) {
-      if (data.type === 'scene') {
-        this.sceneMode = true
-        this.currGroup = data
-        this.tableTree()
-      }
-      if (node.expanded) {
-        this.expandedArray.push(data.id)
-      } else {
-        const index = this.expandedArray.indexOf(data.id)
-        if (index > -1) {
-          this.expandedArray.splice(index, 1)
-        }
-      }
+      // if (data.type === 'scene') {
+      this.sceneMode = true
+      this.currGroup = data
+      this.tableTree()
+      // }
+      // if (node.expanded) {
+      //   this.expandedArray.push(data.id)
+      // } else {
+      //   const index = this.expandedArray.indexOf(data.id)
+      //   if (index > -1) {
+      //     this.expandedArray.splice(index, 1)
+      //   }
+      // }
       // console.log(this.expandedArray);
     },
 
@@ -339,6 +341,17 @@ export default {
         div1.style.setProperty('cursor', 'not-allowed')
         div2.style.setProperty('pointer-events', 'none')
       })
+    },
+
+    nodeExpand(data) {
+      if (data.id) {
+        this.expandedArray.push(data.id)
+      }
+    },
+    nodeCollapse(data) {
+      if (data.id) {
+        this.expandedArray.splice(this.expandedArray.indexOf(data.id), 1)
+      }
     }
   }
 }

frontend/src/views/dataset/group/DsMoveSelector.vue

@@ -38,7 +38,7 @@ export default {
         name: '',
         pid: '0',
         level: 0,
-        type: '',
+        type: 'group',
         children: [],
         sort: 'type desc,name asc'
       },

frontend/src/views/dataset/index.vue

@@ -2,12 +2,12 @@
   <de-container v-loading="$store.getters.loadingMap[$store.getters.currentPath]">
 
     <de-aside-container>
-      <group @switchComponent="switchComponent" />
+      <group :save-status="saveStatus" @switchComponent="switchComponent" />
     </de-aside-container>
 
     <de-main-container>
       <!--<router-view/>-->
-      <component :is="component" :param="param" @switchComponent="switchComponent" />
+      <component :is="component" :param="param" @switchComponent="switchComponent" @saveSuccess="saveSuccess" />
     </de-main-container>
   </de-container>
 </template>
@@ -33,7 +33,8 @@ export default {
   data() {
     return {
       component: DataHome,
-      param: {}
+      param: {},
+      saveStatus: null
     }
   },
   mounted() {
@@ -65,6 +66,10 @@ export default {
           this.component = DataHome
           break
       }
+    },
+
+    saveSuccess(val) {
+      this.saveStatus = val
     }
   }
 }