From dec4ebfa20483f699a676e41e0541d23ebe24d81 Mon Sep 17 00:00:00 2001
From: manmanyu <manmanyu@tencent.com>
Date: Mon, 27 Jul 2026 06:52:18 +0000
Subject: [PATCH] =?UTF-8?q?fix(form,table):=20groupList=E5=88=86=E7=95=8C?=
 =?UTF-8?q?=E7=BA=BF=E3=80=81=E7=A9=BA=E7=8A=B6=E6=80=81=E3=80=81actions?=
 =?UTF-8?q?=E5=8F=AA=E5=AD=98=E5=9C=A8=E4=B8=80=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

TAPD: --story=134235103
---
 packages/form/src/theme/group-list.scss       | 11 ++++++++
 .../src/theme/themes/magic-admin/index.scss   | 11 ++++++++
 packages/table/src/ActionsColumn.vue          | 26 ++++++++++++++++++-
 3 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/packages/form/src/theme/group-list.scss b/packages/form/src/theme/group-list.scss
index 778ea5ba..b0304f64 100644
--- a/packages/form/src/theme/group-list.scss
+++ b/packages/form/src/theme/group-list.scss
@@ -38,3 +38,14 @@
     margin-bottom: 16px;
   }
 }
+
+/** 最外层的groupList需要每个item需要增加空白区域界限时，增加outer-gorup_list可以实现 */
+.m-container-group-list {
+  &.outer-gorup_list {
+    > .m-fields-group-list {
+      > .m-fields-group-list-item {
+        margin-bottom: 10px;
+      }
+    }
+  }
+}
diff --git a/packages/form/src/theme/themes/magic-admin/index.scss b/packages/form/src/theme/themes/magic-admin/index.scss
index c75982a9..b1be37db 100644
--- a/packages/form/src/theme/themes/magic-admin/index.scss
+++ b/packages/form/src/theme/themes/magic-admin/index.scss
@@ -92,4 +92,15 @@
       text-align: left;
     }
   }
+
+  .m-fields-group-list {
+    .el-table__empty-block {
+      .el-table__empty-text {
+        width: 100%;
+        background-color: rgba(0, 0, 0, 0.03);
+        margin-top: 8px;
+        border-radius: 4px;
+      }
+    }
+  }
 }
diff --git a/packages/table/src/ActionsColumn.vue b/packages/table/src/ActionsColumn.vue
index 28604734..2ed22683 100644
--- a/packages/table/src/ActionsColumn.vue
+++ b/packages/table/src/ActionsColumn.vue
@@ -17,6 +17,7 @@
       :width="action.subActionConfig?.popoverWidth"
       :popper-class="action.subActionConfig?.popoverClass"
       :destroy-on-close="action.subActionConfig?.popoverDestroyOnClose ?? true"
+      @clickoutside="popoverVisible = false"
     >
       <template #reference>
         <TMagicButton
@@ -84,8 +85,15 @@
   >
 </template>
 
-<script lang="ts" setup>
+<script lang="ts">
 import { ref } from 'vue';
+
+// 所有行共享：同一时间仅允许一个 sub-actions 气泡展开，激活新的会自动关闭上一个
+const activePopoverId = ref<symbol | null>(null);
+</script>
+
+<script lang="ts" setup>
+import { watch } from 'vue';
 import { ArrowDown, ArrowRight } from '@element-plus/icons-vue';
 import { cloneDeep } from 'lodash-es';
 
@@ -117,7 +125,23 @@ const props = withDefaults(
   },
 );
 
+const popoverId = Symbol('sub-actions-popover');
 const popoverVisible = ref(false);
+
+watch(popoverVisible, (visible) => {
+  if (visible) {
+    activePopoverId.value = popoverId;
+  } else if (activePopoverId.value === popoverId) {
+    activePopoverId.value = null;
+  }
+});
+
+watch(activePopoverId, (id) => {
+  if (id !== popoverId && popoverVisible.value) {
+    popoverVisible.value = false;
+  }
+});
+
 const togglePopover = () => {
   popoverVisible.value = !popoverVisible.value;
 };