From e2786874a99c643885ee851ad0ce1e7d5485dcb9 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Tue, 9 Jan 2024 10:43:24 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=95=B0=E6=8D=AE=E5=BA=93=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E5=85=81=E8=AE=B8=E9=87=8D=E5=A4=8D=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/datasource/DatasourceService.java | 23 +-------
 .../frontend/src/views/dataset/add/AddApi.vue | 57 ++++++++----------
 core/frontend/src/views/dataset/add/AddDB.vue | 59 ++++++++-----------
 3 files changed, 50 insertions(+), 89 deletions(-)

diff --git a/core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java b/core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
index 0189e64be2..0fd2fd1e80 100644
--- a/core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
+++ b/core/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
@@ -51,7 +51,6 @@ import io.dataease.service.message.DeMsgutil;
 import io.dataease.service.sys.SysAuthService;
 import io.dataease.service.system.SystemParameterService;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
@@ -431,11 +430,7 @@ public class DatasourceService {
         }
 
         List<TableDesc> tables = datasourceProvider.getTables(datasourceRequest);
-
-        // 获取当前数据源下的db、api类型数据集
-        DatasetTableExample datasetTableExample = new DatasetTableExample();
-        datasetTableExample.createCriteria().andTypeIn(Arrays.asList(DatasetType.DB.name(), DatasetType.API.name())).andDataSourceIdEqualTo(ds.getId());
-        List<DatasetTable> datasetTables = datasetTableMapper.selectByExample(datasetTableExample);
+        // 构造table节点
         List<DBTableDTO> list = new ArrayList<>();
         for (TableDesc tableDesc : tables) {
             DBTableDTO dbTableDTO = new DBTableDTO();
@@ -444,22 +439,6 @@ public class DatasourceService {
             dbTableDTO.setRemark(tableDesc.getRemark());
             dbTableDTO.setEnableCheck(true);
             dbTableDTO.setDatasetPath(null);
-            for (DatasetTable datasetTable : datasetTables) {
-                DataTableInfoDTO dataTableInfoDTO = new Gson().fromJson(datasetTable.getInfo(), DataTableInfoDTO.class);
-                if (StringUtils.equals(tableDesc.getName(), dataTableInfoDTO.getTable())) {
-                    dbTableDTO.setEnableCheck(false);
-                    List<DatasetGroup> parents = dataSetGroupService.getParents(datasetTable.getSceneId());
-                    StringBuilder stringBuilder = new StringBuilder();
-                    parents.forEach(ele -> {
-                        if (ObjectUtils.isNotEmpty(ele)) {
-                            stringBuilder.append(ele.getName()).append("/");
-                        }
-                    });
-                    stringBuilder.append(datasetTable.getName());
-                    dbTableDTO.setDatasetPath(stringBuilder.toString());
-                    break;
-                }
-            }
             list.add(dbTableDTO);
         }
         return list;
diff --git a/core/frontend/src/views/dataset/add/AddApi.vue b/core/frontend/src/views/dataset/add/AddApi.vue
index 3b930f4c16..31b4d0864b 100644
--- a/core/frontend/src/views/dataset/add/AddApi.vue
+++ b/core/frontend/src/views/dataset/add/AddApi.vue
@@ -73,43 +73,34 @@
           v-model="checkTableList"
           size="small"
         >
-          <el-tooltip
-            v-for="t in tableData"
-            :key="t.name"
-            :disabled="t.enableCheck"
-            effect="dark"
-            :content="$t('dataset.table_already_add_to') + ': ' + t.datasetPath"
-            placement="right"
+          <div
+            :class="[
+              { active: activeName === t.name, 'not-allow': !t.enableCheck }
+            ]"
+            class="item"
+            :title="t.name"
+            @click="setActiveName(t)"
           >
-            <div
-              :class="[
-                { active: activeName === t.name, 'not-allow': !t.enableCheck }
-              ]"
-              class="item"
-              :title="t.name"
-              @click="setActiveName(t)"
+            <svg-icon
+              v-if="!t.enableCheck"
+              icon-class="Checkbox"
+              style="margin-right: 8px"
+            />
+            <el-checkbox
+              v-else
+              :label="t.name"
+            />
+            <span class="label">{{ showTableNameWithComment(t) }}</span>
+            <span
+              v-if="t.nameExist"
+              class="error-name-exist"
             >
               <svg-icon
-                v-if="!t.enableCheck"
-                icon-class="Checkbox"
-                style="margin-right: 8px"
+                icon-class="exclamationmark"
+                class="ds-icon-scene"
               />
-              <el-checkbox
-                v-else
-                :label="t.name"
-              />
-              <span class="label">{{ showTableNameWithComment(t) }}</span>
-              <span
-                v-if="t.nameExist"
-                class="error-name-exist"
-              >
-                <svg-icon
-                  icon-class="exclamationmark"
-                  class="ds-icon-scene"
-                />
-              </span>
-            </div>
-          </el-tooltip>
+            </span>
+          </div>
         </el-checkbox-group>
       </div>
     </div>
diff --git a/core/frontend/src/views/dataset/add/AddDB.vue b/core/frontend/src/views/dataset/add/AddDB.vue
index 62762efd2e..bdad3cf69f 100644
--- a/core/frontend/src/views/dataset/add/AddDB.vue
+++ b/core/frontend/src/views/dataset/add/AddDB.vue
@@ -73,44 +73,35 @@
           v-model="checkTableList"
           size="small"
         >
-          <el-tooltip
-            v-for="t in tableData"
-            :key="t.name"
-            :disabled="t.enableCheck"
-            effect="dark"
-            :content="$t('dataset.table_already_add_to') + ': ' + t.datasetPath"
-            placement="right"
+          <div
+            :class="[
+              { active: activeName === t.name, 'not-allow': !t.enableCheck }
+            ]"
+            class="item"
+            :title="t.name"
+            @click="setActiveName(t)"
           >
-            <div
-              :class="[
-                { active: activeName === t.name, 'not-allow': !t.enableCheck }
-              ]"
-              class="item"
-              :title="t.name"
-              @click="setActiveName(t)"
+            <svg-icon
+              v-if="!t.enableCheck"
+              icon-class="Checkbox"
+              style="margin-right: 8px"
+            />
+            <el-checkbox
+              v-else
+              :label="t.name"
+              :disabled="!t.enableCheck"
+            />
+            <span class="label">{{ showTableNameWithComment(t) }}</span>
+            <span
+              v-if="t.nameExist"
+              class="error-name-exist"
             >
               <svg-icon
-                v-if="!t.enableCheck"
-                icon-class="Checkbox"
-                style="margin-right: 8px"
+                icon-class="exclamationmark"
+                class="ds-icon-scene"
               />
-              <el-checkbox
-                v-else
-                :label="t.name"
-                :disabled="!t.enableCheck"
-              />
-              <span class="label">{{ showTableNameWithComment(t) }}</span>
-              <span
-                v-if="t.nameExist"
-                class="error-name-exist"
-              >
-                <svg-icon
-                  icon-class="exclamationmark"
-                  class="ds-icon-scene"
-                />
-              </span>
-            </div>
-          </el-tooltip>
+            </span>
+          </div>
         </el-checkbox-group>
       </div>
     </div>