From 8243e47a51bb0ef83f59c04a6ecaba67fed976ee Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 15 Apr 2025 13:18:30 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E8=B0=83=E6=95=B4=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E3=80=81=E5=8F=91=E5=B8=83=E7=AD=89?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=8F=9C=E5=8D=95=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core-frontend/src/components/dashboard/DbToolbar.vue | 3 ++-
 .../src/components/data-visualization/DvToolbar.vue      | 7 ++++---
 core/core-frontend/src/utils/canvasUtils.ts              | 9 +++++++--
 core/core-frontend/src/views/common/DeResourceTree.vue   | 2 +-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/core/core-frontend/src/components/dashboard/DbToolbar.vue b/core/core-frontend/src/components/dashboard/DbToolbar.vue
index 94b702e77d..fd2c91277e 100644
--- a/core/core-frontend/src/components/dashboard/DbToolbar.vue
+++ b/core/core-frontend/src/components/dashboard/DbToolbar.vue
@@ -41,6 +41,7 @@ import { getPanelAllLinkageInfo, saveLinkage } from '@/api/visualization/linkage
 import { queryVisualizationJumpInfo } from '@/api/visualization/linkJump'
 import {
   canvasSave,
+  canvasSaveWithParams,
   checkCanvasChangePre,
   findAllViewsId,
   initCanvasData
@@ -259,7 +260,7 @@ const saveResource = (checkParams?) => {
       useEmitt().emitter.emit(`updateQueryCriteria${ele.id}`)
     })
     try {
-      canvasSave(() => {
+      canvasSaveWithParams(checkParams, () => {
         snapshotStore.resetStyleChangeTimes()
         let url = window.location.href
         url = url.replace(/(#\/[^?]*)(?:\?[^#]*)?/, `$1?resourceId=${dvInfo.value.id}`)
diff --git a/core/core-frontend/src/components/data-visualization/DvToolbar.vue b/core/core-frontend/src/components/data-visualization/DvToolbar.vue
index 7fffb59dfa..4ca5b1805d 100644
--- a/core/core-frontend/src/components/data-visualization/DvToolbar.vue
+++ b/core/core-frontend/src/components/data-visualization/DvToolbar.vue
@@ -30,6 +30,7 @@ import CommonGroup from '@/custom-component/component-group/CommonGroup.vue'
 import DeResourceGroupOpt from '@/views/common/DeResourceGroupOpt.vue'
 import {
   canvasSave,
+  canvasSaveWithParams,
   checkCanvasChangePre,
   cleanUrlAndSetDvId,
   findAllViewsId,
@@ -179,7 +180,7 @@ const saveResource = (checkParams?) => {
   if (styleChangeTimes.value > 0 || checkParams.withPublish) {
     eventBus.emit('hideArea-canvas-main')
     nextTick(() => {
-      canvasSave(() => {
+      canvasSaveWithParams(checkParams, () => {
         snapshotStore.resetStyleChangeTimes()
         wsCache.delete('DE-DV-CATCH-' + dvInfo.value.id)
         let url = window.location.href
@@ -498,7 +499,7 @@ const fullScreenPreview = () => {
         </el-button>
         <el-dropdown
           :disabled="dvInfo.status === 0"
-          popper-class="menu-outer-dv_popper"
+          popper-class="menu-outer-dv_popper-toolbar"
           trigger="hover"
         >
           <el-button
@@ -698,7 +699,7 @@ const fullScreenPreview = () => {
 </style>
 
 <style lang="less">
-.menu-outer-dv_popper {
+.menu-outer-dv_popper-toolbar {
   border: 1px solid rgba(67, 67, 67, 1) !important;
   background-color: rgba(41, 41, 41, 1) !important;
   .ed-dropdown-menu {
diff --git a/core/core-frontend/src/utils/canvasUtils.ts b/core/core-frontend/src/utils/canvasUtils.ts
index 109abd3916..0e441e79e5 100644
--- a/core/core-frontend/src/utils/canvasUtils.ts
+++ b/core/core-frontend/src/utils/canvasUtils.ts
@@ -568,6 +568,10 @@ export function checkCanvasChangePre(callBack) {
 }
 
 export async function canvasSave(callBack) {
+  await canvasSaveWithParams(null, callBack)
+}
+
+export async function canvasSaveWithParams(params, callBack) {
   dvMainStore.removeGroupArea()
   const componentDataToSave = cloneDeep(componentData.value)
   componentDataToSave.forEach(item => {
@@ -624,8 +628,9 @@ export async function canvasSave(callBack) {
   }
   method(canvasInfo).then(res => {
     if (method === updateCanvas) {
-      // saveCanvas 为初次保存 状态为0 updateCanvas为二次保存状态为2
-      dvMainStore.updateDvInfoCall(res.data?.status, null, newContentId)
+      // saveCanvas 为初次保存 状态为0 updateCanvas为二次保存状态为2 当存在传入状态时，则修改对应的传入状态
+      const status = params?.status ? params?.status : res.data?.status
+      dvMainStore.updateDvInfoCall(status, null, newContentId)
     } else {
       dvMainStore.updateDvInfoCall(0, res.data, newContentId)
     }
diff --git a/core/core-frontend/src/views/common/DeResourceTree.vue b/core/core-frontend/src/views/common/DeResourceTree.vue
index 55e463f41d..224dd8596b 100644
--- a/core/core-frontend/src/views/common/DeResourceTree.vue
+++ b/core/core-frontend/src/views/common/DeResourceTree.vue
@@ -687,7 +687,7 @@ defineExpose({
             </el-icon>
           </el-tooltip>
 
-          <el-tooltip :content="newResourceLabel" placement="top">
+          <el-tooltip :content="newResourceLabel" placement="top" effect="dark">
             <el-dropdown popper-class="menu-outer-dv_popper" trigger="hover">
               <el-icon class="custom-icon btn" @click="addOperation('newLeaf', null, 'leaf', true)">
                 <Icon name="icon_file-add_outlined"