Merge pull request #13802 from dataease/pr@dev-v2_st

fix(系统设置): 设置当前页面打开数据大屏，创建数据集保存后，点击返回，进入到数据填报目录页面

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>

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"

core/core-frontend/src/views/visualized/data/datasource/form/ExcelDetail.vue

@@ -648,8 +648,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']"
@@ -666,7 +666,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
@@ -841,7 +845,10 @@ defineExpose({
 
     .info-table {
       width: 100%;
-      height: calc(100% - 379px);
+      height: calc(100% - 200px);
+      &.info-table_height {
+        height: calc(100% - 379px);
+      }
     }
   }
 }