KYLIN-6078 [Front] submit jobs when refresh specify partitions
diff --git a/kystudio/src/components/monitor/batchJobs/jobs.vue b/kystudio/src/components/monitor/batchJobs/jobs.vue
index 3d38693..64342fc 100644
--- a/kystudio/src/components/monitor/batchJobs/jobs.vue
+++ b/kystudio/src/components/monitor/batchJobs/jobs.vue
@@ -95,16 +95,21 @@
min-width="180"
show-overflow-tooltip>
<template slot-scope="scope">
- <template v-if="scope.row.job_name !== 'SNAPSHOT_REFRESH' && scope.row.job_name !== 'SNAPSHOT_BUILD' && scope.row.job_name !== 'LAYOUT_DATA_OPTIMIZE'">
- <span v-if="scope.row.data_range_end==9223372036854776000 && ![...delSecJobTypes, ...otherJobTypes].includes(scope.row.job_name)">{{$t('fullLoad')}}</span>
- <span v-else-if="scope.row.data_range_end==9223372036854776000 && [...delSecJobTypes, ...otherJobTypes].includes(scope.row.job_name)">{{$t('full')}}</span>
- <span v-else>{{scope.row.data_range_start | toServerGMTDate}} - {{scope.row.data_range_end | toServerGMTDate}}</span>
+ <template v-if="scope.row.data_range_partitions">
+ {{$t('partitions')}} ( {{ scope.row.data_range_partitions }} )
</template>
<template v-else>
- <span v-if="scope.row.snapshot_data_range === 'FULL'">{{$t('fullLoad')}}</span>
- <span v-else-if="scope.row.snapshot_data_range === 'INC'">{{$t('increamLoad')}}</span>
- <span v-else-if="scope.row.job_name === 'LAYOUT_DATA_OPTIMIZE'">{{$t('fullOptimization')}}</span>
- <span v-else>{{scope.row.snapshot_data_range ? JSON.parse(scope.row.snapshot_data_range).splice(0, 10).join(', ') : ''}}</span>
+ <template v-if="scope.row.job_name !== 'SNAPSHOT_REFRESH' && scope.row.job_name !== 'SNAPSHOT_BUILD' && scope.row.job_name !== 'LAYOUT_DATA_OPTIMIZE'">
+ <span v-if="scope.row.data_range_end==9223372036854776000 && ![...delSecJobTypes, ...otherJobTypes].includes(scope.row.job_name)">{{$t('fullLoad')}}</span>
+ <span v-else-if="scope.row.data_range_end==9223372036854776000 && [...delSecJobTypes, ...otherJobTypes].includes(scope.row.job_name)">{{$t('full')}}</span>
+ <span v-else>{{scope.row.data_range_start | toServerGMTDate}} - {{scope.row.data_range_end | toServerGMTDate}}</span>
+ </template>
+ <template v-else>
+ <span v-if="scope.row.snapshot_data_range === 'FULL'">{{$t('fullLoad')}}</span>
+ <span v-else-if="scope.row.snapshot_data_range === 'INC'">{{$t('increamLoad')}}</span>
+ <span v-else-if="scope.row.job_name === 'LAYOUT_DATA_OPTIMIZE'">{{$t('fullOptimization')}}</span>
+ <span v-else>{{scope.row.snapshot_data_range ? JSON.parse(scope.row.snapshot_data_range).splice(0, 10).join(', ') : ''}}</span>
+ </template>
</template>
</template>
</el-table-column>
diff --git a/kystudio/src/components/studio/InternalTable/DataManagement/DataManagement.vue b/kystudio/src/components/studio/InternalTable/DataManagement/DataManagement.vue
index 61a310e..285a3ae 100644
--- a/kystudio/src/components/studio/InternalTable/DataManagement/DataManagement.vue
+++ b/kystudio/src/components/studio/InternalTable/DataManagement/DataManagement.vue
@@ -211,6 +211,8 @@
yarn_queue: 'default'
}).then(() => {
this.$message({ type: 'success', message: this.$t('refreshDataSuccessTips', { tableName: this.tableInfo.name }) })
+ }).catch((e) => {
+ this.$message.error(e.body.msg)
}).finally(() => {
this.internalTableDataListLoading = false
})
diff --git a/kystudio/src/components/studio/InternalTable/DataManagement/locales.js b/kystudio/src/components/studio/InternalTable/DataManagement/locales.js
index 1a22f17..784752e 100644
--- a/kystudio/src/components/studio/InternalTable/DataManagement/locales.js
+++ b/kystudio/src/components/studio/InternalTable/DataManagement/locales.js
@@ -14,7 +14,7 @@
confirmDeletePartionsTitle: 'Delete Data',
confirmDeleteAllDataPrompt: 'Are you sure to clear the data?',
confirmDeleteAllDataTitle: 'Clear Data',
- refreshDataSuccessTips: 'Refreshing data job for internal table [{tableName}] has been submitted successfully, you can view the job progress in the Monitor page.'
+ refreshDataSuccessTips: 'Refreshing internal table [{tableName}] partition has been submitted successfully, you can view the job progress in the Monitor page.'
},
'zh-cn': {
dialogTitle: '内表数据管理 | {tableName}',
@@ -31,6 +31,6 @@
confirmDeletePartionsTitle: '删除数据',
confirmDeleteAllDataPrompt: '确认要清空数据么？',
confirmDeleteAllDataTitle: '清空数据',
- refreshDataSuccessTips: '刷新内表 [{tableName}] 任务提交成功，您可以在监控页面查看任务进度。'
+ refreshDataSuccessTips: '刷新内表 [{tableName}] 分区任务提交成功，您可以在监控页面查看任务进度。'
}
}
