From 9d1a7e4e0f75691e03d2b7a6fd004bf06312ba7d Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 18 Mar 2021 18:30:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84=E5=88=86=E4=BA=AB?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtPanelShareMapper.java  |  3 +-
 .../base/mapper/ext/ExtPanelShareMapper.xml   |  7 ++-
 .../io/dataease/dto/panel/PanelShareDto.java  | 12 ++---
 .../io/dataease/dto/panel/PanelSharePo.java   | 20 +++++++++
 .../dataease/service/panel/ShareService.java  | 14 ++++--
 frontend/src/api/panel/share.js               |  9 ++++
 .../src/views/panel/GrantAuth/shareTree.vue   | 36 +++++++++++++++
 frontend/src/views/panel/index.vue            |  7 +--
 .../src/views/panel/list/PanelViewShow.vue    | 44 +++++++++----------
 9 files changed, 110 insertions(+), 42 deletions(-)
 create mode 100644 backend/src/main/java/io/dataease/dto/panel/PanelSharePo.java
 create mode 100644 frontend/src/views/panel/GrantAuth/shareTree.vue

diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelShareMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelShareMapper.java
index 6d2cc5acda..a3c52468e1 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelShareMapper.java
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelShareMapper.java
@@ -3,6 +3,7 @@ package io.dataease.base.mapper.ext;
 import io.dataease.base.domain.PanelShare;
 import io.dataease.base.mapper.ext.query.GridExample;
 import io.dataease.dto.panel.PanelShareDto;
+import io.dataease.dto.panel.PanelSharePo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -11,7 +12,7 @@ public interface ExtPanelShareMapper {
 
     int batchInsert(@Param("shares") List<PanelShare> shares);
 
-    List<PanelShareDto> query(GridExample example);
+    List<PanelSharePo> query(GridExample example);
 
     List<PanelShare> queryWithResource(GridExample example);
 }
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelShareMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelShareMapper.xml
index 35fbc15311..db4a0afc66 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelShareMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelShareMapper.xml
@@ -2,11 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="io.dataease.base.mapper.ext.ExtPanelShareMapper">
 
-    <resultMap id="treeNodeMap" type="io.dataease.dto.panel.PanelShareDto">
+    <resultMap id="treeNodeMap" type="io.dataease.dto.panel.PanelSharePo">
         <id column="id" property="id" />
         <result column="name" property="name" />
-        <result column="pid" property="pid" />
-        <result column="creator" property="create_by" />
+        <result column="creator" property="creator" />
     </resultMap>
 
     <insert id="batchInsert" parameterType="io.dataease.base.domain.PanelShare">
@@ -18,7 +17,7 @@
     </insert>
 
     <select id="query" parameterType="io.dataease.base.mapper.ext.query.GridExample" resultMap="treeNodeMap">
-        select s.panel_group_id as id, g.create_by as pid, g.name
+        select s.panel_group_id as id, g.create_by as creator, g.name
         from panel_share s
         left join panel_group g on g.id = s.panel_group_id
         <if test="_parameter != null">
diff --git a/backend/src/main/java/io/dataease/dto/panel/PanelShareDto.java b/backend/src/main/java/io/dataease/dto/panel/PanelShareDto.java
index 0ad7dd3575..b8ce93f5b2 100644
--- a/backend/src/main/java/io/dataease/dto/panel/PanelShareDto.java
+++ b/backend/src/main/java/io/dataease/dto/panel/PanelShareDto.java
@@ -1,21 +1,15 @@
 package io.dataease.dto.panel;
 
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.List;
 
 @Data
-@Builder
-public class PanelShareDto {
+@NoArgsConstructor
+public class PanelShareDto extends PanelSharePo{
 
-    @ApiModelProperty("节点ID")
-    private String id;
-    @ApiModelProperty("名称")
-    private String name;
-    @ApiModelProperty("节点父ID")
-    private String creator;
     @ApiModelProperty("子节点")
     private List<PanelShareDto> children;
 
diff --git a/backend/src/main/java/io/dataease/dto/panel/PanelSharePo.java b/backend/src/main/java/io/dataease/dto/panel/PanelSharePo.java
new file mode 100644
index 0000000000..b859d45317
--- /dev/null
+++ b/backend/src/main/java/io/dataease/dto/panel/PanelSharePo.java
@@ -0,0 +1,20 @@
+package io.dataease.dto.panel;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+@Data
+@NoArgsConstructor
+public class PanelSharePo {
+
+    @ApiModelProperty("节点ID")
+    private String id;
+    @ApiModelProperty("名称")
+    private String name;
+    @ApiModelProperty("节点父ID")
+    private String creator;
+
+
+}
diff --git a/backend/src/main/java/io/dataease/service/panel/ShareService.java b/backend/src/main/java/io/dataease/service/panel/ShareService.java
index 83022d807a..a40d2f0ed3 100644
--- a/backend/src/main/java/io/dataease/service/panel/ShareService.java
+++ b/backend/src/main/java/io/dataease/service/panel/ShareService.java
@@ -7,11 +7,13 @@ import io.dataease.base.mapper.PanelShareMapper;
 import io.dataease.base.mapper.ext.ExtPanelShareMapper;
 import io.dataease.base.mapper.ext.query.GridExample;
 import io.dataease.commons.utils.AuthUtils;
+import io.dataease.commons.utils.BeanUtils;
 import io.dataease.commons.utils.CommonBeanFactory;
 import io.dataease.controller.request.panel.PanelShareRequest;
 import io.dataease.controller.sys.base.BaseGridRequest;
 import io.dataease.controller.sys.base.ConditionEntity;
 import io.dataease.dto.panel.PanelShareDto;
+import io.dataease.dto.panel.PanelSharePo;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -96,14 +98,20 @@ public class ShareService {
         request.setConditions(new ArrayList<ConditionEntity>(){{add(condition);}});
 
         GridExample example = request.convertExample();
-        List<PanelShareDto> datas = extPanelShareMapper.query(example);
-        return convertTree(datas);
+        List<PanelSharePo> datas = extPanelShareMapper.query(example);
+        List<PanelShareDto> dtoLists = datas.stream().map(po -> BeanUtils.copyBean(new PanelShareDto(), po)).collect(Collectors.toList());
+        return convertTree(dtoLists);
     }
 
     //List构建Tree
     private List<PanelShareDto> convertTree(List<PanelShareDto> datas){
         Map<String, List<PanelShareDto>> map = datas.stream().collect(Collectors.groupingBy(PanelShareDto::getCreator));
-        return map.entrySet().stream().map(entry -> PanelShareDto.builder().name(entry.getKey()).children(entry.getValue()).build()).collect(Collectors.toList());
+        return map.entrySet().stream().map(entry -> {
+            PanelShareDto panelShareDto = new PanelShareDto();
+            panelShareDto.setName(entry.getKey());
+            panelShareDto.setChildren(entry.getValue());
+            return panelShareDto;
+        }).collect(Collectors.toList());
     }
 
     public List<PanelShare> queryWithResource(BaseGridRequest request){
diff --git a/frontend/src/api/panel/share.js b/frontend/src/api/panel/share.js
index ed12ea2301..d463ea3b99 100644
--- a/frontend/src/api/panel/share.js
+++ b/frontend/src/api/panel/share.js
@@ -18,3 +18,12 @@ export function loadShares(data) {
   })
 }
 
+export function loadTree(data) {
+  return request({
+    url: '/api/share/treeList',
+    method: 'post',
+    loading: true,
+    data
+  })
+}
+
diff --git a/frontend/src/views/panel/GrantAuth/shareTree.vue b/frontend/src/views/panel/GrantAuth/shareTree.vue
new file mode 100644
index 0000000000..c05edf6e1a
--- /dev/null
+++ b/frontend/src/views/panel/GrantAuth/shareTree.vue
@@ -0,0 +1,36 @@
+<template>
+  <div>
+
+    <el-tree :data="data" :props="defaultProps" @node-click="handleNodeClick" />
+  </div>
+</template>
+
+<script>
+import { loadTree } from '@/api/panel/share'
+export default {
+  name: 'ShareTree',
+  data() {
+    return {
+      data: [],
+      defaultProps: {
+        children: 'children',
+        label: 'name'
+      }
+    }
+  },
+  created() {
+    this.initData()
+  },
+  methods: {
+    initData() {
+      const param = {}
+      loadTree(param).then(res => {
+        this.data = res.data
+      })
+    },
+    handleNodeClick(data) {
+      console.log(data)
+    }
+  }
+}
+</script>
diff --git a/frontend/src/views/panel/index.vue b/frontend/src/views/panel/index.vue
index 26368e50b5..760d28e25f 100644
--- a/frontend/src/views/panel/index.vue
+++ b/frontend/src/views/panel/index.vue
@@ -2,7 +2,7 @@
   <de-container>
 
     <de-aside-container>
-      <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tabs v-model="activeName" :lazy="true" @tab-click="handleClick">
         <el-tab-pane name="PanelList">
           <span slot="label"><i class="el-icon-document" />列表</span>
           <PanelList @switchComponent="switchComponent" />
@@ -13,7 +13,7 @@
         </el-tab-pane>
         <el-tab-pane name="panels_share">
           <span slot="label"><i class="el-icon-share" />分享</span>
-          开发中...
+          <share-tree />
         </el-tab-pane>
         <!--        <el-tab-pane name="example">-->
         <!--          <span slot="label"><i class="el-icon-star-on"></i>示例</span>-->
@@ -38,10 +38,11 @@ import DeAsideContainer from '@/components/dataease/DeAsideContainer'
 import PanelList from './list/PanelList'
 import PanelView from './list/PanelView'
 import PanelViewShow from './list/PanelViewShow'
+import ShareTree from './GrantAuth/shareTree'
 
 export default {
   name: 'Panel',
-  components: { DeMainContainer, DeContainer, DeAsideContainer, PanelList, PanelView, PanelViewShow },
+  components: { DeMainContainer, DeContainer, DeAsideContainer, PanelList, PanelView, PanelViewShow, ShareTree },
   data() {
     return {
       component: PanelViewShow,
diff --git a/frontend/src/views/panel/list/PanelViewShow.vue b/frontend/src/views/panel/list/PanelViewShow.vue
index f2eca67623..c0a8b721b3 100644
--- a/frontend/src/views/panel/list/PanelViewShow.vue
+++ b/frontend/src/views/panel/list/PanelViewShow.vue
@@ -232,29 +232,29 @@ export default {
       })
     },
     getData(id) {
-      if (id) {
-        post('/chart/view/getData/' + id, null).then(response => {
-          this.view = response.data
-          this.view.xaxis = this.view.xaxis ? JSON.parse(this.view.xaxis) : []
-          this.view.yaxis = this.view.yaxis ? JSON.parse(this.view.yaxis) : []
+    //   if (id) {
+    //     post('/chart/view/getData/' + id, null).then(response => {
+    //       this.view = response.data
+    //       this.view.xaxis = this.view.xaxis ? JSON.parse(this.view.xaxis) : []
+    //       this.view.yaxis = this.view.yaxis ? JSON.parse(this.view.yaxis) : []
 
-          const chart = response.data
-          const chart_option = JSON.parse(JSON.stringify(BASE_BAR))
-          // console.log(chart_option);
-          if (chart.data) {
-            chart_option.title.text = chart.title
-            chart_option.xAxis.data = chart.data.x
-            chart.data.series.forEach(function(y) {
-              chart_option.legend.data.push(y.name)
-              chart_option.series.push(y)
-            })
-          }
-          // console.log(chart_option);
-          this.myEcharts(chart_option)
-        })
-      } else {
-        this.view = {}
-      }
+    //       const chart = response.data
+    //       const chart_option = JSON.parse(JSON.stringify(BASE_BAR))
+    //       // console.log(chart_option);
+    //       if (chart.data) {
+    //         chart_option.title.text = chart.title
+    //         chart_option.xAxis.data = chart.data.x
+    //         chart.data.series.forEach(function(y) {
+    //           chart_option.legend.data.push(y.name)
+    //           chart_option.series.push(y)
+    //         })
+    //       }
+    //       // console.log(chart_option);
+    //       this.myEcharts(chart_option)
+    //     })
+    //   } else {
+    //     this.view = {}
+    //   }
     },
 
     // 左边往右边拖动时的事件