You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by xx...@apache.org on 2023/03/28 03:05:17 UTC
[kylin] 09/12: KYLIN-5486 format yyyyMMdd date time
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 4d152f17832cfa965a1e643e03ad7b40a2981920
Author: Qian Xia <la...@gmail.com>
AuthorDate: Fri Mar 24 18:16:46 2023 +0800
KYLIN-5486 format yyyyMMdd date time
---
kystudio/src/components/query/query_history_table.vue | 3 +--
.../StudioModel/ModelList/Components/ModelTitleDescription.vue | 6 +++++-
.../studio/StudioModel/ModelList/ModelLayout/modelLayout.vue | 2 +-
kystudio/src/components/studio/StudioModel/ModelList/index.vue | 2 +-
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/kystudio/src/components/query/query_history_table.vue b/kystudio/src/components/query/query_history_table.vue
index d267cbc29c..bf32a9f1f9 100644
--- a/kystudio/src/components/query/query_history_table.vue
+++ b/kystudio/src/components/query/query_history_table.vue
@@ -302,9 +302,8 @@ import Vue from 'vue'
import { mapActions, mapGetters } from 'vuex'
import { Component, Watch } from 'vue-property-decorator'
// import $ from 'jquery'
-import { sqlRowsLimit, sqlStrLenLimit , formatSQLConfig} 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'
@Component({
diff --git a/kystudio/src/components/studio/StudioModel/ModelList/Components/ModelTitleDescription.vue b/kystudio/src/components/studio/StudioModel/ModelList/Components/ModelTitleDescription.vue
index 8d264fd8c7..a764df0a60 100644
--- a/kystudio/src/components/studio/StudioModel/ModelList/Components/ModelTitleDescription.vue
+++ b/kystudio/src/components/studio/StudioModel/ModelList/Components/ModelTitleDescription.vue
@@ -13,6 +13,7 @@
<div v-if="modelData.status === 'WARNING' && modelData.empty_indexes_count">{{$t('emptyIndexTips')}}</div>
<div v-if="modelData.status === 'WARNING' && (modelData.segment_holes && modelData.segment_holes.length && modelData.model_type === 'BATCH') || (modelData.batch_segment_holes && modelData.batch_segment_holes.length && modelData.model_type === 'HYBRID')">
<span>{{modelData.model_type === 'HYBRID' ? $t('modelSegmentHoleTips1') : $t('modelSegmentHoleTips')}}</span><span
+ v-if="!['modelEdit'].includes(source)"
style="color:#0988DE;cursor: pointer;"
@click="autoFix(modelData.alias, modelData.model_type === 'HYBRID' ? modelData.batch_id : modelData.uuid, modelData.model_type === 'HYBRID' ? modelData.batch_segment_holes : modelData.segment_holes)">{{$t('seeDetail')}}</span>
</div>
@@ -21,7 +22,7 @@
</div>
<div v-if="modelData.status === 'WARNING' && modelData.inconsistent_segment_count">
<span>{{$t('modelMetadataChangedTips')}}</span><span
- v-if="!['modelLayout', 'modelEdit'].includes(source)"
+ v-if="!['modelEdit'].includes(source)"
style="color:#0988DE;cursor: pointer;"
@click="openComplementSegment(model, true)">{{$t('seeDetail')}}</span>
</div>
@@ -111,6 +112,9 @@
openComplementSegment (model, status) {
this.$emit('openSegment', model, status)
}
+ autoFix (...args) {
+ this.$emit('autoFix', ...args)
+ }
}
</script>
diff --git a/kystudio/src/components/studio/StudioModel/ModelList/ModelLayout/modelLayout.vue b/kystudio/src/components/studio/StudioModel/ModelList/ModelLayout/modelLayout.vue
index dc8838e576..d56c6e5a0b 100644
--- a/kystudio/src/components/studio/StudioModel/ModelList/ModelLayout/modelLayout.vue
+++ b/kystudio/src/components/studio/StudioModel/ModelList/ModelLayout/modelLayout.vue
@@ -2,7 +2,7 @@
<div class="model-layout" :key="randomKey">
<div class="header-layout">
<div class="title"><el-button type="primary" text icon-button-mini icon="el-ksd-icon-arrow_left_16" size="small" @click="jumpBack"></el-button>
- <model-title-description :modelData="currentModelRow" source="modelLayout" v-if="currentModelRow" hideTimeTooltip />
+ <model-title-description :modelData="currentModelRow" @autoFix="autoFix" @openSegment="openComplementSegment" source="modelLayout" v-if="currentModelRow" hideTimeTooltip />
<el-button class="ksd-ml-8" type="primary" text @click.stop="showModelList = !showModelList" icon-button-mini icon="el-ksd-icon-arrow_down_16" size="small"></el-button>
<div class="model-filter-list" v-if="showModelList">
<div class="search-bar"><el-input class="search-model-input" v-model="searchModelName" size="small" :placeholder="$t('kylinLang.common.pleaseInput')" prefix-icon="el-ksd-icon-search_22" v-global-key-event.enter.debounce="searchModel" @clear="searchModel()"></el-input></div>
diff --git a/kystudio/src/components/studio/StudioModel/ModelList/index.vue b/kystudio/src/components/studio/StudioModel/ModelList/index.vue
index 15e664c761..80670ea147 100644
--- a/kystudio/src/components/studio/StudioModel/ModelList/index.vue
+++ b/kystudio/src/components/studio/StudioModel/ModelList/index.vue
@@ -106,7 +106,7 @@
prop="alias"
:label="modelTableTitle">
<template slot-scope="scope">
- <model-title-description :modelData="scope.row" @openSegment="openComplementSegment" source="modelList" />
+ <model-title-description :modelData="scope.row" @openSegment="openComplementSegment" @autoFix="autoFix" source="modelList" />
<!-- 工具栏 -->
<model-actions :currentModel="scope.row" @loadModelsList="loadModelsList"/>