From 959a044ef63461f84543dbd7845d089c2a5fb4b9 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Fri, 2 Apr 2021 11:36:01 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=95=B0=E6=8D=AE=E9=9B=86=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=A2=84=E8=A7=88=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E8=A1=8C=E6=95=B0=EF=BC=9B=E8=A7=86=E5=9B=BE=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0tip=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request/dataset/DataSetTableRequest.java  |  1 +
 .../service/dataset/DataSetTableService.java  |  4 +--
 frontend/src/lang/zh.js                       |  3 ++-
 .../components/shape-attr/LabelSelector.vue   | 13 +++++++++-
 .../src/views/dataset/data/TabDataPreview.vue | 25 +++++++++++++++++--
 frontend/src/views/dataset/data/ViewTable.vue | 14 +++++++++--
 6 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/backend/src/main/java/io/dataease/controller/request/dataset/DataSetTableRequest.java b/backend/src/main/java/io/dataease/controller/request/dataset/DataSetTableRequest.java
index aed452a87a..272515d833 100644
--- a/backend/src/main/java/io/dataease/controller/request/dataset/DataSetTableRequest.java
+++ b/backend/src/main/java/io/dataease/controller/request/dataset/DataSetTableRequest.java
@@ -15,4 +15,5 @@ import java.util.List;
 public class DataSetTableRequest extends DatasetTable {
     private String sort;
     private List<String> tableNames;
+    private String row;
 }
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 12fee6e58b..ec133babe6 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -155,10 +155,10 @@ public class DataSetTableService {
         DatasetTable datasetTable = datasetTableMapper.selectByPrimaryKey(dataSetTableRequest.getId());
         if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "db")) {
             String table = dataTableInfoDTO.getTable();
-            datasourceRequest.setQuery(createQuerySQL(ds.getType(), table, fieldArray) + " LIMIT 0,10");// todo limit
+            datasourceRequest.setQuery(createQuerySQL(ds.getType(), table, fieldArray) + " LIMIT 0," + dataSetTableRequest.getRow());
         } else if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "sql")) {
             String sql = dataTableInfoDTO.getSql();
-            datasourceRequest.setQuery(createQuerySQL(ds.getType(), " (" + sql + ") AS tmp ", fieldArray));// todo 因为编辑可能取消某些字段展示，这里sql看看怎么处理
+            datasourceRequest.setQuery(createQuerySQL(ds.getType(), " (" + sql + ") AS tmp ", fieldArray) + " LIMIT 0," + dataSetTableRequest.getRow());
         }
 
         List<String[]> data = new ArrayList<>();
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index fdcc2230c2..df5a380349 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -769,7 +769,8 @@ export default {
     last_update_time: '上次更新时间',
     current_update_time: '当前更新时间',
     param: '参数',
-    edit_sql: '编辑SQL'
+    edit_sql: '编辑SQL',
+    showRow: '显示行'
   },
   datasource: {
     create: '新建数据连接',
diff --git a/frontend/src/views/chart/components/shape-attr/LabelSelector.vue b/frontend/src/views/chart/components/shape-attr/LabelSelector.vue
index 1bc73b8182..ee671da097 100644
--- a/frontend/src/views/chart/components/shape-attr/LabelSelector.vue
+++ b/frontend/src/views/chart/components/shape-attr/LabelSelector.vue
@@ -28,7 +28,18 @@
                 <el-radio-button label="right">{{ $t('chart.text_pos_right') }}</el-radio-button>
               </el-radio-group>
             </el-form-item>
-            <el-form-item :label="$t('chart.content_formatter')" class="form-item">
+            <el-form-item class="form-item">
+              <span slot="label">
+                <span class="span-box">
+                  <span>{{ $t('chart.content_formatter') }}</span>
+                  <el-tooltip class="item" effect="dark" placement="bottom">
+                    <div slot="content">
+                      字符串支持用 \n 换行<br>字符串模板 模板变量有：<br>{a}：系列名。<br>{b}：数据名。<br>{c}：数据值。
+                    </div>
+                    <i class="el-icon-info" style="cursor: pointer;" />
+                  </el-tooltip>
+                </span>
+              </span>
               <el-input v-model="labelForm.formatter" type="textarea" :autosize="{ minRows: 4, maxRows: 4}" @blur="changeLabelAttr" />
             </el-form-item>
           </el-form>
diff --git a/frontend/src/views/dataset/data/TabDataPreview.vue b/frontend/src/views/dataset/data/TabDataPreview.vue
index 459bf2fb10..8f8e8dfd3a 100644
--- a/frontend/src/views/dataset/data/TabDataPreview.vue
+++ b/frontend/src/views/dataset/data/TabDataPreview.vue
@@ -1,5 +1,16 @@
 <template>
   <el-col>
+    <el-row>
+      <el-col :span="4">
+        <el-form ref="form" :model="form" label-width="60px" size="mini" class="row-style">
+          <el-form-item :label="$t('dataset.showRow')">
+            <el-input v-model="form.row">
+              <el-button slot="append" icon="el-icon-search" @click="reSearch" />
+            </el-input>
+          </el-form-item>
+        </el-form>
+      </el-col>
+    </el-row>
     <ux-grid
       ref="plxTable"
       size="mini"
@@ -35,6 +46,10 @@ export default {
     data: {
       type: Array,
       required: true
+    },
+    form: {
+      type: Object,
+      required: true
     }
   },
   data() {
@@ -60,10 +75,16 @@ export default {
   },
   activated() {
   },
-  methods: {}
+  methods: {
+    reSearch() {
+      this.$emit('reSearch', this.form)
+    }
+  }
 }
 </script>
 
 <style scoped>
-
+.row-style>>>.el-form-item__label{
+  font-size: 12px;
+}
 </style>
diff --git a/frontend/src/views/dataset/data/ViewTable.vue b/frontend/src/views/dataset/data/ViewTable.vue
index b95df5ae63..80af214a22 100644
--- a/frontend/src/views/dataset/data/ViewTable.vue
+++ b/frontend/src/views/dataset/data/ViewTable.vue
@@ -22,7 +22,7 @@
 
       <el-tabs v-model="tabActive">
         <el-tab-pane :label="$t('dataset.data_preview')" name="dataPreview">
-          <tab-data-preview :table="table" :fields="fields" :data="data" />
+          <tab-data-preview :table="table" :fields="fields" :data="data" :form="tableViewRowForm" @reSearch="reSearch" />
         </el-tab-pane>
         <el-tab-pane :label="$t('dataset.join_view')" name="joinView">
           关联视图 TODO
@@ -86,7 +86,10 @@ export default {
       fields: [],
       data: [],
       tabActive: 'dataPreview',
-      tableFields: []
+      tableFields: [],
+      tableViewRowForm: {
+        row: 1000
+      }
     }
   },
   computed: {
@@ -102,6 +105,7 @@ export default {
   methods: {
     initTable(id) {
       console.log(id)
+      this.tableViewRowForm.row = 1000
       if (id !== null) {
         this.fields = []
         this.data = []
@@ -114,6 +118,7 @@ export default {
 
     initPreviewData() {
       if (this.table.id) {
+        this.table.row = this.tableViewRowForm.row
         getPreviewData(this.table).then(response => {
           this.fields = response.data.fields
           this.data = response.data.data
@@ -153,6 +158,11 @@ export default {
 
     editSql() {
       this.$emit('switchComponent', { name: 'AddSQL', param: { id: this.table.sceneId, tableId: this.table.id }})
+    },
+
+    reSearch(val) {
+      this.tableViewRowForm = val
+      this.initPreviewData()
     }
   }
 }