From 8998db6b6114258340337dcbd5d4f6b286bb94a4 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 29 Nov 2024 11:09:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=89=93=E5=BC=80=E6=A8=A1=E5=BC=8F=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=95=B0=E6=8D=AE=E9=9B=86=E6=97=B6=E5=86=8D=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=8F=AF=E8=83=BD=E5=87=BA=E7=8E=B0=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E6=9D=BF=E8=BF=98=E5=8E=9F=E4=B8=BA=E5=88=9D=E5=A7=8B=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/chart/components/editor/index.vue   | 28 ++++++++++++++++---
 .../src/views/common/DeResourceTree.vue       |  2 +-
 2 files changed, 25 insertions(+), 5 deletions(-)

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 4aab39b245..a1384a061c 100644
--- a/core/core-frontend/src/views/chart/components/editor/index.vue
+++ b/core/core-frontend/src/views/chart/components/editor/index.vue
@@ -72,13 +72,21 @@ import {
   iconFieldCalculatedQMap
 } from '@/components/icon-group/field-calculated-list'
 import { useCache } from '@/hooks/web/useCache'
+import { canvasSave } from '@/utils/canvasUtils'
 
 const { wsCache } = useCache('localStorage')
 const embeddedStore = useEmbedded()
 const snapshotStore = snapshotStoreWithOut()
 const dvMainStore = dvMainStoreWithOut()
-const { canvasCollapse, curComponent, componentData, editMode, mobileInPc, fullscreenFlag } =
-  storeToRefs(dvMainStore)
+const {
+  canvasCollapse,
+  curComponent,
+  componentData,
+  editMode,
+  mobileInPc,
+  fullscreenFlag,
+  dvInfo
+} = storeToRefs(dvMainStore)
 const router = useRouter()
 let componentNameEdit = ref(false)
 let inputComponentName = ref('')
@@ -1435,8 +1443,20 @@ const editDs = () => {
     }
   })
   const openType = wsCache.get('open-backend') === '1' ? '_self' : '_blank'
-  const newWindow = window.open(routeData.href, openType)
-  initOpenHandler(newWindow)
+  // 检查是否保存
+  if (openType === '_self') {
+    if (!dvInfo.value.id) {
+      ElMessage.warning(t('visualization.save_page_tips'))
+      return
+    }
+    canvasSave(() => {
+      const newWindow = window.open(routeData.href, openType)
+      initOpenHandler(newWindow)
+    })
+  } else {
+    const newWindow = window.open(routeData.href, openType)
+    initOpenHandler(newWindow)
+  }
 }
 
 const showQuotaEditCompare = item => {
diff --git a/core/core-frontend/src/views/common/DeResourceTree.vue b/core/core-frontend/src/views/common/DeResourceTree.vue
index 26c75ee119..801a120f8a 100644
--- a/core/core-frontend/src/views/common/DeResourceTree.vue
+++ b/core/core-frontend/src/views/common/DeResourceTree.vue
@@ -292,7 +292,7 @@ const operation = (cmd: string, data: BusiTreeNode, nodeType: string) => {
   if (cmd === 'delete') {
     const msg = data.leaf ? '' : t('visualization.delete_tips')
     const tips_label = data.leaf ? resourceLabel : t('visualization.folder')
-    ElMessageBox.confirm(t('visualization.delete_tips', tips_label), {
+    ElMessageBox.confirm(t('visualization.delete_warn', [tips_label]), {
       confirmButtonType: 'danger',
       type: 'warning',
       tip: msg,