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

package/es/table/module/export/mixin.js

@@ -559,7 +559,7 @@ function downloadFile($xetable, opts, content) {
     saveLocalFile({ filename, type, content }).then(() => {
         if (opts.message !== false) {
             // 检测弹窗模块
-            if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+            if (process.env.NODE_ENV === 'development') {
                 if (!VxeUI.modal) {
                     errLog('vxe.error.reqModule', ['Modal']);
                 }
@@ -777,7 +777,7 @@ function handleImport($xetable, content, opts) {
             }
             if (opts.message !== false) {
                 // 检测弹窗模块
-                if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                if (process.env.NODE_ENV === 'development') {
                     if (!VxeUI.modal) {
                         errLog('vxe.error.reqModule', ['Modal']);
                     }
@@ -793,7 +793,7 @@ function handleImport($xetable, content, opts) {
     }
     else if (opts.message !== false) {
         // 检测弹窗模块
-        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (process.env.NODE_ENV === 'development') {
             if (!VxeUI.modal) {
                 errLog('vxe.error.reqModule', ['Modal']);
             }
@@ -812,7 +812,7 @@ function handleFileImport($xetable, file, opts) {
     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.NODE_ENV === 'development') {
                 if (!VxeUI.modal) {
                     errLog('vxe.error.reqModule', ['Modal']);
                 }
@@ -865,7 +865,7 @@ function handleFileImport($xetable, file, opts) {
         }
         else {
             // 不支持的浏览器
-            if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+            if (process.env.NODE_ENV === 'development') {
                 errLog('vxe.error.notExp');
             }
             _importResolve({ status: true });
@@ -921,7 +921,7 @@ export function readLocalFile(options = {}) {
             else {
                 if (options.message !== false) {
                     // 检测弹窗模块
-                    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                    if (process.env.NODE_ENV === 'development') {
                         if (!VxeUI.modal) {
                             errLog('vxe.error.reqModule', ['Modal']);
                         }
@@ -1239,7 +1239,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.NODE_ENV === 'development') {
                     errLog('vxe.error.notType', [type]);
                 }
                 const params = { status: false };
@@ -1262,7 +1262,7 @@ export default {
                     }
                 }
                 else if (mode === 'all') {
-                    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                    if (process.env.NODE_ENV === 'development') {
                         if (!$xegrid) {
                             warnLog('vxe.error.errProp', ['all', 'mode=current,selected']);
                         }
@@ -1272,7 +1272,7 @@ export default {
                         const ajaxMethods = ajax.queryAll;
                         const queryAllSuccessMethods = ajax.queryAllSuccess;
                         const queryAllErrorMethods = ajax.queryAllError;
-                        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                        if (process.env.NODE_ENV === 'development') {
                             if (!ajaxMethods) {
                                 warnLog('vxe.error.notFunc', ['proxy-config.ajax.queryAll']);
                             }
@@ -1443,7 +1443,7 @@ export default {
         },
         _openExport(options) {
             const { exportOpts } = this;
-            if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+            if (process.env.NODE_ENV === 'development') {
                 if (!this.exportConfig) {
                     errLog('vxe.error.reqProp', ['export-config']);
                 }
@@ -1452,7 +1452,7 @@ export default {
         },
         _openPrint(options) {
             const { printOpts } = this;
-            if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+            if (process.env.NODE_ENV === 'development') {
                 if (!this.printConfig) {
                     errLog('vxe.error.reqProp', ['print-config']);
                 }

package/es/table/module/menu/mixin.js

@@ -110,7 +110,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.NODE_ENV === 'development') {
                                 warnLog('vxe.error.delEvent', [`${typePrefix}cell-context-menu`, `${typePrefix}cell-menu`]);
                             }
                             this.emitEvent(`${typePrefix}cell-context-menu`, params, evnt);
@@ -267,7 +267,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.NODE_ENV === 'development') {
                         warnLog('vxe.error.delEvent', ['context-menu-click', 'menu-click']);
                     }
                     this.emitEvent('context-menu-click', params, evnt);

package/es/table/module/validator/mixin.js

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

package/es/table/render/index.js

@@ -2,32 +2,11 @@ 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';
 const { getConfig, renderer, getI18n } = VxeUI;
-const componentDefaultModelProp = 'modelValue';
+const componentDefaultModelProp = 'value';
 const defaultCompProps = { transfer: true };
-function getModelEvent(renderOpts) {
-    switch (renderOpts.name) {
-        case 'input':
-        case 'textarea':
-            return 'input';
-    }
-    return 'update:modelValue';
-}
-function getChangeEvent(renderOpts) {
-    switch (renderOpts.name) {
-        case 'input':
-        case 'textarea':
-        case 'VxeInput':
-        case 'VxeNumberInput':
-        case 'VxeTextarea':
-        case '$input':
-        case '$textarea':
-            return 'input';
-    }
-    return 'change';
-}
 function parseDate(value, props) {
     return value && props.valueFormat ? XEUtils.toStringDate(value, props.valueFormat) : value;
 }
@@ -36,7 +15,7 @@ function getFormatDate(value, props, defaultFormat) {
     return XEUtils.toDateString(parseDate(value, props), dateConfig.labelFormat || defaultFormat);
 }
 function getLabelFormatDate(value, props) {
-    return getFormatDate(value, props, getI18n(`vxe.input.date.labelFormat.${props.type}`));
+    return getFormatDate(value, props, getI18n(`vxe.input.date.labelFormat.${props.type || 'date'}`));
 }
 /**
  * 已废弃
@@ -110,7 +89,7 @@ function getCellLabelVNs(h, renderOpts, params, cellLabel) {
  * @param modelFunc
  * @param changeFunc
  */
-function getElementOns(renderOpts, params, modelFunc, changeFunc) {
+function getNativeElementOns(renderOpts, params, modelFunc, changeFunc) {
     const { events } = renderOpts;
     const modelEvent = getModelEvent(renderOpts);
     const changeEvent = getChangeEvent(renderOpts);
@@ -220,7 +199,7 @@ function getFilterOns(renderOpts, params, option) {
 function getNativeEditOns(renderOpts, params) {
     const { $table, row, column } = params;
     const { model } = column;
-    return getElementOns(renderOpts, params, (evnt) => {
+    return getNativeElementOns(renderOpts, params, (evnt) => {
         // 处理 model 值双向绑定
         const cellValue = evnt.target.value;
         if (isImmediateCell(renderOpts, params)) {
@@ -237,7 +216,7 @@ function getNativeEditOns(renderOpts, params) {
     });
 }
 function getNativeFilterOns(renderOpts, params, option) {
-    return getElementOns(renderOpts, params, (evnt) => {
+    return getNativeElementOns(renderOpts, params, (evnt) => {
         // 处理 model 值双向绑定
         option.data = evnt.target.value;
     }, () => {
@@ -332,7 +311,7 @@ function renderNativeOptgroups(h, renderOpts, params, renderOptionsMethods) {
     return optionGroups.map((group, gIndex) => {
         return h('optgroup', {
             key: gIndex,
-            props: {
+            attrs: {
                 label: group[groupLabel]
             }
         }, renderOptionsMethods(h, group[groupOptions], renderOpts, params));
@@ -609,15 +588,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);
         },
@@ -626,7 +597,8 @@ renderer.mixin({
         tableFilterDefaultMethod: handleFilterMethod
     },
     VxeTextarea: {
-        tableAutoFocus: 'VxeTextarea'
+        tableAutoFocus: 'textarea',
+        renderTableEdit: defaultEditRender
     },
     VxeButton: {
         renderTableDefault: buttonCellRender
@@ -721,6 +693,19 @@ renderer.mixin({
             ];
         }
     },
+    VxeTextEllipsis: {
+        renderTableDefault(h, renderOpts, params) {
+            const { row, column } = params;
+            const { props } = renderOpts;
+            const cellValue = getCellValue(row, column);
+            return [
+                h(getDefaultComponent(renderOpts), {
+                    props: Object.assign(Object.assign({}, props), { content: cellValue }),
+                    on: getEditOns(renderOpts, params)
+                })
+            ];
+        }
+    },
     // 以下已废弃
     $input: {
         tableAutoFocus: '.vxe-input--inner',

package/es/table/src/body.js

@@ -236,6 +236,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
                 '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/es/table/src/columnInfo.js

@@ -11,7 +11,7 @@ export class ColumnInfo {
         const proxyOpts = $xegrid ? $xegrid.proxyOpts : null;
         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.NODE_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(', ')]);
@@ -39,13 +39,13 @@ 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/es/table/src/methods.js

@@ -95,9 +95,10 @@ function computeVirtualX(_vm) {
     return { toVisibleIndex: 0, visibleSize: 8 };
 }
 function computeVirtualY(_vm) {
-    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;
@@ -382,7 +383,7 @@ const Methods = {
         if (treeConfig) {
             // 树结构自动转换
             if (treeOpts.transform) {
-                if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                if (process.env.NODE_ENV === 'development') {
                     if (!treeOpts.rowField) {
                         errLog('vxe.error.reqProp', ['table.tree-config.rowField']);
                     }
@@ -437,7 +438,7 @@ const Methods = {
         if (keepSource) {
             this.cacheSourceMap(fullData);
         }
-        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (process.env.NODE_ENV === 'development') {
             if (sYLoad) {
                 if (!(this.height || this.maxHeight)) {
                     errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
@@ -571,7 +572,7 @@ const Methods = {
             this.tableData = tableData.slice(0);
         }
         else {
-            if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+            if (process.env.NODE_ENV === 'development') {
                 warnLog('vxe.error.reqProp', ['keep-source']);
             }
         }
@@ -621,7 +622,7 @@ const Methods = {
             this.clearMergeCells();
             this.clearMergeFooterItems();
             this.handleTableData(true);
-            if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+            if (process.env.NODE_ENV === 'development') {
                 if ((this.scrollXLoad || this.scrollYLoad) && this.expandColumn) {
                     warnLog('vxe.error.scrollErrProp', ['column.type=expand']);
                 }
@@ -761,7 +762,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.NODE_ENV === 'development') {
                     if (fullColumnFieldData[field]) {
                         warnLog('vxe.error.colRepet', ['field', field]);
                     }
@@ -775,7 +776,7 @@ const Methods = {
                 htmlColumn = column;
             }
             if (treeNode) {
-                if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                if (process.env.NODE_ENV === 'development') {
                     if (treeNodeColumn) {
                         warnLog('vxe.error.colRepet', ['tree-node', treeNode]);
                     }
@@ -785,7 +786,7 @@ const Methods = {
                 }
             }
             else if (type === 'expand') {
-                if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+                if (process.env.NODE_ENV === 'development') {
                     if (expandColumn) {
                         warnLog('vxe.error.colRepet', ['type', type]);
                     }
@@ -794,7 +795,7 @@ const Methods = {
                     expandColumn = column;
                 }
             }
-            if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+            if (process.env.NODE_ENV === 'development') {
                 if (type === 'checkbox') {
                     if (checkboxColumn) {
                         warnLog('vxe.error.colRepet', ['type', type]);
@@ -812,7 +813,7 @@ const Methods = {
                     }
                 }
             }
-            if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+            if (process.env.NODE_ENV === 'development') {
                 if (this.showOverflow && column.showOverflow === false) {
                     warnLog('vxe.error.errConflicts', [`table.show-overflow=${this.showOverflow}`, `column.show-overflow=${column.showOverflow}`]);
                 }
@@ -823,7 +824,7 @@ const Methods = {
                     warnLog('vxe.error.errConflicts', [`table.show-footer-overflow=${this.showFooterOverflow}`, `column.show-footer-overflow=${column.showFooterOverflow}`]);
                 }
             }
-            if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+            if (process.env.NODE_ENV === 'development') {
                 if (htmlColumn) {
                     if (!columnOpts.useKey) {
                         errLog('vxe.error.reqProp', ['column-config.useKey', 'column.type=html']);
@@ -852,7 +853,7 @@ const Methods = {
         else {
             tableFullColumn.forEach(handleFunc);
         }
-        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (process.env.NODE_ENV === 'development') {
             if (expandColumn && this.mouseOpts.area) {
                 errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
             }
@@ -923,7 +924,7 @@ const Methods = {
     },
     // 在 v3 中废弃
     _getRowIndex(row) {
-        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (process.env.NODE_ENV === 'development') {
             warnLog('vxe.error.delFunc', ['_getRowIndex', 'getVTRowIndex']);
         }
         return this.getVTRowIndex(row);
@@ -937,7 +938,7 @@ const Methods = {
     },
     // 在 v3 中废弃
     $getRowIndex(row) {
-        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (process.env.NODE_ENV === 'development') {
             warnLog('vxe.error.delFunc', ['$getRowIndex', 'getVMRowIndex']);
         }
         return this.getVMRowIndex(row);
@@ -958,7 +959,7 @@ const Methods = {
     },
     // 在 v3 中废弃
     _getColumnIndex(column) {
-        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (process.env.NODE_ENV === 'development') {
             warnLog('vxe.error.delFunc', ['_getColumnIndex', 'getVTColumnIndex']);
         }
         return this.getVTColumnIndex(column);
@@ -972,7 +973,7 @@ const Methods = {
     },
     // 在 v3 中废弃
     $getColumnIndex(column) {
-        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (process.env.NODE_ENV === 'development') {
             warnLog('vxe.error.delFunc', ['$getColumnIndex', 'getVMColumnIndex']);
         }
         return this.getVMColumnIndex(column);
@@ -1060,7 +1061,7 @@ const Methods = {
     revertData(rows, field) {
         const { keepSource, tableSourceData, treeConfig } = this;
         if (!keepSource) {
-            if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+            if (process.env.NODE_ENV === 'development') {
                 warnLog('vxe.error.reqProp', ['keep-source']);
             }
             return this.$nextTick();
@@ -1173,11 +1174,13 @@ 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);
@@ -1387,8 +1390,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) => filterMethod({ value: item.value, option: item, cellValue, row, column, $table: this }));
@@ -1399,8 +1402,8 @@ const Methods = {
                         else if (allFilterMethod) {
                             return allFilterMethod({ options: itemList, values: valueList, cellValue, row, column });
                         }
-                        else if (defaultFilterMethod) {
-                            return itemList.some((item) => defaultFilterMethod({ value: item.value, option: item, cellValue, row, column, $table: this }));
+                        else if (tdFilterMethod) {
+                            return itemList.some((item) => tdFilterMethod({ value: item.value, option: item, cellValue, row, column, $table: this }));
                         }
                         return valueList.indexOf(XEUtils.get(row, field)) > -1;
                     }
@@ -2003,7 +2006,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.NODE_ENV === 'development') {
                 // if (this.showHeader && !this.showHeaderOverflow) {
                 //   warnLog('vxe.error.reqProp', ['show-header-overflow'])
                 // }
@@ -2158,10 +2161,21 @@ const Methods = {
                         paddingSize = Math.floor(XEUtils.toNumber(cellStyle.paddingLeft) + XEUtils.toNumber(cellStyle.paddingRight)) + 2;
                     }
                     let colWidth = column.renderAutoWidth - paddingSize;
-                    XEUtils.arrayEach(cellElList, (cellEl) => {
-                        const labelEl = cellEl.firstChild;
-                        if (labelEl) {
-                            colWidth = Math.max(colWidth, Math.ceil(labelEl.offsetWidth) + 4);
+                    XEUtils.arrayEach(cellElList, (itemEl) => {
+                        const cellEl = itemEl;
+                        const thElem = cellEl.parentNode;
+                        let titleWidth = 0;
+                        if (`${thElem.tagName}`.toLowerCase() === 'th') {
+                            XEUtils.arrayEach(cellEl.children, (btnEl) => {
+                                titleWidth += btnEl.offsetWidth + 1;
+                            });
+                        }
+                        else {
+                            const labelEl = cellEl.firstChild;
+                            titleWidth = labelEl.offsetWidth;
+                        }
+                        if (titleWidth) {
+                            colWidth = Math.max(colWidth, Math.ceil(titleWidth) + 4);
                         }
                     });
                     column.renderAutoWidth = colWidth + paddingSize;
@@ -2587,7 +2601,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.NODE_ENV === 'development') {
                 if (evntList.length) {
                     warnLog('vxe.error.delEvent', ['event.clearActived', 'event.clearEdit']);
                 }
@@ -3012,12 +3026,6 @@ const Methods = {
                                 setCellValue(selected.row, selected.column, null);
                                 this.handleEdit(selected.args, evnt);
                             }
-                            const afterEditMethod = editOpts.afterEditMethod;
-                            if (afterEditMethod) {
-                                this.$nextTick(() => {
-                                    afterEditMethod(params);
-                                });
-                            }
                         }
                     }
                 }
@@ -4457,7 +4465,7 @@ const Methods = {
     },
     // 在 v3 中废弃
     getSortColumn() {
-        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (process.env.NODE_ENV === 'development') {
             warnLog('vxe.error.delFunc', ['getSortColumn', 'getSortColumns']);
         }
         return XEUtils.find(this.tableFullColumn, column => (column.sortable || column.remoteSort) && column.order);
@@ -4554,7 +4562,7 @@ const Methods = {
         return this.$nextTick();
     },
     reloadExpandContent(row) {
-        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (process.env.NODE_ENV === 'development') {
             warnLog('vxe.error.delFunc', ['reloadExpandContent', 'reloadRowExpand']);
         }
         // 即将废弃
@@ -4721,7 +4729,7 @@ const Methods = {
         return !!rowExpandedMaps[rowid];
     },
     isExpandByRow(row) {
-        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (process.env.NODE_ENV === 'development') {
             warnLog('vxe.error.delFunc', ['isExpandByRow', 'isRowExpandByRow']);
         }
         // 即将废弃
@@ -4839,7 +4847,7 @@ const Methods = {
         return this.$nextTick();
     },
     reloadTreeChilds(row) {
-        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (process.env.NODE_ENV === 'development') {
             warnLog('vxe.error.delFunc', ['reloadTreeChilds', 'reloadTreeExpand']);
         }
         // 即将废弃
@@ -5615,7 +5623,7 @@ const Methods = {
 const funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,updateFilterOptionStatus,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,openPrint,getPrintHtml,exportData,openImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom'.split(',');
 funcs.forEach(name => {
     Methods[name] = function (...args) {
-        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (process.env.NODE_ENV === 'development') {
             if (!this[`_${name}`]) {
                 if ('openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').includes(name)) {
                     errLog('vxe.error.reqModule', ['VxeTableExportModule']);