From 7fdafa0be3a644b1b140ec5b7e158a182bade0f2 Mon Sep 17 00:00:00 2001
From: jianneng-fit2cloud <jianneng.pan@fit2cloud.com>
Date: Thu, 29 May 2025 11:34:08 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=9D=A1=E5=BD=A2=E5=9B=BE=E7=B1=BB=E5=88=AB=E8=BD=B4=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E5=AD=97=E6=AE=B5=E6=9C=89=E6=95=B0=E5=AD=97=E6=97=B6?=
 =?UTF-8?q?=E6=8C=87=E6=A0=87=E6=8E=92=E5=BA=8F=E5=A4=B1=E6=95=88=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/BasicStyleSelector.vue         | 16 ++++++----
 .../components/js/panel/common/common_antv.ts | 32 ++++++++++++-------
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue
index 7e9d941456..4bc9d1f740 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue
@@ -24,6 +24,7 @@ import {
   qqMapStyleOptions,
   tdtMapStyleOptions
 } from '@/views/chart/components/js/panel/charts/map/common'
+import { useEmitt } from '@/hooks/web/useEmitt'
 
 const dvMainStore = dvMainStoreWithOut()
 const localeStore = useLocaleStoreWithOut()
@@ -149,12 +150,6 @@ const init = () => {
     }
   }
   initTableColumnWidth()
-  if (
-    props.chart.type.includes('-stack') &&
-    state.basicStyleForm.radiusColumnBar === 'topRoundAngle'
-  ) {
-    state.basicStyleForm.radiusColumnBar = 'roundAngle'
-  }
 }
 const debouncedInit = debounce(init, 500)
 watch(
@@ -364,6 +359,15 @@ onMounted(() => {
       mapType.value = res.mapType
     }
   })
+  useEmitt({
+    name: 'chart-type-change',
+    callback: () => {
+      if (['topRoundAngle', 'roundAngle'].includes(state.basicStyleForm.radiusColumnBar)) {
+        state.basicStyleForm.radiusColumnBar = 'roundAngle'
+        changeBasicStyle('radiusColumnBar')
+      }
+    }
+  })
 })
 </script>
 <template>
diff --git a/core/core-frontend/src/views/chart/components/js/panel/common/common_antv.ts b/core/core-frontend/src/views/chart/components/js/panel/common/common_antv.ts
index 9092157aaa..76271ca958 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/common/common_antv.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/common/common_antv.ts
@@ -2500,24 +2500,34 @@ export const assembleOptionsDataForRoundAngle = (
   isStack?: boolean
 ) => {
   // column数据分组
-  const groupedByField = data.reduce((acc, item) => {
+  const groupedByField = new Map<string, Record<string, any>[]>()
+
+  data.forEach(item => {
     let groupField = item.field
     if (isGroup || isStack) {
       groupField = `${item.field}-${isStack ? item.group : item.category}`
     }
-    if (!acc[groupField]) {
-      acc[groupField] = []
+    if (!groupedByField.has(groupField)) {
+      groupedByField.set(groupField, [])
     }
-    acc[groupField].push(item)
-    return acc
-  }, {})
+    groupedByField.get(groupField)?.push(item)
+  })
+
   // 遍历每个分组，添加 isFirst 和 isLast 属性
-  Object.values(groupedByField).forEach(group => {
+  groupedByField.forEach(group => {
     const firstItem = group[0]
     const lastItem = group[group.length - 1]
-    firstItem.isFirst = true
-    lastItem.isLast = true
+    if (firstItem) firstItem.isFirst = true
+    if (lastItem) lastItem.isLast = true
+  })
+
+  // 按原始数据顺序重新组装
+  return data.map(item => {
+    let groupField = item.field
+    if (isGroup || isStack) {
+      groupField = `${item.field}-${isStack ? item.group : item.category}`
+    }
+    const group = groupedByField.get(groupField)
+    return group && group.length > 0 ? group.shift() : item
   })
-  // 将分组后的数据重新展开为一个数组
-  return Object.values(groupedByField).flat()
 }