center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

refactor: 数据集预览优化

Browse Source
This commit is contained in:
junjun 2022-02-10 18:04:38 +08:00
parent 0d73961d86
commit 107635933e
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/src/main/java/io/dataease/provider/query/doris/DorisQueryProvider.java
View File

@ -76,7 +76,7 @@ public class DorisQueryProvider extends QueryProvider {
@Override @Override
public String createSQLPreview(String sql, String orderBy) { 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 @Override
@ -147,14 +147,6 @@ public class DorisQueryProvider extends QueryProvider {
if (customWheres != null) wheres.add(customWheres); if (customWheres != null) wheres.add(customWheres);
if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres); 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(); return st_sql.render();
} }

8
frontend/src/views/dataset/data/TabDataPreview.vue
View File

@ -58,9 +58,10 @@
{{ $t('dataset.preview_item') }} {{ $t('dataset.preview_item') }}
</span> </span>
<el-pagination <el-pagination
v-show="false"
:current-page="currentPage.page" :current-page="currentPage.page"
:page-sizes="[100]" :page-sizes="[parseInt(form.row)]"
:page-size="currentPage.pageSize" :page-size="parseInt(form.row)"
:pager-count="5" :pager-count="5"
layout="sizes, prev, pager, next" layout="sizes, prev, pager, next"
:total="currentPage.show" :total="currentPage.show"
@ -104,7 +105,7 @@ export default {
height: 500, height: 500,
currentPage: { currentPage: {
page: 1, page: 1,
pageSize: 100, pageSize: parseInt(this.form.row),
show: parseInt(this.form.row) show: parseInt(this.form.row)
} }
} }
@ -153,6 +154,7 @@ export default {
return return
} }
this.currentPage.show = parseInt(this.form.row) this.currentPage.show = parseInt(this.form.row)
this.currentPage.pageSize = parseInt(this.form.row)
this.currentPage.page = 1 this.currentPage.page = 1
this.$emit('reSearch', { form: this.form, page: this.currentPage }) this.$emit('reSearch', { form: this.form, page: this.currentPage })
}, },

6
frontend/src/views/dataset/data/ViewTable.vue
View File

@ -93,7 +93,7 @@ export default {
data: [], data: [],
page: { page: {
page: 1, page: 1,
pageSize: 100, pageSize: 1000,
show: 1000 show: 1000
}, },
tabActive: 'dataPreview', tabActive: 'dataPreview',
@ -160,7 +160,7 @@ export default {
this.data = [] this.data = []
this.page = { this.page = {
page: 1, page: 1,
pageSize: 100, pageSize: 1000,
show: 0 show: 0
} }
}) })
@ -218,7 +218,7 @@ export default {
resetPage() { resetPage() {
this.page = { this.page = {
page: 1, page: 1,
pageSize: 100, pageSize: 1000,
show: 1000 show: 1000
} }
}, },