diff --git a/core/core-frontend/src/views/chart/components/editor/index.vue b/core/core-frontend/src/views/chart/components/editor/index.vue
index 275ed43f7f..d5bdd75594 100644
--- a/core/core-frontend/src/views/chart/components/editor/index.vue
+++ b/core/core-frontend/src/views/chart/components/editor/index.vue
@@ -1513,13 +1513,18 @@ const addDsWindow = () => {
 const editDs = () => {
   const path =
     embeddedStore.getToken && appStore.getIsIframe ? 'dataset-embedded-form' : '/dataset-form'
+  const openType = wsCache.get('open-backend') === '1' ? '_self' : '_blank'
+  // 此处校验提前 防止router返回时找到错误的路径
+  if (openType === '_self' && !dvInfo.value.id) {
+    ElMessage.warning(t('visualization.save_page_tips'))
+    return
+  }
   let routeData = router.resolve({
     path: path,
     query: {
       id: view.value.tableId
     }
   })
-  const openType = wsCache.get('open-backend') === '1' ? '_self' : '_blank'
   // 检查是否保存
   if (openType === '_self') {
     if (!dvInfo.value.id) {
@@ -1527,6 +1532,7 @@ const editDs = () => {
       return
     }
     canvasSave(() => {
+      wsCache.delete('DE-DV-CATCH-' + dvInfo.value.id)
       const newWindow = window.open(routeData.href, openType)
       initOpenHandler(newWindow)
     })
diff --git a/core/core-frontend/src/views/dashboard/index.vue b/core/core-frontend/src/views/dashboard/index.vue
index bf731bc727..3c00ea4e46 100644
--- a/core/core-frontend/src/views/dashboard/index.vue
+++ b/core/core-frontend/src/views/dashboard/index.vue
@@ -394,7 +394,7 @@ onUnmounted(() => {
 
 <style lang="less">
 .dv-common-layout {
-  height: calc(100vh - 1px);
+  height: 100vh;
   width: 100vw;
 
   .dv-layout-container {