From 0dd7f54ebc3518404653d6e43ee428e05566dd28 Mon Sep 17 00:00:00 2001
From: roymondchen <roymondchen@tencent.com>
Date: Tue, 2 Dec 2025 15:25:34 +0800
Subject: [PATCH] =?UTF-8?q?feat(form):=20table=E6=94=AF=E6=8C=81=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AE=E7=9A=84icon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/form-schema/src/base.ts          |  3 +++
 packages/form/src/table/ActionsColumn.vue | 23 ++++++++++++-----------
 packages/form/src/table/Table.vue         |  2 +-
 packages/form/src/table/useSortable.ts    |  5 ++---
 packages/form/src/theme/table.scss        |  4 ++++
 5 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/packages/form-schema/src/base.ts b/packages/form-schema/src/base.ts
index 0ca48531..e364aea4 100644
--- a/packages/form-schema/src/base.ts
+++ b/packages/form-schema/src/base.ts
@@ -722,6 +722,9 @@ export interface TableConfig extends FormItem {
   /** 是否支持拖拽排序 */
   dropSort?: boolean;
   dropSortHandle?: boolean;
+  dropActionButtonIcon?: any;
+  copyActionButtonIcon?: any;
+  deleteActionButtonIcon?: any;
   /** 是否显示全屏按钮 */
   enableFullscreen?: boolean;
   fixed?: boolean | 'left' | 'right';
diff --git a/packages/form/src/table/ActionsColumn.vue b/packages/form/src/table/ActionsColumn.vue
index 85d6e1ab..f0de9af1 100644
--- a/packages/form/src/table/ActionsColumn.vue
+++ b/packages/form/src/table/ActionsColumn.vue
@@ -1,20 +1,21 @@
 <template>
   <slot name="operateCol" :scope="{ $index: index, row: row }"></slot>
-  <TMagicButton
-    v-if="config.dropSort && config.dropSortHandle"
-    :class="{ 'tmagic-form-table-drag-target': config.dropSortHandle }"
-    :icon="Sort"
-    link
-    size="small"
-    title="拖动排序"
-  ></TMagicButton>
+  <TMagicTooltip v-if="config.dropSort && config.dropSortHandle" content="拖动排序" placement="left-start">
+    <TMagicButton
+      size="small"
+      link
+      :class="{ 'tmagic-form-table-drag-target': config.dropSortHandle }"
+      :icon="config.dropActionButtonIcon || Sort"
+    >
+    </TMagicButton>
+  </TMagicTooltip>
   <TMagicButton
     v-show="showDelete(index + 1 + currentPage * pageSize - 1)"
     size="small"
     type="danger"
     link
     title="删除"
-    :icon="Delete"
+    :icon="config.deleteActionButtonIcon || Delete"
     @click="removeHandler(index + 1 + currentPage * pageSize - 1)"
   ></TMagicButton>
 
@@ -24,7 +25,7 @@
     size="small"
     type="primary"
     title="复制"
-    :icon="DocumentCopy"
+    :icon="config.copyActionButtonIcon || DocumentCopy"
     :disabled="disabled"
     @click="copyHandler(index + 1 + currentPage * pageSize - 1)"
   ></TMagicButton>
@@ -35,7 +36,7 @@ import { inject } from 'vue';
 import { Delete, DocumentCopy, Sort } from '@element-plus/icons-vue';
 import { cloneDeep } from 'lodash-es';
 
-import { TMagicButton } from '@tmagic/design';
+import { TMagicButton, TMagicTooltip } from '@tmagic/design';
 
 import type { FormState, TableConfig } from '../schema';
 
diff --git a/packages/form/src/table/Table.vue b/packages/form/src/table/Table.vue
index fd110e6a..60ee20ce 100644
--- a/packages/form/src/table/Table.vue
+++ b/packages/form/src/table/Table.vue
@@ -11,7 +11,7 @@
         <TMagicTooltip
           content="拖拽可排序"
           placement="left-start"
-          :disabled="config.dropSort !== true && !config.dropSortHandle"
+          :disabled="config.dropSort !== true || config.dropSortHandle"
         >
           <TMagicTable
             v-if="model[modelName]"
diff --git a/packages/form/src/table/useSortable.ts b/packages/form/src/table/useSortable.ts
index fb8bda19..ed5449e3 100644
--- a/packages/form/src/table/useSortable.ts
+++ b/packages/form/src/table/useSortable.ts
@@ -39,10 +39,9 @@ export const useSortable = (
         emit('change', newData);
         mForm?.$emit('field-change', newData);
 
-        sortable?.destroy();
-        sortable = undefined;
-
         nextTick(() => {
+          sortable?.destroy();
+          sortable = undefined;
           updateKey.value += 1;
         });
       },
diff --git a/packages/form/src/theme/table.scss b/packages/form/src/theme/table.scss
index ff5f137e..e649da94 100644
--- a/packages/form/src/theme/table.scss
+++ b/packages/form/src/theme/table.scss
@@ -65,4 +65,8 @@
   .el-form-item {
     margin-bottom: 0;
   }
+
+  .tmagic-form-table-drag-target {
+    cursor: move;
+  }
 }