From 4f40ad9f118cff9597807352734ad11acc75aeb8 Mon Sep 17 00:00:00 2001
From: oneao <hi_itao@163.com>
Date: Thu, 23 Jul 2026 22:54:30 +0800
Subject: [PATCH] 20260723225430

---
 .../src/components/fms-table/FmsTable.vue     | 13 +++++++++++-
 .../utils/createEditableCellRenderer.js       | 20 +++++++++++--------
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/code/fms/fms-vue/src/components/fms-table/FmsTable.vue b/code/fms/fms-vue/src/components/fms-table/FmsTable.vue
index 379778c0..d2bd65bd 100644
--- a/code/fms/fms-vue/src/components/fms-table/FmsTable.vue
+++ b/code/fms/fms-vue/src/components/fms-table/FmsTable.vue
@@ -22,7 +22,7 @@ const props = defineProps({
   activeRowKey: { type: [String, Number], default: null },
 });
 
-const emit = defineEmits(["update:columns"]);
+const emit = defineEmits(["update:columns", "row-click"]);
 
 function getRowKey(row) {
   return typeof props.rowKey === "function" ? props.rowKey(row) : row?.[props.rowKey];
@@ -30,9 +30,19 @@ function getRowKey(row) {
 
 const selectedRowKeySet = computed(() => new Set(props.rowSelection?.selectedRowKeys || []));
 
+// 追踪用户点击的单元格列，用于编辑态自动聚焦到对应列
+const activeColKey = ref(null);
+
+function onStkRowClick(ev, row, data) {
+  const td = ev.target.closest?.("td");
+  activeColKey.value = td?.dataset?.colKey || null;
+  emit("row-click", ev, row, data);
+}
+
 const EditableCell = createEditableCellRenderer({
   getRowKey,
   getActiveRowKey: () => props.activeRowKey,
+  getActiveColKey: () => activeColKey.value,
 });
 
 const { SelectionCell, SelectionHeaderCell } = createSelectionCellRenderers({
@@ -154,6 +164,7 @@ defineExpose({ scrollToRow });
     :row-key="rowKey"
     :bordered="bordered"
     :no-data-full="noDataFull"
+    @row-click="onStkRowClick"
   >
     <template v-for="(slot, name) in forwardSlots" :key="name" #[name]="slotProps">
       <slot :name="name" v-bind="slotProps || {}" />
diff --git a/code/fms/fms-vue/src/components/fms-table/utils/createEditableCellRenderer.js b/code/fms/fms-vue/src/components/fms-table/utils/createEditableCellRenderer.js
index dbaa4a65..c97d3dcc 100644
--- a/code/fms/fms-vue/src/components/fms-table/utils/createEditableCellRenderer.js
+++ b/code/fms/fms-vue/src/components/fms-table/utils/createEditableCellRenderer.js
@@ -5,11 +5,13 @@ function resolveOption(option, row) {
   return typeof option === "function" ? option(row) : option;
 }
 
-export function createEditableCellRenderer({ getRowKey, getActiveRowKey }) {
+export function createEditableCellRenderer({ getRowKey, getActiveRowKey, getActiveColKey }) {
   return function EditableCell({ row, col, cellValue }) {
     const editor = typeof col.editor === "string" ? { type: col.editor } : col.editor || {};
     const activeRowKey = getActiveRowKey();
     const isEditing = activeRowKey != null && String(getRowKey(row)) === String(activeRowKey);
+    const activeColKey = getActiveColKey?.();
+    const shouldFocus = isEditing && (activeColKey == null || col.dataIndex === activeColKey);
 
     const update = (value) => {
       row[col.dataIndex] = value;
@@ -41,13 +43,15 @@ export function createEditableCellRenderer({ getRowKey, getActiveRowKey }) {
       size: "small",
       style: { width: "100%" },
       onClick: (event) => event.stopPropagation(),
-      // 编辑态首次渲染自动聚焦
-      ref: (instance) => {
-        if (instance) {
-          const target = instance.focus ? instance : instance.$el;
-          target?.focus?.();
-        }
-      },
+      // 仅被点击的列首次渲染时自动聚焦
+      ref: shouldFocus
+        ? (instance) => {
+            if (instance) {
+              const target = instance.focus ? instance : instance.$el;
+              target?.focus?.();
+            }
+          }
+        : undefined,
     };
 
     if (editor.type === "number") {