Skip to content

Commit db4392b

Browse files
committed
fix(ui): 修复分页未国际化
1 parent 61b641a commit db4392b

File tree

22 files changed

+37
-7
lines changed

22 files changed

+37
-7
lines changed

core/datacap-spi/src/main/java/io/edurt/datacap/spi/PluginService.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1292,8 +1292,6 @@ default Pagination getPagination(Configure configure, TableDefinition definition
12921292

12931293
default Pagination formatPagination(Configure configure, String sql, TableDefinition definition)
12941294
{
1295-
// 强制指定为 JsonConvert
1296-
configure.setFormat("JsonConvert");
12971295
Response response = this.getResponse(
12981296
sql.replace("{0}", definition.getDatabase())
12991297
.replace("{1}", definition.getName())

core/datacap-ui/src/views/components/visual/VisualView.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ export default defineComponent({
166166
setTimeout(() => {
167167
this.loading = true
168168
if (this.type === 'QUERY') {
169-
const configure: ExecuteModel = { name: this.original as any, content: this.query as any, mode: 'REPORT', format: 'JsonConvert' }
169+
const configure: ExecuteModel = { name: this.original as any, content: this.query as any, mode: 'REPORT' }
170170
ExecuteService.execute(configure, null)
171171
.then(response => {
172172
if (response.status && response.data.isSuccessful) {

core/datacap-ui/src/views/pages/admin/dashboard/DashboardHome.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@
7979
:page-size="pageSize"
8080
:total="dataCount"
8181
:sizerOptions="[12, 24, 36]"
82+
:prevText="$t('source.common.previousPage')"
83+
:nextText="$t('source.common.nextPage')"
8284
@on-change="onPageChange"
8385
@on-prev="onPrevChange"
8486
@on-next="onNextChange"

core/datacap-ui/src/views/pages/admin/dashboard/components/ChartContainer.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@
4545
:page-size="pageSize"
4646
:total="dataCount"
4747
:sizerOptions="[12, 24, 36]"
48+
:prevText="$t('source.common.previousPage')"
49+
:nextText="$t('source.common.nextPage')"
4850
@on-change="onPageChange"
4951
@on-prev="onPrevChange"
5052
@on-next="onNextChange"

core/datacap-ui/src/views/pages/admin/dataset/DatasetHistory.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
:page-size="pageSize"
3535
:total="dataCount"
3636
:sizerOptions="[10, 20, 50]"
37+
:prevText="$t('source.common.previousPage')"
38+
:nextText="$t('source.common.nextPage')"
3739
@on-change="onPageChange"
3840
@on-prev="onPrevChange"
3941
@on-next="onNextChange"

core/datacap-ui/src/views/pages/admin/dataset/DatasetHome.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@
107107
:page-size="pageSize"
108108
:total="dataCount"
109109
:sizerOptions="[10, 20, 50]"
110+
:prevText="$t('source.common.previousPage')"
111+
:nextText="$t('source.common.nextPage')"
110112
@on-change="onPageChange"
111113
@on-prev="onPrevChange"
112114
@on-next="onNextChange"

core/datacap-ui/src/views/pages/admin/dataset/DatasetInfo.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -455,8 +455,7 @@ export default defineComponent({
455455
const configure: ExecuteModel = {
456456
content: this.value,
457457
name: this.sourceInfo?.code as unknown as string,
458-
mode: 'DATASET',
459-
format: 'JsonConvert'
458+
mode: 'DATASET'
460459
}
461460
this.running = true
462461
ExecuteService.execute(configure, null)

core/datacap-ui/src/views/pages/admin/history/HistoryHome.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@
9393
:page-size="pageSize"
9494
:total="dataCount"
9595
:sizerOptions="[10, 20, 50]"
96+
:prevText="$t('source.common.previousPage')"
97+
:nextText="$t('source.common.nextPage')"
9698
@on-change="onPageChange"
9799
@on-prev="onPrevChange"
98100
@on-next="onNextChange"

core/datacap-ui/src/views/pages/admin/query/QueryHome.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ export default defineComponent({
240240
{
241241
this.createEditor()
242242
243-
this.queryConfigure.configure = { name: this.selectSource.id as string, content: '', mode: 'ADHOC', format: 'JsonConvert' }
243+
this.queryConfigure.configure = { name: this.selectSource.id as string, content: '', mode: 'ADHOC' }
244244
const params = this.$route.params
245245
if (params) {
246246
const code = params.code

core/datacap-ui/src/views/pages/admin/report/ReportHome.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@
7373
:page-size="pageSize"
7474
:total="dataCount"
7575
:sizerOptions="[10, 20, 50]"
76+
:prevText="$t('source.common.previousPage')"
77+
:nextText="$t('source.common.nextPage')"
7678
@on-change="onPageChange"
7779
@on-prev="onPrevChange"
7880
@on-next="onNextChange"

0 commit comments

Comments
 (0)