[kylin] branch kylin5 updated: KYLIN-5685 fix query issue

[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


The following commit(s) were added to refs/heads/kylin5 by this push:
     new 4b097d1e31 KYLIN-5685 fix query issue
4b097d1e31 is described below

commit 4b097d1e319a7b61d1d99d204c12fe8de1304bb2
Author: Qian Xia <lauraxiaq...@gmail.com>
AuthorDate: Thu Aug 10 11:54:51 2023 +0800

    KYLIN-5685 fix query issue
---
 .../src/components/common/CustomTransferData/TransferData.vue  | 10 +++++-----
 kystudio/src/components/query/query_result.vue                 |  2 +-
 .../studio/StudioModel/TableIndexEdit/tableindex_edit.vue      |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/kystudio/src/components/common/CustomTransferData/TransferData.vue 
b/kystudio/src/components/common/CustomTransferData/TransferData.vue
index a76b341141..848658f500 100644
--- a/kystudio/src/components/common/CustomTransferData/TransferData.vue
+++ b/kystudio/src/components/common/CustomTransferData/TransferData.vue
@@ -182,7 +182,7 @@
   </template>
   <script>
   import { Component, Vue } from 'vue-property-decorator'
-  import { objectClone, indexOfObjWithSomeKey, kapConfirm } from 'util'
+  import { objectClone, indexOfObjWithSomeKey, kylinConfirm } from 'util'
   import Sortable, { AutoScroll } from 
'sortablejs/modular/sortable.core.esm.js'
   import EmptyData from '../EmptyData/EmptyData'
   
@@ -497,7 +497,7 @@
           onEnd: async (e) => {
             if (this.selectedColumnSortByCardinality || 
this.selectedColumnSort) {
               try {
-                await kapConfirm(' ', {confirmButtonText: this.$t('remove'), 
type: 'warning'}, this.$t('cofirmRemoveSort'))
+                await kylinConfirm(' ', {confirmButtonText: this.$t('remove'), 
type: 'warning'}, this.$t('cofirmRemoveSort'))
               } catch (res) {
                 const items = this.$el.querySelectorAll('.drag-item')
                 this.$nextTick(() => {
@@ -617,7 +617,7 @@
   
     async handleSortSelectedCommand (sort) {
       if (this.hasDragSuccess) {
-        await kapConfirm(' ', {confirmButtonText: this.$t('remove'), type: 
'warning'}, this.$t('cofirmRemoveSort'))
+        await kylinConfirm(' ', {confirmButtonText: this.$t('remove'), type: 
'warning'}, this.$t('cofirmRemoveSort'))
       }
       this.selectedColumnSortByCardinality = ''
       this.selectedColumnSort = sort
@@ -627,7 +627,7 @@
   
     async handleSortCardinality (sort) {
       if (this.hasDragSuccess) {
-        await kapConfirm(' ', {confirmButtonText: this.$t('remove'), type: 
'warning'}, this.$t('cofirmRemoveSort'))
+        await kylinConfirm(' ', {confirmButtonText: this.$t('remove'), type: 
'warning'}, this.$t('cofirmRemoveSort'))
       }
       this.selectedColumnSort = ''
       this.selectedColumnSortByCardinality = sort
@@ -663,7 +663,7 @@
       e.preventDefault()
       if (this.selectedColumnSortByCardinality || this.selectedColumnSort) {
         try {
-          await kapConfirm(' ', {confirmButtonText: this.$t('remove'), type: 
'warning'}, this.$t('cofirmRemoveSort'))
+          await kylinConfirm(' ', {confirmButtonText: this.$t('remove'), type: 
'warning'}, this.$t('cofirmRemoveSort'))
         } catch (res) {
           return
         }
diff --git a/kystudio/src/components/query/query_result.vue 
b/kystudio/src/components/query/query_result.vue
index f302ec1c2e..0ddc198e7d 100644
--- a/kystudio/src/components/query/query_result.vue
+++ b/kystudio/src/components/query/query_result.vue
@@ -530,7 +530,7 @@ export default class queryResult extends Vue {
         }
       }
     }
-    return isAnyNull || this.currentEditTabs.vacant
+    return isAnyNull || this.extraoption.vacant
   }
   get includeFilterIndexType () {
     let flag = false
diff --git 
a/kystudio/src/components/studio/StudioModel/TableIndexEdit/tableindex_edit.vue 
b/kystudio/src/components/studio/StudioModel/TableIndexEdit/tableindex_edit.vue
index e2c07f6792..1ff5f0bd10 100644
--- 
a/kystudio/src/components/studio/StudioModel/TableIndexEdit/tableindex_edit.vue
+++ 
b/kystudio/src/components/studio/StudioModel/TableIndexEdit/tableindex_edit.vue
@@ -97,7 +97,7 @@
   import { mapState, mapMutations, mapActions, mapGetters } from 'vuex'
   import vuex from '../../../../store'
   import { BuildIndexStatus } from 'config/model'
-  import { handleSuccess, kapConfirm, postCloudUrlMessage } from 
'util/business'
+  import { handleSuccess, kylinConfirm, postCloudUrlMessage } from 
'util/business'
   import { objectClone, getQueryString, indexOfObjWithSomeKey } from 
'util/index'
   import TransferData from '../../../common/CustomTransferData/TransferData'
   import locales from './locales'
@@ -366,7 +366,7 @@
         this.tableIndexMeta.load_data = isLoadData
       }
       if (status && status !== 'EMPTY' && status === 'ONLINE') {
-        kapConfirm(this.$t('cofirmEditTableIndex'), {cancelButtonText: 
this.$t('kylinLang.common.cancel'), confirmButtonText: 
this.$t('kylinLang.common.submit'), type: 'warning'}).then(() => {
+        kylinConfirm(this.$t('cofirmEditTableIndex'), {cancelButtonText: 
this.$t('kylinLang.common.cancel'), confirmButtonText: 
this.$t('kylinLang.common.submit'), type: 'warning'}).then(() => {
           this.confirmSubmit(isLoadData)
         })
       } else {