From fe1aff27c1b46382a702fd7245a74dc21f232715 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 4 Dec 2024 10:46:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):?=
 =?UTF-8?q?=20=E8=AE=BE=E7=BD=AE=E5=BD=93=E5=89=8D=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=89=93=E5=BC=80=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F=EF=BC=8C?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=95=B0=E6=8D=AE=E9=9B=86=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E7=82=B9=E5=87=BB=E8=BF=94=E5=9B=9E=EF=BC=8C?=
 =?UTF-8?q?=E8=BF=9B=E5=85=A5=E5=88=B0=E6=95=B0=E6=8D=AE=E5=A1=AB=E6=8A=A5?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visualized/data/dataset/form/CreatDsGroup.vue      |  4 ++--
 .../src/views/visualized/data/dataset/form/index.vue   | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/CreatDsGroup.vue b/core/core-frontend/src/views/visualized/data/dataset/form/CreatDsGroup.vue
index e8ccbbc29a..069a72bf5f 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/form/CreatDsGroup.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/CreatDsGroup.vue
@@ -274,7 +274,7 @@ const saveDataset = () => {
               ElMessage.success(t('data_set.rename_successful'))
               break
             default:
-              useEmitt().emitter.emit('onDatasetSave')
+              emits('onDatasetSave')
               ElMessage.success(t('common.save_success'))
               break
           }
@@ -291,7 +291,7 @@ defineExpose({
   editeInit
 })
 
-const emits = defineEmits(['finish'])
+const emits = defineEmits(['finish', 'onDatasetSave'])
 </script>
 
 <template>
diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/index.vue b/core/core-frontend/src/views/visualized/data/dataset/form/index.vue
index 5b0b030da4..6d9e118abe 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/form/index.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/index.vue
@@ -1048,10 +1048,6 @@ onMounted(async () => {
   await new Promise(r => (p = r))
   await initEdite()
   getDatasource()
-  useEmitt({
-    name: 'onDatasetSave',
-    callback: saveAndBack
-  })
   window.addEventListener('resize', handleResize)
   getSqlResultHeight()
   quotaTableHeight.value = sqlResultHeight.value - 242
@@ -2194,7 +2190,11 @@ const getDsIconName = data => {
       </template>
     </el-drawer>
   </div>
-  <creat-ds-group @finish="finish" ref="creatDsFolder"></creat-ds-group>
+  <creat-ds-group
+    @finish="finish"
+    @onDatasetSave="saveAndBack"
+    ref="creatDsFolder"
+  ></creat-ds-group>
   <el-dialog
     custom-class="calc-field-edit-dialog"
     v-model="editCalcField"

From 3045df1041d46fdc6415fd28685048741cd17f60 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 4 Dec 2024 10:53:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E6=BA=90):=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BF=BD=E5=8A=A0=E9=A1=B5=E9=9D=A2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/datasource/form/ExcelDetail.vue          | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/ExcelDetail.vue b/core/core-frontend/src/views/visualized/data/datasource/form/ExcelDetail.vue
index 7c9f7e2d49..eacce3e715 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/form/ExcelDetail.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/ExcelDetail.vue
@@ -643,8 +643,8 @@ defineExpose({
           :tab-list="tabList"
         ></SheetTabs>
 
-        <div class="table-select_mode">
-          <div class="btn-select" v-if="param.editType === 0">
+        <div class="table-select_mode" v-if="param.editType === 0">
+          <div class="btn-select">
             <el-button
               @click="changeCurrentMode('preview')"
               :class="[currentMode === 'preview' && 'is-active']"
@@ -661,7 +661,11 @@ defineExpose({
             </el-button>
           </div>
         </div>
-        <div class="info-table" v-if="isResize">
+        <div
+          class="info-table"
+          :class="param.editType === 0 && 'info-table_height'"
+          v-if="isResize"
+        >
           <el-auto-resizer v-if="currentMode === 'preview'">
             <template #default="{ height, width }">
               <el-table-v2
@@ -836,7 +840,10 @@ defineExpose({
 
     .info-table {
       width: 100%;
-      height: calc(100% - 379px);
+      height: calc(100% - 200px);
+      &.info-table_height {
+        height: calc(100% - 379px);
+      }
     }
   }
 }