From 107635933ed590284228de13c8ec358f46663c05 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Thu, 10 Feb 2022 18:04:38 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=95=B0=E6=8D=AE=E9=9B=86?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../provider/query/doris/DorisQueryProvider.java       | 10 +---------
 frontend/src/views/dataset/data/TabDataPreview.vue     |  8 +++++---
 frontend/src/views/dataset/data/ViewTable.vue          |  6 +++---
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/backend/src/main/java/io/dataease/provider/query/doris/DorisQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/doris/DorisQueryProvider.java
index 9ba233dc06..4e2a59f65d 100644
--- a/backend/src/main/java/io/dataease/provider/query/doris/DorisQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/doris/DorisQueryProvider.java
@@ -76,7 +76,7 @@ public class DorisQueryProvider extends QueryProvider {
 
     @Override
     public String createSQLPreview(String sql, String orderBy) {
-        return "SELECT * FROM (" + sql + ") AS tmp ORDER BY " + orderBy + " LIMIT 0,1000";
+        return "SELECT * FROM (" + sqlFix(sql) + ") AS tmp LIMIT 0,1000";
     }
 
     @Override
@@ -147,14 +147,6 @@ public class DorisQueryProvider extends QueryProvider {
         if (customWheres != null) wheres.add(customWheres);
         if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
 
-        if ((fields.size() > 0)) {
-            xOrders.add(SQLObj.builder()
-                    .orderDirection("asc")
-                    .orderField(fields.get(0).getDataeaseName())
-                    .orderAlias(String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, "0"))
-                    .build());
-            st_sql.add("orders", xOrders);
-        }
         return st_sql.render();
     }
 
diff --git a/frontend/src/views/dataset/data/TabDataPreview.vue b/frontend/src/views/dataset/data/TabDataPreview.vue
index f7db8d26af..cb2ff98435 100644
--- a/frontend/src/views/dataset/data/TabDataPreview.vue
+++ b/frontend/src/views/dataset/data/TabDataPreview.vue
@@ -58,9 +58,10 @@
         {{ $t('dataset.preview_item') }}
       </span>
       <el-pagination
+        v-show="false"
         :current-page="currentPage.page"
-        :page-sizes="[100]"
-        :page-size="currentPage.pageSize"
+        :page-sizes="[parseInt(form.row)]"
+        :page-size="parseInt(form.row)"
         :pager-count="5"
         layout="sizes, prev, pager, next"
         :total="currentPage.show"
@@ -104,7 +105,7 @@ export default {
       height: 500,
       currentPage: {
         page: 1,
-        pageSize: 100,
+        pageSize: parseInt(this.form.row),
         show: parseInt(this.form.row)
       }
     }
@@ -153,6 +154,7 @@ export default {
         return
       }
       this.currentPage.show = parseInt(this.form.row)
+      this.currentPage.pageSize = parseInt(this.form.row)
       this.currentPage.page = 1
       this.$emit('reSearch', { form: this.form, page: this.currentPage })
     },
diff --git a/frontend/src/views/dataset/data/ViewTable.vue b/frontend/src/views/dataset/data/ViewTable.vue
index 816b129141..4616c13cb8 100644
--- a/frontend/src/views/dataset/data/ViewTable.vue
+++ b/frontend/src/views/dataset/data/ViewTable.vue
@@ -93,7 +93,7 @@ export default {
       data: [],
       page: {
         page: 1,
-        pageSize: 100,
+        pageSize: 1000,
         show: 1000
       },
       tabActive: 'dataPreview',
@@ -160,7 +160,7 @@ export default {
           this.data = []
           this.page = {
             page: 1,
-            pageSize: 100,
+            pageSize: 1000,
             show: 0
           }
         })
@@ -218,7 +218,7 @@ export default {
     resetPage() {
       this.page = {
         page: 1,
-        pageSize: 100,
+        pageSize: 1000,
         show: 1000
       }
     },