vxe-table 3.22.11 → 3.23.0-beta.0

package/packages/locale/lang/vi-VN.ts

@@ -620,6 +620,17 @@ export default {
         minute: '{mm}',
         second: '{ss}'
       },
+      stepFormat: {
+        year: '{start.yyyy}~{end.yyyy}年',
+        quarter: '{start.q}~{end.q}季度',
+        month: '{start.M}~{end.M}月',
+        week: '{start.W}~{end.W}周',
+        day: '{sE}~{eE}',
+        date: '{start.d}~{end.d}',
+        hour: '{start.HH}~{end.HH}',
+        minute: '{start.mm}~{end.mm}',
+        second: '{start.ss}~{end.ss}'
+      },
       dayss: {
         w0: '日',
         w1: '一',
@@ -628,6 +639,15 @@ export default {
         w4: '四',
         w5: '五',
         w6: '六'
+      },
+      days: {
+        w0: '日',
+        w1: '一',
+        w2: '二',
+        w3: '三',
+        w4: '四',
+        w5: '五',
+        w6: '六'
       }
     },
     plugins: {

package/packages/locale/lang/zh-CHT.ts

@@ -620,6 +620,17 @@ export default {
         minute: '{mm}',
         second: '{ss}'
       },
+      stepFormat: {
+        year: '{start.yyyy}~{end.yyyy}年',
+        quarter: '{start.q}~{end.q}季度',
+        month: '{start.M}~{end.M}月',
+        week: '{start.W}~{end.W}周',
+        day: '{sE}~{eE}',
+        date: '{start.d}~{end.d}',
+        hour: '{start.HH}~{end.HH}',
+        minute: '{start.mm}~{end.mm}',
+        second: '{start.ss}~{end.ss}'
+      },
       dayss: {
         w0: '日',
         w1: '一',
@@ -628,6 +639,15 @@ export default {
         w4: '四',
         w5: '五',
         w6: '六'
+      },
+      days: {
+        w0: '日',
+        w1: '一',
+        w2: '二',
+        w3: '三',
+        w4: '四',
+        w5: '五',
+        w6: '六'
       }
     },
     plugins: {

package/packages/locale/lang/zh-CN.ts

@@ -603,7 +603,7 @@ export default {
         quarter: '{yyyy}年第{q}季度',
         month: '{yyyy}年{MM}月',
         week: '{yyyy}年第{W}周',
-        day: '{yyyy}年{MM}月 {E}',
+        day: '{yyyy}年{MM}月 {eLabel}',
         date: '{yyyy}年{MM}月{dd}日',
         hour: '{yyyy}年{MM}月{dd}日{HH}时',
         minute: '{yyyy}年{MM}月{dd}日{HH}时{mm}分',
@@ -614,12 +614,23 @@ export default {
         quarter: '{q}季度',
         month: '{M}月',
         week: '{W}周',
-        day: '{d}',
+        day: '{eLabel}',
         date: '{d}',
         hour: '{HH}',
         minute: '{mm}',
         second: '{ss}'
       },
+      stepFormat: {
+        year: '{start.yyyy}~{end.yyyy}年',
+        quarter: '{start.q}~{end.q}季度',
+        month: '{start.M}~{end.M}月',
+        week: '{start.W}~{end.W}周',
+        day: '{eStartLabel}~{eEndLabel}',
+        date: '{start.d}~{end.d}',
+        hour: '{start.HH}~{end.HH}',
+        minute: '{start.mm}~{end.mm}',
+        second: '{start.ss}~{end.ss}'
+      },
       dayss: {
         w0: '日',
         w1: '一',
@@ -628,6 +639,15 @@ export default {
         w4: '四',
         w5: '五',
         w6: '六'
+      },
+      days: {
+        w0: '日',
+        w1: '一',
+        w2: '二',
+        w3: '三',
+        w4: '四',
+        w5: '五',
+        w6: '六'
       }
     },
     plugins: {

package/packages/table/module/edit/mixin.ts

@@ -5,7 +5,7 @@ import { getCellValue, setCellValue, getRowid } from '../../src/util'
 import { removeClass, addClass } from '../../../ui/src/dom'
 import { createComponentLog } from '../../../ui/src/log'
 
-import type { VxeTableConstructor, TableInternalData, VxeTableDefines, TableReactData, VxeTablePrivateMethods } from '../../../../types'
+import type { VxeTableConstructor, TableInternalData, VxeTableDefines, TableReactData, VxeTablePrivateMethods, VxeGlobalRendererHandles } from '../../../../types'
 
 const { warnLog, errLog } = createComponentLog('table')
 
@@ -387,7 +387,18 @@ function handleClearEdit ($xeTable: VxeTableConstructor & VxeTablePrivateMethods
   return $xeTable.$nextTick().then(() => $xeTable.updateCellAreas())
 }
 
-function handleEditActive ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, params: any, evnt: Event | null, options: {
+function handleEditActive ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, params: {
+  $table: VxeTableConstructor
+  column: VxeTableDefines.ColumnInfo
+  columnIndex: number
+  _columnIndex: number
+  $columnIndex: number
+  rowIndex: number
+  $rowIndex: number
+  _rowIndex: number
+  row: any
+  cell?: HTMLElement
+}, evnt: Event | null, options: {
   isClear?: boolean
   isFocus?: boolean
   isPos?: boolean
@@ -395,6 +406,7 @@ function handleEditActive ($xeTable: VxeTableConstructor & VxeTablePrivateMethod
   const props = $xeTable
   const reactData = $xeTable as unknown as TableReactData
   const $xeGrid = $xeTable.$xeGrid
+  const $xeGantt = $xeTable.$xeGantt
 
   const { editConfig, mouseConfig } = props
   const { editStore, tableColumn } = reactData
@@ -404,16 +416,16 @@ function handleEditActive ($xeTable: VxeTableConstructor & VxeTablePrivateMethod
   const { row, column } = params
   const { editRender } = column
   const { isFocus, isPos, isClear } = options
-  const cell = (params.cell || $xeTable.getCellElement(row, column))
+  const cell = (params.cell || $xeTable.getCellElement(row, column)) as HTMLElement
   const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod
-  params.cell = cell
+  const editParams = { ...params, cell }
   if (cell && isEnableConf(editConfig) && isEnableConf(editRender)) {
     // 激活编辑
     if (!$xeTable.isPendingByRow(row) && !$xeTable.isAggregateRecord(row)) {
       if (actived.row !== row || (mode === 'cell' ? actived.column !== column : false)) {
         // 判断是否禁用编辑
         let type: 'edit-disabled' | 'edit-activated' = 'edit-disabled'
-        if (!beforeEditMethod || beforeEditMethod({ ...params, $table: $xeTable, $grid: $xeGrid })) {
+        if (!beforeEditMethod || beforeEditMethod({ ...editParams, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt })) {
           if (mouseConfig) {
             $xeTable.clearSelected()
             if ($xeTable.clearCellAreas) {
@@ -427,7 +439,7 @@ function handleEditActive ($xeTable: VxeTableConstructor & VxeTablePrivateMethod
           }
           type = 'edit-activated'
           column.renderHeight = cell.offsetHeight
-          actived.args = params
+          actived.args = editParams
           actived.row = row
           actived.column = column
           $xeTable.handlePushStack()
@@ -442,10 +454,10 @@ function handleEditActive ($xeTable: VxeTableConstructor & VxeTablePrivateMethod
           const afterEditMethod = editOpts.afterEditMethod
           $xeTable.$nextTick(() => {
             if (isFocus) {
-              $xeTable.handleFocus(params, evnt)
+              $xeTable.handleFocus(editParams, evnt)
             }
             if (afterEditMethod) {
-              afterEditMethod({ ...params, $table: $xeTable, $grid: $xeGrid })
+              afterEditMethod({ ...editParams, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt })
             }
           })
         }
@@ -488,11 +500,11 @@ function handleEditActive ($xeTable: VxeTableConstructor & VxeTablePrivateMethod
           }
         }
         column.renderHeight = cell.offsetHeight
-        actived.args = params
+        actived.args = editParams
         actived.column = column
         if (isPos) {
           setTimeout(() => {
-            $xeTable.handleFocus(params, evnt)
+            $xeTable.handleFocus(editParams, evnt)
           })
         }
       }
@@ -522,8 +534,12 @@ function handleEditCell ($xeTable: VxeTableConstructor & VxeTablePrivateMethods,
         handleEditActive($xeTable, {
           row,
           rowIndex: $xeTable.getRowIndex(row),
+          $rowIndex: $xeTable.getVMRowIndex(row),
+          _rowIndex: $xeTable.getVTRowIndex(row),
           column,
           columnIndex: $xeTable.getColumnIndex(column),
+          $columnIndex: $xeTable.getVMColumnIndex(column),
+          _columnIndex: $xeTable.getVTColumnIndex(column),
           cell,
           $table: $xeTable
         }, null, options)
@@ -948,32 +964,34 @@ export default {
       const { editStore } = reactData
       return editStore.actived.row === row
     },
-    /**
-     * 处理聚焦
-     */
-    handleFocus (params: any) {
+    handleCellFocus (cell: HTMLElement, params: {
+      $table: VxeTableConstructor
+      column: VxeTableDefines.ColumnInfo
+      row: any
+    }) {
       const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+      const props = $xeTable
 
-      const { row, column, cell } = params
+      const { editConfig } = props
+      const { column } = params
       const { editRender } = column
       const editOpts = $xeTable.computeEditOpts
-      if (isEnableConf(editRender)) {
-        const browseObj = XEUtils.browse()
+      if (editConfig && isEnableConf(editRender)) {
         const compRender = renderer.get(editRender.name)
-        let autoFocus = editRender.autofocus || editRender.autoFocus
+        let autoFocus: boolean | string | ((params: VxeGlobalRendererHandles.TableAutoFocusParams) => HTMLElement | null) | null | undefined = editRender.autofocus || editRender.autoFocus
         let autoSelect = editRender.autoSelect || editRender.autoselect
-        let inputElem
+        let inputElem: HTMLElement | null = null
         // 是否启用聚焦
         if (editOpts.autoFocus) {
           if (!autoFocus && compRender) {
-            autoFocus = compRender.tableAutoFocus || compRender.tableAutofocus || (compRender as any).autoFocus || compRender.autofocus
+            autoFocus = compRender.tableAutoFocus || compRender.tableAutofocus || compRender.autofocus
           }
           if (!autoSelect && compRender) {
-            autoSelect = compRender.tableAutoSelect || (compRender as any).autoSelect || compRender.autoselect
+            autoSelect = compRender.tableAutoSelect || compRender.autoselect
           }
           // 如果指定了聚焦 class
           if (XEUtils.isFunction(autoFocus)) {
-            inputElem = autoFocus.call($xeTable, params)
+            inputElem = autoFocus(params)
           } else if (autoFocus) {
             if (autoFocus === true) {
               // 自动匹配模式，会自动匹配第一个可输入元素
@@ -986,13 +1004,35 @@ export default {
             }
           }
         }
+        return inputElem as HTMLInputElement
+      }
+      return null
+    },
+    /**
+     * 处理聚焦
+     */
+    handleFocus (params: {
+      $table: VxeTableConstructor<any>;
+      column: VxeTableDefines.ColumnInfo<any>;
+      row: any;
+      cell: HTMLElement;
+    }) {
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+
+      const { row, column, cell } = params
+      const { editRender } = column
+      const editOpts = $xeTable.computeEditOpts
+      if (isEnableConf(editRender)) {
+        const browseObj = XEUtils.browse()
+        const autoSelect = editRender.autoSelect || editRender.autoselect
+        const inputElem = $xeTable.handleCellFocus(cell, params)
         if (inputElem) {
           if (autoSelect) {
             inputElem.select()
           } else {
             // 保持一致行为，光标移到末端
             if (browseObj.msie) {
-              const textRange = inputElem.createTextRange()
+              const textRange = (inputElem as any).createTextRange()
               textRange.collapse(false)
               textRange.select()
             }
@@ -1073,13 +1113,18 @@ export default {
         if (rowIndex > -1) {
           const cell = $xeTable.getCellElement(row, column)
           const params = {
+            $table: $xeTable,
             row,
             rowIndex,
+            $rowIndex: $xeTable.getVMRowIndex(row),
+            _rowIndex: $xeTable.getVTRowIndex(row),
             column,
             columnIndex: $xeTable.getColumnIndex(column),
+            $columnIndex: $xeTable.getVMColumnIndex(column),
+            _columnIndex: $xeTable.getVTColumnIndex(column),
             cell
           }
-          $xeTable.handleSelected(params, {})
+          $xeTable.handleSelected(params, null)
         }
       }
       return $xeTable.$nextTick()
@@ -1092,7 +1137,7 @@ export default {
       const props = $xeTable
       const reactData = $xeTable as unknown as TableReactData
 
-      const { mouseConfig } = props
+      const { mouseConfig, editConfig } = props
       const { editStore } = reactData
       const mouseOpts = $xeTable.computeMouseOpts
       const editOpts = $xeTable.computeEditOpts
@@ -1115,6 +1160,19 @@ export default {
               $xeTable.addCellSelectedClass()
             }
             $xeTable.focus()
+            // 如果是支持可复用控件
+            if (editConfig && editOpts.isReuseKeep && isEnableConf(editOpts) && isEnableConf(column.editRender)) {
+              setTimeout(() => {
+                const cell = $xeTable.getCellElement(row, column)
+                if (cell) {
+                  const hasReusekeep = cell.querySelector('.vxe-reusekeep-control')
+                  if (hasReusekeep) {
+                    params.cell = cell
+                    $xeTable.handleCellFocus(cell, params)
+                  }
+                }
+              }, 0)
+            }
             if (evnt) {
               $xeTable.dispatchEvent('cell-selected', params, evnt)
             }

package/packages/table/module/keyboard/mixin.ts

@@ -494,8 +494,8 @@ export default {
       const checkboxOpts = $xeTable.computeCheckboxOpts
       const mouseOpts = $xeTable.computeMouseOpts
       const editOpts = $xeTable.computeEditOpts
-      if (mouseConfig && mouseOpts.area && $xeTable.triggerCelllAreaMnEvent) {
-        return $xeTable.triggerCelllAreaMnEvent(evnt, params)
+      if (mouseConfig && mouseOpts.area && $xeTable.triggerClAreaMnEvent) {
+        return $xeTable.triggerClAreaMnEvent(evnt, params)
       } else {
         if (checkboxConfig && checkboxOpts.range) {
           handleCheckboxRangeEvent($xeTable, evnt, params)

package/packages/table/render/index.ts

@@ -1,4 +1,4 @@
-import { CreateElement } from 'vue'
+import { CreateElement, VNode } from 'vue'
 import XEUtils from 'xe-utils'
 import { VxeUI } from '../../ui'
 import { getCellValue, setCellValue } from '../src/util'
@@ -6,7 +6,7 @@ import { getFuncText, formatText, isEmptyValue } from '../../ui/src/utils'
 import { getOnName, getModelEvent, getChangeEvent, hasInputType } from '../../ui/src/vn'
 import { createComponentLog } from '../../ui/src/log'
 
-import type { VxeGlobalRendererHandles, VxeColumnPropTypes, VxeTableConstructor, VxeTablePrivateMethods, VxeTableDefines } from '../../../types'
+import type { VxeGlobalRendererHandles, VxeColumnPropTypes, VxeTableConstructor, VxeTablePrivateMethods, VxeTableDefines, TableReactData } from '../../../types'
 
 const { errLog } = createComponentLog('table')
 
@@ -104,6 +104,7 @@ function getCellLabelVNs (h: CreateElement, renderOpts: VxeGlobalRendererHandles
   const { placeholder } = renderOpts
   return [
     h('span', {
+      key: 1,
       class: ['vxe-cell--label', opts ? opts.class : '']
     }, placeholder && isEmptyValue(cellLabel)
       ? [
@@ -384,22 +385,34 @@ function getNativeFilterOns (renderOpts: VxeGlobalRendererHandles.RenderTableFil
   })
 }
 
+function nativeInputCellRender (h: CreateElement, renderOpts: VxeGlobalRendererHandles.RenderTableCellOptions, renderParams: VxeGlobalRendererHandles.RenderTableEditParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
+  const { row, column } = renderParams
+  const cellValue = XEUtils.get(row, column.field)
+  const cellVNs = [
+    h('span', {
+      key: 1
+    }, cellValue)
+  ]
+  return getNativeInputRenderCellVNs(h, cellValue, cellVNs, renderOpts, renderParams)
+}
+
 /**
  * 单元格可编辑渲染-原生的标签
- * input、textarea、select
+ * input、textarea
  */
-function nativeEditRender (h: CreateElement, renderOpts: VxeGlobalRendererHandles.RenderTableEditOptions, params: any) {
-  const { row, column } = params
+function nativeInputEditRender (h: CreateElement, renderOpts: VxeGlobalRendererHandles.RenderTableEditOptions, renderParams: VxeGlobalRendererHandles.RenderTableEditParams) {
+  const { row, column } = renderParams
   const { name } = renderOpts
-  const cellValue = isImmediateCell(renderOpts, params) ? getCellValue(row, column) : column.model.value
+  const cellValue = isImmediateCell(renderOpts, renderParams) ? getCellValue(row, column) : column.model.value
   return [
-    h(`${name}`, {
+    h('' + name, {
+      key: 2,
       class: `vxe-default-${name}`,
       attrs: getNativeAttrs(renderOpts),
       domProps: {
         value: cellValue
       },
-      on: getNativeEditOns(renderOpts, params)
+      on: getNativeEditOns(renderOpts, renderParams)
     })
   ]
 }
@@ -413,6 +426,18 @@ function buttonCellRender (h: CreateElement, renderOpts: VxeGlobalRendererHandle
   ]
 }
 
+function defaultInputEditRender (h: CreateElement, renderOpts: VxeGlobalRendererHandles.RenderTableEditOptions, params: VxeGlobalRendererHandles.RenderEditParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
+  const { row, column } = params
+  const cellValue = getCellValue(row, column)
+  return [
+    h(getDefaultComponent(renderOpts), {
+      key: 2,
+      props: getCellEditProps(renderOpts, params, cellValue),
+      on: getEditOns(renderOpts, params)
+    })
+  ]
+}
+
 function defaultEditRender (h: CreateElement, renderOpts: VxeGlobalRendererHandles.RenderTableEditOptions, params: VxeGlobalRendererHandles.RenderEditParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
   const { row, column } = params
   const cellValue = getCellValue(row, column)
@@ -736,11 +761,9 @@ function handleExportTreeSelectMethod (params: any) {
   return options.original ? getCellValue(row, column) : getTreeSelectCellValue(column.editRender || column.cellRender, params)
 }
 
-function handleNumberCell (h: CreateElement, renderOpts: VxeGlobalRendererHandles.RenderTableDefaultOptions, params: VxeGlobalRendererHandles.RenderTableDefaultParams) {
+function handleNumberCell (h: CreateElement, cellValue: any, renderOpts: VxeGlobalRendererHandles.RenderTableDefaultOptions, params: VxeGlobalRendererHandles.RenderTableDefaultParams) {
   const { props = {}, showNegativeStatus } = renderOpts
-  const { row, column } = params
   const { type } = props
-  let cellValue = XEUtils.get(row, column.field)
   let isNegative = false
   if (!isEmptyValue(cellValue)) {
     const numberInputConfig = getConfig().numberInput || {}
@@ -891,20 +914,100 @@ function handleSetTreeSelectValue (renderOpts: VxeGlobalRendererHandles.RenderTa
   }
 }
 
+function getNativeInputRenderCellVNs (h: CreateElement, cellValue: any, labelVNs: VNode[], renderOpts: VxeGlobalRendererHandles.RenderTableDefaultOptions, renderParams: VxeGlobalRendererHandles.RenderTableEditParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
+  const { $table, row, column } = renderParams
+  const { name } = renderOpts
+  const tableProps = $table
+  const { editConfig, mouseConfig } = tableProps
+  let isColSelected = false
+  let isActiveCellArea = false
+  if (editConfig && mouseConfig) {
+    const tableReactData = $table as unknown as TableReactData
+    const { editStore } = tableReactData
+    const { selected } = editStore
+    isColSelected = row === selected.row && column === selected.column
+    if ($table.getActiveCellArea) {
+      const activeCellArea = $table.getActiveCellArea()
+      if (activeCellArea) {
+        isActiveCellArea = row === activeCellArea.row && column === activeCellArea.column
+      }
+    }
+  }
+  const cellVNs = labelVNs
+  if (isActiveCellArea || isColSelected) {
+    cellVNs.push(
+      h('' + name, {
+        key: 2,
+        class: `vxe-default-${name} vxe-reusekeep-control`,
+        attrs: getNativeAttrs(renderOpts),
+        domProps: {
+          value: cellValue
+        },
+        on: getNativeEditOns(renderOpts, renderParams)
+      })
+    )
+  }
+  return cellVNs
+}
+
+function getInputRenderCellVNs (h: CreateElement, cellValue: any, labelVNs: VNode[], renderOpts: VxeGlobalRendererHandles.RenderTableDefaultOptions, renderParams: VxeGlobalRendererHandles.RenderTableEditParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
+  const { $table, row, column } = renderParams
+  const tableProps = $table
+  const { editConfig, mouseConfig } = tableProps
+  let isColSelected = false
+  let isActiveCellArea = false
+  if (editConfig && mouseConfig) {
+    const tableReactData = $table as unknown as TableReactData
+    const { editStore } = tableReactData
+    const editOpts = $table.computeEditOpts
+    if (editOpts.isReuseKeep) {
+      const { selected } = editStore
+      isColSelected = row === selected.row && column === selected.column
+      if ($table.getActiveCellArea) {
+        const activeCellArea = $table.getActiveCellArea()
+        if (activeCellArea) {
+          isActiveCellArea = row === activeCellArea.row && column === activeCellArea.column
+        }
+      }
+    }
+  }
+  const cellVNs = labelVNs
+  if (isActiveCellArea || isColSelected) {
+    const compProps = getCellEditProps(renderOpts, renderParams, cellValue)
+    const { className, inputClassName } = compProps
+    cellVNs.push(
+      h(getDefaultComponent(renderOpts), {
+        key: 2,
+        props: {
+          ...compProps,
+          className: 'vxe-reusekeep-control' + (className ? (' ' + className) : ''),
+          inputClassName: 'vxe-reusekeep-control' + (inputClassName ? (' ' + inputClassName) : '')
+        },
+        on: getEditOns(renderOpts, renderParams)
+      })
+    )
+  }
+  return cellVNs
+}
+
 /**
  * 表格 - 渲染器
  */
 renderer.mixin({
   input: {
     tableAutoFocus: true,
-    renderTableEdit: nativeEditRender,
-    renderTableDefault: nativeEditRender,
+    renderTableEdit: nativeInputEditRender,
+    renderTableCell: nativeInputCellRender,
+    renderTableDefault: nativeInputEditRender,
+    createTableFilterOptions: defaultFilterOptions,
     renderTableFilter: nativeFilterRender,
     tableFilterDefaultMethod: handleInputFilterMethod
   },
   textarea: {
     tableAutoFocus: true,
-    renderTableEdit: nativeEditRender
+    renderTableEdit: nativeInputEditRender,
+    renderTableCell: nativeInputCellRender,
+    renderTableDefault: nativeInputEditRender
   },
   select: {
     renderTableEdit: nativeSelectEditRender,
@@ -949,10 +1052,10 @@ renderer.mixin({
   },
   VxeInput: {
     tableAutoFocus: true,
-    renderTableEdit: defaultEditRender,
-    renderTableCell (h, renderOpts, params) {
+    renderTableEdit: defaultInputEditRender,
+    renderTableCell (h, renderOpts, renderParams: VxeGlobalRendererHandles.RenderTableEditParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
       const { props = {} } = renderOpts
-      const { row, column } = params
+      const { row, column } = renderParams
       const inputConfig = getConfig().input || {}
       const digits = props.digits || inputConfig.digits || 2
       let cellValue = XEUtils.get(row, column.field)
@@ -970,16 +1073,21 @@ renderer.mixin({
             break
         }
       }
-      return getCellLabelVNs(h, renderOpts, params, cellValue)
+      const cellVNs = getCellLabelVNs(h, renderOpts, renderParams, cellValue)
+      return getInputRenderCellVNs(h, cellValue, cellVNs, renderOpts, renderParams)
     },
-    renderTableDefault: defaultEditRender,
+    renderTableDefault: defaultInputEditRender,
     createTableFilterOptions: defaultFilterOptions,
     renderTableFilter: defaultFilterRender,
     renderTableFloatingFilter: defaultFloatingFilterRender,
     tableFilterDefaultMethod: handleInputFilterMethod
   },
   FormatNumberInput: {
-    renderTableDefault: handleNumberCell,
+    renderTableDefault (h, renderOpts, renderParams) {
+      const { row, column } = renderParams
+      const cellValue = XEUtils.get(row, column.field)
+      return handleNumberCell(h, cellValue, renderOpts, renderParams)
+    },
     tableFilterDefaultMethod ({ option, row, column }) {
       const { data } = option
       const cellValue = XEUtils.get(row, column.field)
@@ -994,8 +1102,13 @@ renderer.mixin({
   },
   VxeNumberInput: {
     tableAutoFocus: true,
-    renderTableEdit: defaultEditRender,
-    renderTableCell: handleNumberCell,
+    renderTableEdit: defaultInputEditRender,
+    renderTableCell (h, renderOpts, renderParams: VxeGlobalRendererHandles.RenderTableEditParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
+      const { row, column } = renderParams
+      const cellValue = XEUtils.get(row, column.field)
+      const cellVNs = handleNumberCell(h, cellValue, renderOpts, renderParams)
+      return getInputRenderCellVNs(h, cellValue, cellVNs, renderOpts, renderParams)
+    },
     renderTableFooter (h, renderOpts, params) {
       const { props = {} } = renderOpts
       const { row, column, _columnIndex } = params
@@ -1032,7 +1145,7 @@ renderer.mixin({
       }
       return getFuncText(itemValue, 1)
     },
-    renderTableDefault: defaultEditRender,
+    renderTableDefault: defaultInputEditRender,
     createTableFilterOptions: defaultFilterOptions,
     renderTableFilter: defaultFilterRender,
     renderTableFloatingFilter: defaultFloatingFilterRender,
@@ -1180,8 +1293,14 @@ renderer.mixin({
   },
   VxeTextarea: {
     tableAutoFocus: true,
-    renderTableDefault: defaultEditRender,
-    renderTableEdit: defaultEditRender
+    renderTableDefault: defaultInputEditRender,
+    renderTableCell (h, renderOpts, renderParams: VxeGlobalRendererHandles.RenderTableEditParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
+      const { row, column } = renderParams
+      const cellValue = XEUtils.get(row, column.field)
+      const cellVNs = getCellLabelVNs(h, renderOpts, renderParams, cellValue)
+      return getInputRenderCellVNs(h, cellValue, cellVNs, renderOpts, renderParams)
+    },
+    renderTableEdit: defaultInputEditRender
   },
   VxeButton: {
     renderTableDefault: buttonCellRender