From acca5465bdabf731fd2bf044aaacefc07aa48735 Mon Sep 17 00:00:00 2001
From: xuliangzhan <xu_liangzhan@163.com>
Date: Thu, 16 Nov 2023 09:29:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20setEditRow=20=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E6=94=AF=E6=8C=81=E6=8C=87=E5=AE=9A=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/edit/src/hook.ts | 8 ++++++--
 packages/icon/src/icon.ts | 3 ++-
 types/edit.d.ts           | 4 ++--
 types/icon.d.ts           | 2 ++
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/packages/edit/src/hook.ts b/packages/edit/src/hook.ts
index 210ac4c87..e12547c58 100644
--- a/packages/edit/src/hook.ts
+++ b/packages/edit/src/hook.ts
@@ -574,9 +574,13 @@ const editHook: VxeGlobalHooksHandles.HookOptions = {
       /**
        * 激活行编辑
        */
-      setEditRow (row) {
+      setEditRow (row, fieldOrColumn) {
         const { visibleColumn } = internalData
-        return $xetable.setEditCell(row, XEUtils.find(visibleColumn, column => isEnableConf(column.editRender)))
+        let column: any = XEUtils.find(visibleColumn, column => isEnableConf(column.editRender))
+        if (fieldOrColumn) {
+          column = XEUtils.isString(fieldOrColumn) ? $xetable.getColumnByField(fieldOrColumn) : fieldOrColumn
+        }
+        return $xetable.setEditCell(row, column)
       },
       setActiveCell (row, fieldOrColumn) {
         // if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
diff --git a/packages/icon/src/icon.ts b/packages/icon/src/icon.ts
index c3815afe3..617199fd4 100644
--- a/packages/icon/src/icon.ts
+++ b/packages/icon/src/icon.ts
@@ -6,7 +6,8 @@ export default defineComponent({
   name: 'VxeIcon',
   props: {
     name: String as PropType<VxeIconPropTypes.Name>,
-    roll: Boolean as PropType<VxeIconPropTypes.Roll>
+    roll: Boolean as PropType<VxeIconPropTypes.Roll>,
+    status: String as PropType<VxeIconPropTypes.Status>
   },
   emits: [
     'click'
diff --git a/types/edit.d.ts b/types/edit.d.ts
index 537ab1ecd..16234c968 100644
--- a/types/edit.d.ts
+++ b/types/edit.d.ts
@@ -135,10 +135,10 @@ export interface TableEditMethods<D = VxeTableDataRow> {
    */
   setActiveRow(row: any): Promise<void>
   /**
-   * 用于 edit-config，激活行编辑并激活第一个单元格
+   * 用于 edit-config，激活行编辑并默认激活第一个列，也可以指定列
    * @param row 指定行
    */
-  setEditRow(row: any): Promise<void>
+  setEditRow(row: any, fieldOrColumn?: string | VxeTableDefines.ColumnInfo<any>): Promise<void>
   /**
    * 请使用 setEditCell
    * @deprecated
diff --git a/types/icon.d.ts b/types/icon.d.ts
index 6626b388c..4d3dca5a8 100644
--- a/types/icon.d.ts
+++ b/types/icon.d.ts
@@ -25,11 +25,13 @@ export interface VxeIconMethods extends IconMethods { }
 export type VxeIconProps<D = any> = {
   name?: VxeIconPropTypes.Name
   roll?: VxeIconPropTypes.Roll
+  status?: VxeIconPropTypes.Status
 }
 
 export namespace VxeIconPropTypes {
   export type Name = string
   export type Roll = boolean
+  export type Status = string
 }
 
 export type VxeIconEmits = [