From 7a5037068e84a00d1283fe80c90d7948dcd0ab29 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Tue, 11 May 2021 10:48:59 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=95=B0=E6=8D=AE=E9=9B=86):=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A9=E6=95=B0=E6=8D=AE=E9=9B=86=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dataset/DataSetTableService.java  |  2 +-
 frontend/src/views/dataset/add/AddCustom.vue  | 63 +++++++++++++------
 2 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
index 40cc45087e..8f2efbe720 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -354,7 +354,7 @@ public class DataSetTableService {
         DataTableInfoDTO dataTableInfoDTO = new Gson().fromJson(dataSetTableRequest.getInfo(), DataTableInfoDTO.class);
         List<DataSetTableUnionDTO> list = dataSetTableUnionService.listByTableId(dataTableInfoDTO.getList().get(0).getTableId());
 
-        datasourceRequest.setQuery(getCustomSQL(dataTableInfoDTO, list));
+        datasourceRequest.setQuery("SELECT * FROM (" + getCustomSQL(dataTableInfoDTO, list) + ") AS tmp LIMIT 0,1000");
         Map<String, List> result = jdbcProvider.fetchResultAndField(datasourceRequest);
         List<String[]> data = result.get("dataList");
         List<TableFiled> fields = result.get("fieldList");
diff --git a/frontend/src/views/dataset/add/AddCustom.vue b/frontend/src/views/dataset/add/AddCustom.vue
index 3e300be0bf..2633e4c420 100644
--- a/frontend/src/views/dataset/add/AddCustom.vue
+++ b/frontend/src/views/dataset/add/AddCustom.vue
@@ -28,24 +28,34 @@
       <el-col class="panel-height" style="width: 235px;border-top:solid 1px #dcdfe6;padding: 0 15px;overflow-y: auto;">
         <dataset-custom-field :table="table" :checked-list="checkedList" @getChecked="getChecked" />
       </el-col>
-      <el-col class="panel-height" style="flex: 1;overflow: scroll;">
-        <ux-grid
-          ref="plxTable"
-          size="mini"
-          style="width: 100%;"
-          :height="height"
-          :checkbox-config="{highlight: true}"
-          :width-resize="true"
-        >
-          <ux-table-column
-            v-for="field in fields"
-            :key="field.fieldName"
-            min-width="200px"
-            :field="field.fieldName"
-            :title="field.remarks"
-            :resizable="true"
-          />
-        </ux-grid>
+      <el-col class="panel-height" style="flex: 1;overflow: hidden;">
+        <el-card class="box-card dataPreview" shadow="never">
+          <div slot="header" class="clearfix">
+            <span>{{ $t('dataset.data_preview') }}</span>
+          </div>
+          <ux-grid
+            ref="plxTable"
+            size="mini"
+            style="width: 100%;"
+            :height="height"
+            :checkbox-config="{highlight: true}"
+            :width-resize="true"
+          >
+            <ux-table-column
+              v-for="field in fields"
+              :key="field.fieldName"
+              min-width="200px"
+              :field="field.fieldName"
+              :title="field.remarks"
+              :resizable="true"
+            />
+          </ux-grid>
+          <span class="table-count">
+            {{ $t('dataset.preview_show') }}
+            <span class="span-number">1000</span>
+            {{ $t('dataset.preview_item') }}
+          </span>
+        </el-card>
       </el-col>
     </el-col>
   </el-col>
@@ -101,7 +111,7 @@ export default {
       const that = this
       setTimeout(function() {
         const currentHeight = document.documentElement.clientHeight
-        that.height = currentHeight - 56 - 15 - 26 - 25 - 43 - 15
+        that.height = currentHeight - 56 - 15 - 26 - 25 - 43 - 16 - 37 - 20 - 10
       }, 10)
     },
 
@@ -207,6 +217,14 @@ export default {
     margin-left: 0;
   }
 
+  .dataPreview>>>.el-card__header{
+    padding: 6px 8px;
+  }
+
+  .dataPreview>>>.el-card__body{
+    padding:10px;
+  }
+
   span{
     font-size: 14px;
   }
@@ -214,4 +232,11 @@ export default {
   .panel-height{
     height: calc(100vh - 56px - 15px - 26px - 25px - 43px);
   }
+
+  .span-number{
+    color: #f18126;
+  }
+  .table-count{
+    color: #606266;
+  }
 </style>