From fddc019fd35f97522c6ef8f3db05a9cdd0644f94 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Mon, 11 Apr 2022 09:31:41 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=88=87=E6=8D=A2=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtDataSetTableMapper.xml        |  2 +-
 frontend/src/views/chart/view/ChartEdit.vue          |  5 +++--
 frontend/src/views/chart/view/TableSelector.vue      |  8 +++++++-
 .../dataset/common/DatasetGroupSelectorTree.vue      | 12 ++++++++++++
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml
index fe1bd89034..b87120fd16 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml
@@ -16,7 +16,7 @@
     <select id="searchOne" resultMap="BaseResultMapDTO">
         select
         id, `name`, scene_id, data_source_id, `type`, `mode`,`info`, create_by, create_time,
-        get_auths(id,'dataset',#{userId}) as `privileges`
+        get_auths(id,'dataset',#{userId}) as `privileges`, scene_id as pid
         from dataset_table
         <where>
             <if test="id != null">
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index bd4a045744..91dbb9150f 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -1088,7 +1088,7 @@
       width="70%"
       class="dialog-css"
     >
-      <table-selector @getTable="getTable" />
+      <table-selector :checked-table="table" @getTable="getTable" />
       <p style="margin-top: 10px;color:#F56C6C;font-size: 12px;">{{ $t('chart.change_ds_tip') }}</p>
       <div slot="footer" class="dialog-footer">
         <el-button size="mini" @click="closeChangeChart">{{ $t('chart.cancel') }}</el-button>
@@ -2598,7 +2598,7 @@ export default {
 
 .view-panel {
   display: flex;
-  height: calc(100% - 80px);
+  height: 100%;
   background-color: #f7f8fa;
 }
 
@@ -2717,6 +2717,7 @@ span {
 }
 
 .tab-header > > > .el-tabs__content {
+  height: calc(100% - 40px);
 }
 
 .draggable-group {
diff --git a/frontend/src/views/chart/view/TableSelector.vue b/frontend/src/views/chart/view/TableSelector.vue
index 15b2d7c326..0d39978435 100644
--- a/frontend/src/views/chart/view/TableSelector.vue
+++ b/frontend/src/views/chart/view/TableSelector.vue
@@ -1,7 +1,7 @@
 <template>
   <de-container>
     <de-aside-container>
-      <dataset-group-selector-tree :privileges="privileges" :mode="mode" :clear-empty-dir="clearEmptyDir" :type="type" :custom-type="customType" :show-mode="showMode" @getTable="getTable" />
+      <dataset-group-selector-tree :checked-table="checkedTable" :privileges="privileges" :mode="mode" :clear-empty-dir="clearEmptyDir" :type="type" :custom-type="customType" :show-mode="showMode" @getTable="getTable" />
     </de-aside-container>
     <de-main-container>
       <dataset-table-data :table="table" />
@@ -54,6 +54,11 @@ export default {
       type: Boolean,
       required: false,
       default: false
+    },
+    checkedTable: {
+      type: Object,
+      required: false,
+      default: null
     }
   },
   data() {
@@ -65,6 +70,7 @@ export default {
   created() {
   },
   mounted() {
+    this.getTable(this.checkedTable)
   },
   methods: {
     getTable(table) {
diff --git a/frontend/src/views/dataset/common/DatasetGroupSelectorTree.vue b/frontend/src/views/dataset/common/DatasetGroupSelectorTree.vue
index 830702ccbc..728299c05e 100644
--- a/frontend/src/views/dataset/common/DatasetGroupSelectorTree.vue
+++ b/frontend/src/views/dataset/common/DatasetGroupSelectorTree.vue
@@ -38,6 +38,7 @@
         <div class="block" :style="treeStyle">
           <el-tree
             ref="datasetTreeRef"
+            :current-node-key="checkedTable ? checkedTable.id : ''"
             :default-expanded-keys="expandedArray"
             :data="data"
             node-key="id"
@@ -133,6 +134,11 @@ export default {
       type: Boolean,
       required: false,
       default: false
+    },
+    checkedTable: {
+      type: Object,
+      required: false,
+      default: null
     }
   },
   data() {
@@ -197,6 +203,7 @@ export default {
   },
   mounted() {
     this.treeNode()
+    this.initExpand()
   },
   created() {
   },
@@ -218,6 +225,11 @@ export default {
         name: ''
       }
     },
+    initExpand() {
+      if (this.checkedTable && this.checkedTable.pid) {
+        this.expandedArray.push(this.checkedTable.pid)
+      }
+    },
     treeNode(cache) {
       const modelInfo = localStorage.getItem('dataset-tree')
       const userCache = (modelInfo && cache)