From 46f84ae12937dda2d052abdb1b262eb5bd3b74a1 Mon Sep 17 00:00:00 2001
From: wisonic <shaochuan.wu@fit2cloud.com>
Date: Tue, 25 Feb 2025 17:42:18 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=88=86=E7=BB=84=E8=AE=BE=E7=BD=AE=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E6=9C=AA=E9=80=89=E6=8B=A9=E8=A1=A8=E5=A4=B4=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=A0=BC=E7=8A=B6=E6=80=81=E4=B8=8B=E5=8F=B3=E9=94=AE?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=97=A0=E6=B3=95=E7=82=B9=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../editor-style/components/table/TableHeaderGroupConfig.vue | 2 ++
 .../editor-style/components/table/TableHeaderSelector.vue    | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderGroupConfig.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderGroupConfig.vue
index 803445fb37..c87c69543f 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderGroupConfig.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderGroupConfig.vue
@@ -192,6 +192,8 @@ const renderTable = (chart: ChartObj) => {
     }
     //只有一个cell，并且colIndex为-1，那就是组合的，显示取消分组按钮和重命名按钮
     if (activeColumns?.length === 1 && curCell.getMeta().colIndex === -1) {
+      s2.interaction.clearState()
+      s2.interaction.selectHeaderCell({ cell: curCell })
       const cancelBtn = document.createElement('span')
       groupMenuContainer.appendChild(cancelBtn)
       cancelBtn.innerText = t('chart.cancel_group')
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderSelector.vue
index 8a4417bf64..0a6f449201 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableHeaderSelector.vue
@@ -16,7 +16,7 @@ import { storeToRefs } from 'pinia'
 import TableHeaderGroupConfig from './TableHeaderGroupConfig.vue'
 
 const dvMainStore = dvMainStoreWithOut()
-const { mobileInPc } = storeToRefs(dvMainStore)
+const { batchOptStatus, mobileInPc } = storeToRefs(dvMainStore)
 const { t } = useI18n()
 
 const props = defineProps({
@@ -79,6 +79,7 @@ const changeHeaderGroupConfig = (headerGroupConfig: ChartTableHeaderAttr['header
 
 const enableGroupConfig = computed(() => {
   return (
+    !batchOptStatus.value &&
     showProperty('headerGroup') &&
     state.tableHeaderForm.headerGroup &&
     state.tableHeaderForm.showTableHeader !== false
@@ -742,7 +743,7 @@ onMounted(() => {
       </el-checkbox>
     </el-form-item>
     <el-form-item
-      v-if="showProperty('headerGroup')"
+      v-if="!batchOptStatus && showProperty('headerGroup')"
       class="form-item"
       :class="'form-item-' + themes"
       :disabled="!state.tableHeaderForm.showTableHeader"