From 98c2e2ff1fdd18cbb6a245e55eb6a32f0e2ea164 Mon Sep 17 00:00:00 2001
From: roymondchen <roymondchen@tencent.com>
Date: Thu, 25 Dec 2025 19:16:17 +0800
Subject: [PATCH] =?UTF-8?q?fix(table):=20=E8=A1=8C=E5=86=85=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=97=A0=E6=B3=95=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/table/src/ActionsColumn.vue | 39 ++++++++++++++++------------
 packages/table/src/Table.vue         |  3 +++
 packages/table/src/TextColumn.vue    | 33 +++++++++++++++--------
 packages/table/src/schema.ts         |  4 ++-
 4 files changed, 50 insertions(+), 29 deletions(-)

diff --git a/packages/table/src/ActionsColumn.vue b/packages/table/src/ActionsColumn.vue
index 7d834cc2..d50279a6 100644
--- a/packages/table/src/ActionsColumn.vue
+++ b/packages/table/src/ActionsColumn.vue
@@ -32,14 +32,16 @@
     class="action-btn"
     v-show="editState[index]"
     link
-    type="primary"
+    type="danger"
     size="small"
-    @click="editState[index] = undefined"
+    @click="cancel(index, config)"
     >取消</TMagicButton
   >
 </template>
 
 <script lang="ts" setup>
+import { cloneDeep } from 'lodash-es';
+
 import { TMagicButton, tMagicMessage, TMagicTooltip } from '@tmagic/design';
 
 import { ColumnActionConfig, ColumnConfig } from './schema';
@@ -65,7 +67,10 @@ const props = withDefaults(
   },
 );
 
-const emit = defineEmits(['after-action']);
+const emit = defineEmits<{
+  'after-action': [{ index: number }];
+  'after-action-cancel': [{ index: number }];
+}>();
 
 const display = (fuc: boolean | Function | undefined, row: any) => {
   if (typeof fuc === 'function') {
@@ -97,7 +102,7 @@ const formatter = (fuc: string | Function | undefined, row: any) => {
 const actionHandler = async (action: ColumnActionConfig, row: any, index: number) => {
   await action.before?.(row, index);
   if (action.type === 'edit') {
-    props.editState[index] = row;
+    props.editState[index] = cloneDeep(row);
   } else {
     await action.handler?.(row, index);
   }
@@ -108,31 +113,31 @@ const save = async (index: number, config: ColumnConfig) => {
   const action = config.actions?.find((item) => item.type === 'edit')?.action;
   if (!action) return;
 
-  const data: any = {};
-  const row = props.editState[index];
-  props.columns
-    .filter((item) => item.type)
-    .forEach((column) => {
-      if (column.prop) {
-        data[column.prop] = row[column.prop];
-      }
-    });
-
   const res: any = await action({
-    data,
+    data: props.editState[index],
+    index,
   });
 
   if (res) {
     if (res.ret === 0) {
       tMagicMessage.success('保存成功');
       props.editState[index] = undefined;
-      emit('after-action');
+      emit('after-action', { index });
     } else {
       tMagicMessage.error(res.msg || '保存失败');
     }
   } else {
     props.editState[index] = undefined;
-    emit('after-action');
+    emit('after-action', { index });
   }
 };
+
+const cancel = async (index: number, config: ColumnConfig) => {
+  props.editState[index] = undefined;
+  const cancel = config.actions?.find((item) => item.type === 'edit')?.cancel;
+  if (cancel) {
+    await cancel({ index });
+  }
+  emit('after-action-cancel', { index });
+};
 </script>
diff --git a/packages/table/src/Table.vue b/packages/table/src/Table.vue
index 28163ab2..55b36ccc 100644
--- a/packages/table/src/Table.vue
+++ b/packages/table/src/Table.vue
@@ -73,6 +73,7 @@ const props = withDefaults(
 const emit = defineEmits([
   'sort-change',
   'after-action',
+  'after-action-cancel',
   'select',
   'select-all',
   'selection-change',
@@ -102,6 +103,8 @@ const cellRender = (config: ColumnConfig, { row = {}, $index }: any) => {
       rowkeyName: props.rowkeyName,
       editState: editState.value,
       columns: props.columns,
+      onAfterAction: (payload: { index: number }) => emit('after-action', payload),
+      onAfterActionCancel: (payload: { index: number }) => emit('after-action-cancel', payload),
     });
   }
   if (config.type === 'popover') {
diff --git a/packages/table/src/TextColumn.vue b/packages/table/src/TextColumn.vue
index 1d701d70..2043e168 100644
--- a/packages/table/src/TextColumn.vue
+++ b/packages/table/src/TextColumn.vue
@@ -2,15 +2,13 @@
   <div v-if="config.type === 'index'">
     {{ config.pageIndex && config.pageSize ? config.pageIndex * config.pageSize + index + 1 : index + 1 }}
   </div>
-  <TMagicForm v-else-if="config.type && editState[index]" label-width="0" :model="editState[index]">
-    <m-form-container
-      :prop="config.prop"
-      :rules="config.rules"
-      :config="config"
-      :name="config.prop"
-      :model="editState[index]"
-    ></m-form-container>
-  </TMagicForm>
+  <MForm
+    v-else-if="(config.type || config.editInlineFormConfig) && editState[index]"
+    label-width="0"
+    :config="config.editInlineFormConfig ?? [config]"
+    :init-values="editState[index]"
+    @change="formChangeHandler"
+  ></MForm>
 
   <TMagicButton
     v-else-if="config.action === 'actionLink' && config.prop"
@@ -46,7 +44,10 @@
 </template>
 
 <script lang="ts" setup>
-import { TMagicButton, TMagicForm, TMagicTag, TMagicTooltip } from '@tmagic/design';
+import { TMagicButton, TMagicTag, TMagicTooltip } from '@tmagic/design';
+import { type ContainerChangeEventData, MForm } from '@tmagic/form';
+import type { FormValue } from '@tmagic/form-schema';
+import { setValueByKeyPath } from '@tmagic/utils';
 
 import { ColumnConfig } from './schema';
 import { formatter } from './utils';
@@ -55,7 +56,7 @@ defineOptions({
   name: 'MTableColumn',
 });
 
-withDefaults(
+const props = withDefaults(
   defineProps<{
     config: ColumnConfig;
     editState?: any;
@@ -67,4 +68,14 @@ withDefaults(
     editState: () => ({}),
   },
 );
+
+const formChangeHandler = (v: FormValue, eventData: ContainerChangeEventData) => {
+  if (eventData.changeRecords?.length) {
+    for (const record of eventData.changeRecords) {
+      if (record.propPath) {
+        setValueByKeyPath(record.propPath, record.value, props.editState[props.index]);
+      }
+    }
+  }
+};
 </script>
diff --git a/packages/table/src/schema.ts b/packages/table/src/schema.ts
index a3f5f3fc..17c2a99c 100644
--- a/packages/table/src/schema.ts
+++ b/packages/table/src/schema.ts
@@ -31,7 +31,8 @@ export interface ColumnActionConfig {
   handler?: (row: any, index: number) => Promise<any> | any;
   before?: (row: any, index: number) => Promise<void> | void;
   after?: (row: any, index: number) => Promise<void> | void;
-  action?: (data: { data: any }) => Promise<void> | void;
+  action?: (data: { data: any; index: number }) => Promise<void> | void;
+  cancel?: (data: { index: number }) => Promise<void> | void;
 }
 
 export interface ColumnConfig<T = any> {
@@ -52,6 +53,7 @@ export interface ColumnConfig<T = any> {
   name?: string;
   showHeader?: boolean;
   table?: ColumnConfig[];
+  editInlineFormConfig?: FormConfig;
   formatter?: 'datetime' | ((item: any, row: T, data: { index: number }) => any);
   popover?: {
     placement?: