fix(数据集): 预览样式优化；分页展示fix

backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java

@@ -188,6 +188,9 @@ public class DataSetTableService {
         dataSetPreviewPage.setPage(page);
         dataSetPreviewPage.setPageSize(pageSize);
         int realSize = Integer.parseInt(dataSetTableRequest.getRow()) < pageSize ? Integer.parseInt(dataSetTableRequest.getRow()) : pageSize;
+        if (page == Integer.parseInt(dataSetTableRequest.getRow()) / pageSize + 1) {
+            realSize = Integer.parseInt(dataSetTableRequest.getRow()) % pageSize;
+        }
         if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "db")) {
             Datasource ds = datasourceMapper.selectByPrimaryKey(dataSetTableRequest.getDataSourceId());
             DatasourceProvider datasourceProvider = ProviderFactory.getProvider(ds.getType());

frontend/src/views/dataset/add/AddDB.vue

 <template>
-  <el-col>
-    <el-row>
+  <el-row style="display: flex;flex-direction: column;height: 100%">
     <el-row style="height: 26px;">
       <span style="line-height: 26px;">
         {{ $t('dataset.add_db_table') }}
@@ -44,7 +43,7 @@
         </el-form-item>
       </el-form>
     </el-row>
-      <el-row style="overflow: auto;height: 60vh;">
+    <el-col style="overflow-y: auto;">
       <el-checkbox-group v-model="checkTableList" size="small">
         <el-checkbox
           v-for="t in tableData"
@@ -53,9 +52,8 @@
           :label="t"
         />
       </el-checkbox-group>
-      </el-row>
-    </el-row>
     </el-col>
+  </el-row>
 </template>
 
 <script>

frontend/src/views/dataset/data/TabDataPreview.vue

@@ -128,7 +128,7 @@ export default {
       }, 10)
     },
     reSearch() {
-      if (this.form.row.length > 8 || isNaN(Number(this.form.row)) || String(this.form.row).includes('.')) {
+      if (!this.form.row || this.form.row === '' || this.form.row.length > 8 || isNaN(Number(this.form.row)) || String(this.form.row).includes('.')) {
         this.$message({
           message: this.$t('dataset.pls_input_less_9'),
           type: 'error',

frontend/src/views/dataset/data/ViewTable.vue

@@ -40,7 +40,7 @@
     </el-tabs>
 
     <el-dialog :title="table.name" :visible.sync="editField" :fullscreen="true" :show-close="false" class="dialog-css">
-      <el-table :data="tableFields" size="mini" max-height="600px">
+      <el-table :data="tableFields" size="mini" :max-height="maxHeight">
         <el-table-column property="type" :label="$t('dataset.field_type')" width="100">
           <template slot-scope="scope">
             <span v-if="scope.row.deType === 0">
@@ -117,7 +117,8 @@ export default {
       tableViewRowForm: {
         row: 1000
       },
-      tabStatus: false
+      tabStatus: false,
+      maxHeight: 'auto'
     }
   },
   // computed: {
@@ -132,6 +133,7 @@ export default {
     }
   },
   mounted() {
+    this.maxHeight = (document.documentElement.clientHeight - 45 - 78) + 'px'
     this.initTable(this.param)
   },
   methods: {
@@ -228,6 +230,6 @@ export default {
     padding: 10px 20px;
   }
   .dialog-css >>> .el-dialog__footer {
-    padding-top: 30px;
+    padding-top: 10px;
   }
 </style>