From 94ec27862c30d1755fdb8431affe33b2b91e0116 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 8 Nov 2023 14:02:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E5=90=8E=E8=83=BD=E5=90=A6=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E5=85=B3=E9=97=AD=E6=95=B0=E6=8D=AE=E9=9B=86=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E9=A1=B5=E9=9D=A2=E6=88=96=E8=80=85=E7=BB=99=E4=B8=AA?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/dataset/form/CreatDsGroup.vue        |  2 ++
 .../visualized/data/dataset/form/index.vue    | 20 +++++++++++++++++++
 2 files changed, 22 insertions(+)

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 85ec90c558..f47da32311 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
@@ -2,6 +2,7 @@
 import { ref, reactive, computed, watch, nextTick } from 'vue'
 import { ElMessage } from 'element-plus-secondary'
 import { useI18n } from '@/hooks/web/useI18n'
+import { useEmitt } from '@/hooks/web/useEmitt'
 import {
   getDatasetTree,
   moveDatasetTree,
@@ -270,6 +271,7 @@ const saveDataset = () => {
               ElMessage.success('重命名成功')
               break
             default:
+              useEmitt().emitter.emit('onDatasetSave')
               ElMessage.success(t('common.save_success'))
               break
           }
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 10febd87ea..1ed96e772d 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
@@ -11,6 +11,7 @@ import {
   onBeforeUnmount
 } from 'vue'
 import { useI18n } from '@/hooks/web/useI18n'
+import { useEmitt } from '@/hooks/web/useEmitt'
 import { ElIcon, ElMessageBox, ElMessage } from 'element-plus-secondary'
 import type { Action } from 'element-plus-secondary'
 import FieldMore from './FieldMore.vue'
@@ -316,6 +317,9 @@ const editeSave = () => {
   })
     .then(() => {
       ElMessage.success('保存成功')
+      if (willBack) {
+        pushDataset()
+      }
     })
     .finally(() => {
       loading.value = false
@@ -822,8 +826,17 @@ const handleResize = debounce(() => {
   }
   dragHeight.value = clientHeight - sqlResultHeight.value - 56
 }, 60)
+let willBack = false
+const saveAndBack = () => {
+  if (!willBack) return
+  pushDataset()
+}
 
 onMounted(() => {
+  useEmitt({
+    name: 'onDatasetSave',
+    callback: saveAndBack
+  })
   window.addEventListener('resize', handleResize)
   getSqlResultHeight()
   quotaTableHeight.value = sqlResultHeight.value - 242
@@ -868,6 +881,10 @@ const datasetSave = () => {
     datasetName.value
   )
 }
+const datasetSaveAndBack = () => {
+  willBack = true
+  datasetSave()
+}
 
 const datasetPreviewLoading = ref(false)
 
@@ -1118,6 +1135,9 @@ const getDsIconName = data => {
         </template>
       </span>
       <span class="oprate">
+        <el-button :disabled="showInput" type="primary" @click="datasetSaveAndBack"
+          >保存并返回</el-button
+        >
         <el-button :disabled="showInput" type="primary" @click="datasetSave">保存</el-button>
       </span>
     </div>