vxe-table 4.10.12 → 4.10.14

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

@@ -38,7 +38,7 @@ hooks.add('tableEditModule', {
                 }
             }
         };
-        function syncActivedCell() {
+        const syncActivedCell = () => {
             const { editStore, tableColumn } = reactData;
             const editOpts = computeEditOpts.value;
             const { actived } = editStore;
@@ -51,8 +51,8 @@ hooks.add('tableEditModule', {
                     setEditColumnModel(row, column);
                 }
             }
-        }
-        function insertTreeRow(newRecords, isAppend) {
+        };
+        const insertTreeRow = (newRecords, isAppend) => {
             const { tableFullTreeData, afterFullData, fullDataRowIdData, fullAllDataRowIdData } = internalData;
             const treeOpts = computeTreeOpts.value;
             const { rowField, parentField, mapChildrenField } = treeOpts;
@@ -93,7 +93,7 @@ hooks.add('tableEditModule', {
                     fullAllDataRowIdData[rowid] = rest;
                 }
             });
-        }
+        };
         const handleInsertRowAt = (records, targetRow, isInsertNextRow) => {
             const { treeConfig } = props;
             const { mergeList, editStore } = reactData;
@@ -325,6 +325,132 @@ hooks.add('tableEditModule', {
                 }
             });
         };
+        const handleEditActive = (params, evnt, isFocus) => {
+            const { editConfig, mouseConfig } = props;
+            const { editStore, tableColumn } = reactData;
+            const editOpts = computeEditOpts.value;
+            const { mode } = editOpts;
+            const { actived, focused } = editStore;
+            const { row, column } = params;
+            const { editRender } = column;
+            const cell = (params.cell || $xeTable.getCellElement(row, column));
+            const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
+            params.cell = cell;
+            if (cell && isEnableConf(editConfig) && isEnableConf(editRender)) {
+                // 激活编辑
+                if (!$xeTable.isPendingByRow(row)) {
+                    if (actived.row !== row || (mode === 'cell' ? actived.column !== column : false)) {
+                        // 判断是否禁用编辑
+                        let type = 'edit-disabled';
+                        if (!beforeEditMethod || beforeEditMethod(Object.assign(Object.assign({}, params), { $table: $xeTable, $grid: $xeTable.xegrid }))) {
+                            if (mouseConfig) {
+                                $xeTable.clearSelected();
+                                if ($xeTable.clearCellAreas) {
+                                    $xeTable.clearCellAreas();
+                                    $xeTable.clearCopyCellArea();
+                                }
+                            }
+                            $xeTable.closeTooltip();
+                            if (actived.column) {
+                                handleClearEdit(evnt);
+                            }
+                            type = 'edit-activated';
+                            column.renderHeight = cell.offsetHeight;
+                            actived.args = params;
+                            actived.row = row;
+                            actived.column = column;
+                            if (mode === 'row') {
+                                tableColumn.forEach((column) => getEditColumnModel(row, column));
+                            }
+                            else {
+                                getEditColumnModel(row, column);
+                            }
+                            const afterEditMethod = editOpts.afterEditMethod;
+                            nextTick(() => {
+                                if (isFocus) {
+                                    $xeTable.handleFocus(params, evnt);
+                                }
+                                if (afterEditMethod) {
+                                    afterEditMethod(Object.assign(Object.assign({}, params), { $table: $xeTable, $grid: $xeTable.xegrid }));
+                                }
+                            });
+                        }
+                        $xeTable.dispatchEvent(type, {
+                            row,
+                            rowIndex: $xeTable.getRowIndex(row),
+                            $rowIndex: $xeTable.getVMRowIndex(row),
+                            column,
+                            columnIndex: $xeTable.getColumnIndex(column),
+                            $columnIndex: $xeTable.getVMColumnIndex(column)
+                        }, evnt);
+                        // v4已废弃
+                        if (type === 'edit-activated') {
+                            $xeTable.dispatchEvent('edit-actived', {
+                                row,
+                                rowIndex: $xeTable.getRowIndex(row),
+                                $rowIndex: $xeTable.getVMRowIndex(row),
+                                column,
+                                columnIndex: $xeTable.getColumnIndex(column),
+                                $columnIndex: $xeTable.getVMColumnIndex(column)
+                            }, evnt);
+                        }
+                    }
+                    else {
+                        const { column: oldColumn } = actived;
+                        if (mouseConfig) {
+                            $xeTable.clearSelected();
+                            if ($xeTable.clearCellAreas) {
+                                $xeTable.clearCellAreas();
+                                $xeTable.clearCopyCellArea();
+                            }
+                        }
+                        if (oldColumn !== column) {
+                            const { model: oldModel } = oldColumn;
+                            if (oldModel.update) {
+                                setCellValue(row, oldColumn, oldModel.value);
+                            }
+                            if ($xeTable.clearValidate) {
+                                $xeTable.clearValidate(row, column);
+                            }
+                        }
+                        column.renderHeight = cell.offsetHeight;
+                        actived.args = params;
+                        actived.column = column;
+                        if (isFocus) {
+                            setTimeout(() => {
+                                $xeTable.handleFocus(params, evnt);
+                            });
+                        }
+                    }
+                    focused.column = null;
+                    focused.row = null;
+                    $xeTable.focus();
+                }
+            }
+            return nextTick();
+        };
+        const handleEditCell = (row, fieldOrColumn, isPos) => {
+            const { editConfig } = props;
+            const column = XEUtils.isString(fieldOrColumn) ? $xeTable.getColumnByField(fieldOrColumn) : fieldOrColumn;
+            if (row && column && isEnableConf(editConfig) && isEnableConf(column.editRender)) {
+                return Promise.resolve(isPos ? $xeTable.scrollToRow(row, column) : null).then(() => {
+                    const cell = $xeTable.getCellElement(row, column);
+                    if (cell) {
+                        handleEditActive({
+                            row,
+                            rowIndex: $xeTable.getRowIndex(row),
+                            column,
+                            columnIndex: $xeTable.getColumnIndex(column),
+                            cell,
+                            $table: $xeTable
+                        }, null, false);
+                        internalData._lastCallTime = Date.now();
+                    }
+                    return nextTick();
+                });
+            }
+            return nextTick();
+        };
         editMethods = {
             /**
              * 往表格中插入临时数据
@@ -658,7 +784,7 @@ hooks.add('tableEditModule', {
                 if (fieldOrColumn) {
                     column = XEUtils.isString(fieldOrColumn) ? $xeTable.getColumnByField(fieldOrColumn) : fieldOrColumn;
                 }
-                return $xeTable.setEditCell(row, column);
+                return handleEditCell(row, column, false);
             },
             setActiveCell(row, fieldOrColumn) {
                 if (process.env.NODE_ENV === 'development') {
@@ -671,26 +797,7 @@ hooks.add('tableEditModule', {
              * 激活单元格编辑
              */
             setEditCell(row, fieldOrColumn) {
-                const { editConfig } = props;
-                const column = XEUtils.isString(fieldOrColumn) ? $xeTable.getColumnByField(fieldOrColumn) : fieldOrColumn;
-                if (row && column && isEnableConf(editConfig) && isEnableConf(column.editRender)) {
-                    return $xeTable.scrollToRow(row, column).then(() => {
-                        const cell = $xeTable.getCellElement(row, column);
-                        if (cell) {
-                            editPrivateMethods.handleEdit({
-                                row,
-                                rowIndex: $xeTable.getRowIndex(row),
-                                column,
-                                columnIndex: $xeTable.getColumnIndex(column),
-                                cell,
-                                $table: $xeTable
-                            });
-                            internalData._lastCallTime = Date.now();
-                        }
-                        return nextTick();
-                    });
-                }
-                return nextTick();
+                return handleEditCell(row, fieldOrColumn, true);
             },
             /**
              * 只对 trigger=dblclick 有效，选中单元格
@@ -721,104 +828,7 @@ hooks.add('tableEditModule', {
              * 处理激活编辑
              */
             handleEdit(params, evnt) {
-                const { editConfig, mouseConfig } = props;
-                const { editStore, tableColumn } = reactData;
-                const editOpts = computeEditOpts.value;
-                const { mode } = editOpts;
-                const { actived, focused } = editStore;
-                const { row, column } = params;
-                const { editRender } = column;
-                const cell = (params.cell || $xeTable.getCellElement(row, column));
-                const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
-                params.cell = cell;
-                if (cell && isEnableConf(editConfig) && isEnableConf(editRender)) {
-                    // 激活编辑
-                    if (!$xeTable.isPendingByRow(row)) {
-                        if (actived.row !== row || (mode === 'cell' ? actived.column !== column : false)) {
-                            // 判断是否禁用编辑
-                            let type = 'edit-disabled';
-                            if (!beforeEditMethod || beforeEditMethod(Object.assign(Object.assign({}, params), { $table: $xeTable, $grid: $xeTable.xegrid }))) {
-                                if (mouseConfig) {
-                                    editMethods.clearSelected();
-                                    if ($xeTable.clearCellAreas) {
-                                        $xeTable.clearCellAreas();
-                                        $xeTable.clearCopyCellArea();
-                                    }
-                                }
-                                $xeTable.closeTooltip();
-                                if (actived.column) {
-                                    handleClearEdit(evnt);
-                                }
-                                type = 'edit-activated';
-                                column.renderHeight = cell.offsetHeight;
-                                actived.args = params;
-                                actived.row = row;
-                                actived.column = column;
-                                if (mode === 'row') {
-                                    tableColumn.forEach((column) => getEditColumnModel(row, column));
-                                }
-                                else {
-                                    getEditColumnModel(row, column);
-                                }
-                                const afterEditMethod = editOpts.afterEditMethod;
-                                nextTick(() => {
-                                    editPrivateMethods.handleFocus(params, evnt);
-                                    if (afterEditMethod) {
-                                        afterEditMethod(Object.assign(Object.assign({}, params), { $table: $xeTable, $grid: $xeTable.xegrid }));
-                                    }
-                                });
-                            }
-                            $xeTable.dispatchEvent(type, {
-                                row,
-                                rowIndex: $xeTable.getRowIndex(row),
-                                $rowIndex: $xeTable.getVMRowIndex(row),
-                                column,
-                                columnIndex: $xeTable.getColumnIndex(column),
-                                $columnIndex: $xeTable.getVMColumnIndex(column)
-                            }, evnt);
-                            // v4已废弃
-                            if (type === 'edit-activated') {
-                                $xeTable.dispatchEvent('edit-actived', {
-                                    row,
-                                    rowIndex: $xeTable.getRowIndex(row),
-                                    $rowIndex: $xeTable.getVMRowIndex(row),
-                                    column,
-                                    columnIndex: $xeTable.getColumnIndex(column),
-                                    $columnIndex: $xeTable.getVMColumnIndex(column)
-                                }, evnt);
-                            }
-                        }
-                        else {
-                            const { column: oldColumn } = actived;
-                            if (mouseConfig) {
-                                editMethods.clearSelected();
-                                if ($xeTable.clearCellAreas) {
-                                    $xeTable.clearCellAreas();
-                                    $xeTable.clearCopyCellArea();
-                                }
-                            }
-                            if (oldColumn !== column) {
-                                const { model: oldModel } = oldColumn;
-                                if (oldModel.update) {
-                                    setCellValue(row, oldColumn, oldModel.value);
-                                }
-                                if ($xeTable.clearValidate) {
-                                    $xeTable.clearValidate(row, column);
-                                }
-                            }
-                            column.renderHeight = cell.offsetHeight;
-                            actived.args = params;
-                            actived.column = column;
-                            setTimeout(() => {
-                                editPrivateMethods.handleFocus(params, evnt);
-                            });
-                        }
-                        focused.column = null;
-                        focused.row = null;
-                        $xeTable.focus();
-                    }
-                }
-                return nextTick();
+                return handleEditActive(params, evnt, true);
             },
             /**
              * @deprecated

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

@@ -3,6 +3,7 @@ import XEUtils from 'xe-utils';
 import { VxeUI } from '../../../ui';
 import { isColumnInfo, mergeBodyMethod, getCellValue } from '../../src/util';
 import { parseFile, formatText, eqEmptyValue } from '../../../ui/src/utils';
+import { hasClass } from '../../../ui/src/dom';
 import { createHtmlPage, getExportBlobByContent } from './util';
 import { warnLog, errLog } from '../../../ui/src/log';
 const { getI18n, hooks, renderer } = VxeUI;
@@ -357,7 +358,7 @@ hooks.add('tableExportModule', {
                                             }
                                             else {
                                                 const cell = $xeTable.getCellElement(row, column);
-                                                if (cell) {
+                                                if (cell && !hasClass(cell, 'is--progress')) {
                                                     cellValue = cell.innerText.trim();
                                                 }
                                             }
@@ -418,7 +419,7 @@ hooks.add('tableExportModule', {
                                     }
                                     else {
                                         const cell = $xeTable.getCellElement(row, column);
-                                        if (cell) {
+                                        if (cell && !hasClass(cell, 'is--progress')) {
                                             cellValue = cell.innerText.trim();
                                         }
                                     }

package/es/table/src/body.js

@@ -364,6 +364,7 @@ export default defineComponent({
                         'fixed--width': !isAutoCellWidth,
                         'fixed--hidden': fixedHiddenColumn,
                         'is--padding': isCellPadding,
+                        'is--progress': (fixedHiddenColumn && isAllOverflow) || isVNPreEmptyStatus,
                         'is--drag-cell': isRowDragCell && (isCrossDrag || isPeerDrag || !rowLevel),
                         'is--drag-disabled': isDisabledDrag,
                         'col--dirty': isDirty,

package/es/table/src/table.js

@@ -1540,12 +1540,12 @@ export default defineComponent({
             const sortOpts = computeSortOpts.value;
             const treeOpts = computeTreeOpts.value;
             const childrenField = treeOpts.children || treeOpts.childrenField;
-            const { transform } = treeOpts;
+            const { transform, rowField, parentField, mapChildrenField } = treeOpts;
             const { remote: allRemoteFilter, filterMethod: allFilterMethod } = filterOpts;
             const { remote: allRemoteSort, sortMethod: allSortMethod, multiple: sortMultiple, chronological } = sortOpts;
             let tableData = [];
             let tableTree = [];
-            // 处理列
+            // 处理数据
             if (!allRemoteFilter || !allRemoteSort) {
                 const filterColumns = [];
                 let orderColumns = [];
@@ -1601,7 +1601,7 @@ export default defineComponent({
                         tableTree = XEUtils.searchTree(tableFullTreeData, handleFilter, {
                             original: true,
                             isEvery: true,
-                            children: treeOpts.mapChildrenField,
+                            children: mapChildrenField,
                             mapChildren: childrenField
                         });
                         tableData = tableTree;
@@ -1617,7 +1617,7 @@ export default defineComponent({
                         tableTree = XEUtils.searchTree(tableFullTreeData, () => true, {
                             original: true,
                             isEvery: true,
-                            children: treeOpts.mapChildrenField,
+                            children: mapChildrenField,
                             mapChildren: childrenField
                         });
                         tableData = tableTree;
@@ -1637,7 +1637,15 @@ export default defineComponent({
                             tableTree = XEUtils.isArray(sortRests) ? sortRests : tableTree;
                         }
                         else {
-                            tableTree = XEUtils.orderBy(tableTree, orderColumns.map(({ column, order }) => [getOrderField(column), order]));
+                            const treeList = XEUtils.toTreeArray(tableTree, {
+                                children: mapChildrenField
+                            });
+                            tableTree = XEUtils.toArrayTree(XEUtils.orderBy(treeList, orderColumns.map(({ column, order }) => [getOrderField(column), order])), {
+                                key: rowField,
+                                parentKey: parentField,
+                                children: childrenField,
+                                mapChildren: mapChildrenField
+                            });
                         }
                         tableData = tableTree;
                     }
@@ -8500,6 +8508,7 @@ export default defineComponent({
                 }
             },
             triggerBodyScrollEvent(evnt, fixedType) {
+                const { scrollYLoad, scrollXLoad } = reactData;
                 const { elemStore, intoRunScroll, lastScrollTop, lastScrollLeft, inWheelScroll, inVirtualScroll, inHeaderScroll, inBodyScroll, scrollRenderType, inFooterScroll } = internalData;
                 const xHandleEl = refScrollXHandleElem.value;
                 const yHandleEl = refScrollYHandleElem.value;
@@ -8558,13 +8567,17 @@ export default defineComponent({
                         setScrollTop(rightScrollElem, scrollTop);
                     }
                     setScrollTop(yHandleEl, scrollTop);
-                    $xeTable.triggerScrollYEvent(evnt);
+                    if (scrollYLoad) {
+                        $xeTable.triggerScrollYEvent(evnt);
+                    }
                 }
                 if (isRollX) {
                     setScrollLeft(xHandleEl, scrollLeft);
                     setScrollLeft(headerScrollElem, scrollLeft);
                     setScrollLeft(footerScrollElem, scrollLeft);
-                    $xeTable.triggerScrollXEvent(evnt);
+                    if (scrollXLoad) {
+                        $xeTable.triggerScrollXEvent(evnt);
+                    }
                 }
                 $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
                     type: 'body',
@@ -8572,6 +8585,7 @@ export default defineComponent({
                 });
             },
             triggerHeaderScrollEvent(evnt, fixedType) {
+                const { scrollXLoad } = reactData;
                 const { elemStore, intoRunScroll, inWheelScroll, inVirtualScroll, inBodyScroll, inFooterScroll } = internalData;
                 const yHandleEl = refScrollYHandleElem.value;
                 const xHandleEl = refScrollXHandleElem.value;
@@ -8601,13 +8615,16 @@ export default defineComponent({
                 setScrollLeft(xHandleEl, scrollLeft);
                 setScrollLeft(footerScrollElem, scrollLeft);
                 setScrollLeft(bodyScrollElem, scrollLeft);
-                $xeTable.triggerScrollXEvent(evnt);
+                if (scrollXLoad) {
+                    $xeTable.triggerScrollXEvent(evnt);
+                }
                 $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
                     type: 'header',
                     fixed: fixedType
                 });
             },
             triggerFooterScrollEvent(evnt, fixedType) {
+                const { scrollXLoad } = reactData;
                 const { elemStore, intoRunScroll, inWheelScroll, inVirtualScroll, inHeaderScroll, inBodyScroll } = internalData;
                 const yHandleEl = refScrollYHandleElem.value;
                 const xHandleEl = refScrollXHandleElem.value;
@@ -8637,7 +8654,9 @@ export default defineComponent({
                 setScrollLeft(xHandleEl, scrollLeft);
                 setScrollLeft(headerScrollElem, scrollLeft);
                 setScrollLeft(bodyScrollElem, scrollLeft);
-                $xeTable.triggerScrollXEvent(evnt);
+                if (scrollXLoad) {
+                    $xeTable.triggerScrollXEvent(evnt);
+                }
                 $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
                     type: 'footer',
                     fixed: fixedType
@@ -8649,6 +8668,7 @@ export default defineComponent({
                     return;
                 }
                 const { highlightHoverRow } = tableProps;
+                const { scrollYLoad } = reactData;
                 const { elemStore, lastScrollTop, lastScrollLeft } = internalData;
                 const rowOpts = computeRowOpts.value;
                 const xHandleEl = refScrollXHandleElem.value;
@@ -8691,7 +8711,9 @@ export default defineComponent({
                         setScrollTop(bodyScrollElem, currTopNum);
                         setScrollTop(leftScrollElem, currTopNum);
                         setScrollTop(rightScrollElem, currTopNum);
-                        $xeTable.triggerScrollYEvent(evnt);
+                        if (scrollYLoad) {
+                            $xeTable.triggerScrollYEvent(evnt);
+                        }
                         $xeTable.handleScrollEvent(evnt, isRollY, isRollX, currTopNum, scrollLeft, {
                             type: 'table',
                             fixed: ''
@@ -8710,6 +8732,7 @@ export default defineComponent({
                 }
             },
             triggerVirtualScrollXEvent(evnt) {
+                const { scrollXLoad } = reactData;
                 const { elemStore, inWheelScroll, lastScrollTop, inHeaderScroll, inBodyScroll, inFooterScroll } = internalData;
                 if (inHeaderScroll || inBodyScroll || inFooterScroll) {
                     return;
@@ -8734,13 +8757,16 @@ export default defineComponent({
                 setScrollLeft(bodyScrollElem, scrollLeft);
                 setScrollLeft(headerScrollElem, scrollLeft);
                 setScrollLeft(footerScrollElem, scrollLeft);
-                $xeTable.triggerScrollXEvent(evnt);
+                if (scrollXLoad) {
+                    $xeTable.triggerScrollXEvent(evnt);
+                }
                 $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
                     type: 'table',
                     fixed: ''
                 });
             },
             triggerVirtualScrollYEvent(evnt) {
+                const { scrollYLoad } = reactData;
                 const { elemStore, inWheelScroll, lastScrollLeft, inHeaderScroll, inBodyScroll, inFooterScroll } = internalData;
                 if (inHeaderScroll || inBodyScroll || inFooterScroll) {
                     return;
@@ -8765,7 +8791,9 @@ export default defineComponent({
                 setScrollTop(bodyScrollElem, scrollTop);
                 setScrollTop(leftScrollElem, scrollTop);
                 setScrollTop(rightScrollElem, scrollTop);
-                $xeTable.triggerScrollYEvent(evnt);
+                if (scrollYLoad) {
+                    $xeTable.triggerScrollYEvent(evnt);
+                }
                 $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
                     type: 'table',
                     fixed: ''

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.10.12";
+export const version = "4.10.14";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"4.10.12"}`;
+const version = `table v${"4.10.14"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);