This is an automated email from the ASF dual-hosted git repository. liyang pushed a commit to branch kylin5 in repository https://gitbox.apache.org/repos/asf/kylin.git
commit cfd9257b9c25fae5969f3929851fb0dcbf198795 Author: ShengHuang <[email protected]> AuthorDate: Fri Sep 13 19:19:04 2024 +0800 KYLIN-5974 fix internal table detail page partition column read error --- kystudio/src/components/monitor/batchJobs/jobs.vue | 2 +- .../DataManagement/DataManagement.vue | 33 ++++++++++------------ .../InternalTable/DataManagement/LoadData.vue | 18 +++++------- .../InternalTable/Setting/InternalTableSetting.vue | 2 +- 4 files changed, 24 insertions(+), 31 deletions(-) diff --git a/kystudio/src/components/monitor/batchJobs/jobs.vue b/kystudio/src/components/monitor/batchJobs/jobs.vue index 633217b8d9..9d3b021927 100644 --- a/kystudio/src/components/monitor/batchJobs/jobs.vue +++ b/kystudio/src/components/monitor/batchJobs/jobs.vue @@ -443,7 +443,7 @@ export default class JobsList extends Vue { jobsList = [] jobTotal = 0 allStatus = ['PENDING', 'RUNNING', 'FINISHED', 'ERROR', 'DISCARDED', 'STOPPED'] - jobTypeFilteArr = ['INDEX_REFRESH', 'INDEX_MERGE', 'INDEX_BUILD', 'INC_BUILD', 'TABLE_SAMPLING', 'SNAPSHOT_BUILD', 'SNAPSHOT_REFRESH', 'SUB_PARTITION_BUILD', 'SUB_PARTITION_REFRESH', 'EXPORT_TO_SECOND_STORAGE', 'SECOND_STORAGE_NODE_CLEAN', 'SECOND_STORAGE_MODEL_CLEAN', 'SECOND_STORAGE_SEGMENT_CLEAN', 'SECOND_STORAGE_INDEX_CLEAN', 'SECOND_STORAGE_REFRESH_SECONDARY_INDEXES', 'LAYOUT_DATA_OPTIMIZE'] + jobTypeFilteArr = ['INDEX_REFRESH', 'INDEX_MERGE', 'INDEX_BUILD', 'INC_BUILD', 'TABLE_SAMPLING', 'SNAPSHOT_BUILD', 'SNAPSHOT_REFRESH', 'SUB_PARTITION_BUILD', 'SUB_PARTITION_REFRESH', 'EXPORT_TO_SECOND_STORAGE', 'SECOND_STORAGE_NODE_CLEAN', 'SECOND_STORAGE_MODEL_CLEAN', 'SECOND_STORAGE_SEGMENT_CLEAN', 'SECOND_STORAGE_INDEX_CLEAN', 'SECOND_STORAGE_REFRESH_SECONDARY_INDEXES', 'LAYOUT_DATA_OPTIMIZE', 'INTERNAL_TABLE_BUILD'] tableJobTypes = ['TABLE_SAMPLING', 'SNAPSHOT_BUILD', 'SNAPSHOT_REFRESH', 'SECOND_STORAGE_NODE_CLEAN'] delSecJobTypes = ['SECOND_STORAGE_NODE_CLEAN', 'SECOND_STORAGE_MODEL_CLEAN', 'SECOND_STORAGE_SEGMENT_CLEAN', 'SECOND_STORAGE_INDEX_CLEAN'] otherJobTypes = ['SECOND_STORAGE_REFRESH_SECONDARY_INDEXES'] diff --git a/kystudio/src/components/studio/InternalTable/DataManagement/DataManagement.vue b/kystudio/src/components/studio/InternalTable/DataManagement/DataManagement.vue index 415eab762c..c5a0e82bff 100644 --- a/kystudio/src/components/studio/InternalTable/DataManagement/DataManagement.vue +++ b/kystudio/src/components/studio/InternalTable/DataManagement/DataManagement.vue @@ -2,9 +2,9 @@ <el-dialog :visible="open" :title="dialogTitle" - class='data-management' + class='internal-table-data-management' :before-close="handleDataClose"> - <div v-show="!showLoadData"> + <div v-show="!showLoadData" v-loading="internalTableDataListLoading"> <div> <div class="ksd-fleft ky-no-br-space"> <div class="ke-it-other_actions ksd-fleft"> @@ -19,8 +19,7 @@ :data="internalTableDataList" class="data-list-table" style="width: 100%" - @selection-change="handleSelectionChange" - v-loading="internalTableDataListLoading"> + @selection-change="handleSelectionChange"> <el-table-column type="selection" width="40"> @@ -262,24 +261,22 @@ export default class DataManagement extends Vue { } </script> <style lang="less"> - .data-management { + .internal-table-data-management { position: absolute; .el-dialog { width: 960px; padding-bottom: 24px; - - .el-dialog__body { - overflow: visible !important; - } - .data-list-table { - max-height: 430px; - overflow: auto; - } } - } - .text-ellipsis { - text-overflow: ellipsis; - white-space: nowrap; - } + .el-dialog__body { + overflow: visible !important; + } + .el-dialog__wrapper { + overflow: hidden; + } + .text-ellipsis { + text-overflow: ellipsis; + white-space: nowrap; + } +} </style> diff --git a/kystudio/src/components/studio/InternalTable/DataManagement/LoadData.vue b/kystudio/src/components/studio/InternalTable/DataManagement/LoadData.vue index 4a18c79096..33f2369c3a 100644 --- a/kystudio/src/components/studio/InternalTable/DataManagement/LoadData.vue +++ b/kystudio/src/components/studio/InternalTable/DataManagement/LoadData.vue @@ -1,6 +1,6 @@ <template> <div><el-form :model="ruleForm" :rules="rules" ref="ruleForm"> - <el-tabs v-model="activeTab" type="card"> + <el-tabs v-model="activeTab" type="card" class="internal-table-load-data"> <el-tab-pane name="append" :disabled="!tableInfo.date_partition_format"> <span slot="label">{{$t('loadModelAppend')}}</span> <div> @@ -9,7 +9,7 @@ <div class="sub-title">{{$t('timePartitionOptionsTitle')}}</div> <div> <el-form-item prop="timePartitionColumn"> - <el-select v-model="ruleForm.timePartitionColumn" class='max-width' disabled> + <el-select v-model="tableInfo.time_partition_col" class='max-width' disabled> <el-option v-for="item in timePartitionOptions" :key="item.value" @@ -24,7 +24,7 @@ <div class="sub-title">{{$t('timePartitionFormatTitle')}}</div> <div> <el-form-item prop="timePartitionFormat"> - <el-select v-model="ruleForm.timePartitionFormat" class='max-width' disabled> + <el-select v-model="tableInfo.date_partition_format" class='max-width' disabled> <el-option v-for="item in timePartitionFormatOptions" :key="item.value" @@ -55,7 +55,7 @@ <div> <div class="sub-title">{{$t('partitionOptionsTitle')}}</div> <div> - <el-select v-model="ruleForm.partitionColumn" class='max-width' disabled> + <el-select v-model="tableInfo.time_partition_col" class='max-width' disabled> <el-option v-for="item in partitionOptions" :key="item.value" @@ -144,7 +144,7 @@ import { timePartitionFormatOptions } from '../const' } } }) -export default class DataManagement extends Vue { +export default class LoadData extends Vue { activeTab = this.tableInfo.date_partition_format ? 'append' : 'full' @Watch('tableInfo') @@ -153,17 +153,13 @@ export default class DataManagement extends Vue { } ruleForm = { - timePartitionColumn: this.tableInfo.time_partition_col, - timePartitionFormat: this.tableInfo.date_partition_format, dateRange: (() => { const currentDate = new Date() return [ new Date(currentDate.getFullYear(), currentDate.getMonth() - 1, currentDate.getDate() - 1, 10, 10), new Date(currentDate.getFullYear(), currentDate.getMonth(), currentDate.getDate() - 1, 10, 10) ] - })(), - - partitionColumn: this.tableInfo.time_partition_col + })() } loading = false @@ -207,7 +203,7 @@ export default class DataManagement extends Vue { } </script> <style lang="less"> - .el-tabs__content { + .internal-table-load-data .el-tabs__content { overflow: visible; } </style> diff --git a/kystudio/src/components/studio/InternalTable/Setting/InternalTableSetting.vue b/kystudio/src/components/studio/InternalTable/Setting/InternalTableSetting.vue index 09476ffb55..53d69a5dbe 100644 --- a/kystudio/src/components/studio/InternalTable/Setting/InternalTableSetting.vue +++ b/kystudio/src/components/studio/InternalTable/Setting/InternalTableSetting.vue @@ -361,7 +361,7 @@ export default class InternalTableSetting extends Vue { height: 0px; } .el-table { - min-height: 234px; + min-height: 148px; } .max-width { width: 100%;
