From db4392bf836bbc7ebdc41d6c4665a28ae0ff2515 Mon Sep 17 00:00:00 2001 From: qianmoQ Date: Thu, 24 Jul 2025 18:56:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(ui):=20=E4=BF=AE=E5=A4=8D=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=9C=AA=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/edurt/datacap/spi/PluginService.java | 2 -- core/datacap-ui/src/views/components/visual/VisualView.vue | 2 +- .../src/views/pages/admin/dashboard/DashboardHome.vue | 2 ++ .../views/pages/admin/dashboard/components/ChartContainer.vue | 2 ++ .../src/views/pages/admin/dataset/DatasetHistory.vue | 2 ++ core/datacap-ui/src/views/pages/admin/dataset/DatasetHome.vue | 2 ++ core/datacap-ui/src/views/pages/admin/dataset/DatasetInfo.vue | 3 +-- core/datacap-ui/src/views/pages/admin/history/HistoryHome.vue | 2 ++ core/datacap-ui/src/views/pages/admin/query/QueryHome.vue | 2 +- core/datacap-ui/src/views/pages/admin/report/ReportHome.vue | 2 ++ core/datacap-ui/src/views/pages/admin/snippet/SnippetHome.vue | 2 ++ core/datacap-ui/src/views/pages/admin/source/SourceHistory.vue | 2 ++ core/datacap-ui/src/views/pages/admin/source/SourceHome.vue | 2 ++ .../src/views/pages/admin/source/components/TableExport.vue | 1 - core/datacap-ui/src/views/pages/admin/user/profile/LogHome.vue | 2 ++ .../datacap-ui/src/views/pages/admin/wofkflow/WorkflowHome.vue | 2 ++ .../src/views/pages/system/function/FunctionHome.vue | 2 ++ core/datacap-ui/src/views/pages/system/menu/MenuHome.vue | 2 ++ core/datacap-ui/src/views/pages/system/role/RoleHome.vue | 2 ++ .../src/views/pages/system/schedule/ScheduleHistory.vue | 2 ++ .../src/views/pages/system/schedule/ScheduleHome.vue | 2 ++ core/datacap-ui/src/views/pages/system/user/UserHome.vue | 2 ++ 22 files changed, 37 insertions(+), 7 deletions(-) diff --git a/core/datacap-spi/src/main/java/io/edurt/datacap/spi/PluginService.java b/core/datacap-spi/src/main/java/io/edurt/datacap/spi/PluginService.java index 2d42a3c430..d9617bc27d 100644 --- a/core/datacap-spi/src/main/java/io/edurt/datacap/spi/PluginService.java +++ b/core/datacap-spi/src/main/java/io/edurt/datacap/spi/PluginService.java @@ -1292,8 +1292,6 @@ default Pagination getPagination(Configure configure, TableDefinition definition default Pagination formatPagination(Configure configure, String sql, TableDefinition definition) { - // 强制指定为 JsonConvert - configure.setFormat("JsonConvert"); Response response = this.getResponse( sql.replace("{0}", definition.getDatabase()) .replace("{1}", definition.getName()) diff --git a/core/datacap-ui/src/views/components/visual/VisualView.vue b/core/datacap-ui/src/views/components/visual/VisualView.vue index 69c0bd5eb6..f1f932e22b 100644 --- a/core/datacap-ui/src/views/components/visual/VisualView.vue +++ b/core/datacap-ui/src/views/components/visual/VisualView.vue @@ -166,7 +166,7 @@ export default defineComponent({ setTimeout(() => { this.loading = true if (this.type === 'QUERY') { - const configure: ExecuteModel = { name: this.original as any, content: this.query as any, mode: 'REPORT', format: 'JsonConvert' } + const configure: ExecuteModel = { name: this.original as any, content: this.query as any, mode: 'REPORT' } ExecuteService.execute(configure, null) .then(response => { if (response.status && response.data.isSuccessful) { diff --git a/core/datacap-ui/src/views/pages/admin/dashboard/DashboardHome.vue b/core/datacap-ui/src/views/pages/admin/dashboard/DashboardHome.vue index 73875a30e7..05c1c7d29c 100644 --- a/core/datacap-ui/src/views/pages/admin/dashboard/DashboardHome.vue +++ b/core/datacap-ui/src/views/pages/admin/dashboard/DashboardHome.vue @@ -79,6 +79,8 @@ :page-size="pageSize" :total="dataCount" :sizerOptions="[12, 24, 36]" + :prevText="$t('source.common.previousPage')" + :nextText="$t('source.common.nextPage')" @on-change="onPageChange" @on-prev="onPrevChange" @on-next="onNextChange" diff --git a/core/datacap-ui/src/views/pages/admin/dashboard/components/ChartContainer.vue b/core/datacap-ui/src/views/pages/admin/dashboard/components/ChartContainer.vue index 33cf32d0ed..79e4b77242 100644 --- a/core/datacap-ui/src/views/pages/admin/dashboard/components/ChartContainer.vue +++ b/core/datacap-ui/src/views/pages/admin/dashboard/components/ChartContainer.vue @@ -45,6 +45,8 @@ :page-size="pageSize" :total="dataCount" :sizerOptions="[12, 24, 36]" + :prevText="$t('source.common.previousPage')" + :nextText="$t('source.common.nextPage')" @on-change="onPageChange" @on-prev="onPrevChange" @on-next="onNextChange" diff --git a/core/datacap-ui/src/views/pages/admin/dataset/DatasetHistory.vue b/core/datacap-ui/src/views/pages/admin/dataset/DatasetHistory.vue index 0b50423f24..d35ada2670 100644 --- a/core/datacap-ui/src/views/pages/admin/dataset/DatasetHistory.vue +++ b/core/datacap-ui/src/views/pages/admin/dataset/DatasetHistory.vue @@ -34,6 +34,8 @@ :page-size="pageSize" :total="dataCount" :sizerOptions="[10, 20, 50]" + :prevText="$t('source.common.previousPage')" + :nextText="$t('source.common.nextPage')" @on-change="onPageChange" @on-prev="onPrevChange" @on-next="onNextChange" diff --git a/core/datacap-ui/src/views/pages/admin/dataset/DatasetHome.vue b/core/datacap-ui/src/views/pages/admin/dataset/DatasetHome.vue index 4c034150e8..d8c4ada51f 100644 --- a/core/datacap-ui/src/views/pages/admin/dataset/DatasetHome.vue +++ b/core/datacap-ui/src/views/pages/admin/dataset/DatasetHome.vue @@ -107,6 +107,8 @@ :page-size="pageSize" :total="dataCount" :sizerOptions="[10, 20, 50]" + :prevText="$t('source.common.previousPage')" + :nextText="$t('source.common.nextPage')" @on-change="onPageChange" @on-prev="onPrevChange" @on-next="onNextChange" diff --git a/core/datacap-ui/src/views/pages/admin/dataset/DatasetInfo.vue b/core/datacap-ui/src/views/pages/admin/dataset/DatasetInfo.vue index 8de76b2caa..fcd5edc6c3 100644 --- a/core/datacap-ui/src/views/pages/admin/dataset/DatasetInfo.vue +++ b/core/datacap-ui/src/views/pages/admin/dataset/DatasetInfo.vue @@ -455,8 +455,7 @@ export default defineComponent({ const configure: ExecuteModel = { content: this.value, name: this.sourceInfo?.code as unknown as string, - mode: 'DATASET', - format: 'JsonConvert' + mode: 'DATASET' } this.running = true ExecuteService.execute(configure, null) diff --git a/core/datacap-ui/src/views/pages/admin/history/HistoryHome.vue b/core/datacap-ui/src/views/pages/admin/history/HistoryHome.vue index 8f08b14bbd..5fadebe590 100644 --- a/core/datacap-ui/src/views/pages/admin/history/HistoryHome.vue +++ b/core/datacap-ui/src/views/pages/admin/history/HistoryHome.vue @@ -93,6 +93,8 @@ :page-size="pageSize" :total="dataCount" :sizerOptions="[10, 20, 50]" + :prevText="$t('source.common.previousPage')" + :nextText="$t('source.common.nextPage')" @on-change="onPageChange" @on-prev="onPrevChange" @on-next="onNextChange" diff --git a/core/datacap-ui/src/views/pages/admin/query/QueryHome.vue b/core/datacap-ui/src/views/pages/admin/query/QueryHome.vue index 68cf23bf3a..4eab96b961 100644 --- a/core/datacap-ui/src/views/pages/admin/query/QueryHome.vue +++ b/core/datacap-ui/src/views/pages/admin/query/QueryHome.vue @@ -240,7 +240,7 @@ export default defineComponent({ { this.createEditor() - this.queryConfigure.configure = { name: this.selectSource.id as string, content: '', mode: 'ADHOC', format: 'JsonConvert' } + this.queryConfigure.configure = { name: this.selectSource.id as string, content: '', mode: 'ADHOC' } const params = this.$route.params if (params) { const code = params.code diff --git a/core/datacap-ui/src/views/pages/admin/report/ReportHome.vue b/core/datacap-ui/src/views/pages/admin/report/ReportHome.vue index 54154152fc..3cc446e99a 100644 --- a/core/datacap-ui/src/views/pages/admin/report/ReportHome.vue +++ b/core/datacap-ui/src/views/pages/admin/report/ReportHome.vue @@ -73,6 +73,8 @@ :page-size="pageSize" :total="dataCount" :sizerOptions="[10, 20, 50]" + :prevText="$t('source.common.previousPage')" + :nextText="$t('source.common.nextPage')" @on-change="onPageChange" @on-prev="onPrevChange" @on-next="onNextChange" diff --git a/core/datacap-ui/src/views/pages/admin/snippet/SnippetHome.vue b/core/datacap-ui/src/views/pages/admin/snippet/SnippetHome.vue index e986810810..fe7cf7fbda 100644 --- a/core/datacap-ui/src/views/pages/admin/snippet/SnippetHome.vue +++ b/core/datacap-ui/src/views/pages/admin/snippet/SnippetHome.vue @@ -64,6 +64,8 @@ :page-size="pageSize" :total="dataCount" :sizerOptions="[10, 20, 50]" + :prevText="$t('source.common.previousPage')" + :nextText="$t('source.common.nextPage')" @on-change="onPageChange" @on-prev="onPrevChange" @on-next="onNextChange" diff --git a/core/datacap-ui/src/views/pages/admin/source/SourceHistory.vue b/core/datacap-ui/src/views/pages/admin/source/SourceHistory.vue index a703cd9d7f..435006a216 100644 --- a/core/datacap-ui/src/views/pages/admin/source/SourceHistory.vue +++ b/core/datacap-ui/src/views/pages/admin/source/SourceHistory.vue @@ -42,6 +42,8 @@ :page-size="pageSize" :total="dataCount" :sizerOptions="[10, 20, 50]" + :prevText="$t('source.common.previousPage')" + :nextText="$t('source.common.nextPage')" @on-change="onPageChange" @on-prev="onPrevChange" @on-next="onNextChange" diff --git a/core/datacap-ui/src/views/pages/admin/source/SourceHome.vue b/core/datacap-ui/src/views/pages/admin/source/SourceHome.vue index c7127ae98d..3d762f43ba 100644 --- a/core/datacap-ui/src/views/pages/admin/source/SourceHome.vue +++ b/core/datacap-ui/src/views/pages/admin/source/SourceHome.vue @@ -96,6 +96,8 @@ :page-size="pageSize" :total="dataCount" :sizerOptions="[10, 20, 50]" + :prevText="$t('source.common.previousPage')" + :nextText="$t('source.common.nextPage')" @on-change="onPageChange" @on-prev="onPrevChange" @on-next="onNextChange" diff --git a/core/datacap-ui/src/views/pages/admin/source/components/TableExport.vue b/core/datacap-ui/src/views/pages/admin/source/components/TableExport.vue index b429a7cbeb..f6beba6d8b 100644 --- a/core/datacap-ui/src/views/pages/admin/source/components/TableExport.vue +++ b/core/datacap-ui/src/views/pages/admin/source/components/TableExport.vue @@ -74,7 +74,6 @@ export default defineComponent({ title: null as string | null, formats: [], formState: { - format: 'JsonConvert', count: 5000, path: null } diff --git a/core/datacap-ui/src/views/pages/admin/user/profile/LogHome.vue b/core/datacap-ui/src/views/pages/admin/user/profile/LogHome.vue index ab2d988c6a..bb5ad740f5 100644 --- a/core/datacap-ui/src/views/pages/admin/user/profile/LogHome.vue +++ b/core/datacap-ui/src/views/pages/admin/user/profile/LogHome.vue @@ -19,6 +19,8 @@ :page-size="pageSize" :total="dataCount" :sizerOptions="[10, 20, 50]" + :prevText="$t('source.common.previousPage')" + :nextText="$t('source.common.nextPage')" @on-change="onPageChange" @on-prev="onPrevChange" @on-next="onNextChange" diff --git a/core/datacap-ui/src/views/pages/admin/wofkflow/WorkflowHome.vue b/core/datacap-ui/src/views/pages/admin/wofkflow/WorkflowHome.vue index 2009deaa5a..72b7da9382 100644 --- a/core/datacap-ui/src/views/pages/admin/wofkflow/WorkflowHome.vue +++ b/core/datacap-ui/src/views/pages/admin/wofkflow/WorkflowHome.vue @@ -110,6 +110,8 @@ :page-size="pageSize" :total="dataCount" :sizerOptions="[10, 20, 50]" + :prevText="$t('source.common.previousPage')" + :nextText="$t('source.common.nextPage')" @on-change="onPageChange" @on-prev="onPrevChange" @on-next="onNextChange" diff --git a/core/datacap-ui/src/views/pages/system/function/FunctionHome.vue b/core/datacap-ui/src/views/pages/system/function/FunctionHome.vue index 833c1d05b7..b14643530d 100644 --- a/core/datacap-ui/src/views/pages/system/function/FunctionHome.vue +++ b/core/datacap-ui/src/views/pages/system/function/FunctionHome.vue @@ -50,6 +50,8 @@ :page-size="pageSize" :total="dataCount" :sizerOptions="[10, 20, 50]" + :prevText="$t('source.common.previousPage')" + :nextText="$t('source.common.nextPage')" @on-change="onPageChange" @on-prev="onPrevChange" @on-next="onNextChange" diff --git a/core/datacap-ui/src/views/pages/system/menu/MenuHome.vue b/core/datacap-ui/src/views/pages/system/menu/MenuHome.vue index 7eff1048ae..6ee3ec7741 100644 --- a/core/datacap-ui/src/views/pages/system/menu/MenuHome.vue +++ b/core/datacap-ui/src/views/pages/system/menu/MenuHome.vue @@ -40,6 +40,8 @@ :page-size="pageSize" :total="dataCount" :sizerOptions="[10, 20, 50]" + :prevText="$t('source.common.previousPage')" + :nextText="$t('source.common.nextPage')" @on-change="onPageChange" @on-prev="onPrevChange" @on-next="onNextChange" diff --git a/core/datacap-ui/src/views/pages/system/role/RoleHome.vue b/core/datacap-ui/src/views/pages/system/role/RoleHome.vue index ce19db2a67..a239bcf560 100644 --- a/core/datacap-ui/src/views/pages/system/role/RoleHome.vue +++ b/core/datacap-ui/src/views/pages/system/role/RoleHome.vue @@ -42,6 +42,8 @@ :page-size="pageSize" :total="dataCount" :sizerOptions="[10, 20, 50]" + :prevText="$t('source.common.previousPage')" + :nextText="$t('source.common.nextPage')" @on-change="onPageChange" @on-prev="onPrevChange" @on-next="onNextChange" diff --git a/core/datacap-ui/src/views/pages/system/schedule/ScheduleHistory.vue b/core/datacap-ui/src/views/pages/system/schedule/ScheduleHistory.vue index c31a4e66ac..a570c7c913 100644 --- a/core/datacap-ui/src/views/pages/system/schedule/ScheduleHistory.vue +++ b/core/datacap-ui/src/views/pages/system/schedule/ScheduleHistory.vue @@ -16,6 +16,8 @@ :page-size="pageSize" :total="dataCount" :sizerOptions="[10, 20, 50]" + :prevText="$t('source.common.previousPage')" + :nextText="$t('source.common.nextPage')" @on-change="onPageChange" @on-prev="onPrevChange" @on-next="onNextChange" diff --git a/core/datacap-ui/src/views/pages/system/schedule/ScheduleHome.vue b/core/datacap-ui/src/views/pages/system/schedule/ScheduleHome.vue index addc5fbcbe..12f32b4e89 100644 --- a/core/datacap-ui/src/views/pages/system/schedule/ScheduleHome.vue +++ b/core/datacap-ui/src/views/pages/system/schedule/ScheduleHome.vue @@ -34,6 +34,8 @@ :page-size="pageSize" :total="dataCount" :sizerOptions="[10, 20, 50]" + :prevText="$t('source.common.previousPage')" + :nextText="$t('source.common.nextPage')" @on-change="onPageChange" @on-prev="onPrevChange" @on-next="onNextChange" diff --git a/core/datacap-ui/src/views/pages/system/user/UserHome.vue b/core/datacap-ui/src/views/pages/system/user/UserHome.vue index 5decb4c5ef..b3a38f207a 100644 --- a/core/datacap-ui/src/views/pages/system/user/UserHome.vue +++ b/core/datacap-ui/src/views/pages/system/user/UserHome.vue @@ -44,6 +44,8 @@ :page-size="pageSize" :total="dataCount" :sizerOptions="[10, 20, 50]" + :prevText="$t('source.common.previousPage')" + :nextText="$t('source.common.nextPage')" @on-change="onPageChange" @on-prev="onPrevChange" @on-next="onNextChange" From 8213ffcf19cd56cd527a6d142725da737ce584a1 Mon Sep 17 00:00:00 2001 From: qianmoQ Date: Thu, 24 Jul 2025 19:32:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(plugin=20doris):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=20doris=20=E6=8F=92=E4=BB=B6=E6=B8=B2=E6=9F=93=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=90=8D=E9=97=AE=E9=A2=98=20(close=20#943)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datacap-ui/src/views/components/tree/MetadataTree.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/datacap-ui/src/views/components/tree/MetadataTree.vue b/core/datacap-ui/src/views/components/tree/MetadataTree.vue index 714f14e45a..0bc5b1f0a8 100644 --- a/core/datacap-ui/src/views/components/tree/MetadataTree.vue +++ b/core/datacap-ui/src/views/components/tree/MetadataTree.vue @@ -63,11 +63,11 @@ export default defineComponent({ if (response.status && response.data && response.data.isSuccessful) { response.data.columns.forEach(item => { const structure = { - title: item.object_name, - catalog: item.object_name, - code: item.object_name, + title: item.object_name || item.schema_name || item.SCHEMA_NAME, + catalog: item.object_name || item.schema_name || item.SCHEMA_NAME, + code: item.object_name || item.schema_name || item.SCHEMA_NAME, level: StructureEnum.DATABASE, - value: item.object_name, + value: item.object_name || item.schema_name || item.SCHEMA_NAME, isLeaf: false } this.data.push(structure) From 1c9ef139faf4dde062d60e732ce05cb3fd20fd8f Mon Sep 17 00:00:00 2001 From: qianmoQ Date: Thu, 24 Jul 2025 19:50:27 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix(ui):=20=E4=BF=AE=E5=A4=8D=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=95=B0=E6=8D=AE=E6=9C=AA=E6=8C=87=E5=AE=9A=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/layouts/metadata/components/MetadataSidebar.vue | 6 +++--- .../src/views/pages/admin/source/SourceDatabase.vue | 2 +- .../src/views/pages/admin/source/SourceTableStatement.vue | 2 +- .../src/views/pages/admin/source/components/TableExport.vue | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/core/datacap-ui/src/views/layouts/metadata/components/MetadataSidebar.vue b/core/datacap-ui/src/views/layouts/metadata/components/MetadataSidebar.vue index 10e1e98f99..8f2bf8be55 100644 --- a/core/datacap-ui/src/views/layouts/metadata/components/MetadataSidebar.vue +++ b/core/datacap-ui/src/views/layouts/metadata/components/MetadataSidebar.vue @@ -246,9 +246,9 @@ export default defineComponent({ if (response.status) { response.data.columns.forEach(item => { const structure: StructureModel = { - title: item.object_name, - catalog: item.object_name, - code: item.object_name + title: item.object_name || item.schema_name || item.SCHEMA_NAME, + catalog: item.object_name || item.schema_name || item.SCHEMA_NAME, + code: item.object_name || item.schema_name || item.SCHEMA_NAME } this.databaseArray.push(structure) }) diff --git a/core/datacap-ui/src/views/pages/admin/source/SourceDatabase.vue b/core/datacap-ui/src/views/pages/admin/source/SourceDatabase.vue index 1a95b4fbb1..5d5a398617 100644 --- a/core/datacap-ui/src/views/pages/admin/source/SourceDatabase.vue +++ b/core/datacap-ui/src/views/pages/admin/source/SourceDatabase.vue @@ -7,7 +7,7 @@
- {{ dataInfo.object_name }} + {{ dataInfo.object_name || dataInfo.schema_name || dataInfo.SCHEMA_NAME }}
diff --git a/core/datacap-ui/src/views/pages/admin/source/SourceTableStatement.vue b/core/datacap-ui/src/views/pages/admin/source/SourceTableStatement.vue index e67ff76310..a462d52530 100644 --- a/core/datacap-ui/src/views/pages/admin/source/SourceTableStatement.vue +++ b/core/datacap-ui/src/views/pages/admin/source/SourceTableStatement.vue @@ -53,7 +53,7 @@ export default defineComponent({ } else { this.$Message.error({ - content: response.message, + content: response.data?.message, showIcon: true }) } diff --git a/core/datacap-ui/src/views/pages/admin/source/components/TableExport.vue b/core/datacap-ui/src/views/pages/admin/source/components/TableExport.vue index f6beba6d8b..b429a7cbeb 100644 --- a/core/datacap-ui/src/views/pages/admin/source/components/TableExport.vue +++ b/core/datacap-ui/src/views/pages/admin/source/components/TableExport.vue @@ -74,6 +74,7 @@ export default defineComponent({ title: null as string | null, formats: [], formState: { + format: 'JsonConvert', count: 5000, path: null }