From e3d2b4ccfcfa75a44889c6cb7057396a74070143 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Tue, 25 May 2021 15:22:33 +0800
Subject: [PATCH] =?UTF-8?q?feat:1.=E8=87=AA=E5=8A=A9=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=9B=86=E4=BC=98=E5=8C=96=EF=BC=9B2.=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=9B=86list=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml | 5 ++++-
 frontend/src/views/dataset/common/DatasetCustomField.vue  | 8 +++++++-
 2 files changed, 11 insertions(+), 2 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 a955bc86c1..8b51a258e0 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,10 @@
         <where>
             FIND_IN_SET(dataset_table.id,cids)
             <if test="sceneId != null">
-               and scene_id = #{sceneId,jdbcType=VARCHAR}
+                and scene_id = #{sceneId,jdbcType=VARCHAR}
+            </if>
+            <if test="mode != null">
+                and mode = #{mode,jdbcType=INTEGER}
             </if>
         </where>
         <if test="sort != null">
diff --git a/frontend/src/views/dataset/common/DatasetCustomField.vue b/frontend/src/views/dataset/common/DatasetCustomField.vue
index e7a171341c..ce009078e9 100644
--- a/frontend/src/views/dataset/common/DatasetCustomField.vue
+++ b/frontend/src/views/dataset/common/DatasetCustomField.vue
@@ -1,5 +1,9 @@
 <template>
   <el-col>
+    <el-row style="height: 25px;">
+      <span>{{ table.name }}</span>
+    </el-row>
+    <el-divider />
     <el-checkbox v-model="checkAll" :disabled="!(fields.length > 0)" :indeterminate="isIndeterminate" @change="handleCheckAllChange">{{ $t('dataset.check_all') }}</el-checkbox>
     <el-checkbox-group v-model="checkedFields" @change="handleCheckedFieldsChange">
       <el-checkbox v-for="f in fields" :key="f.id" :label="f.id" style="display: block;margin-top: 4px;width: 100%;">
@@ -98,5 +102,7 @@ export default {
 </script>
 
 <style scoped>
-
+  .el-divider--horizontal {
+    margin: 12px 0
+  }
 </style>