This is an automated email from the ASF dual-hosted git repository.
xxyu pushed a commit to branch kylin5
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 321547ec798d76f90d19a33532fc06f6b9f546a6
Author: Qian Xia <lauraxiaq...@gmail.com>
AuthorDate: Fri Mar 24 17:51:51 2023 +0800
KYLIN-5484 remove duplicate partition time format
---
kystudio/src/components/query/query_history_table.vue | 5 +++--
.../studio/StudioModel/ModelList/ModelBuildModal/build.vue | 2 +-
.../components/studio/StudioModel/ModelList/ModelPartition/index.vue | 2 +-
.../studio/StudioModel/ModelList/ModelSaveConfig/index.vue | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/kystudio/src/components/query/query_history_table.vue
b/kystudio/src/components/query/query_history_table.vue
index f09db8b504..d267cbc29c 100644
--- a/kystudio/src/components/query/query_history_table.vue
+++ b/kystudio/src/components/query/query_history_table.vue
@@ -302,7 +302,8 @@ import Vue from 'vue'
import { mapActions, mapGetters } from 'vuex'
import { Component, Watch } from 'vue-property-decorator'
// import $ from 'jquery'
-import { sqlRowsLimit, sqlStrLenLimit } from '../../config/index'
+import { sqlRowsLimit, sqlStrLenLimit , formatSQLConfig} from
'../../config/index'
+import { format } from 'sql-formatter'
import sqlFormatter from 'sql-formatter'
import IndexDetails from
'../studio/StudioModel/ModelList/ModelAggregate/indexDetails'
import Diagnostic from 'components/admin/Diagnostic/index'
@@ -434,7 +435,7 @@ export default class QueryHistoryTable extends Vue {
const sql = element.sql_text
const sql_limit = this.sqlOverLimit(sql) ? `${sql.slice(0,
this.sqlLimitRows)}...` : sql
const sqlTextArr = sql.split('\n') // 换行符超过一个，说明用户查询行自定义过format格式，则保留
- element['sql_limit'] = sqlTextArr.length > 1 ? sql_limit :
sqlFormatter.format(sql_limit)
+ element['sql_limit'] = sqlTextArr.length > 1 ? sql_limit :
format(sql_limit, formatSQLConfig)
element['server'] = [element['server']]
element['flexHeight'] = 0
element['editorH'] = 0
diff --git
a/kystudio/src/components/studio/StudioModel/ModelList/ModelBuildModal/build.vue
b/kystudio/src/components/studio/StudioModel/ModelList/ModelBuildModal/build.vue
index 8a63c62ea3..fa2941c6c7 100644
---
a/kystudio/src/components/studio/StudioModel/ModelList/ModelBuildModal/build.vue
+++
b/kystudio/src/components/studio/StudioModel/ModelList/ModelBuildModal/build.vue
@@ -79,7 +79,7 @@
default-first-option
:placeholder="$t('pleaseInputColumn')">
<el-option-group>
- <el-option
v-if="prevPartitionMeta.format.indexOf(dateFormatsOptions) ===
-1&&prevPartitionMeta.format" :label="prevPartitionMeta.format"
:value="prevPartitionMeta.format"></el-option>
+ <el-option v-if="dateFormatsOptions.map(it =>
it.value).indexOf(prevPartitionMeta.format) === -1 && prevPartitionMeta.format"
:label="prevPartitionMeta.format" :value="prevPartitionMeta.format"></el-option>
<el-option :label="f.label" :value="f.value" v-for="f in
dateFormatsOptions" :key="f.label"></el-option>
</el-option-group>
</el-select>
diff --git
a/kystudio/src/components/studio/StudioModel/ModelList/ModelPartition/index.vue
b/kystudio/src/components/studio/StudioModel/ModelList/ModelPartition/index.vue
index 06fb663e09..ca48d1a37d 100644
---
a/kystudio/src/components/studio/StudioModel/ModelList/ModelPartition/index.vue
+++
b/kystudio/src/components/studio/StudioModel/ModelList/ModelPartition/index.vue
@@ -65,7 +65,7 @@
@change="val => changePartitionSetting('format', val)"
:placeholder="$t('pleaseInputColumn')">
<el-option-group>
- <el-option
v-if="prevPartitionMeta.format.indexOf(dateFormatsOptions) ===
-1&&prevPartitionMeta.format" :label="prevPartitionMeta.format"
:value="prevPartitionMeta.format"></el-option>
+ <el-option v-if="dateFormatsOptions.map(it =>
it.value).indexOf(prevPartitionMeta.format) === -1 && prevPartitionMeta.format"
:label="prevPartitionMeta.format" :value="prevPartitionMeta.format"></el-option>
<el-option :label="f.label" :value="f.value" v-for="f in
dateFormatsOptions" :key="f.label"></el-option>
<!-- <el-option label="" value="" v-if="partitionMeta.column
&&
timeDataType.indexOf(getColumnInfo(partitionMeta.column).datatype)===-1"></el-option>
-->
</el-option-group>
diff --git
a/kystudio/src/components/studio/StudioModel/ModelList/ModelSaveConfig/index.vue
b/kystudio/src/components/studio/StudioModel/ModelList/ModelSaveConfig/index.vue
index 622e95d598..1136808697 100644
---
a/kystudio/src/components/studio/StudioModel/ModelList/ModelSaveConfig/index.vue
+++
b/kystudio/src/components/studio/StudioModel/ModelList/ModelSaveConfig/index.vue
@@ -106,7 +106,7 @@
@change="val => changeColumn('format', val)"
>
<el-option-group>
- <el-option
v-if="prevPartitionMeta.format.indexOf(dateFormatsOptions) ===
-1&&prevPartitionMeta.format" :label="prevPartitionMeta.format"
:value="prevPartitionMeta.format"></el-option>
+ <el-option v-if="dateFormatsOptions.map(it =>
it.value).indexOf(prevPartitionMeta.format) === -1 && prevPartitionMeta.format"
:label="prevPartitionMeta.format" :value="prevPartitionMeta.format"></el-option>
<el-option :label="f.label" :value="f.value" v-for="f in
dateFormatsOptions" :key="f.label"></el-option>
<!-- <el-option label="" value="" v-if="partitionMeta.column
&&
timeDataType.indexOf(getColumnInfo(partitionMeta.column).datatype)===-1"></el-option>
-->
</el-option-group>
