From 49690a655ba7bfa8cad60dcf2279cb5aec6011d3 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Fri, 23 Dec 2022 17:37:00 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E8=A1=80=E7=BC=98=E5=85=B3?=
 =?UTF-8?q?=E7=B3=BB=20=20=E7=BC=BA=E5=B0=91=E5=85=A8=E5=B1=80scss?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E5=AF=BC=E8=87=B4=E7=9A=84=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20#4151?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/api/chart/chart.js               |  27 +
 frontend/src/api/dataset/dataset.js           |  17 +
 frontend/src/lang/en.js                       |   1 +
 frontend/src/lang/tw.js                       |   1 +
 frontend/src/lang/zh.js                       |   1 +
 frontend/src/views/dataset/add/AddDB.vue      |   2 +-
 .../system/relationship/consanguinity.vue     | 478 +++++++++++++++++
 .../src/views/system/relationship/index.vue   | 499 +++++++++++++++++-
 8 files changed, 1017 insertions(+), 9 deletions(-)
 create mode 100644 frontend/src/views/system/relationship/consanguinity.vue

diff --git a/frontend/src/api/chart/chart.js b/frontend/src/api/chart/chart.js
index c58409d9cc..be854d84bd 100644
--- a/frontend/src/api/chart/chart.js
+++ b/frontend/src/api/chart/chart.js
@@ -152,3 +152,30 @@ export const viewOptions = panelId => {
     method: 'post'
   })
 }
+
+
+export function getDatasourceRelationship(id) {
+  return request({
+    url: `/api/relation/datasource/${id}`,
+    method: 'get',
+    loading: true
+  })
+}
+
+
+export function getDatasetRelationship(id) {
+  return request({
+    url: `/api/relation/dataset/${id}`,
+    method: 'get',
+    loading: true
+  })
+}
+
+
+export function getPanelRelationship(id) {
+  return request({
+    url: `/api/relation/panel/${id}`,
+    method: 'get',
+    loading: true
+  })
+}
diff --git a/frontend/src/api/dataset/dataset.js b/frontend/src/api/dataset/dataset.js
index a7ec14dc6a..a194700c45 100644
--- a/frontend/src/api/dataset/dataset.js
+++ b/frontend/src/api/dataset/dataset.js
@@ -86,6 +86,23 @@ export function listDatasource() {
   })
 }
 
+export function getDatasetList() {
+  return request({
+    url: 'dataset/table/list',
+    loading: false,
+    method: 'post',
+    data: {}
+  })
+}
+
+export function getPanelGroupList() {
+  return request({
+    url: '/panel/group/list',
+    loading: false,
+    method: 'get'
+  })
+}
+
 export function listApiDatasource() {
   return request({
     url: '/datasource/list/api',
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index 601aabdfed..da3607f130 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -135,6 +135,7 @@ export default {
     default_login: 'Normal'
   },
   commons: {
+    consanguinity: 'Consanguinity',
     collapse_navigation: 'Collapse navigation',
     operate_cancelled: 'Operation cancelled',
     bind: 'Bind',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 86904cd527..bdfe346dce 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -135,6 +135,7 @@ export default {
     default_login: '普通登錄'
   },
   commons: {
+    consanguinity: '血緣關係',
     collapse_navigation: '收起導航',
     operate_cancelled: '已取消操作',
     bind: '綁定',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 9255752a76..66dd17496d 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -135,6 +135,7 @@ export default {
     default_login: '普通登录'
   },
   commons: {
+    consanguinity: '血缘关系',
     collapse_navigation: '收起导航',
     operate_cancelled: '已取消操作',
     bind: '绑定',
diff --git a/frontend/src/views/dataset/add/AddDB.vue b/frontend/src/views/dataset/add/AddDB.vue
index f852311969..071fb3774d 100644
--- a/frontend/src/views/dataset/add/AddDB.vue
+++ b/frontend/src/views/dataset/add/AddDB.vue
@@ -554,7 +554,7 @@ export default {
         }
 
         &.active {
-          background-color: var(--deWhiteHover, #3370ff);
+          background-color: var(--deWhiteHover, #e0eaff);
           color: var(--primary, #3370ff);
         }
 
diff --git a/frontend/src/views/system/relationship/consanguinity.vue b/frontend/src/views/system/relationship/consanguinity.vue
new file mode 100644
index 0000000000..17a03e77ef
--- /dev/null
+++ b/frontend/src/views/system/relationship/consanguinity.vue
@@ -0,0 +1,478 @@
+<template>
+  <div id="main" :style="chartSize"></div>
+</template>
+
+<script>
+import * as echarts from 'echarts'
+import {
+  getDatasourceRelationship,
+  getDatasetRelationship,
+  getPanelRelationship
+} from '@/api/chart/chart.js'
+export default {
+  props: {
+    current: {
+      type: Object,
+      default: () => {}
+    },
+    chartSize: {
+      type: Object,
+      default: () => {}
+    },
+  },
+  data() {
+    return {
+      measureText: null,
+      treeData: [],
+      myChart: null,
+      datasourcePanel: {
+        datasource: 'panel',
+        panel: 'datasource',
+        dataset: 'panel'
+      }
+    }
+  },
+  watch: {
+    chartSize: {
+        handler(val) {
+            if (this.myChart) {
+                this.myChart.resize(val)
+            }
+        },
+        deep: true
+    }
+  },
+  methods: {
+    getChartData(id) {
+      switch (this.current.queryType) {
+        case 'datasource':
+          this.getDatasourceRelationship(id)
+          break
+        case 'dataset':
+          this.getDatasetRelationship(id)
+          break
+        case 'panel':
+          this.getPanelRelationship(id)
+          break
+        default:
+          break
+      }
+    },
+    getDatasourceRelationship(id) {
+      getDatasourceRelationship(id).then((res) => {
+        const arr = res.data || []
+        this.treeData = []
+        this.dfsTree(arr, this.current.num)
+        this.initEchart()
+      })
+    },
+    getDatasetRelationship(id) {
+      getDatasetRelationship(id).then((res) => {
+        const arr = res.data ? [res.data] : []
+        this.treeData = []
+        this.dfsTree(arr, this.current.num)
+        this.initEchart()
+      })
+    },
+    getPanelRelationship(id) {
+      getPanelRelationship(id).then((res) => {
+        const arr = res.data || []
+        this.treeData = []
+        this.dfsTreeFlip(arr)
+        this.initEchart()
+      })
+    },
+    dfsTreeFlip(arr = [], obj) {
+      arr.forEach((ele) => {
+        const { id, name, type, subRelation = [] } = ele
+        if (subRelation.length) {
+          this.dfsTreeFlip(subRelation, { id, name })
+        } else if (type === 'dataset') {
+          this.treeData.push({ id, name, type, pid: this.current.num })
+          this.treeData.push({
+            id: obj.id,
+            name: obj.name,
+            type: 'datasource',
+            pid: id
+          })
+        }
+      })
+    },
+    dfsTree(arr = [], pid = 0) {
+      arr.forEach((ele) => {
+        const { id, name, type, subRelation = [] } = ele
+        this.treeData.push({ id, name, type, pid })
+        if (subRelation.length) {
+          this.dfsTree(subRelation, id)
+        }
+      })
+    },
+    deleteRepeat(arr = []) {
+      let list = JSON.parse(JSON.stringify(arr))
+      const repeatPanel = {}
+      list.forEach((ele) => {
+        if (ele[6] === this.datasourcePanel[this.current.queryType]) {
+          if (repeatPanel[ele[4]]) {
+            repeatPanel[ele[4]].push(ele[0])
+          } else {
+            repeatPanel[ele[4]] = [ele[0]]
+          }
+        }
+      })
+
+      Object.keys(repeatPanel).forEach((ele) => {
+        if (repeatPanel[ele].length === 1) {
+          repeatPanel[ele] = undefined
+          return
+        }
+        repeatPanel[ele] = repeatPanel[ele].sort((a, b) => {
+          return a - b
+        })[Math.floor(repeatPanel[ele].length / 2)]
+      })
+      return list.filter((ele) => {
+        if (repeatPanel[ele[4]] === undefined) return true
+        return repeatPanel[ele[4]] === ele[0]
+      })
+    },
+    calculatedLine(arr = []) {
+      if (!arr.length || arr.length === 1) return
+      const repeatPanel = {}
+      const dataItemListMap = {}
+      const list = []
+      const root = arr.find((ele) => ele[6] === this.current.queryType)
+      arr.forEach((ele) => {
+        const [index, start, end, width, id, name, type, pid] = ele
+        dataItemListMap[id] = {
+          index,
+          start,
+          end,
+          width,
+          id,
+          name,
+          type,
+          pid
+        }
+
+        if (type === 'dataset' && this.current.queryType !== 'dataset') {
+          list.push([root[0], root[1], start, index, root[3], type, id])
+        }
+      })
+
+      arr.forEach((ele) => {
+        const [index, start, end, width, id, name, type, pid] = ele
+        if (type === this.datasourcePanel[this.current.queryType]) {
+          let dataset = dataItemListMap[pid]
+          if (repeatPanel[id]) {
+            repeatPanel[id].push({ index, start })
+          } else {
+            repeatPanel[id] = [{ index, start }]
+          }
+          list.push([
+            dataset.index,
+            dataset.start,
+            start,
+            index,
+            dataset.width,
+            type,
+            id
+          ])
+        }
+      })
+
+      Object.keys(repeatPanel).forEach((ele) => {
+        if (repeatPanel[ele].length === 1) {
+          repeatPanel[ele] = null
+          return
+        }
+        repeatPanel[ele] = repeatPanel[ele].sort((a, b) => {
+          return a.index - b.index
+        })[Math.floor(repeatPanel[ele].length / 2)]
+      })
+
+      list.forEach((ele) => {
+        if (!repeatPanel[ele[6]]) return
+        const { start, index } = repeatPanel[ele[6]]
+        ele[2] = start
+        ele[3] = index
+      })
+
+      return list
+    },
+    calculatedWidth(arr = []) {
+      const c = document.createElement('canvas')
+      const ctx = c.getContext('2d')
+      ctx.font = '14px Arial'
+      const dataItemList = []
+      let list = []
+      const repeatPanel = {}
+
+      let max = {
+        dataset: 0,
+        datasource: 0,
+        panel: 0
+      }
+
+      const { queryType, num, label } = this.current
+      max[queryType] = ctx.measureText(label).width + 10
+
+      if (!arr.length)
+        return [
+          [[0, 0, max[queryType], max[queryType], num, label, queryType, 0]],
+          {
+            dataset: 0,
+            datasource: 0,
+            panel: 0
+          }
+        ]
+
+      arr.forEach((ele, index) => {
+        const { id, name, type, pid } = ele
+        let width = ctx.measureText(name).width + 10
+        max[type] = Math.max(width, max[type])
+        dataItemList.push([width, id, name, type, pid])
+      })
+      let inserted = false
+
+      dataItemList.forEach((ele, index) => {
+        if (index === Math.floor(dataItemList.length / 2)) {
+          inserted = true
+          list.push([
+            index,
+            0,
+            max[queryType],
+            max[queryType],
+            num,
+            label,
+            queryType,
+            0
+          ])
+        }
+        const [width, id, name, type, pid] = ele
+        if (type === 'dataset' && this.current.queryType !== 'dataset') {
+          list.push([
+            inserted ? index + 1 : index,
+            max[this.current.queryType],
+            max[this.current.queryType] + width,
+            width,
+            id,
+            name,
+            type,
+            pid
+          ])
+        }
+
+        if (type === 'panel' && this.current.queryType !== 'panel') {
+          list.push([
+            inserted ? index + 1 : index,
+            max.dataset + max.datasource,
+            max.dataset + max.datasource + width,
+            width,
+            id,
+            name,
+            type,
+            pid
+          ])
+        }
+
+        if (type === 'datasource' && this.current.queryType !== 'datasource') {
+          list.push([
+            inserted ? index + 1 : index,
+            max.dataset + max.panel,
+            max.dataset + max.panel + width,
+            width,
+            id,
+            name,
+            type,
+            pid
+          ])
+        }
+      })
+
+      function maxGap(source, target) {
+        return Math.min(
+          Math.max(
+            list.filter((ele) => ele[6] === source).length * 5,
+            max[target] / 2,
+            30
+          ),
+          30
+        )
+      }
+      let gap = {
+        dataset: maxGap('dataset', 'datasource'),
+        datasource: maxGap('datasource', 'datasource'),
+        panel: maxGap('panel', 'dataset')
+      }
+      return [list, gap]
+    },
+    initEchart() {
+      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)
+      const gapDetail = {
+        dataset: gap.dataset,
+        datasource: gap.dataset + gap.panel,
+        panel: gap.panel + gap.dataset
+      }
+
+      gapDetail[this.current.queryType] = 0
+      let lineData = this.calculatedLine(data)
+      data = this.deleteRepeat(data)
+      let option = {
+        xAxis: {
+          show: false, //不显示分隔线,
+          splitLine: {
+            show: false //不显示分隔线
+          }
+        },
+        grid: {
+          top: 10,
+          bottom: 10,
+          left: '5%'
+        },
+        tooltip: {
+          show: true,
+          trigger: 'item',
+          formatter: (a) => {
+            return a.value[5]
+          }
+        },
+        yAxis: {
+          show: false,
+          type: 'category',
+          splitLine: {
+            show: false //不显示分隔线
+          }
+        },
+        series: [
+          {
+            type: 'custom',
+            encode: {
+              // data 中『维度1』和『维度2』对应到 X 轴
+              x: [1, 2],
+              // data 中『维度0』对应到 Y 轴
+              y: 0
+            },
+            roam: true,
+            renderItem: function (params, api) {
+              let categoryIndex = api.value(0)
+              let startPoint = api.coord([api.value(1), categoryIndex])
+              let width = api.value(3)
+              let height = 22
+              return {
+                type: 'group', //当需要多个自定义拼接时，需要用group，此案例是文字和图形的拼接
+                children: [
+                  {
+                    type: 'text',
+                    position: [
+                      startPoint[0] + gapDetail[api.value(6)],
+                      startPoint[1] - height / 2
+                    ], //相对位置
+                    z2: 10,
+                    style: {
+                      text: api.value(5), //data中取值
+                      color: '#1F2329',
+                      x: 5,
+                      y: 5
+                    }
+                  },
+                  {
+                    // 表示这个图形元素是矩形。还可以是 'circle', 'sector', 'polygon' 等等。
+                    type: 'rect',
+                    z2: 2,
+                    // shape 属性描述了这个矩形的像素位置和大小。
+                    // 其中特殊得用到了 echarts.graphic.clipRectByRect，意思是，
+                    // 如果矩形超出了当前坐标系的包围盒，则剪裁这个矩形。
+                    shape: echarts.graphic.clipRectByRect(
+                      {
+                        // 矩形的位置和大小。
+                        x: startPoint[0] + gapDetail[api.value(6)],
+                        y: startPoint[1] - height / 2,
+                        width,
+                        height: height
+                      },
+                      {
+                        // 当前坐标系的包围盒。
+                        x: params.coordSys.x,
+                        y: params.coordSys.y,
+                        width: params.coordSys.width,
+                        height: params.coordSys.height
+                      }
+                    ),
+                    style: {
+                      ...api.style(),
+                      fill: api.value(4) === that.current.num ? '#c2d4ff' : 'none',
+                      stroke: '#3370FF'
+                    }
+                  }
+                ]
+              }
+            },
+            data
+          },
+          {
+            type: 'custom',
+            encode: {
+              x: [1, 2],
+              y: [0, 3]
+            },
+            roam: true,
+            renderItem: function (params, api) {
+              let categoryIndex = api.value(0)
+              let categoryIndex2 = api.value(3)
+              let startPoint = api.coord([api.value(1), categoryIndex])
+              let endPoint = api.coord([api.value(2), categoryIndex2])
+              let height = 20
+
+              function startPointX1() {
+                if (api.value(5) === 'dataset') {
+                  return startPoint[0] + api.value(4)
+                }
+
+                if (
+                  api.value(5) === that.datasourcePanel[that.current.queryType]
+                ) {
+                  return startPoint[0] + api.value(4) + gapDetail.dataset
+                }
+
+                if (api.value(5) === that.current.queryType) {
+                  return 0
+                }
+              }
+
+              let x1 = startPointX1()
+
+              return {
+                type: 'group', //当需要多个自定义拼接时，需要用group，此案例是文字和图形的拼接
+                children: [
+                  {
+                    type: 'line',
+                    silent: true,
+                    shape: {
+                      x1,
+                      y1: startPoint[1],
+                      x2: endPoint[0] + gapDetail[api.value(5)],
+                      y2: endPoint[1],
+                      percent: 1
+                    },
+                    style: {
+                      stroke: '#3370FF',
+                      lineWidth: 1
+                    }
+                  }
+                ]
+              }
+            },
+            data: lineData
+          }
+        ]
+      }
+      this.myChart.setOption(option, true)
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/frontend/src/views/system/relationship/index.vue b/frontend/src/views/system/relationship/index.vue
index 1cb6132949..e35ae371eb 100644
--- a/frontend/src/views/system/relationship/index.vue
+++ b/frontend/src/views/system/relationship/index.vue
@@ -1,24 +1,507 @@
 <template>
-  <div>
-    <h2>this is blood relationship page for shutong</h2>
-    <span>{{ text }}</span>
+  <div class="consanguinity">
+    <div class="route-title">{{ $t('commons.consanguinity') }}</div>
+    <div class="container-wrapper">
+      <el-form
+        :rules="rules"
+        :inline="true"
+        ref="form"
+        :model="formInline"
+        class="de-form-inline"
+      >
+        <el-form-item
+          prop="queryType"
+          :label="$t('commons.adv_search.search') + $t('table.type')"
+        >
+          <el-select
+            v-model="formInline.queryType"
+            @change="queryTypeChange"
+            :placeholder="$t('fu.search_bar.please_select')"
+          >
+            <el-option
+              v-for="item in queryTypeNameList"
+              :key="item.value"
+              :label="$t(item.label)"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="dataSourceName" :label="queryTypeTitle">
+          <el-select
+            v-model="formInline.dataSourceName"
+            filterable
+            :placeholder="$t('fu.search_bar.please_select')"
+          >
+            <el-option
+              v-for="item in dataSourceNameList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item style="float: right">
+          <de-btn type="primary" @click="onSubmit">{{
+            $t('commons.adv_search.search')
+          }}</de-btn>
+        </el-form-item>
+      </el-form>
+      <div class="select-icon">
+        <i
+          @click="activeIcon = 'date'"
+          :class="[activeIcon === 'date' ? 'active-icon' : '']"
+          class="el-icon-date"
+        ></i>
+        <svg-icon
+          icon-class="sys-relationship"
+          :class="[activeIcon === 'share' ? 'active-icon' : '']"
+          @click="activeIcon = 'share'"
+        />
+      </div>
+      <div v-show="activeIcon === 'share'" id="consanguinity">
+        <consanguinity
+          :chartSize="chartSize"
+          :current="current"
+          ref="consanguinity"
+        />
+      </div>
+      <div v-show="activeIcon === 'date'" class="consanguinity-table">
+        <grid-table
+          v-loading="loading"
+          :table-data="tableData"
+          :pagination="paginationConfig"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        >
+          <el-table-column :label="$t('table.id')" type="index" width="50" />
+          <el-table-column
+            prop="datasource"
+            :formatter="formatter"
+            show-overflow-tooltip
+            :label="$t('commons.datasource') + $t('commons.name')"
+          />
+          <el-table-column
+            prop="dataset"
+            show-overflow-tooltip
+            :formatter="formatter"
+            :label="$t('dataset.name')"
+          />
+          <el-table-column
+            prop="panel"
+            show-overflow-tooltip
+            :formatter="formatter"
+            :label="$t('app_template.panel_name')"
+          />
+        </grid-table>
+      </div>
+    </div>
   </div>
 </template>
+
 <script>
+import {
+  getDatasourceRelationship,
+  getDatasetRelationship,
+  getPanelRelationship
+} from '@/api/chart/chart.js'
+import {
+  listDatasource,
+  getDatasetList,
+  getPanelGroupList
+} from '@/api/dataset/dataset'
+import _ from 'lodash'
+import GridTable from '@/components/gridTable/index.vue'
+import consanguinity from './consanguinity.vue'
+import { log } from '@antv/g2plot/lib/utils'
 export default {
-  name: 'Relationship',
+  name: 'Consanguinity',
+  components: { GridTable, consanguinity },
   data() {
     return {
-      text: ''
+      formInline: {
+        queryType: 'datasource',
+        dataSourceName: ''
+      },
+      rules: {
+        queryType: [{ required: true, trigger: 'blur' }],
+        dataSourceName: [{ required: true, trigger: 'blur', message: this.$t('chart.name_can_not_empty') }]
+      },
+      dataSourceNameList: [],
+      queryTypeNameList: [
+        {
+          label: 'commons.datasource',
+          value: 'datasource'
+        },
+        {
+          label: 'dataset.datalist',
+          value: 'dataset'
+        },
+        {
+          label: 'panel.panel',
+          value: 'panel'
+        }
+      ],
+      chartSize: {
+        height: 0,
+        width: 0
+      },
+      treeData: [],
+      loading: false,
+      activeIcon: 'date',
+      paginationConfig: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 0
+      }
+    }
+  },
+  computed: {
+    current() {
+      const { queryType = '', dataSourceName } = this.formInline
+      const obj =
+        this.dataSourceNameList.find((ele) => dataSourceName === ele.value) ||
+        {}
+      return {
+        queryType,
+        num: obj.value,
+        label: obj.label
+      }
+    },
+    queryTypeTitle() {
+      return (
+        this.$t(
+          this.queryTypeNameList.find(
+            (ele) => ele.value === this.formInline.queryType
+          ).label
+        ) + this.$t('commons.name')
+      )
+    },
+    tableData() {
+      const { currentPage, pageSize } = this.paginationConfig
+      return this.treeData.slice(
+        (currentPage - 1) * pageSize,
+        currentPage * pageSize
+      )
     }
   },
   created() {
-    this.init
+    this.listDatasource()
+  },
+  beforeDestroy() {
+    window.removeEventListener('resize', this.getChartSize)
+  },
+  mounted() {
+    window.addEventListener('resize', this.getChartSize)
+    this.getChartSize()
   },
   methods: {
-    init() {
-      this.text = 'shutong is a handsome guy'
+    getChartData() {
+      const { queryType, dataSourceName: id } = this.formInline
+      switch (queryType) {
+        case 'datasource':
+          this.getDatasourceRelationship(id)
+          break
+        case 'dataset':
+          this.getDatasetRelationship(id)
+          break
+        case 'panel':
+          this.getPanelRelationship(id)
+          break
+        default:
+          break
+      }
+    },
+    getDatasourceRelationship(id) {
+      getDatasourceRelationship(id).then((res) => {
+        const arr = res.data || []
+        this.treeData = []
+        this.dfsTree(arr, this.current)
+        this.initTable()
+      })
+    },
+    getDatasetRelationship(id) {
+      getDatasetRelationship(id).then((res) => {
+        const arr = res.data ? [res.data] : []
+        this.treeData = []
+        this.dfsTree(arr, this.current)
+        this.initTable()
+      })
+    },
+    getPanelRelationship(id) {
+      getPanelRelationship(id).then((res) => {
+        const arr = res.data || []
+        this.treeData = []
+        this.dfsTreeFlip(arr, this.current)
+        this.initTable()
+      })
+    },
+    formatter(row, column, cellValue) {
+      return cellValue ? cellValue : '-'
+    },
+    initTable() {
+      this.paginationConfig.total = this.treeData.length
+    },
+    dfsTreeFlip(arr = [], { queryType, label }) {
+      arr.forEach((ele) => {
+        const { name, type, subRelation = [] } = ele
+        if (subRelation.length) {
+          this.dfsTreeFlip(subRelation, { label: name })
+        } else if (type === 'dataset') {
+          const obj = {}
+          obj[type] = name
+          obj.datasource = label
+          obj.panel = this.current.label
+          this.treeData.push(obj)
+        }
+      })
+    },
+    dfsTree(arr = [], { queryType, label }, item) {
+      arr.forEach((ele) => {
+        const { name, type, subRelation = [] } = ele
+        const obj = {}
+        obj[type] = name
+        obj[queryType] = label
+        if (subRelation.length) {
+          this.dfsTree(subRelation, { queryType: type, label: name }, obj)
+        } else {
+          this.treeData.push({ ...item, ...obj })
+        }
+      })
+    },
+    getChartSize: _.debounce(function () {
+      const dom = document.querySelector(
+        this.activeIcon === 'date' ? '.consanguinity-table' : '#consanguinity'
+      )
+      this.chartSize = {
+        height: dom.offsetHeight + 'px',
+        width: dom.offsetWidth + 'px'
+      }
+    }, 200),
+    listDatasource() {
+      listDatasource().then((res) => {
+        const arr = res?.data || []
+        this.dataSourceNameList = arr.map((ele) => ({
+          value: ele.id,
+          label: ele.name
+        }))
+      })
+    },
+    getDatasetList() {
+      getDatasetList().then((res) => {
+        const arr = res?.data || []
+        this.dataSourceNameList = arr.map((ele) => ({
+          value: ele.id,
+          label: ele.name
+        }))
+      })
+    },
+    getPanelGroupList() {
+      getPanelGroupList().then((res) => {
+        const arr = res?.data || []
+        this.dataSourceNameList = arr.map((ele) => ({
+          value: ele.id,
+          label: ele.name
+        }))
+      })
+    },
+    queryTypeChange(val) {
+      this.formInline.dataSourceName = ''
+      switch (val) {
+        case 'datasource':
+          this.listDatasource()
+          break
+        case 'dataset':
+          this.getDatasetList()
+          break
+        case 'panel':
+          this.getPanelGroupList()
+          break
+        default:
+          break
+      }
+    },
+    onSubmit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          if (this.activeIcon === 'date') {
+            this.getChartData()
+          } else {
+            this.$refs.consanguinity.getChartData(
+              this.formInline.dataSourceName
+            )
+          }
+        }
+      })
+    },
+    handleSizeChange(pageSize) {
+      this.paginationConfig.currentPage = 1
+      this.paginationConfig.pageSize = pageSize
+      this.onSubmit()
+    },
+    handleCurrentChange(currentPage) {
+      this.paginationConfig.currentPage = currentPage
+      this.onSubmit()
+    },
+    initTree() {
+      const chartDom = document.getElementById('consanguinity')
+      this.treeChart = this.$echarts.init(chartDom)
+      const data = {
+        name: 'flare',
+        children: [
+          {
+            name: 'data',
+            children: [
+              {
+                name: 'converters',
+                children: [
+                  { name: 'Converters', value: 721 },
+                  { name: 'DelimitedTextConverter', value: 4294 }
+                ]
+              },
+              {
+                name: 'DataUtil',
+                value: 3322
+              }
+            ]
+          },
+          {
+            name: 'display',
+            children: [
+              { name: 'DirtySprite', value: 8833 },
+              { name: 'LineSprite', value: 1732 },
+              { name: 'RectSprite', value: 3623 }
+            ]
+          },
+          {
+            name: 'flex',
+            children: [{ name: 'FlareVis', value: 4116 }]
+          },
+          {
+            name: 'scale',
+            children: [
+              { name: 'IScaleMap', value: 2105 },
+              { name: 'LinearScale', value: 1316 },
+              { name: 'LogScale', value: 3151 },
+              { name: 'OrdinalScale', value: 3770 },
+              { name: 'QuantileScale', value: 2435 },
+              { name: 'QuantitativeScale', value: 4839 },
+              { name: 'RootScale', value: 1756 },
+              { name: 'Scale', value: 4268 },
+              { name: 'ScaleType', value: 1821 },
+              { name: 'TimeScale', value: 5833 }
+            ]
+          }
+        ]
+      }
+
+      const option = {
+        tooltip: {
+          trigger: 'item',
+          triggerOn: 'mousemove'
+        },
+        series: [
+          {
+            type: 'tree',
+            id: 0,
+            name: 'tree1',
+            data: [data],
+            top: '10%',
+            left: '8%',
+            bottom: '22%',
+            right: '20%',
+            symbolSize: 0,
+            edgeShape: 'polyline',
+            edgeForkPosition: '50%',
+            initialTreeDepth: 3,
+            lineStyle: {
+              width: 2
+            },
+            label: {
+              formatter: function (a, b) {
+                return [`{a|${a.data.name}a}`].join('\n')
+              },
+
+              rich: {
+                a: {
+                  color: 'red',
+                  backgroundColor: '#fff',
+                  lineHeight: 10,
+                  borderColor: '#DCDFE6',
+                  borderWidth: '1',
+                  borderRadius: 2,
+                  padding: [5, 10]
+                }
+              }
+            },
+            leaves: {
+              label: {
+                position: 'right',
+                verticalAlign: 'middle',
+                align: 'left'
+              }
+            },
+            expandAndCollapse: true,
+            animationDuration: 550,
+            animationDurationUpdate: 750
+          }
+        ]
+      }
+
+      this.treeChart.setOption(option)
     }
   }
 }
 </script>
+
+<style lang="less">
+.consanguinity {
+  .active-icon {
+    color: var(--primary, #3370ff);
+  }
+  box-sizing: border-box;
+  background-color: var(--MainBG, #f5f6f7);
+  overflow: hidden;
+  padding: 24px 24px 24px 24px;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  position: relative;
+
+  .consanguinity-table {
+    height: calc(100% - 100px);
+    width: 100%;
+  }
+
+  .route-title {
+    font-family: PingFang SC;
+    font-size: 20px;
+    font-weight: 500;
+    line-height: 28px;
+    text-align: left;
+    color: var(--TextPrimary, #1f2329);
+    width: 100%;
+    margin: 0;
+  }
+
+  .container-wrapper {
+    width: 100%;
+    overflow: auto;
+    background-color: var(--ContentBG, #ffffff);
+    margin-top: 24px;
+    padding: 24px;
+    flex: 1;
+
+    .select-icon {
+      margin-bottom: 16px;
+      i,
+      svg {
+        font-size: 16px;
+        cursor: pointer;
+        margin-right: 10px;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file

From f35f33725a9f50dca98a6ebaa5600472db1332f4 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Mon, 26 Dec 2022 16:05:09 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20simple=E6=A8=A1=E5=BC=8F=E4=B8=8B?=
 =?UTF-8?q?=EF=BC=8C=E5=88=9B=E5=BB=BASQL=E6=95=B0=E6=8D=AE=E9=9B=86?=
 =?UTF-8?q?=E7=9A=84=E5=AE=9A=E6=97=B6=E5=90=8C=E6=AD=A5=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=20=20=E5=9C=A8=E6=9C=AA=E7=BC=96=E8=BE=91=E7=8A=B6=E6=80=81API?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E7=A6=81=E6=AD=A2=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E5=92=8C=E5=88=A0=E9=99=A4=20=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=96=B9=E5=BC=8F=E7=BB=9F=E4=B8=80=20=20?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E7=BC=96=E8=BE=91=E5=90=8E=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E8=BE=93=E5=85=A5=E6=A1=86=E5=8F=98=E4=B8=BA=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=AF=E7=BC=96=E8=BE=91=E7=8A=B6=E6=80=81=20=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E5=B7=A6=E4=BE=A7=E5=88=97=E8=A1=A8=E6=A0=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AE=BD=E5=BA=A6=E5=90=8E=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=A8=A1=E5=9D=97=E5=90=8E=E6=89=8D=E7=94=9F?=
 =?UTF-8?q?=E6=95=88=20#4016?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/dataease/DeAsideContainer.vue  | 14 ++++++++++-
 .../src/components/deCustomCm/DeTextarea.vue  |  5 +++-
 frontend/src/views/dataset/add/AddSQL.vue     |  2 +-
 .../system/datasource/DsConfiguration.vue     |  7 +++++-
 .../views/system/datasource/DsFormContent.vue |  7 +++---
 .../src/views/system/datasource/DsTable.vue   | 19 +++++++++++----
 .../src/views/system/datasource/DsTree.vue    | 23 ++++++++++++++++++-
 7 files changed, 64 insertions(+), 13 deletions(-)

diff --git a/frontend/src/components/dataease/DeAsideContainer.vue b/frontend/src/components/dataease/DeAsideContainer.vue
index c2eb6074ea..d175b0c29e 100644
--- a/frontend/src/components/dataease/DeAsideContainer.vue
+++ b/frontend/src/components/dataease/DeAsideContainer.vue
@@ -46,7 +46,8 @@ export default {
   },
   data() {
     return {
-      asideHidden: false
+      asideHidden: false,
+      currentWidth: '',
     }
   },
   computed: {
@@ -57,6 +58,17 @@ export default {
       // 系统管理不需要拖拽菜单
       return this.isTemplate || (!this.$route.fullPath.includes('system') && this.showDragBar)
     }
+  },
+  mounted() {
+    this.setCurrentWidth()
+  },
+  beforeUpdate() {
+    this.setCurrentWidth()
+  },
+  methods: {
+    setCurrentWidth() {
+      this.currentWidth = this.isCollapseWidth || this.type && getLayout(this.type) || this.width
+    }
   }
 }
 </script>
diff --git a/frontend/src/components/deCustomCm/DeTextarea.vue b/frontend/src/components/deCustomCm/DeTextarea.vue
index b624d7eea6..ca2b255469 100644
--- a/frontend/src/components/deCustomCm/DeTextarea.vue
+++ b/frontend/src/components/deCustomCm/DeTextarea.vue
@@ -17,7 +17,10 @@ export default {
     count: {
       update: function(el, binding) {
         const { value, maxlength, buttonDisabled } = binding.value
-        if (buttonDisabled) return
+        if (buttonDisabled) {
+          el.removeChild(el.querySelector('.el-input__count'))
+          return
+        }
         const lg = value?.length || 0
         const count = el.querySelector('.el-input__count')
         if (!count) return
diff --git a/frontend/src/views/dataset/add/AddSQL.vue b/frontend/src/views/dataset/add/AddSQL.vue
index 61dbe828fc..6f747ac1c7 100644
--- a/frontend/src/views/dataset/add/AddSQL.vue
+++ b/frontend/src/views/dataset/add/AddSQL.vue
@@ -37,6 +37,7 @@
             <el-option
               :label="$t('dataset.sync_data')"
               value="1"
+              v-if="engineMode !== 'simple'"
               :disabled="disabledSync"
             />
           </el-select>
@@ -49,7 +50,6 @@
             size="small"
           >
             <el-option
-              v-if="engineMode !== 'simple'"
               :label="$t('dataset.sync_now')"
               value="sync_now"
               :disabled="engineMode === 'simple'"
diff --git a/frontend/src/views/system/datasource/DsConfiguration.vue b/frontend/src/views/system/datasource/DsConfiguration.vue
index 397bbffd7c..ccdb3d1c93 100644
--- a/frontend/src/views/system/datasource/DsConfiguration.vue
+++ b/frontend/src/views/system/datasource/DsConfiguration.vue
@@ -57,6 +57,7 @@
               >
                 <svg-icon
                   icon-class="de-copy"
+                  :disabled="disabled"
                   class="de-copy-icon"
                   @click.stop="copyItem(api)"
                 />
@@ -66,10 +67,11 @@
                     :ref="`apiTable${api.name}`"
                     placement="top"
                     width="200"
+                    :disabled="disabled"
                     popper-class="api-table-delete"
                     trigger="click"
                   >
-                    <i class="el-icon-warning" />
+                    <i :disabled="disabled" class="el-icon-warning" />
                     <div class="tips">
                       {{ $t('datasource.delete_this_item') }}
                     </div>
@@ -1140,6 +1142,9 @@ export default {
       }
     },
     copyItem(item) {
+      if (this.disabled) {
+        return
+      }
       var newItem = JSON.parse(JSON.stringify(item))
       newItem.serialNumber =
         this.form.apiConfiguration[this.form.apiConfiguration.length - 1]
diff --git a/frontend/src/views/system/datasource/DsFormContent.vue b/frontend/src/views/system/datasource/DsFormContent.vue
index 8bfc71907f..ed5ade745e 100644
--- a/frontend/src/views/system/datasource/DsFormContent.vue
+++ b/frontend/src/views/system/datasource/DsFormContent.vue
@@ -660,8 +660,9 @@ export default {
     })
   },
   methods: {
-    editDatasource() {
-      this.disabled = false
+    editDatasource(type) {
+      this.canEdit = type
+      this.disabled = !type
     },
     baseInfoDisabledCheck(privileges) {
       return !(this.formType === 'add' ? true : hasDataPermission('manage', privileges))
@@ -1190,7 +1191,7 @@ export default {
       }
     },
     backToList() {
-      this.$router.push('/datasource/index')
+      this.$emit('editeTodisable', false)
     },
 
     closeDraw() {
diff --git a/frontend/src/views/system/datasource/DsTable.vue b/frontend/src/views/system/datasource/DsTable.vue
index e9d19132e7..713c8db260 100644
--- a/frontend/src/views/system/datasource/DsTable.vue
+++ b/frontend/src/views/system/datasource/DsTable.vue
@@ -21,9 +21,15 @@
       <template v-else>
         <div class="ds-top">
           <deBtn
-            v-if="privileges"
+            v-if="privileges && canEdit"
             secondary
-            @click="editDatasource"
+            @click="editDatasource(false)"
+          >{{ $t('commons.cancel') }}
+          </deBtn>
+          <deBtn
+            v-if="privileges && !canEdit"
+            secondary
+            @click="editDatasource(true)"
           >{{ $t('commons.edit') }}
           </deBtn>
           <el-tooltip
@@ -56,6 +62,7 @@
         </div>
         <div style="height: calc(100% - 36px)">
           <ds-form-content
+            @editeTodisable="editDatasource(false)"
             ref="DsFormContent"
             :config-from-tabs="configFromTabs"
           />
@@ -78,7 +85,8 @@ export default {
   },
   data() {
     return {
-      activeName: 'detail'
+      activeName: 'detail',
+      canEdit: false,
     }
   },
   computed: {
@@ -90,8 +98,9 @@ export default {
     }
   },
   methods: {
-    editDatasource() {
-      this.$refs.DsFormContent.editDatasource()
+    editDatasource(type = false) {
+      this.$refs.DsFormContent.editDatasource(type)
+      this.canEdit = type
     },
     validaDatasource() {
       this.$refs.DsFormContent.validaDatasource()
diff --git a/frontend/src/views/system/datasource/DsTree.vue b/frontend/src/views/system/datasource/DsTree.vue
index 876c047492..83a1fa6718 100644
--- a/frontend/src/views/system/datasource/DsTree.vue
+++ b/frontend/src/views/system/datasource/DsTree.vue
@@ -543,6 +543,11 @@ export default {
             this.tData.push(typeData[0])
           }
         }
+
+        if (!this.key) return
+        this.$nextTick(() => {
+          this.$refs.myDsTree.filter(this.key)
+        })
       })
     },
     buildTree(array = []) {
@@ -671,7 +676,7 @@ export default {
     _handleEditer(row) {
       if (this.showView === 'Datasource') {
         const param = { ...row, ...{ showModel: 'show' }}
-        this.switchMain('DsForm', param, this.tData, this.dsTypes)
+        this.switchMain('dsTable', param, this.tData, this.dsTypes)
         this.currentNodeId && sessionStorage.setItem('datasource-current-node', this.currentNodeId)
         return
       }
@@ -720,6 +725,22 @@ export default {
       this.handlerConfirm(params)
     },
     switchMain(component, componentParam, tData, dsTypes) {
+      if (component === 'dsTable') {
+        const { id, type, showModel } = componentParam
+        this.$emit('switch-main', {
+          component,
+          componentParam: {
+            id,
+            type,
+            showModel,
+            msgNodeId: this.msgNodeId
+          },
+          tData,
+          dsTypes
+        })
+        return
+      }
+
       if (component === 'DsForm') {
         const { id, type, showModel } = componentParam
         this.$router.push({

From cc1de109758917243cad9ae513fde9a1104a8c0e Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Mon, 26 Dec 2022 16:15:20 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E5=8F=98=E9=87=8F=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E5=A3=B0=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/dataease/DeAsideContainer.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/frontend/src/components/dataease/DeAsideContainer.vue b/frontend/src/components/dataease/DeAsideContainer.vue
index d175b0c29e..4a76dff7df 100644
--- a/frontend/src/components/dataease/DeAsideContainer.vue
+++ b/frontend/src/components/dataease/DeAsideContainer.vue
@@ -51,9 +51,6 @@ export default {
     }
   },
   computed: {
-    currentWidth() {
-      return this.isCollapseWidth || this.type && getLayout(this.type) || this.width
-    },
     isSystem() {
       // 系统管理不需要拖拽菜单
       return this.isTemplate || (!this.$route.fullPath.includes('system') && this.showDragBar)