From 546d2b23acec4af4768575cdbd063aa61bb79575 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 22 Aug 2024 15:58:30 +0800
Subject: [PATCH] =?UTF-8?q?perf(X-Pack):=20=E5=A4=A7=E5=B1=8F=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=98=88=E5=80=BC=E5=91=8A=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-visualization/canvas/ContextMenuDetails.vue     | 6 ++++++
 .../core-frontend/src/views/data-visualization/index.vue | 1 +
 de-xpack                                                 | 2 +-
 .../java/io/dataease/api/threshold/ThresholdApi.java     | 9 +++++----
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/core/core-frontend/src/components/data-visualization/canvas/ContextMenuDetails.vue b/core/core-frontend/src/components/data-visualization/canvas/ContextMenuDetails.vue
index 91d0e726c1..9dac63bb6d 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/ContextMenuDetails.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/ContextMenuDetails.vue
@@ -11,6 +11,7 @@ import { ElDivider } from 'element-plus-secondary'
 import eventBus from '@/utils/eventBus'
 import { getCurInfo } from '@/store/modules/data-visualization/common'
 import { useEmitt } from '@/hooks/web/useEmitt'
+import { XpackComponent } from '@/components/plugin'
 const dvMainStore = dvMainStoreWithOut()
 const copyStore = copyStoreWithOut()
 const lockStore = lockStoreWithOut()
@@ -245,6 +246,11 @@ const editQueryCriteria = () => {
           <li @click="downComponent">下移一层</li>
           <li @click="topComponent">置于顶层</li>
           <li @click="bottomComponent">置于底层</li>
+          <xpack-component
+            :chart="curComponent"
+            is-screen
+            jsname="L2NvbXBvbmVudC90aHJlc2hvbGQtd2FybmluZy9FZGl0QmFySGFuZGxlcg=="
+          />
           <li
             @click="categoryChange('hidden')"
             v-show="
diff --git a/core/core-frontend/src/views/data-visualization/index.vue b/core/core-frontend/src/views/data-visualization/index.vue
index 0492cbde84..7c1b9fcd19 100644
--- a/core/core-frontend/src/views/data-visualization/index.vue
+++ b/core/core-frontend/src/views/data-visualization/index.vue
@@ -526,6 +526,7 @@ eventBus.on('handleNew', handleNew)
     @loaded="XpackLoaded"
     @load-fail="XpackLoaded"
   />
+  <xpack-component jsname="L2NvbXBvbmVudC90aHJlc2hvbGQtd2FybmluZy9UaHJlc2hvbGREaWFsb2c=" />
   <canvas-cache-dialog ref="canvasCacheOutRef" @doUseCache="doUseCache"></canvas-cache-dialog>
   <dv-preview
     v-if="fullscreenFlag"
diff --git a/de-xpack b/de-xpack
index bab1ca0e38..ede6179491 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit bab1ca0e386dc0f4941b163e626253b8d6f11bc2
+Subproject commit ede6179491774d25309d3cbb4f92f276b6eed620
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/threshold/ThresholdApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/threshold/ThresholdApi.java
index c6c85cc5e6..579993408d 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/threshold/ThresholdApi.java
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/threshold/ThresholdApi.java
@@ -10,10 +10,7 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.enums.ParameterIn;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -70,4 +67,8 @@ public interface ThresholdApi {
     @Operation(summary = "视图是否设置了阈值告警")
     @GetMapping("/anyThreshold/{chartId}")
     boolean anyThreshold(@PathVariable("chartId") Long chartId);
+
+    @Operation(summary = "根据视图ID删除")
+    @GetMapping("/deleteWithChart/{chartId}")
+    void deleteWithChart(@PathVariable("chartId") Long chartId);
 }