(kylin) branch kylin5 updated: KYLIN-5961 fix load as native table button was not visible on source data page

[liyang]

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


The following commit(s) were added to refs/heads/kylin5 by this push:
     new 730ec05925 KYLIN-5961 fix load as native table button was not visible 
on source data page
730ec05925 is described below

commit 730ec05925a952866055e26b2079c7cf7880cc14
Author: ShengHuang <huangshen...@163.com>
AuthorDate: Tue Sep 3 19:01:05 2024 +0800

    KYLIN-5961 fix load as native table button was not visible on source data 
page
---
 .../DataSourceModal/SourceHive/SourceHive.vue      | 24 +++++++++++++++++-----
 .../components/common/DataSourceModal/index.vue    |  4 ++--
 .../DataManagement/DataManagement.vue              |  4 ++--
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git 
a/kystudio/src/components/common/DataSourceModal/SourceHive/SourceHive.vue 
b/kystudio/src/components/common/DataSourceModal/SourceHive/SourceHive.vue
index e4ee7c3d78..6752709f4d 100644
--- a/kystudio/src/components/common/DataSourceModal/SourceHive/SourceHive.vue
+++ b/kystudio/src/components/common/DataSourceModal/SourceHive/SourceHive.vue
@@ -137,6 +137,7 @@ import arealabel from '../../area_label.vue'
       default: () => []
     },
     needSampling: Boolean,
+    loadAsInternalTable: Boolean,
     samplingRows: {
       default: 20000000
     },
@@ -151,7 +152,8 @@ import arealabel from '../../area_label.vue'
   },
   computed: {
     ...mapGetters([
-      'currentSelectedProject'
+      'currentSelectedProject',
+      'currentSelectedProjectInternalTableEnabled'
     ]),
     ...mapState({
       loadHiveTableNameEnabled: state => state.system.loadHiveTableNameEnabled
@@ -591,6 +593,15 @@ export default class SourceHive extends Vue {
       this.contentStyle.height = '367px'
     }
   }
+
+  handleInternalTableOption (loadAsInternalTable) {
+    this.$emit('input', { loadAsInternalTable })
+    if (!loadAsInternalTable) {
+      this.errorMsg = ''
+      this.contentStyle.height = '367px'
+    }
+  }
+
   handleSamplingRows (samplingRows) {
     if (samplingRows && samplingRows < 10000) {
       this.errorMsg = this.$t('minNumber')
@@ -722,9 +733,12 @@ export default class SourceHive extends Vue {
     position: relative;
     // height: 453px;
   }
+  .source-options {
+    display: flex;
+    padding: 0 8px;
+  }
   .sample-block {
-    margin-left: calc(400px + 25px + 10px);
-    margin-top: -13px;
+    flex: 1;
     .sample-desc {
       color: @text-title-color;
       word-break: break-word;
@@ -834,8 +848,8 @@ export default class SourceHive extends Vue {
     background-color: @regular-background-color;
     // bottom: 25px;
     margin-top: 10px;
-    right: 20px;
-    width: 485px;
+    right: 24px;
+    width: 466px;
     .infoIcon{
       position: absolute;
       top: 10px;
diff --git a/kystudio/src/components/common/DataSourceModal/index.vue 
b/kystudio/src/components/common/DataSourceModal/index.vue
index ba4cf20f9c..9b50d7cf03 100644
--- a/kystudio/src/components/common/DataSourceModal/index.vue
+++ b/kystudio/src/components/common/DataSourceModal/index.vue
@@ -447,10 +447,10 @@ export default class DataSourceModal extends Vue {
       left: 0;
       right: 0;
       margin: auto;
-      height: 647px;
+      height: 720px;
     }
     .el-dialog__body {
-      height: 524px;
+      height: 600px;
       max-height: inherit !important;
       overflow: hidden !important;
     }
diff --git 
a/kystudio/src/components/studio/InternalTable/DataManagement/DataManagement.vue
 
b/kystudio/src/components/studio/InternalTable/DataManagement/DataManagement.vue
index 70f62945ff..415eab762c 100644
--- 
a/kystudio/src/components/studio/InternalTable/DataManagement/DataManagement.vue
+++ 
b/kystudio/src/components/studio/InternalTable/DataManagement/DataManagement.vue
@@ -67,13 +67,13 @@
         >
         </el-table-column>
       </el-table>
-      <kap-pager
+      <kylin-pager
         :totalSize="internalTableDataListTotal"
         :perPageSize="internalTableDataListPageLimit"
         :curPage="internalTableDataListPageOffset + 1"
         @handleCurrentChange='handlePagerChange'
         class="ksd-mtb-16 ksd-center">
-      </kap-pager>
+      </kylin-pager>
     </div>
     <LoadData v-show="showLoadData" :tableInfo="tableInfo" 
:handleClose="handleCloseLoadData"/>
   </el-dialog>