vxe-table 3.9.0-rc.2 → 3.9.0-rc.21

package/packages/table/module/export/import-panel.ts

@@ -2,12 +2,17 @@ import { CreateElement } from 'vue'
 import { VxeUI } from '../../../ui'
 import XEUtils from 'xe-utils'
 import { parseFile } from '../../../ui/src/utils'
-// import { errLog } from '../../../ui/src/log'
+import { errLog } from '../../../ui/src/log'
 
-const { getI18n, getIcon } = VxeUI
+import type { VxeModalComponent, VxeSelectComponent, VxeButtonComponent } from 'vxe-pc-ui'
+
+const { getI18n, getIcon, globalMixins } = VxeUI
 
 export default {
   name: 'VxeTableImportPanel',
+  mixins: [
+    globalMixins.sizeMixin
+  ],
   props: {
     defaultOptions: Object,
     storeData: Object
@@ -22,9 +27,6 @@ export default {
     }
   },
   computed: {
-    vSize () {
-      return this.size || this.$parent.size || this.$parent.vSize
-    },
     selectName () {
       return `${this.storeData.filename}.${this.storeData.type}`
     },
@@ -41,6 +43,27 @@ export default {
       return `*.${typeList.map((item: any) => item.value).join(', *.')}`
     }
   } as any,
+  created (this: any) {
+    const $xeTableImportPanel = this
+
+    if (process.env.VUE_APP_VXE_ENV === 'development') {
+      const VxeUIModalComponent = VxeUI.getComponent<VxeModalComponent>('VxeModal')
+      const VxeUIButtonComponent = VxeUI.getComponent<VxeButtonComponent>('VxeButton')
+      const VxeUISelectComponent = VxeUI.getComponent<VxeSelectComponent>('VxeSelect')
+
+      $xeTableImportPanel.$nextTick(() => {
+        if (!VxeUIModalComponent) {
+          errLog('vxe.error.reqComp', ['vxe-modal'])
+        }
+        if (!VxeUIButtonComponent) {
+          errLog('vxe.error.reqComp', ['vxe-button'])
+        }
+        if (!VxeUISelectComponent) {
+          errLog('vxe.error.reqComp', ['vxe-select'])
+        }
+      })
+    }
+  },
   render (this: any, h: CreateElement) {
     const { hasFile, parseTypeLabel, defaultOptions, storeData, selectName } = this
     return h('vxe-modal', {

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

@@ -584,7 +584,7 @@ function downloadFile ($xetable: any, opts: any, content: any) {
   saveLocalFile({ filename, type, content }).then(() => {
     if (opts.message !== false) {
       // 检测弹窗模块
-      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      if (process.env.VUE_APP_VXE_ENV === 'development') {
         if (!VxeUI.modal) {
           errLog('vxe.error.reqModule', ['Modal'])
         }
@@ -813,7 +813,7 @@ function handleImport ($xetable: any, content: any, opts: any) {
         }
         if (opts.message !== false) {
           // 检测弹窗模块
-          if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+          if (process.env.VUE_APP_VXE_ENV === 'development') {
             if (!VxeUI.modal) {
               errLog('vxe.error.reqModule', ['Modal'])
             }
@@ -828,7 +828,7 @@ function handleImport ($xetable: any, content: any, opts: any) {
       })
   } else if (opts.message !== false) {
     // 检测弹窗模块
-    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+    if (process.env.VUE_APP_VXE_ENV === 'development') {
       if (!VxeUI.modal) {
         errLog('vxe.error.reqModule', ['Modal'])
       }
@@ -849,7 +849,7 @@ function handleFileImport ($xetable: any, file: any, opts: any) {
   if (!importMethod && !XEUtils.includes(XEUtils.keys(importOpts._typeMaps), type)) {
     if (opts.message !== false) {
       // 检测弹窗模块
-      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      if (process.env.VUE_APP_VXE_ENV === 'development') {
         if (!VxeUI.modal) {
           errLog('vxe.error.reqModule', ['Modal'])
         }
@@ -900,7 +900,7 @@ function handleFileImport ($xetable: any, file: any, opts: any) {
       }
     } else {
       // 不支持的浏览器
-      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      if (process.env.VUE_APP_VXE_ENV === 'development') {
         errLog('vxe.error.notExp')
       }
       _importResolve({ status: true })
@@ -957,7 +957,7 @@ export function readLocalFile (options: any = {}) {
       } else {
         if (options.message !== false) {
           // 检测弹窗模块
-          if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+          if (process.env.VUE_APP_VXE_ENV === 'development') {
             if (!VxeUI.modal) {
               errLog('vxe.error.reqModule', ['Modal'])
             }
@@ -1277,7 +1277,7 @@ export default {
 
       // 检查类型，如果为自定义导出，则不需要校验类型
       if (!opts.exportMethod && !XEUtils.includes(XEUtils.keys(exportOpts._typeMaps), type)) {
-        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (process.env.VUE_APP_VXE_ENV === 'development') {
           errLog('vxe.error.notType', [type])
         }
         const params = { status: false }
@@ -1300,7 +1300,7 @@ export default {
             opts.data = selectRecords
           }
         } else if (mode === 'all') {
-          if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+          if (process.env.VUE_APP_VXE_ENV === 'development') {
             if (!$xegrid) {
               warnLog('vxe.error.errProp', ['all', 'mode=current,selected'])
             }
@@ -1312,7 +1312,7 @@ export default {
             const queryAllSuccessMethods = ajax.queryAllSuccess
             const queryAllErrorMethods = ajax.queryAllError
 
-            if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+            if (process.env.VUE_APP_VXE_ENV === 'development') {
               if (!ajaxMethods) {
                 warnLog('vxe.error.notFunc', ['proxy-config.ajax.queryAll'])
               }
@@ -1484,7 +1484,7 @@ export default {
     },
     _openExport (options: any) {
       const { exportOpts } = this
-      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      if (process.env.VUE_APP_VXE_ENV === 'development') {
         if (!this.exportConfig) {
           errLog('vxe.error.reqProp', ['export-config'])
         }
@@ -1493,7 +1493,7 @@ export default {
     },
     _openPrint (options: any) {
       const { printOpts } = this
-      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      if (process.env.VUE_APP_VXE_ENV === 'development') {
         if (!this.printConfig) {
           errLog('vxe.error.reqProp', ['print-config'])
         }

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

@@ -107,7 +107,7 @@ export default {
             this.handleOpenMenuEvent(evnt, layout, params)
             // 在 v4 中废弃事件 cell-context-menu、header-cell-context-menu、footer-cell-context-menu
             if (this.$listeners[`${typePrefix}cell-context-menu`]) {
-              if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+              if (process.env.VUE_APP_VXE_ENV === 'development') {
                 warnLog('vxe.error.delEvent', [`${typePrefix}cell-context-menu`, `${typePrefix}cell-menu`])
               }
               this.emitEvent(`${typePrefix}cell-context-menu`, params, evnt)
@@ -258,7 +258,7 @@ export default {
         }
         // 在 v4 中废弃事件 context-menu-click
         if (this.$listeners['context-menu-click']) {
-          if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+          if (process.env.VUE_APP_VXE_ENV === 'development') {
             warnLog('vxe.error.delEvent', ['context-menu-click', 'menu-click'])
           }
           this.emitEvent('context-menu-click', params, evnt)

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

@@ -68,7 +68,7 @@ export default {
      * 完整校验，和 validate 的区别就是会给有效数据中的每一行进行校验
      */
     _fullValidate (rows: any, cb: any) {
-      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      if (process.env.VUE_APP_VXE_ENV === 'development') {
         if (XEUtils.isFunction(cb)) {
           warnLog('vxe.error.notValidators', ['fullValidate(rows, callback)', 'fullValidate(rows)'])
         }
@@ -79,7 +79,7 @@ export default {
      * 快速校验，如果存在记录不通过的记录，则返回不再继续校验（异步校验除外）
      */
     _validate (rows: any, cb: any) {
-      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      if (process.env.VUE_APP_VXE_ENV === 'development') {
         if (XEUtils.isFunction(cb)) {
           warnLog('vxe.error.notValidators', ['validate(rows, callback)', 'validate(rows)'])
         }
@@ -308,12 +308,12 @@ export default {
                     if (gvItem.cellValidatorMethod) {
                       customValid = gvItem.cellValidatorMethod(validParams)
                     } else {
-                      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                      if (process.env.VUE_APP_VXE_ENV === 'development') {
                         warnLog('vxe.error.notValidators', [validator])
                       }
                     }
                   } else {
-                    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                    if (process.env.VUE_APP_VXE_ENV === 'development') {
                       errLog('vxe.error.notValidators', [validator])
                     }
                   }

package/packages/table/render/index.ts

@@ -3,40 +3,17 @@ import XEUtils from 'xe-utils'
 import { VxeUI } from '../../ui'
 import { getCellValue, setCellValue } from '../src/util'
 import { getFuncText, formatText, isEmptyValue } from '../../ui/src/utils'
-import { getOnName } from '../../ui/src/vn'
+import { getOnName, getModelEvent, getChangeEvent } from '../../ui/src/vn'
 import { errLog } from '../../ui/src/log'
 
 import type { VxeGlobalRendererHandles, VxeColumnPropTypes } from '../../../types'
 
 const { getConfig, renderer, getI18n } = VxeUI
 
-const componentDefaultModelProp = 'modelValue'
+const componentDefaultModelProp = 'value'
 
 const defaultCompProps = { transfer: true }
 
-function getModelEvent (renderOpts: any) {
-  switch (renderOpts.name) {
-    case 'input':
-    case 'textarea':
-      return 'input'
-  }
-  return 'update:modelValue'
-}
-
-function getChangeEvent (renderOpts: any) {
-  switch (renderOpts.name) {
-    case 'input':
-    case 'textarea':
-    case 'VxeInput':
-    case 'VxeNumberInput':
-    case 'VxeTextarea':
-    case '$input':
-    case '$textarea':
-      return 'input'
-  }
-  return 'change'
-}
-
 function parseDate (value: any, props: any) {
   return value && props.valueFormat ? XEUtils.toStringDate(value, props.valueFormat) : value
 }
@@ -47,7 +24,7 @@ function getFormatDate (value: any, props: any, defaultFormat: string) {
 }
 
 function getLabelFormatDate (value: any, props: any) {
-  return getFormatDate(value, props, getI18n(`vxe.input.date.labelFormat.${props.type}`))
+  return getFormatDate(value, props, getI18n(`vxe.input.date.labelFormat.${props.type || 'date'}`))
 }
 
 /**
@@ -132,7 +109,7 @@ function getCellLabelVNs (h: CreateElement, renderOpts: any, params: any, cellLa
  * @param modelFunc
  * @param changeFunc
  */
-function getElementOns (renderOpts: any, params: any, modelFunc?: any, changeFunc?: any) {
+function getNativeElementOns (renderOpts: any, params: any, modelFunc?: any, changeFunc?: any) {
   const { events } = renderOpts
   const modelEvent = getModelEvent(renderOpts)
   const changeEvent = getChangeEvent(renderOpts)
@@ -245,7 +222,7 @@ function getFilterOns (renderOpts: any, params: any, option: any) {
 function getNativeEditOns (renderOpts: any, params: any) {
   const { $table, row, column } = params
   const { model } = column
-  return getElementOns(renderOpts, params, (evnt: any) => {
+  return getNativeElementOns(renderOpts, params, (evnt: any) => {
     // 处理 model 值双向绑定
     const cellValue = evnt.target.value
     if (isImmediateCell(renderOpts, params)) {
@@ -262,7 +239,7 @@ function getNativeEditOns (renderOpts: any, params: any) {
 }
 
 function getNativeFilterOns (renderOpts: any, params: any, option: any) {
-  return getElementOns(renderOpts, params, (evnt: any) => {
+  return getNativeElementOns(renderOpts, params, (evnt: any) => {
     // 处理 model 值双向绑定
     option.data = evnt.target.value
   }, () => {
@@ -368,7 +345,7 @@ function renderNativeOptgroups (h: CreateElement, renderOpts: any, params: any,
   return optionGroups.map((group: any, gIndex: any) => {
     return h('optgroup', {
       key: gIndex,
-      props: {
+      attrs: {
         label: group[groupLabel]
       }
     }, renderOptionsMethods(h, group[groupOptions], renderOpts, params))
@@ -663,15 +640,7 @@ renderer.mixin({
       const { row, column } = params
       let cellValue = XEUtils.get(row, column.field)
       if (cellValue) {
-        switch (props.type) {
-          case 'date':
-          case 'week':
-          case 'month':
-          case 'quarter':
-          case 'year':
-            cellValue = getLabelFormatDate(cellValue, props)
-            break
-        }
+        cellValue = getLabelFormatDate(cellValue, props)
       }
       return getCellLabelVNs(h, renderOpts, params, cellValue)
     },
@@ -680,7 +649,8 @@ renderer.mixin({
     tableFilterDefaultMethod: handleFilterMethod
   },
   VxeTextarea: {
-    tableAutoFocus: 'VxeTextarea'
+    tableAutoFocus: 'textarea',
+    renderTableEdit: defaultEditRender
   },
   VxeButton: {
     renderTableDefault: buttonCellRender
@@ -788,6 +758,22 @@ renderer.mixin({
       ]
     }
   },
+  VxeTextEllipsis: {
+    renderTableDefault (h, renderOpts, params) {
+      const { row, column } = params
+      const { props } = renderOpts
+      const cellValue = getCellValue(row, column)
+      return [
+        h(getDefaultComponent(renderOpts), {
+          props: {
+            ...props,
+            content: cellValue
+          },
+          on: getEditOns(renderOpts, params)
+        })
+      ]
+    }
+  },
 
   // 以下已废弃
   $input: {

package/packages/table/src/body.ts

@@ -280,6 +280,7 @@ function renderColumn (h: any, _vm: any, $xetable: any, seq: any, rowid: any, fi
         'col--tree-node': treeNode,
         'col--edit': isEdit,
         'col--ellipsis': hasEllipsis,
+        'col--height': !!rowOpts.height,
         'fixed--hidden': fixedHiddenColumn,
         'col--dirty': isDirty,
         'col--active': editConfig && isEdit && (actived.row === row && (actived.column === column || editOpts.mode === 'row')),

package/packages/table/src/columnInfo.ts

@@ -14,7 +14,7 @@ export class ColumnInfo {
     const formatter = _vm.formatter
     const visible = XEUtils.isBoolean(_vm.visible) ? _vm.visible : true
 
-    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+    if (process.env.VUE_APP_VXE_ENV === 'development') {
       const types = ['seq', 'checkbox', 'radio', 'expand', 'html']
       if (_vm.type && types.indexOf(_vm.type) === -1) {
         warnLog('vxe.error.errProp', [`type=${_vm.type}`, types.join(', ')])
@@ -42,12 +42,12 @@ export class ColumnInfo {
       if (formatter) {
         if (XEUtils.isString(formatter)) {
           const gFormatOpts = formats.get(formatter) || XEUtils[formatter]
-          if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.cellFormatMethod)) {
+          if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
             errLog('vxe.error.notFormats', [formatter])
           }
         } else if (XEUtils.isArray(formatter)) {
           const gFormatOpts = formats.get(formatter[0]) || XEUtils[formatter[0]]
-          if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.cellFormatMethod)) {
+          if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
             errLog('vxe.error.notFormats', [formatter[0]])
           }
         }

package/packages/table/src/methods.ts

@@ -107,9 +107,10 @@ function computeVirtualX (_vm: any) {
 }
 
 function computeVirtualY (_vm: any) {
-  const { $refs, vSize, rowHeightMaps } = _vm
+  const { $refs, computeSize, rowHeightMaps } = _vm
   const { tableHeader, tableBody } = $refs
   const tableBodyElem = tableBody ? tableBody.$el : null
+  const vSize = computeSize
   if (tableBodyElem) {
     const tableHeaderElem = tableHeader ? tableHeader.$el : null
     let rowHeight = 0
@@ -395,7 +396,7 @@ const Methods = {
     if (treeConfig) {
       // 树结构自动转换
       if (treeOpts.transform) {
-        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (process.env.VUE_APP_VXE_ENV === 'development') {
           if (!treeOpts.rowField) {
             errLog('vxe.error.reqProp', ['table.tree-config.rowField'])
           }
@@ -449,7 +450,7 @@ const Methods = {
     if (keepSource) {
       this.cacheSourceMap(fullData)
     }
-    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+    if (process.env.VUE_APP_VXE_ENV === 'development') {
       if (sYLoad) {
         if (!(this.height || this.maxHeight)) {
           errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}'])
@@ -580,7 +581,7 @@ const Methods = {
       }
       this.tableData = tableData.slice(0)
     } else {
-      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      if (process.env.VUE_APP_VXE_ENV === 'development') {
         warnLog('vxe.error.reqProp', ['keep-source'])
       }
     }
@@ -632,7 +633,7 @@ const Methods = {
       this.clearMergeCells()
       this.clearMergeFooterItems()
       this.handleTableData(true)
-      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      if (process.env.VUE_APP_VXE_ENV === 'development') {
         if ((this.scrollXLoad || this.scrollYLoad) && this.expandColumn) {
           warnLog('vxe.error.scrollErrProp', ['column.type=expand'])
         }
@@ -770,7 +771,7 @@ const Methods = {
       const { id: colid, field, fixed, type, treeNode } = column
       const rest = { column, colid, index, items, parent }
       if (field) {
-        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (process.env.VUE_APP_VXE_ENV === 'development') {
           if (fullColumnFieldData[field]) {
             warnLog('vxe.error.colRepet', ['field', field])
           }
@@ -786,7 +787,7 @@ const Methods = {
       }
 
       if (treeNode) {
-        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (process.env.VUE_APP_VXE_ENV === 'development') {
           if (treeNodeColumn) {
             warnLog('vxe.error.colRepet', ['tree-node', treeNode])
           }
@@ -795,7 +796,7 @@ const Methods = {
           treeNodeColumn = column
         }
       } else if (type === 'expand') {
-        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (process.env.VUE_APP_VXE_ENV === 'development') {
           if (expandColumn) {
             warnLog('vxe.error.colRepet', ['type', type])
           }
@@ -804,7 +805,7 @@ const Methods = {
           expandColumn = column
         }
       }
-      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      if (process.env.VUE_APP_VXE_ENV === 'development') {
         if (type === 'checkbox') {
           if (checkboxColumn) {
             warnLog('vxe.error.colRepet', ['type', type])
@@ -821,7 +822,7 @@ const Methods = {
           }
         }
       }
-      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      if (process.env.VUE_APP_VXE_ENV === 'development') {
         if (this.showOverflow && column.showOverflow === false) {
           warnLog('vxe.error.errConflicts', [`table.show-overflow=${this.showOverflow}`, `column.show-overflow=${column.showOverflow}`])
         }
@@ -833,7 +834,7 @@ const Methods = {
         }
       }
 
-      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      if (process.env.VUE_APP_VXE_ENV === 'development') {
         if (htmlColumn) {
           if (!columnOpts.useKey) {
             errLog('vxe.error.reqProp', ['column-config.useKey', 'column.type=html'])
@@ -863,7 +864,7 @@ const Methods = {
       tableFullColumn.forEach(handleFunc)
     }
 
-    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+    if (process.env.VUE_APP_VXE_ENV === 'development') {
       if (expandColumn && this.mouseOpts.area) {
         errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand'])
       }
@@ -935,7 +936,7 @@ const Methods = {
   },
   // 在 v3 中废弃
   _getRowIndex (row: any) {
-    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+    if (process.env.VUE_APP_VXE_ENV === 'development') {
       warnLog('vxe.error.delFunc', ['_getRowIndex', 'getVTRowIndex'])
     }
     return this.getVTRowIndex(row)
@@ -949,7 +950,7 @@ const Methods = {
   },
   // 在 v3 中废弃
   $getRowIndex (row: any) {
-    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+    if (process.env.VUE_APP_VXE_ENV === 'development') {
       warnLog('vxe.error.delFunc', ['$getRowIndex', 'getVMRowIndex'])
     }
     return this.getVMRowIndex(row)
@@ -970,7 +971,7 @@ const Methods = {
   },
   // 在 v3 中废弃
   _getColumnIndex (column: any) {
-    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+    if (process.env.VUE_APP_VXE_ENV === 'development') {
       warnLog('vxe.error.delFunc', ['_getColumnIndex', 'getVTColumnIndex'])
     }
     return this.getVTColumnIndex(column)
@@ -984,7 +985,7 @@ const Methods = {
   },
   // 在 v3 中废弃
   $getColumnIndex (column: any) {
-    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+    if (process.env.VUE_APP_VXE_ENV === 'development') {
       warnLog('vxe.error.delFunc', ['$getColumnIndex', 'getVMColumnIndex'])
     }
     return this.getVMColumnIndex(column)
@@ -1071,7 +1072,7 @@ const Methods = {
   revertData (rows: any, field: any) {
     const { keepSource, tableSourceData, treeConfig } = this
     if (!keepSource) {
-      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      if (process.env.VUE_APP_VXE_ENV === 'development') {
         warnLog('vxe.error.reqProp', ['keep-source'])
       }
       return this.$nextTick()
@@ -1180,10 +1181,12 @@ const Methods = {
       const formatParams = { cellValue, row, rowIndex: this.getRowIndex(row), column, columnIndex: this.getColumnIndex(column) }
       if (XEUtils.isString(formatter)) {
         const gFormatOpts = formats.get(formatter)
-        cellLabel = gFormatOpts && gFormatOpts.cellFormatMethod ? gFormatOpts.cellFormatMethod(formatParams) : ''
+        const tcFormatMethod = gFormatOpts ? (gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod) : null
+        cellLabel = tcFormatMethod ? tcFormatMethod(formatParams) : ''
       } else if (XEUtils.isArray(formatter)) {
         const gFormatOpts = formats.get(formatter[0])
-        cellLabel = gFormatOpts && gFormatOpts.cellFormatMethod ? gFormatOpts.cellFormatMethod(formatParams, ...formatter.slice(1)) : ''
+        const tcFormatMethod = gFormatOpts ? (gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod) : null
+        cellLabel = tcFormatMethod ? tcFormatMethod(formatParams, ...formatter.slice(1)) : ''
       } else {
         cellLabel = formatter(formatParams)
       }
@@ -1389,8 +1392,8 @@ const Methods = {
           if (valueList.length && !allRemoteFilter) {
             const { filterMethod, filterRender, field } = column
             const compConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null
-            const compFilterMethod = compConf && compConf.renderFilter ? (compConf.tableFilterMethod || compConf.filterMethod) : null
-            const defaultFilterMethod = compConf ? (compConf.tableFilterDefaultMethod || compConf.defaultTableFilterMethod || compConf.defaultFilterMethod) : null
+            const compFilterMethod = compConf ? (compConf.tableFilterMethod || compConf.filterMethod) : null
+            const tdFilterMethod = compConf ? (compConf.tableFilterDefaultMethod || compConf.defaultTableFilterMethod || compConf.defaultFilterMethod) : null
             const cellValue = getCellValue(row, column)
             if (filterMethod) {
               return itemList.some((item: any) => filterMethod({ value: item.value, option: item, cellValue, row, column, $table: this }))
@@ -1398,8 +1401,8 @@ const Methods = {
               return itemList.some((item: any) => compFilterMethod({ value: item.value, option: item, cellValue, row, column, $table: this }))
             } else if (allFilterMethod) {
               return allFilterMethod({ options: itemList, values: valueList, cellValue, row, column })
-            } else if (defaultFilterMethod) {
-              return itemList.some((item: any) => defaultFilterMethod({ value: item.value, option: item, cellValue, row, column, $table: this }))
+            } else if (tdFilterMethod) {
+              return itemList.some((item: any) => tdFilterMethod({ value: item.value, option: item, cellValue, row, column, $table: this }))
             }
             return valueList.indexOf(XEUtils.get(row, field)) > -1
           }
@@ -1982,7 +1985,7 @@ const Methods = {
     this.hasFixedColumn = leftList.length > 0 || rightList.length > 0
     Object.assign(columnStore, { leftList, centerList, rightList })
     if (scrollXLoad) {
-      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      if (process.env.VUE_APP_VXE_ENV === 'development') {
         // if (this.showHeader && !this.showHeaderOverflow) {
         //   warnLog('vxe.error.reqProp', ['show-header-overflow'])
         // }
@@ -2130,10 +2133,20 @@ const Methods = {
             paddingSize = Math.floor(XEUtils.toNumber(cellStyle.paddingLeft) + XEUtils.toNumber(cellStyle.paddingRight)) + 2
           }
           let colWidth = column.renderAutoWidth - paddingSize
-          XEUtils.arrayEach(cellElList, (cellEl: any) => {
-            const labelEl = cellEl.firstChild
-            if (labelEl) {
-              colWidth = Math.max(colWidth, Math.ceil(labelEl.offsetWidth) + 4)
+          XEUtils.arrayEach(cellElList, (itemEl) => {
+            const cellEl = itemEl as HTMLElement
+            const thElem = cellEl.parentNode as HTMLElement
+            let titleWidth = 0
+            if (`${thElem.tagName}`.toLowerCase() === 'th') {
+              XEUtils.arrayEach(cellEl.children, (btnEl) => {
+                titleWidth += (btnEl as HTMLElement).offsetWidth + 1
+              })
+            } else {
+              const labelEl = cellEl.firstChild as HTMLElement
+              titleWidth = labelEl.offsetWidth
+            }
+            if (titleWidth) {
+              colWidth = Math.max(colWidth, Math.ceil(titleWidth) + 4)
             }
           })
           column.renderAutoWidth = colWidth + paddingSize
@@ -2590,7 +2603,7 @@ const Methods = {
     // 兼容老版本
     if (!evntList.length && type === 'event.clearEdit') {
       evntList = interceptor.get('event.clearActived')
-      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      if (process.env.VUE_APP_VXE_ENV === 'development') {
         if (evntList.length) {
           warnLog('vxe.error.delEvent', ['event.clearActived', 'event.clearEdit'])
         }
@@ -2988,12 +3001,6 @@ const Methods = {
                 setCellValue(selected.row, selected.column, null)
                 this.handleEdit(selected.args, evnt)
               }
-              const afterEditMethod = editOpts.afterEditMethod
-              if (afterEditMethod) {
-                this.$nextTick(() => {
-                  afterEditMethod(params)
-                })
-              }
             }
           }
         }
@@ -4394,7 +4401,7 @@ const Methods = {
   },
   // 在 v3 中废弃
   getSortColumn () {
-    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+    if (process.env.VUE_APP_VXE_ENV === 'development') {
       warnLog('vxe.error.delFunc', ['getSortColumn', 'getSortColumns'])
     }
     return XEUtils.find(this.tableFullColumn, column => (column.sortable || column.remoteSort) && column.order)
@@ -4491,7 +4498,7 @@ const Methods = {
     return this.$nextTick()
   },
   reloadExpandContent (row: any) {
-    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+    if (process.env.VUE_APP_VXE_ENV === 'development') {
       warnLog('vxe.error.delFunc', ['reloadExpandContent', 'reloadRowExpand'])
     }
     // 即将废弃
@@ -4653,7 +4660,7 @@ const Methods = {
     return !!rowExpandedMaps[rowid]
   },
   isExpandByRow (row: any) {
-    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+    if (process.env.VUE_APP_VXE_ENV === 'development') {
       warnLog('vxe.error.delFunc', ['isExpandByRow', 'isRowExpandByRow'])
     }
     // 即将废弃
@@ -4770,7 +4777,7 @@ const Methods = {
     return this.$nextTick()
   },
   reloadTreeChilds (row: any) {
-    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+    if (process.env.VUE_APP_VXE_ENV === 'development') {
       warnLog('vxe.error.delFunc', ['reloadTreeChilds', 'reloadTreeExpand'])
     }
     // 即将废弃
@@ -5537,7 +5544,7 @@ const funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,updateFilterOp
 
 funcs.forEach(name => {
   Methods[name] = function (...args: any[]) {
-    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+    if (process.env.VUE_APP_VXE_ENV === 'development') {
       if (!this[`_${name}`]) {
         if ('openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').includes(name)) {
           errLog('vxe.error.reqModule', ['VxeTableExportModule'])