From 0870598fcefc87c8f46fd3bd2bfa2e51b6eb9d0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E5=86=9B?= <253495832@qq.com>
Date: Tue, 12 May 2026 15:37:35 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8A=A8=E6=80=81=E9=98=B4=E5=BD=B1?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/ContentConfigurations/index.vue     | 115 ++++++++++--------
 .../ContentEdit/components/EditRule/index.vue |  48 +++++++-
 .../components/EditTools/index.vue            |   1 +
 3 files changed, 106 insertions(+), 58 deletions(-)

diff --git a/src/views/chart/ContentConfigurations/index.vue b/src/views/chart/ContentConfigurations/index.vue
index 110a3c2f..ef74f70d 100644
--- a/src/views/chart/ContentConfigurations/index.vue
+++ b/src/views/chart/ContentConfigurations/index.vue
@@ -37,7 +37,13 @@
         </n-tabs>
 
         <!-- 编辑 -->
-        <n-tabs v-if="selectTarget" v-model:value="tabsSelect" class="tabs-box" size="small" type="segment">
+        <n-tabs
+          v-if="selectTarget"
+          v-model:value="tabsSelect"
+          class="tabs-box"
+          size="small"
+          type="segment"
+        >
           <n-tab-pane
             v-for="item in selectTarget.isGroup ? chartsDefaultTabList : chartsTabList"
             :key="item.key"
@@ -62,104 +68,107 @@
 </template>
 
 <script setup lang="ts">
-import { ref, toRefs, watch, computed } from 'vue'
-import { icon } from '@/plugins'
-import { loadAsyncComponent } from '@/utils'
-import { ContentBox } from '../ContentBox/index'
-import { TabsEnum } from './index.d'
-import { useChartLayoutStore } from '@/store/modules/chartLayoutStore/chartLayoutStore'
-import { ChartLayoutStoreEnum } from '@/store/modules/chartLayoutStore/chartLayoutStore.d'
-import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
+import { ref, toRefs, watch, computed } from "vue";
+import { icon } from "@/plugins";
+import { loadAsyncComponent } from "@/utils";
+import { ContentBox } from "../ContentBox/index";
+import { TabsEnum } from "./index.d";
+import { useChartLayoutStore } from "@/store/modules/chartLayoutStore/chartLayoutStore";
+import { ChartLayoutStoreEnum } from "@/store/modules/chartLayoutStore/chartLayoutStore.d";
+import { useChartEditStore } from "@/store/modules/chartEditStore/chartEditStore";
 
-const { getDetails } = toRefs(useChartLayoutStore())
-const { setItem } = useChartLayoutStore()
-const chartEditStore = useChartEditStore()
+const { getDetails } = toRefs(useChartLayoutStore());
+const { setItem } = useChartLayoutStore();
+const chartEditStore = useChartEditStore();
 
-const { ConstructIcon, FlashIcon, DesktopOutlineIcon, LeafIcon, RocketIcon } = icon.ionicons5
+const { ConstructIcon, FlashIcon, DesktopOutlineIcon, LeafIcon, RocketIcon } = icon.ionicons5;
 
-const ContentEdit = loadAsyncComponent(() => import('../ContentEdit/index.vue'))
-const CanvasPage = loadAsyncComponent(() => import('./components/CanvasPage/index.vue'))
-const ChartSetting = loadAsyncComponent(() => import('./components/ChartSetting/index.vue'))
-const ChartData = loadAsyncComponent(() => import('./components/ChartData/index.vue'))
-const ChartEvent = loadAsyncComponent(() => import('./components/ChartEvent/index.vue'))
-const ChartAnimation = loadAsyncComponent(() => import('./components/ChartAnimation/index.vue'))
+const ContentEdit = loadAsyncComponent(() => import("../ContentEdit/index.vue"));
+const CanvasPage = loadAsyncComponent(() => import("./components/CanvasPage/index.vue"));
+const ChartSetting = loadAsyncComponent(() => import("./components/ChartSetting/index.vue"));
+const ChartData = loadAsyncComponent(() => import("./components/ChartData/index.vue"));
+const ChartEvent = loadAsyncComponent(() => import("./components/ChartEvent/index.vue"));
+const ChartAnimation = loadAsyncComponent(() => import("./components/ChartAnimation/index.vue"));
 
-const collapsed = ref<boolean>(getDetails.value)
-const tabsSelect = ref<TabsEnum>(TabsEnum.CHART_SETTING)
+const collapsed = ref<boolean>(getDetails.value);
+const tabsSelect = ref<TabsEnum>(TabsEnum.CHART_SETTING);
 
 const collapsedHandle = () => {
-  collapsed.value = true
-  setItem(ChartLayoutStoreEnum.DETAILS, true)
-}
+  collapsed.value = true;
+  setItem(ChartLayoutStoreEnum.DETAILS, true);
+};
 
 const expandHandle = () => {
-  collapsed.value = false
-  setItem(ChartLayoutStoreEnum.DETAILS, false)
-}
+  collapsed.value = false;
+  setItem(ChartLayoutStoreEnum.DETAILS, false);
+};
 
 const selectTarget = computed(() => {
-  const selectId = chartEditStore.getTargetChart.selectId
+  const selectId = chartEditStore.getTargetChart.selectId;
   // 排除多个
-  if (selectId.length !== 1) return undefined
-  const target = chartEditStore.componentList[chartEditStore.fetchTargetIndex()]
+  if (selectId.length !== 1) return undefined;
+  const target = chartEditStore.componentList[chartEditStore.fetchTargetIndex()];
   if (target?.isGroup) {
     // eslint-disable-next-line vue/no-side-effects-in-computed-properties
-    tabsSelect.value = TabsEnum.CHART_SETTING
+    tabsSelect.value = TabsEnum.CHART_SETTING;
   }
-  return target
-})
+  return target;
+});
 
-watch(getDetails, newData => {
+watch(getDetails, (newData) => {
   if (newData) {
-    collapsedHandle()
+    collapsedHandle();
   } else {
-    expandHandle()
+    expandHandle();
   }
-})
+});
 
 // 页面设置
 const globalTabList = [
   {
     key: TabsEnum.PAGE_SETTING,
-    title: '页面配置',
+    title: "页面配置",
     icon: DesktopOutlineIcon,
-    render: CanvasPage
-  }
-]
+    render: CanvasPage,
+  },
+];
 
 const chartsDefaultTabList = [
   {
     key: TabsEnum.CHART_SETTING,
-    title: '定制',
+    title: "定制",
     icon: ConstructIcon,
-    render: ChartSetting
+    render: ChartSetting,
   },
   {
     key: TabsEnum.CHART_ANIMATION,
-    title: '动画',
+    title: "动画",
     icon: LeafIcon,
-    render: ChartAnimation
-  }
-]
+    render: ChartAnimation,
+  },
+];
 
 const chartsTabList = [
   ...chartsDefaultTabList,
   {
     key: TabsEnum.CHART_DATA,
-    title: '数据',
+    title: "数据",
     icon: FlashIcon,
-    render: ChartData
+    render: ChartData,
   },
   {
     key: TabsEnum.CHART_EVENT,
-    title: '事件',
+    title: "事件",
     icon: RocketIcon,
-    render: ChartEvent
-  }
-]
+    render: ChartEvent,
+  },
+];
 </script>
 
 <style lang="scss" scoped>
+::v-deep .n-layout-toggle-bar {
+  z-index: 9;
+}
 @include go(content-configurations) {
   overflow: hidden;
   .tabs-box {
diff --git a/src/views/chart/ContentEdit/components/EditRule/index.vue b/src/views/chart/ContentEdit/components/EditRule/index.vue
index ca4eb25d..e8ea4162 100644
--- a/src/views/chart/ContentEdit/components/EditRule/index.vue
+++ b/src/views/chart/ContentEdit/components/EditRule/index.vue
@@ -30,6 +30,7 @@ import type { CSSProperties } from 'vue'
 import { listen } from 'dom-helpers'
 import { useDesignStore } from '@/store/modules/designStore/designStore'
 import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
+import { CreateComponentGroupType } from '@/packages/index.d'
 import throttle from 'lodash/throttle'
 
 const chartEditStore = useChartEditStore()
@@ -71,7 +72,7 @@ const paletteStyle = computed(() => {
         longfgColor: '#4d4d4d',
         shortfgColor: '#4d4d4d',
         fontColor: '#4d4d4d',
-        shadowColor: '#18181c',
+        shadowColor: '#232324',
         borderColor: '#18181c',
         cornerActiveColor: '#18181c'
       }
@@ -89,13 +90,50 @@ const canvasStyle = computed((): CSSProperties => {
     height: `${height.value}px`
   }
 })
+// 根据 id 查找组件（含分组内子组件）
+const findComponentById = (id: string) => {
+  for (const item of chartEditStore.getComponentList) {
+    if (item.id === id) return item
+    if (item.isGroup) {
+      const child = (item as CreateComponentGroupType).groupList.find(c => c.id === id)
+      if (child) return child
+    }
+  }
+  return null
+}
+
 // 阴影（画布在标尺坐标系中的位置，从 thick 偏移开始）
 const shadow = computed(() => {
+  const selectIds = chartEditStore.getTargetChart.selectId
+  if (!selectIds.length) {
+    return { x: 0, y: 0, width: 0, height: 0 }
+  }
+
+  let minX = Infinity
+  let minY = Infinity
+  let maxX = -Infinity
+  let maxY = -Infinity
+
+  for (const id of selectIds) {
+    const comp = findComponentById(id)
+    if (comp) {
+      const { x, y, w, h } = comp.attr
+      minX = Math.min(minX, x)
+      minY = Math.min(minY, y)
+      maxX = Math.max(maxX, x + w)
+      maxY = Math.max(maxY, y + h)
+    }
+  }
+
+  if (minX === Infinity) {
+    return { x: 0, y: 0, width: 0, height: 0 }
+  }
+
   return {
-    x: 0,
-    y: 0,
-    width: 200,
-    height: 200
+    x: minX,
+    y: minY,
+    width: maxX - minX,
+    height: maxY - minY
   }
 })
 
diff --git a/src/views/chart/ContentEdit/components/EditTools/index.vue b/src/views/chart/ContentEdit/components/EditTools/index.vue
index c92e578c..4537ce67 100644
--- a/src/views/chart/ContentEdit/components/EditTools/index.vue
+++ b/src/views/chart/ContentEdit/components/EditTools/index.vue
@@ -223,6 +223,7 @@ $asideBottom: 70px;
 
 @include go('chart-edit-tools') {
   @extend .go-background-filter;
+  z-index: 9;
   position: absolute;
   display: flex;
   justify-content: space-around;