[kylin] 12/12: KYLIN-5554 change tips when import same name model

[xxyu]

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 10e4e9ec3a889948e51e80891793a86730ede0be
Author: Qian Xia <lauraxiaq...@gmail.com>
AuthorDate: Tue Jun 6 17:28:39 2023 +0800

    KYLIN-5554 change tips when import same name model
---
 .../src/components/common/ModelsImportModal/ModelsImportModal.vue     | 4 ++--
 kystudio/src/components/studio/DDL/ddl.vue                            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/kystudio/src/components/common/ModelsImportModal/ModelsImportModal.vue 
b/kystudio/src/components/common/ModelsImportModal/ModelsImportModal.vue
index acbcf06a19..326b215bb2 100644
--- a/kystudio/src/components/common/ModelsImportModal/ModelsImportModal.vue
+++ b/kystudio/src/components/common/ModelsImportModal/ModelsImportModal.vue
@@ -63,7 +63,7 @@
       </div>
       <div :class="['single-modal-detail', {'no-conflict': !(activeModalObj && 
activeModalObj.differences > 0)}]">
         <div :class="['model-detail-tips', getCurrentModelDetails().key]" 
v-if="getCurrentModelDetails && activeModalObj && activeModalObj.differences > 
0">
-          <p class="title">{{$t(activeModalObj.has_same_name ? 
`${getCurrentModelDetails().title}SameName` : 
`${getCurrentModelDetails().title}DiffName`)}}<span 
v-if="!(getCurrentModelDetails().key === 'new' && 
!activeModalObj.has_same_name)" class="detail-btn" @click="showModelDetails = 
!showModelDetails">{{$t('detailBtn')}}<i :class="['el-icon-ksd-more_01', 
'ksd-ml-5', {'open': showModelDetails}]"></i></span></p>
+          <p class="title">{{$t(activeModalObj.has_same_name ? 
`${getCurrentModelDetails().title}SameName` : 
`${getCurrentModelDetails().title}DiffName`)}}<span 
v-if="!(getCurrentModelDetails().key === 'new' && 
!(activeModalObj.has_same_name && !activeModalObj.has_same_name_broken))" 
class="detail-btn" @click="showModelDetails = 
!showModelDetails">{{$t('detailBtn')}}<i :class="['el-icon-ksd-more_01', 
'ksd-ml-5', {'open': showModelDetails}]"></i></span></p>
           <div class="detail-content" v-if="showModelDetails">
             <p>{{$t(activeModalObj.has_same_name ? 
`${getCurrentModelDetails().details}SameName` : 
`${getCurrentModelDetails().details}DiffName`)}}</p>
             <div class="ksd-pl-10" v-if="getCurrentDefaultStatus() === 
'noImport'">
@@ -75,7 +75,7 @@
               <p v-for="(item, index) in noOverWriteReason" :key="index">* 
{{$t(item)}}</p>
             </div>
           </div>
-          <p>{{$t(activeModalObj.has_same_name ? 
`${getCurrentModelDetails().msg}SameName` : 
`${getCurrentModelDetails().msg}DiffName`)}}</p>
+          <p>{{$t(activeModalObj.has_same_name && 
!activeModalObj.has_same_name_broken ? 
`${getCurrentModelDetails().msg}SameName` : 
`${getCurrentModelDetails().msg}DiffName`)}}</p>
         </div>
         <el-tabs v-model="activeTabName" @tab-click="handleClick" 
v-if="activeModalObj && activeModalObj.differences > 0">
           <el-tab-pane :name="it.name" v-for="(it, index) in tabPaneList" 
:key="index">
diff --git a/kystudio/src/components/studio/DDL/ddl.vue 
b/kystudio/src/components/studio/DDL/ddl.vue
index 4042ae762a..13a11c2381 100644
--- a/kystudio/src/components/studio/DDL/ddl.vue
+++ b/kystudio/src/components/studio/DDL/ddl.vue
@@ -107,7 +107,7 @@
   })
   export default class DDL extends Vue {
     content = ''
-    activeType = ''
+    activeType = 'result'
     rules = []
     ddlError = false
     errorMsg = ''