Skip to content

fix(plugin doris): 修复 doris 插件渲染数据库名问题 #951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qianmoQ merged 3 commits into from
Jul 24, 2025
Merged

fix(plugin doris): 修复 doris 插件渲染数据库名问题 #951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db4392b
fix(ui): 修复分页未国际化
qianmoQ Jul 24, 2025
8213ffc
fix(plugin doris): 修复 doris 插件渲染数据库名问题 (close #943)
qianmoQ Jul 24, 2025
1c9ef13
fix(ui): 修复导出数据未指定格式化
qianmoQ Jul 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions core/datacap-spi/src/main/java/io/edurt/datacap/spi/PluginService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
8 changes: 4 additions & 4 deletions core/datacap-ui/src/views/components/tree/MetadataTree.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion core/datacap-ui/src/views/components/visual/VisualView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions core/datacap-ui/src/views/layouts/metadata/components/MetadataSidebar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
})
Expand Down
2 changes: 2 additions & 0 deletions core/datacap-ui/src/views/pages/admin/dashboard/DashboardHome.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions core/datacap-ui/src/views/pages/admin/dashboard/components/ChartContainer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions core/datacap-ui/src/views/pages/admin/dataset/DatasetHistory.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions core/datacap-ui/src/views/pages/admin/dataset/DatasetHome.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions core/datacap-ui/src/views/pages/admin/dataset/DatasetInfo.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions core/datacap-ui/src/views/pages/admin/history/HistoryHome.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion core/datacap-ui/src/views/pages/admin/query/QueryHome.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions core/datacap-ui/src/views/pages/admin/report/ReportHome.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions core/datacap-ui/src/views/pages/admin/snippet/SnippetHome.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion core/datacap-ui/src/views/pages/admin/source/SourceDatabase.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ShadcnCol span="4">
<div class="flex items-center space-x-2">
<ShadcnIcon icon="Database"/>
<span>{{ dataInfo.object_name }}</span>
<span>{{ dataInfo.object_name || dataInfo.schema_name || dataInfo.SCHEMA_NAME }}</span>
</div>
</ShadcnCol>

Expand Down
2 changes: 2 additions & 0 deletions core/datacap-ui/src/views/pages/admin/source/SourceHistory.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions core/datacap-ui/src/views/pages/admin/source/SourceHome.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion core/datacap-ui/src/views/pages/admin/source/SourceTableStatement.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export default defineComponent({
}
else {
this.$Message.error({
content: response.message,
content: response.data?.message,
showIcon: true
})
}
Expand Down
2 changes: 2 additions & 0 deletions core/datacap-ui/src/views/pages/admin/user/profile/LogHome.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions core/datacap-ui/src/views/pages/admin/wofkflow/WorkflowHome.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions core/datacap-ui/src/views/pages/system/function/FunctionHome.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions core/datacap-ui/src/views/pages/system/menu/MenuHome.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions core/datacap-ui/src/views/pages/system/role/RoleHome.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions core/datacap-ui/src/views/pages/system/schedule/ScheduleHistory.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions core/datacap-ui/src/views/pages/system/schedule/ScheduleHome.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions core/datacap-ui/src/views/pages/system/user/UserHome.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading