From d0bbc7cd5ef1574d77a822d626391594eb6ceafb Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 8 Apr 2025 17:48:40 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=BF=87=E6=BB=A4=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=86=BB=E7=BB=93=E4=BD=8D=E7=BD=AE=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/data-visualization/canvas/Shape.vue  | 13 +++++++++++--
 core/core-frontend/src/utils/canvasUtils.ts         |  2 +-
 .../editor/editor-style/VQueryChartStyle.vue        |  2 ++
 core/core-frontend/src/views/dashboard/index.vue    |  4 ++--
 de-xpack                                            |  2 +-
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/core/core-frontend/src/components/data-visualization/canvas/Shape.vue b/core/core-frontend/src/components/data-visualization/canvas/Shape.vue
index 070d5165a8..c374e7099d 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/Shape.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/Shape.vue
@@ -1,7 +1,11 @@
 <template>
   <div
     class="shape"
-    :class="{ 'shape-group-area': isGroupArea, 'freeze-component': freezeFlag }"
+    :class="{
+      'shape-group-area': isGroupArea,
+      'freeze-component': freezeFlag,
+      'freeze-component-fullscreen': freezeFlag && fullscreenFlag
+    }"
     ref="shapeInnerRef"
     :id="domId"
     v-loading="downLoading"
@@ -177,7 +181,8 @@ const {
   tabMoveOutComponentId,
   mobileInPc,
   mainScrollTop,
-  hiddenListStatus
+  hiddenListStatus,
+  fullscreenFlag
 } = storeToRefs(dvMainStore)
 const { editorMap, areaData, isCtrlOrCmdDown } = storeToRefs(composeStore)
 const emit = defineEmits([
@@ -1333,4 +1338,8 @@ onMounted(() => {
   z-index: 1;
   top: 66px !important;
 }
+
+.freeze-component-fullscreen {
+  top: 5px !important;
+}
 </style>
diff --git a/core/core-frontend/src/utils/canvasUtils.ts b/core/core-frontend/src/utils/canvasUtils.ts
index c3a82aa957..1fe7a2a556 100644
--- a/core/core-frontend/src/utils/canvasUtils.ts
+++ b/core/core-frontend/src/utils/canvasUtils.ts
@@ -329,7 +329,7 @@ export function refreshOtherComponent(dvId, busiFlag) {
 }
 
 export function initCanvasDataPrepare(dvId, params, callBack) {
-  const busiFlag = params.busiFlg
+  const busiFlag = params.busiFlag
   const copyFlag = busiFlag != null && busiFlag.includes('-copy')
   const busiFlagCustom = copyFlag ? busiFlag.split('-')[0] : busiFlag
   const method = copyFlag ? findCopyResource : findById
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue
index cf1aa3614d..3dcbb96add 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue
@@ -15,6 +15,7 @@ import { useEmitt } from '@/hooks/web/useEmitt'
 import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
 import { storeToRefs } from 'pinia'
 import BackgroundOverallCommon from '@/components/visualization/component-background/BackgroundOverallCommon.vue'
+import { isDashboard, isMainCanvas } from '@/utils/canvasUtils'
 const { t } = useI18n()
 const styleActiveNames = ref(['basicStyle'])
 const dvMainStore = dvMainStoreWithOut()
@@ -331,6 +332,7 @@ const onTitleChange = () => {
               />
             </el-form-item>
             <el-form-item
+              v-if="!mobileInPc && isDashboard() && isMainCanvas(element.canvasId)"
               class="form-item margin-bottom-8"
               :class="'form-item-' + themes"
               :label="t('visualization.query_position')"
diff --git a/core/core-frontend/src/views/dashboard/index.vue b/core/core-frontend/src/views/dashboard/index.vue
index 5a30a275aa..192515aac4 100644
--- a/core/core-frontend/src/views/dashboard/index.vue
+++ b/core/core-frontend/src/views/dashboard/index.vue
@@ -161,8 +161,8 @@ const doUseCache = flag => {
 
 const initLocalCanvasData = callBack => {
   const { resourceId, opt, sourcePid } = state
-  const busiFlg = opt === 'copy' ? 'dashboard-copy' : 'dashboard'
-  initCanvasData(resourceId, { busiFlg, resourceTable: 'snapshot' }, function () {
+  const busiFlag = opt === 'copy' ? 'dashboard-copy' : 'dashboard'
+  initCanvasData(resourceId, { busiFlag, resourceTable: 'snapshot' }, function () {
     dataInitState.value = true
     if (dvInfo.value && opt === 'copy') {
       dvInfo.value.dataState = 'prepare'
diff --git a/de-xpack b/de-xpack
index e0371cba72..c3d100fb07 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit e0371cba7235e94dabce62caeb96a0b4925f9280
+Subproject commit c3d100fb0751c031a6d103a1d429e584a3eb0ad5