From b234b4cfa290635d4136fe9fe6cd266caff9210c Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 15 May 2024 09:18:19 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=AA=E8=A1=A8=E6=9D=BF=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=8D=A2=E6=96=87=E6=A1=88=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/assets/svg/warn-tree.svg             | 2 +-
 .../src/components/visualization/CanvasCacheDialog.vue      | 6 ++----
 core/core-frontend/src/views/dashboard/index.vue            | 2 ++
 core/core-frontend/src/views/data-visualization/index.vue   | 4 ++++
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/core/core-frontend/src/assets/svg/warn-tree.svg b/core/core-frontend/src/assets/svg/warn-tree.svg
index bbafc67e5b..7fdc95fff9 100644
--- a/core/core-frontend/src/assets/svg/warn-tree.svg
+++ b/core/core-frontend/src/assets/svg/warn-tree.svg
@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1626064715257" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4612" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M1019.204 901.632L546.628 82.944c-15.36-26.112-52.736-26.112-68.096 0L5.444 901.632c-15.36 26.112 3.584 58.88 34.304 58.88H984.9c30.208 0 49.152-32.768 34.304-58.88z" fill="#0a7be0" p-id="4613" data-spm-anchor-id="a313x.7781069.0.i1" class="selected"></path><path d="M462.148 353.792h0.512a46.98 46.98 0 0 1 47.104-47.104h5.632a46.98 46.98 0 0 1 47.104 47.104v254.464c0 26.112-21.504 47.616-48.128 47.104h-4.608c-26.112 0-47.616-20.992-47.616-47.104V353.792z m107.52 421.888c-5.12 26.112-20.48 41.984-46.592 47.616-6.144 1.536-12.288 1.536-18.432 0-27.136-5.632-43.52-20.992-49.152-46.592-1.536-6.656-1.536-13.312 0-19.456 5.632-25.6 22.016-40.96 49.152-46.08a55.68 55.68 0 0 1 18.432 0c26.112 5.632 41.472 20.992 46.592 47.104 1.024 5.632 1.024 11.776 0 17.408z" fill="#FFFFFF" p-id="4614"></path></svg>
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1715734866524" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4224" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M512 64c247.424 0 448 200.576 448 448S759.424 960 512 960 64 759.424 64 512 264.576 64 512 64z m64 608H448v128h128V672z m32-448H416l64 400h64l64-400z" fill="#E6960C" p-id="4225"></path></svg>
\ No newline at end of file
diff --git a/core/core-frontend/src/components/visualization/CanvasCacheDialog.vue b/core/core-frontend/src/components/visualization/CanvasCacheDialog.vue
index 9f13d7b8e7..e39d4034b6 100644
--- a/core/core-frontend/src/components/visualization/CanvasCacheDialog.vue
+++ b/core/core-frontend/src/components/visualization/CanvasCacheDialog.vue
@@ -1,10 +1,9 @@
 <template>
   <el-dialog
     ref="canvasCacheDialogRef"
-    :title="dialogInfo.title"
     :append-to-body="true"
     v-model="dialogShow"
-    width="540px"
+    width="340px"
     trigger="click"
   >
     <el-row style="height: 20px">
@@ -47,8 +46,7 @@ const dialogInit = initInfo => {
   const canvasTypeName = initInfo.canvasType === 'dataV' ? '数据大屏' : '仪表板'
   dialogInfo.resourceId = initInfo.resourceId
   dialogInfo.title = '存在未保存的' + canvasTypeName
-  dialogInfo.tips =
-    '检查到上次有' + canvasTypeName + '未能正常保存，是否使用上次未保存的' + canvasTypeName + '？'
+  dialogInfo.tips = canvasTypeName + '存在未保存的修改，立即恢复？'
   dialogShow.value = true
 }
 
diff --git a/core/core-frontend/src/views/dashboard/index.vue b/core/core-frontend/src/views/dashboard/index.vue
index 7ffcdc009c..eeb44d583b 100644
--- a/core/core-frontend/src/views/dashboard/index.vue
+++ b/core/core-frontend/src/views/dashboard/index.vue
@@ -117,6 +117,8 @@ const doUseCache = flag => {
     dataInitState.value = true
     setTimeout(() => {
       snapshotStore.recordSnapshotCache()
+      // 使用缓存时，初始化的保存按钮为激活状态
+      snapshotStore.recordSnapshotCache('renderChart')
     }, 1500)
   } else {
     initLocalCanvasData()
diff --git a/core/core-frontend/src/views/data-visualization/index.vue b/core/core-frontend/src/views/data-visualization/index.vue
index d3a138dd3f..099675987d 100644
--- a/core/core-frontend/src/views/data-visualization/index.vue
+++ b/core/core-frontend/src/views/data-visualization/index.vue
@@ -193,6 +193,10 @@ const doUseCache = flag => {
     nextTick(() => {
       dvMainStore.setDataPrepareState(true)
       snapshotStore.recordSnapshotCache('renderChart')
+      setTimeout(() => {
+        // 使用缓存时，初始化的保存按钮为激活状态
+        snapshotStore.recordSnapshotCache('renderChart')
+      }, 2000)
     })
   } else {
     initLocalCanvasData()