From 6438d3396d91284472b46babb009d9723278521e Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 24 May 2024 18:07:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E7=BB=84=E4=BB=B6=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E6=A1=86=E9=80=89=E5=90=8E=E5=8F=AF=E8=83=BD=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-visualization/canvas/ContextMenuDetails.vue      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 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 57d89ac69e..e824380a85 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/ContextMenuDetails.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/ContextMenuDetails.vue
@@ -90,7 +90,7 @@ const paste = () => {
 }
 
 const deleteComponent = () => {
-  if (curComponent.value) {
+  if (curComponent.value && !isGroupArea.value) {
     const curInfo = getCurInfo()
     dvMainStore.deleteComponentById(curComponent.value?.id, curInfo.componentData)
   } else if (areaData.value.components.length) {
@@ -153,6 +153,10 @@ const handleComposeMouseDown = e => {
 const composeDivider = computed(() => {
   return !(!curComponent || curComponent['isLock'] || curComponent['component'] != 'Group')
 })
+
+const isGroupArea = computed(() => {
+  return curComponent.value?.component === 'GroupArea'
+})
 </script>
 
 <template>
@@ -201,7 +205,7 @@ const composeDivider = computed(() => {
         取消组合
       </li>
       <el-divider class="custom-divider" v-show="composeDivider" />
-      <template v-if="curComponent">
+      <template v-if="curComponent && !isGroupArea">
         <template v-if="!curComponent['isLock']">
           <li @click="upComponent">上移一层</li>
           <li @click="downComponent">下移一层</li>

From 5a16cddda6ec3d28713c47e91f60f036cd9bd0b7 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 27 May 2024 10:16:11 +0800
Subject: [PATCH 2/2] =?UTF-8?q?style(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F)?=
 =?UTF-8?q?:=20=E5=AA=92=E4=BD=93=E6=96=87=E6=A1=88=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/custom-component/de-stream-media/Component.vue           | 1 -
 core/core-frontend/src/custom-component/de-video/Component.vue   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/core/core-frontend/src/custom-component/de-stream-media/Component.vue b/core/core-frontend/src/custom-component/de-stream-media/Component.vue
index ed1ed95ee6..6f07352b06 100644
--- a/core/core-frontend/src/custom-component/de-stream-media/Component.vue
+++ b/core/core-frontend/src/custom-component/de-stream-media/Component.vue
@@ -117,7 +117,6 @@ const destroyPlayer = () => {
   justify-content: center;
   background-color: rgba(245, 245, 220, 0.1);
   font-size: 12px;
-  color: #000000;
 }
 
 .move-bg {
diff --git a/core/core-frontend/src/custom-component/de-video/Component.vue b/core/core-frontend/src/custom-component/de-video/Component.vue
index a15ad9aa8c..6e76cf6137 100644
--- a/core/core-frontend/src/custom-component/de-video/Component.vue
+++ b/core/core-frontend/src/custom-component/de-video/Component.vue
@@ -88,7 +88,6 @@ watch(
   justify-content: center;
   background-color: rgba(255, 255, 255, 0.1);
   font-size: 12px;
-  color: #9ea6b2;
 }
 
 .player {