vxe-table 4.2.4-beta.2 → 4.2.4-beta.3

package/packages/edit/src/hook.ts

@@ -440,6 +440,9 @@ const editHook: VxeGlobalHooksHandles.HookOptions = {
         return []
       },
       getActiveRecord () {
+        return this.getEditRecord()
+      },
+      getEditRecord () {
         const { editStore } = reactData
         const { afterFullData } = internalData
         const el = refElem.value
@@ -460,10 +463,17 @@ const editHook: VxeGlobalHooksHandles.HookOptions = {
         }
         return null
       },
+      clearActived (evnt) {
+        // if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        //   warnLog('vxe.error.delFunc', ['clearActived', 'clearEdit'])
+        // }
+        // 即将废弃
+        return this.clearEdit(evnt)
+      },
       /**
        * 清除激活的编辑
        */
-      clearActived (evnt) {
+      clearEdit (evnt) {
         const { editStore } = reactData
         const { actived } = editStore
         const { row, column } = actived
@@ -495,25 +505,46 @@ const editHook: VxeGlobalHooksHandles.HookOptions = {
         removeCellSelectedClass()
         return nextTick()
       },
+      isActiveByRow (row) {
+        // if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        //   warnLog('vxe.error.delFunc', ['isActiveByRow', 'isEditByRow'])
+        // }
+        // 即将废弃
+        return this.isEditByRow(row)
+      },
       /**
        * 判断行是否为激活编辑状态
        * @param {Row} row 行对象
        */
-      isActiveByRow (row) {
+      isEditByRow (row) {
         const { editStore } = reactData
         return editStore.actived.row === row
       },
+      setActiveRow (row) {
+        // if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        //   warnLog('vxe.error.delFunc', ['setActiveRow', 'setEditRow'])
+        // }
+        // 即将废弃
+        return editMethods.setEditRow(row)
+      },
       /**
        * 激活行编辑
        */
-      setActiveRow (row) {
+      setEditRow (row) {
         const { visibleColumn } = internalData
         return $xetable.setActiveCell(row, XEUtils.find(visibleColumn, column => isEnableConf(column.editRender)))
       },
+      setActiveCell (row, fieldOrColumn) {
+        // if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        //   warnLog('vxe.error.delFunc', ['setActiveCell', 'setEditCell'])
+        // }
+        // 即将废弃
+        return editMethods.setEditCell(row, fieldOrColumn)
+      },
       /**
        * 激活单元格编辑
        */
-      setActiveCell (row, fieldOrColumn) {
+      setEditCell (row, fieldOrColumn) {
         const { editConfig } = props
         const column = XEUtils.isString(fieldOrColumn) ? $xetable.getColumnByField(fieldOrColumn) : fieldOrColumn
         if (row && column && isEnableConf(editConfig) && isEnableConf(column.editRender)) {

package/packages/table/src/table.ts

@@ -10,6 +10,7 @@ import { VXETable } from '../../v-x-e-table'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import Cell from './cell'
 import TableBodyComponent from './body'
+import TableHeaderComponent from '../../header'
 import tableProps from './props'
 import tableEmits from './emits'
 import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible, colToVisible, getCellValue, setCellValue, handleFieldOrColumn, toTreePathSeq, restoreScrollLocation, restoreScrollListener, XEBodyScrollElement } from './util'
@@ -5569,7 +5570,7 @@ export default defineComponent({
         ref: isFixedLeft ? refLeftContainer : refRightContainer,
         class: `vxe-table--fixed-${fixedType}-wrapper`
       }, [
-        showHeader ? h(resolveComponent('vxe-table-header') as ComponentOptions, {
+        showHeader ? h(TableHeaderComponent, {
           ref: isFixedLeft ? refTableLeftHeader : refTableRightHeader,
           fixedType,
           tableData,
@@ -5963,7 +5964,7 @@ export default defineComponent({
             /**
              * 表头
              */
-            showHeader ? h(resolveComponent('vxe-table-header') as ComponentOptions, {
+            showHeader ? h(TableHeaderComponent, {
               ref: refTableHeader,
               tableData,
               tableColumn,

package/types/all.d.ts

@@ -14,7 +14,6 @@ export * from './v-x-e-table'
 export * from './component'
 
 // Module
-export * from './header'
 export * from './footer'
 export * from './icon'
 export * from './filter'

package/types/edit.d.ts

@@ -60,7 +60,8 @@ export interface TableEditMethods {
    */
   getUpdateRecords(): any[]
   /**
-   * 用于 edit-config，获取已激活的行数据
+   * 请使用 getEditRecord
+   * @deprecated
    */
   getActiveRecord(): {
     row: any
@@ -71,6 +72,18 @@ export interface TableEditMethods {
     $columnIndex: number
     cell: HTMLElement
   }
+  /**
+   * 用于 edit-config，获取已激活的行数据
+   */
+  getEditRecord(): {
+    row: any
+    rowIndex: number
+    $rowIndex: number
+    column: VxeTableDefines.ColumnInfo
+    columnIndex: number
+    $columnIndex: number
+    cell: HTMLElement
+  }
   /**
    * 用于 mouse-config.selected，获取选中的单元格信息
    */
@@ -79,29 +92,49 @@ export interface TableEditMethods {
     column: VxeTableDefines.ColumnInfo
   }
   /**
-   * 手动清除单元格激活状态
+   * 请使用 clearEdit
+   * @deprecated
    */
   clearActived(evnt?: Event): Promise<any>
+  /**
+   * 手动清除单元格激活状态
+   */
+  clearEdit(evnt?: Event): Promise<any>
   /**
    * 手动清除单元格选中状态
    */
   clearSelected(): Promise<any>
+  /**
+   * 请使用 isEditByRow
+   * @deprecated
+   */
+  isActiveByRow(row: any): boolean
   /**
    * 用于 edit-config，判断行是否为激活编辑状态
    * @param row 指定行
    */
-  isActiveByRow(row: any): boolean
+  isEditByRow(row: any): boolean
+  /**
+   * 请使用 setEditRow
+   * @deprecated
+   */
+  setActiveRow(row: any): Promise<any>
   /**
    * 用于 edit-config，激活行编辑并激活第一个单元格
    * @param row 指定行
    */
-  setActiveRow(row: any): Promise<any>
+  setEditRow(row: any): Promise<any>
+  /**
+   * 请使用 setEditCell
+   * @deprecated
+   */
+  setActiveCell(row: any, fieldOrColumn: string | VxeTableDefines.ColumnInfo): Promise<any>
   /**
    * 用于 edit-config，激活单元格编辑
    * @param row 指定行
    * @param field 字段名
    */
-  setActiveCell(row: any, fieldOrColumn: string | VxeTableDefines.ColumnInfo): Promise<any>
+  setEditCell(row: any, fieldOrColumn: string | VxeTableDefines.ColumnInfo): Promise<any>
   /**
    * 用于 mouse-config.mouse-config，选中某个单元格
    * @param row 指定行