vxe-table 3.11.35 → 3.11.37

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

@@ -46,8 +46,7 @@ function insertTreeRow(_vm, newRecords, isAppend) {
         }
     });
 }
-function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
-    const $xeTable = _vm;
+function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
     const props = $xeTable;
     const reactData = $xeTable;
     const internalData = $xeTable;
@@ -60,11 +59,11 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
     if (!XEUtils.isArray(records)) {
         records = [records];
     }
-    const newRecords = _vm.defineField(records.map(record => Object.assign(treeConfig && transform ? { [mapChildrenField]: [], [childrenField]: [] } : {}, record)));
-    if (XEUtils.eqNull(row)) {
+    const newRecords = $xeTable.defineField(records.map(record => Object.assign(treeConfig && transform ? { [mapChildrenField]: [], [childrenField]: [] } : {}, record)));
+    if (XEUtils.eqNull(targetRow)) {
         // 如果为虚拟树
         if (treeConfig && transform) {
-            insertTreeRow(_vm, newRecords, false);
+            insertTreeRow($xeTable, newRecords, false);
         }
         else {
             newRecords.forEach(item => {
@@ -85,10 +84,10 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
         }
     }
     else {
-        if (row === -1) {
+        if (targetRow === -1) {
             // 如果为虚拟树
             if (treeConfig && transform) {
-                insertTreeRow(_vm, newRecords, true);
+                insertTreeRow($xeTable, newRecords, true);
             }
             else {
                 newRecords.forEach(item => {
@@ -111,14 +110,14 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
         else {
             // 如果为虚拟树
             if (treeConfig && transform) {
-                const matchMapObj = XEUtils.findTree(tableFullTreeData, (item) => row[rowField] === item[rowField], { children: mapChildrenField });
+                const matchMapObj = XEUtils.findTree(tableFullTreeData, (item) => targetRow[rowField] === item[rowField], { children: mapChildrenField });
                 if (matchMapObj) {
                     const { parent: parentRow } = matchMapObj;
                     const parentMapChilds = parentRow ? parentRow[mapChildrenField] : tableFullTreeData;
-                    const parentRest = fullAllDataRowIdData[getRowid(_vm, parentRow)];
+                    const parentRest = fullAllDataRowIdData[getRowid($xeTable, parentRow)];
                     const parentLevel = parentRest ? parentRest.level : 0;
                     newRecords.forEach((item, i) => {
-                        const rowid = getRowid(_vm, item);
+                        const rowid = getRowid($xeTable, item);
                         if (process.env.NODE_ENV === 'development') {
                             if (item[treeOpts.parentField]) {
                                 if (parentRow && item[treeOpts.parentField] !== parentRow[rowField]) {
@@ -140,7 +139,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
                     });
                     // 源
                     if (parentRow) {
-                        const matchObj = XEUtils.findTree(tableFullTreeData, (item) => row[rowField] === item[rowField], { children: childrenField });
+                        const matchObj = XEUtils.findTree(tableFullTreeData, (item) => targetRow[rowField] === item[rowField], { children: childrenField });
                         if (matchObj) {
                             const parentChilds = matchObj.items;
                             let targetIndex = matchObj.index;
@@ -155,7 +154,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
                     if (process.env.NODE_ENV === 'development') {
                         warnLog('vxe.error.unableInsert');
                     }
-                    insertTreeRow(_vm, newRecords, true);
+                    insertTreeRow($xeTable, newRecords, true);
                 }
             }
             else {
@@ -164,13 +163,13 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
                 }
                 let afIndex = -1;
                 // 如果是可视索引
-                if (XEUtils.isNumber(row)) {
-                    if (row < afterFullData.length) {
-                        afIndex = row;
+                if (XEUtils.isNumber(targetRow)) {
+                    if (targetRow < afterFullData.length) {
+                        afIndex = targetRow;
                     }
                 }
                 else {
-                    afIndex = _vm.findRowIndexOf(afterFullData, row);
+                    afIndex = $xeTable.findRowIndexOf(afterFullData, targetRow);
                 }
                 // 如果是插入指定行的下一行
                 if (isInsertNextRow) {
@@ -180,7 +179,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
                     throw new Error(errLog('vxe.error.unableInsert'));
                 }
                 afterFullData.splice(afIndex, 0, ...newRecords);
-                tableFullData.splice(_vm.findRowIndexOf(tableFullData, row), 0, ...newRecords);
+                tableFullData.splice($xeTable.findRowIndexOf(tableFullData, targetRow), 0, ...newRecords);
                 // 刷新单元格合并
                 mergeList.forEach((mergeItem) => {
                     const { row: mergeRowIndex, rowspan: mergeRowspan } = mergeItem;
@@ -199,20 +198,20 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
         const rowid = getRowid($xeTable, newRow);
         insertMaps[rowid] = newRow;
     });
-    _vm.cacheRowMap();
-    _vm.updateScrollYStatus();
-    _vm.handleTableData(treeConfig && transform);
+    $xeTable.cacheRowMap();
+    $xeTable.updateScrollYStatus();
+    $xeTable.handleTableData(treeConfig && transform);
     if (!(treeConfig && transform)) {
-        _vm.updateAfterDataIndex();
+        $xeTable.updateAfterDataIndex();
     }
-    _vm.updateFooter();
-    _vm.checkSelectionStatus();
-    if (_vm.scrollYLoad) {
-        _vm.updateScrollYSpace();
+    $xeTable.updateFooter();
+    $xeTable.checkSelectionStatus();
+    if ($xeTable.scrollYLoad) {
+        $xeTable.updateScrollYSpace();
     }
-    return _vm.$nextTick().then(() => {
-        _vm.updateCellAreas();
-        return _vm.recalculate();
+    return $xeTable.$nextTick().then(() => {
+        $xeTable.updateCellAreas();
+        return $xeTable.recalculate();
     }).then(() => {
         return {
             row: newRecords.length ? newRecords[newRecords.length - 1] : null,
@@ -220,6 +219,22 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
         };
     });
 }
+function handleInsertChildRowAt($xeTable, records, parentRow, targetRow, isInsertNextRow) {
+    const props = $xeTable;
+    const { treeConfig } = props;
+    const treeOpts = $xeTable.computeTreeOpts;
+    const { transform, rowField, parentField } = treeOpts;
+    if (treeConfig && transform) {
+        if (!XEUtils.isArray(records)) {
+            records = [records];
+        }
+        return handleInsertRowAt($xeTable, records.map((item) => Object.assign({}, item, { [parentField]: parentRow[rowField] })), targetRow, isInsertNextRow);
+    }
+    else {
+        errLog('vxe.error.errProp', ['tree-config.treeConfig=false', 'tree-config.treeConfig=true']);
+    }
+    return Promise.resolve({ row: null, rows: [] });
+}
 export default {
     methods: {
         /**
@@ -236,14 +251,23 @@ export default {
          * 如果 row 为 -1 则从插入到底部
          * 如果 row 为有效行则插入到该行的位置
          * @param {Object/Array} records 新的数据
-         * @param {Row} row 指定行
+         * @param {Row} targetRow 指定行
          * @returns
          */
-        _insertAt(records, row) {
-            return handleInsertRowAt(this, records, row);
+        _insertAt(records, targetRow) {
+            return handleInsertRowAt(this, records, targetRow);
+        },
+        _insertNextAt(records, targetRow) {
+            return handleInsertRowAt(this, records, targetRow, true);
+        },
+        _insertChild(records, parentRow) {
+            return handleInsertChildRowAt(this, records, parentRow, null);
+        },
+        _insertChildAt(records, parentRow, targetRow) {
+            return handleInsertChildRowAt(this, records, parentRow, targetRow);
         },
-        _insertNextAt(records, row) {
-            return handleInsertRowAt(this, records, row, true);
+        _insertChildNextAt(records, parentRow, targetRow) {
+            return handleInsertChildRowAt(this, records, parentRow, targetRow, true);
         },
         /**
          * 删除指定行数据

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

@@ -1,7 +1,7 @@
 import XEUtils from 'xe-utils';
 import { VxeUI } from '../../../ui';
 import { isColumnInfo, mergeBodyMethod, getCellValue } from '../../src/util';
-import { parseFile, formatText } from '../../../ui/src/utils';
+import { parseFile, formatText, eqEmptyValue } from '../../../ui/src/utils';
 import { browse } from '../../../ui/src/dom';
 import { createHtmlPage, getExportBlobByContent } from './util';
 import { warnLog, errLog } from '../../../ui/src/log';
@@ -54,9 +54,12 @@ function toTableBorder(border) {
 function toBooleanValue(cellValue) {
     return XEUtils.isBoolean(cellValue) ? (cellValue ? 'TRUE' : 'FALSE') : cellValue;
 }
-function getBodyLabelData($xetable, opts, columns, datas) {
+const toStringValue = (cellValue) => {
+    return eqEmptyValue(cellValue) ? '' : `${cellValue}`;
+};
+function getBodyLabelData($xeTable, opts, columns, datas) {
     const { isAllExpand, mode } = opts;
-    const { treeConfig, treeOpts, radioOpts, checkboxOpts, columnOpts } = $xetable;
+    const { treeConfig, treeOpts, radioOpts, checkboxOpts, columnOpts } = $xeTable;
     const childrenField = treeOpts.children || treeOpts.childrenField;
     if (!htmlCellElem) {
         htmlCellElem = document.createElement('div');
@@ -68,13 +71,13 @@ function getBodyLabelData($xetable, opts, columns, datas) {
         XEUtils.eachTree(datas, (item, $rowIndex, items, path, parent, nodes) => {
             const row = item._row || item;
             const parentRow = parent && parent._row ? parent._row : parent;
-            if ((isAllExpand || !parentRow || (expandMaps.has(parentRow) && $xetable.isTreeExpandByRow(parentRow)))) {
-                const hasRowChild = hasTreeChildren($xetable, row);
+            if ((isAllExpand || !parentRow || (expandMaps.has(parentRow) && $xeTable.isTreeExpandByRow(parentRow)))) {
+                const hasRowChild = hasTreeChildren($xeTable, row);
                 const item = {
                     _row: row,
                     _level: nodes.length - 1,
                     _hasChild: hasRowChild,
-                    _expand: hasRowChild && $xetable.isTreeExpandByRow(row)
+                    _expand: hasRowChild && $xeTable.isTreeExpandByRow(row)
                 };
                 columns.forEach((column, $columnIndex) => {
                     let cellValue = '';
@@ -90,22 +93,22 @@ function getBodyLabelData($xetable, opts, columns, datas) {
                         bodyExportMethod = columnOpts.exportMethod;
                     }
                     if (bodyExportMethod) {
-                        cellValue = bodyExportMethod({ $table: $xetable, row, column, options: opts });
+                        cellValue = bodyExportMethod({ $table: $xeTable, row, column, options: opts });
                     }
                     else {
                         switch (column.type) {
                             case 'seq': {
                                 const seqValue = path.map((num, i) => i % 2 === 0 ? (Number(num) + 1) : '.').join('');
-                                cellValue = mode === 'all' ? seqValue : getSeq($xetable, seqValue, row, $rowIndex, column, $columnIndex);
+                                cellValue = mode === 'all' ? seqValue : getSeq($xeTable, seqValue, row, $rowIndex, column, $columnIndex);
                                 break;
                             }
                             case 'checkbox':
-                                cellValue = toBooleanValue($xetable.isCheckedByCheckboxRow(row));
+                                cellValue = toBooleanValue($xeTable.isCheckedByCheckboxRow(row));
                                 item._checkboxLabel = checkboxOpts.labelField ? XEUtils.get(row, checkboxOpts.labelField) : '';
                                 item._checkboxDisabled = checkboxOpts.checkMethod && !checkboxOpts.checkMethod({ row });
                                 break;
                             case 'radio':
-                                cellValue = toBooleanValue($xetable.isCheckedByRadioRow(row));
+                                cellValue = toBooleanValue($xeTable.isCheckedByRadioRow(row));
                                 item._radioLabel = radioOpts.labelField ? XEUtils.get(row, radioOpts.labelField) : '';
                                 item._radioDisabled = radioOpts.checkMethod && !radioOpts.checkMethod({ row });
                                 break;
@@ -114,13 +117,13 @@ function getBodyLabelData($xetable, opts, columns, datas) {
                                     cellValue = getCellValue(row, column);
                                 }
                                 else {
-                                    cellValue = $xetable.getCellLabel(row, column);
+                                    cellValue = $xeTable.getCellLabel(row, column);
                                     if (column.type === 'html') {
                                         htmlCellElem.innerHTML = cellValue;
                                         cellValue = htmlCellElem.innerText.trim();
                                     }
                                     else {
-                                        const cell = $xetable.getCellElement(row, column);
+                                        const cell = $xeTable.getCellElement(row, column);
                                         if (cell) {
                                             cellValue = cell.innerText.trim();
                                         }
@@ -128,7 +131,7 @@ function getBodyLabelData($xetable, opts, columns, datas) {
                                 }
                         }
                     }
-                    item[column.id] = XEUtils.toValueString(cellValue);
+                    item[column.id] = toStringValue(cellValue);
                 });
                 expandMaps.set(row, 1);
                 rest.push(Object.assign(item, row));
@@ -154,22 +157,22 @@ function getBodyLabelData($xetable, opts, columns, datas) {
                 bodyExportMethod = columnOpts.exportMethod;
             }
             if (bodyExportMethod) {
-                cellValue = bodyExportMethod({ $table: $xetable, row, column, options: opts });
+                cellValue = bodyExportMethod({ $table: $xeTable, row, column, options: opts });
             }
             else {
                 switch (column.type) {
                     case 'seq': {
                         const seqValue = $rowIndex + 1;
-                        cellValue = mode === 'all' ? seqValue : getSeq($xetable, seqValue, row, $rowIndex, column, $columnIndex);
+                        cellValue = mode === 'all' ? seqValue : getSeq($xeTable, seqValue, row, $rowIndex, column, $columnIndex);
                         break;
                     }
                     case 'checkbox':
-                        cellValue = toBooleanValue($xetable.isCheckedByCheckboxRow(row));
+                        cellValue = toBooleanValue($xeTable.isCheckedByCheckboxRow(row));
                         item._checkboxLabel = checkboxOpts.labelField ? XEUtils.get(row, checkboxOpts.labelField) : '';
                         item._checkboxDisabled = checkboxOpts.checkMethod && !checkboxOpts.checkMethod({ row });
                         break;
                     case 'radio':
-                        cellValue = toBooleanValue($xetable.isCheckedByRadioRow(row));
+                        cellValue = toBooleanValue($xeTable.isCheckedByRadioRow(row));
                         item._radioLabel = radioOpts.labelField ? XEUtils.get(row, radioOpts.labelField) : '';
                         item._radioDisabled = radioOpts.checkMethod && !radioOpts.checkMethod({ row });
                         break;
@@ -178,13 +181,13 @@ function getBodyLabelData($xetable, opts, columns, datas) {
                             cellValue = getCellValue(row, column);
                         }
                         else {
-                            cellValue = $xetable.getCellLabel(row, column);
+                            cellValue = $xeTable.getCellLabel(row, column);
                             if (column.type === 'html') {
                                 htmlCellElem.innerHTML = cellValue;
                                 cellValue = htmlCellElem.innerText.trim();
                             }
                             else {
-                                const cell = $xetable.getCellElement(row, column);
+                                const cell = $xeTable.getCellElement(row, column);
                                 if (cell) {
                                     cellValue = cell.innerText.trim();
                                 }
@@ -192,7 +195,7 @@ function getBodyLabelData($xetable, opts, columns, datas) {
                         }
                 }
             }
-            item[column.id] = XEUtils.toValueString(cellValue);
+            item[column.id] = toStringValue(cellValue);
         });
         return item;
     });

package/es/table/src/body.js

@@ -285,7 +285,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
             getClass(className, params),
             getClass(allCellClassName, params)
         ],
-        key: columnKey || columnOpts.useKey || rowOpts.useKey || columnOpts.drag ? column.id : $columnIndex,
+        key: columnKey || scrollXLoad || scrollYLoad || columnOpts.useKey || rowOpts.useKey || columnOpts.drag ? column.id : $columnIndex,
         attrs,
         style: Object.assign({
             height: cellHeight
@@ -296,7 +296,7 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
 function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
     const columnOpts = $xeTable.computeColumnOpts;
     const columnDragOpts = $xeTable.computeColumnDragOpts;
-    const { stripe, rowKey, highlightHoverRow, rowClassName, rowStyle, editConfig, showOverflow: allColumnOverflow, treeConfig, treeOpts, expandOpts, editOpts, treeExpandedMaps, scrollYLoad, rowExpandedMaps, radioOpts, checkboxOpts, expandColumn, hasFixedColumn, fullAllDataRowIdData, rowOpts, pendingRowMaps, isDragColMove } = $xeTable;
+    const { stripe, rowKey, highlightHoverRow, rowClassName, rowStyle, editConfig, showOverflow: allColumnOverflow, treeConfig, treeOpts, expandOpts, editOpts, treeExpandedMaps, scrollXLoad, scrollYLoad, rowExpandedMaps, radioOpts, checkboxOpts, expandColumn, hasFixedColumn, fullAllDataRowIdData, rowOpts, pendingRowMaps, isDragColMove } = $xeTable;
     const { transform, seqMode } = treeOpts;
     const childrenField = treeOpts.children || treeOpts.childrenField;
     const rows = [];
@@ -391,7 +391,7 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
                     rowid
                 },
                 style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(params) : rowStyle) : null,
-                key: rowKey || rowOpts.useKey || rowOpts.drag || columnOpts.drag || treeConfig ? rowid : $rowIndex,
+                key: rowKey || scrollXLoad || scrollYLoad || rowOpts.useKey || rowOpts.drag || columnOpts.drag || treeConfig ? rowid : $rowIndex,
                 nativeOn: trOn
             }, tdVNs)
             : h('tr', {
@@ -400,7 +400,7 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
                     rowid
                 },
                 style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(params) : rowStyle) : null,
-                key: rowKey || rowOpts.useKey || rowOpts.drag || columnOpts.drag || treeConfig ? rowid : $rowIndex,
+                key: rowKey || scrollXLoad || scrollYLoad || rowOpts.useKey || rowOpts.drag || columnOpts.drag || treeConfig ? rowid : $rowIndex,
                 on: trOn
             }, tdVNs));
         // 如果行被展开了

package/es/table/src/footer.js

@@ -19,7 +19,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
 }
 function renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex, _rowIndex) {
     const { $parent: $xetable, fixedType } = _vm;
-    const { $listeners: tableListeners, footerCellClassName, footerCellStyle, footerAlign: allFooterAlign, mergeFooterList, footerSpanMethod, align: allAlign, scrollXLoad, columnKey, columnOpts, showFooterOverflow: allColumnFooterOverflow, currentColumn, overflowX, scrollbarWidth, tooltipOpts } = $xetable;
+    const { $listeners: tableListeners, footerCellClassName, footerCellStyle, footerAlign: allFooterAlign, mergeFooterList, footerSpanMethod, align: allAlign, scrollXLoad, columnKey, columnOpts, showFooterOverflow: allColumnFooterOverflow, currentColumn, overflowX, scrollYLoad, scrollbarWidth, tooltipOpts } = $xetable;
     return tableColumn.map((column, $columnIndex) => {
         const { type, showFooterOverflow, footerAlign, align, footerClassName, editRender, cellRender } = column;
         const renderOpts = editRender || cellRender;
@@ -128,7 +128,7 @@ function renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex, _rowIn
             attrs,
             style: footerCellStyle ? (XEUtils.isFunction(footerCellStyle) ? footerCellStyle(cellParams) : footerCellStyle) : null,
             on: tfOns,
-            key: columnKey || columnOpts.useKey || columnOpts.drag ? column.id : $columnIndex
+            key: columnKey || scrollXLoad || scrollYLoad || columnOpts.useKey || columnOpts.drag ? column.id : $columnIndex
         }, [
             h('div', {
                 class: ['vxe-cell', {
@@ -158,6 +158,7 @@ function renderHeads(h, _vm, footerTableData) {
         const rowParams = { $table: $xetable, row, _rowIndex, $rowIndex, fixed: fixedType, type: renderType };
         if (columnOpts.drag && columnDragOpts.animation) {
             return h('transition-group', {
+                key: $rowIndex,
                 props: {
                     tag: 'tr',
                     name: `vxe-header--col-list${isDragColMove ? '' : '-disabled'}`,
@@ -170,6 +171,7 @@ function renderHeads(h, _vm, footerTableData) {
             }, renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex, _rowIndex));
         }
         return h('tr', {
+            key: $rowIndex,
             class: [
                 'vxe-footer--row',
                 footerRowClassName ? XEUtils.isFunction(footerRowClassName) ? footerRowClassName(rowParams) : footerRowClassName : ''

package/es/table/src/header.js

@@ -9,7 +9,7 @@ const renderRows = (h, _vm, cols, $rowIndex) => {
     const $xeTable = _vm.$parent;
     const $xeGrid = $xeTable.xegrid;
     const { fixedType } = _vm;
-    const { resizable: allResizable, border, columnKey, headerCellClassName, headerCellStyle, showHeaderOverflow: allColumnHeaderOverflow, headerAlign: allHeaderAlign, align: allAlign, currentColumn, scrollXLoad, overflowX, scrollbarWidth, mouseConfig, columnOpts } = $xeTable;
+    const { resizable: allResizable, border, columnKey, headerCellClassName, headerCellStyle, showHeaderOverflow: allColumnHeaderOverflow, headerAlign: allHeaderAlign, align: allAlign, currentColumn, scrollXLoad, scrollYLoad, overflowX, scrollbarWidth, mouseConfig, columnOpts } = $xeTable;
     const columnDragOpts = $xeTable.computeColumnDragOpts;
     const { disabledMethod: dragDisabledMethod } = columnDragOpts;
     return cols.map((column, $columnIndex) => {
@@ -81,7 +81,7 @@ const renderRows = (h, _vm, cols, $rowIndex) => {
             attrs: thAttrs,
             style: headerCellStyle ? (XEUtils.isFunction(headerCellStyle) ? headerCellStyle(params) : headerCellStyle) : null,
             on: thOns,
-            key: columnKey || columnOpts.useKey || columnOpts.drag || isColGroup ? colid : $columnIndex
+            key: columnKey || scrollXLoad || scrollYLoad || columnOpts.useKey || columnOpts.drag || isColGroup ? colid : $columnIndex
         }, [
             h('div', {
                 class: ['vxe-cell', {
@@ -125,6 +125,7 @@ function renderHeads(h, _vm, headerGroups) {
         const params = { $table: $xeTable, $rowIndex, fixed: fixedType, type: cellType };
         if (columnOpts.drag && columnDragOpts.animation) {
             return h('transition-group', {
+                key: $rowIndex,
                 props: {
                     tag: 'tr',
                     name: `vxe-header--col-list${isDragColMove ? '' : '-disabled'}`,
@@ -137,6 +138,7 @@ function renderHeads(h, _vm, headerGroups) {
             }, renderRows(h, _vm, cols, $rowIndex));
         }
         return h('tr', {
+            key: $rowIndex,
             class: [
                 'vxe-header--row',
                 headerRowClassName ? XEUtils.isFunction(headerRowClassName) ? headerRowClassName(params) : headerRowClassName : ''

package/es/table/src/methods.js

@@ -6728,7 +6728,7 @@ const Methods = {
         const internalData = $xeTable;
         const { lyTimeout, lyRunTime, scrollYStore } = internalData;
         const { visibleSize } = scrollYStore;
-        const fpsTime = Math.min(80, Math.floor(visibleSize * 2));
+        const fpsTime = Math.min(80, Math.floor(visibleSize));
         if (lyTimeout) {
             clearTimeout(lyTimeout);
         }
@@ -7378,7 +7378,7 @@ const Methods = {
     }
 };
 // Module methods
-const funcs = 'setFilter,openFilter,clearFilter,saveFilterPanel,resetFilterPanel,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,fullValidateField,validateField,openExport,closeExport,openPrint,closePrint,getPrintHtml,exportData,openImport,closeImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom,saveCustom,cancelCustom,resetCustom,toggleCustomAllCheckbox,setCustomAllCheckbox'.split(',');
+const funcs = 'setFilter,openFilter,clearFilter,saveFilterPanel,resetFilterPanel,getCheckedFilters,updateFilterOptionStatus,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,insertChild,insertChildAt,insertChildNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,fullValidateField,validateField,openExport,closeExport,openPrint,closePrint,getPrintHtml,exportData,openImport,closeImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom,saveCustom,cancelCustom,resetCustom,toggleCustomAllCheckbox,setCustomAllCheckbox'.split(',');
 funcs.forEach(name => {
     Methods[name] = function (...args) {
         if (process.env.NODE_ENV === 'development') {

package/es/table/src/table.js

@@ -708,8 +708,10 @@ export default {
             }
             return false;
         },
-        tableBorder() {
-            const { border } = this;
+        computeTableBorder() {
+            const $xeTable = this;
+            const props = $xeTable;
+            const { border } = props;
             if (border === true) {
                 return 'full';
             }
@@ -1160,11 +1162,12 @@ export default {
         const VxeUITooltipComponent = VxeUI.getComponent('VxeTooltip');
         const $xeTable = this;
         const $xeGrid = $xeTable.$xeGrid;
-        const { _e, $scopedSlots, tId, isCalcColumn, tableData, tableColumn, tableGroupColumn, isGroup, loading, stripe, showHeader, height, tableBorder, treeOpts, treeConfig, mouseConfig, mouseOpts, areaOpts, computeSize, validOpts, showFooter, overflowX, overflowY, scrollXLoad, scrollYLoad, scrollbarHeight, highlightCell, highlightHoverRow, highlightHoverColumn, editConfig, validTipOpts, initStore, columnStore, filterStore, customStore, ctxMenuStore, ctxMenuOpts, footerTableData, columnOpts, rowOpts, checkboxOpts, loadingOpts, resizableOpts, editRules } = $xeTable;
+        const { _e, $scopedSlots, tId, isCalcColumn, tableData, tableColumn, tableGroupColumn, isGroup, loading, stripe, showHeader, height, treeOpts, treeConfig, mouseConfig, mouseOpts, areaOpts, computeSize, validOpts, showFooter, overflowX, overflowY, scrollXLoad, scrollYLoad, scrollbarHeight, highlightCell, highlightHoverRow, highlightHoverColumn, editConfig, validTipOpts, initStore, columnStore, filterStore, customStore, ctxMenuStore, ctxMenuOpts, footerTableData, columnOpts, rowOpts, checkboxOpts, loadingOpts, resizableOpts, editRules } = $xeTable;
         const { leftList, rightList } = columnStore;
         const loadingSlot = $scopedSlots.loading;
         const currLoading = this._isLoading || loading;
         const vSize = computeSize;
+        const tableBorder = $xeTable.computeTableBorder;
         const virtualScrollBars = $xeTable.computeVirtualScrollBars;
         const isArea = mouseConfig && mouseOpts.area;
         const tableStyle = $xeTable.computeTableStyle;

package/es/table/style.css

@@ -1772,22 +1772,6 @@
 .vxe-footer--column.fixed--width > .vxe-cell .vxe-ico-picker {
   width: 100%;
 }
-.vxe-header--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-input,
-.vxe-header--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-textarea,
-.vxe-header--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-select,
-.vxe-header--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-tree-select,
-.vxe-header--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-date-picker,
-.vxe-header--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-number-input,
-.vxe-header--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-ico-picker,
-.vxe-footer--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-input,
-.vxe-footer--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-textarea,
-.vxe-footer--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-select,
-.vxe-footer--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-tree-select,
-.vxe-footer--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-date-picker,
-.vxe-footer--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-number-input,
-.vxe-footer--column.fixed--width > .vxe-cell .vxe-cell--tree-node .vxe-ico-picker {
-  width: 100%;
-}
 
 .vxe-body--column.fixed--width > .vxe-cell > .vxe-default-input, .vxe-body--column.fixed--width > .vxe-cell > .vxe-default-textarea, .vxe-body--column.fixed--width > .vxe-cell > .vxe-default-select {
   width: 100%;
@@ -1795,6 +1779,9 @@
 .vxe-body--column.fixed--width > .vxe-cell > .vxe-input, .vxe-body--column.fixed--width > .vxe-cell > .vxe-textarea, .vxe-body--column.fixed--width > .vxe-cell > .vxe-select, .vxe-body--column.fixed--width > .vxe-cell > .vxe-tree-select, .vxe-body--column.fixed--width > .vxe-cell > .vxe-date-picker, .vxe-body--column.fixed--width > .vxe-cell > .vxe-number-input, .vxe-body--column.fixed--width > .vxe-cell > .vxe-ico-picker {
   width: 100%;
 }
+.vxe-body--column.fixed--width > .vxe-cell > .vxe-cell--tree-node .vxe-default-input,
+.vxe-body--column.fixed--width > .vxe-cell > .vxe-cell--tree-node .vxe-default-textarea,
+.vxe-body--column.fixed--width > .vxe-cell > .vxe-cell--tree-node .vxe-default-select,
 .vxe-body--column.fixed--width > .vxe-cell > .vxe-cell--tree-node .vxe-input,
 .vxe-body--column.fixed--width > .vxe-cell > .vxe-cell--tree-node .vxe-textarea,
 .vxe-body--column.fixed--width > .vxe-cell > .vxe-cell--tree-node .vxe-select,
@@ -1811,15 +1798,6 @@
 .vxe-table--filter-template > .vxe-input, .vxe-table--filter-template > .vxe-textarea, .vxe-table--filter-template > .vxe-select, .vxe-table--filter-template > .vxe-tree-select, .vxe-table--filter-template > .vxe-date-picker, .vxe-table--filter-template > .vxe-number-input, .vxe-table--filter-template > .vxe-ico-picker {
   width: 100%;
 }
-.vxe-table--filter-template > .vxe-cell--tree-node .vxe-input,
-.vxe-table--filter-template > .vxe-cell--tree-node .vxe-textarea,
-.vxe-table--filter-template > .vxe-cell--tree-node .vxe-select,
-.vxe-table--filter-template > .vxe-cell--tree-node .vxe-tree-select,
-.vxe-table--filter-template > .vxe-cell--tree-node .vxe-date-picker,
-.vxe-table--filter-template > .vxe-cell--tree-node .vxe-number-input,
-.vxe-table--filter-template > .vxe-cell--tree-node .vxe-ico-picker {
-  width: 100%;
-}
 
 .vxe-cell .vxe-default-input,
 .vxe-cell .vxe-default-textarea,