vxe-table 4.19.18 → 4.19.20

package/dist/all.esm.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 export { VxeUI } from '@vxe-ui/core';
-import XEUtils, { isNaN as isNaN$1 } from 'xe-utils';
+import XEUtils from 'xe-utils';
 import DomZIndex from 'dom-zindex';
 import { defineComponent, watch, reactive, h, ref, inject, createCommentVNode, onMounted, onUnmounted, provide, nextTick, TransitionGroup, computed, Teleport, resolveComponent, onActivated, onDeactivated, onBeforeUnmount } from 'vue';
 
@@ -44,7 +44,7 @@ function eqEmptyValue(cellValue) {
     return cellValue === '' || XEUtils.eqNull(cellValue);
 }
 
-const version = "4.19.18";
+const version = "4.19.20";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -743,14 +743,15 @@ function wheelScrollTopTo(diffNum, cb) {
 }
 
 const { log } = VxeUI;
-const tableVersion = `table v${"4.19.18"}`;
+const tableVersion = `table v${"4.19.20"}`;
 function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
     const designVersion = VxeUI.designVersion ? `design v${VxeUI.designVersion}` : '';
+    const versionInfo = [uiVersion, tableVersion, ganttVersion, designVersion].join(' ');
     return {
-        warnLog: log.create('warn', uiVersion + tableVersion + ganttVersion + designVersion + '] [' + name),
-        errLog: log.create('error', uiVersion + tableVersion + ganttVersion + designVersion + '] [' + name)
+        warnLog: log.create('warn', versionInfo + '] [' + name),
+        errLog: log.create('error', versionInfo + '] [' + name)
     };
 }
 log.create('warn', tableVersion);
@@ -9911,16 +9912,28 @@ hooks$5.add('tableEditModule', {
              */
             getUpdateRecords() {
                 const { keepSource, treeConfig } = props;
-                const { tableFullData } = internalData;
+                const { tableFullData, tableFullTreeData } = internalData;
                 const treeOpts = computeTreeOpts.value;
+                const updateRecords = [];
                 if (keepSource) {
                     syncActivedCell();
                     if (treeConfig) {
-                        return XEUtils.filterTree(tableFullData, row => $xeTable.isUpdateByRow(row), treeOpts);
+                        const childrenField = treeOpts.children || treeOpts.childrenField;
+                        XEUtils.eachTree(tableFullTreeData, row => {
+                            if ($xeTable.isUpdateByRow(row)) {
+                                updateRecords.push(row);
+                            }
+                        }, { children: childrenField });
+                    }
+                    else {
+                        tableFullData.forEach((row) => {
+                            if ($xeTable.isUpdateByRow(row)) {
+                                updateRecords.push(row);
+                            }
+                        });
                     }
-                    return tableFullData.filter((row) => $xeTable.isUpdateByRow(row));
                 }
-                return [];
+                return updateRecords;
             },
             getActiveRecord() {
                 warnLog$5('vxe.error.delFunc', ['getActiveRecord', 'getEditCell']);
@@ -15711,16 +15724,20 @@ var VxeTableComponent = defineVxeComponent({
             // 已废弃
             xegrid: $xeGrid
         };
-        const eqCellValue = (row1, row2, field) => {
-            const val1 = XEUtils.get(row1, field);
-            const val2 = XEUtils.get(row2, field);
+        const eqCellValue = (newRow, oldRow, field) => {
+            const val1 = XEUtils.get(newRow, field);
+            const val2 = XEUtils.get(oldRow, field);
+            let result = false;
             if (eqEmptyValue(val1) && eqEmptyValue(val2)) {
-                return true;
+                result = true;
+            }
+            else if (XEUtils.isString(val1) || XEUtils.isNumber(val1)) {
+                result = ('' + val1) === ('' + val2);
             }
-            if (XEUtils.isString(val1) || XEUtils.isNumber(val1)) {
-                return ('' + val1) === ('' + val2);
+            else {
+                result = XEUtils.isEqual(val1, val2);
             }
-            return XEUtils.isEqual(val1, val2);
+            return { newValue: val1, oldValue: val2, result };
         };
         const handleKeyField = () => {
             const keyField = computeRowField.value;
@@ -16958,7 +16975,7 @@ var VxeTableComponent = defineVxeComponent({
                         cellValue = $xeTable.getCellLabel(row, column);
                     }
                     if (!sortType || sortType === 'auto') {
-                        return isNaN$1(cellValue) ? cellValue : XEUtils.toNumber(cellValue);
+                        return eqEmptyValue(cellValue) || isNaN(cellValue) ? cellValue : XEUtils.toNumber(cellValue);
                     }
                     else if (sortType === 'number') {
                         return XEUtils.toNumber(cellValue);
@@ -16977,7 +16994,7 @@ var VxeTableComponent = defineVxeComponent({
                         cellValue = $xeTable.getCellLabel(row, column);
                     }
                     if (!sortType || sortType === 'auto') {
-                        return isNaN$1(cellValue) ? cellValue : XEUtils.toNumber(cellValue);
+                        return eqEmptyValue(cellValue) || isNaN(cellValue) ? cellValue : XEUtils.toNumber(cellValue);
                     }
                     else if (sortType === 'number') {
                         return XEUtils.toNumber(cellValue);
@@ -20549,18 +20566,57 @@ var VxeTableComponent = defineVxeComponent({
                     }
                     const row = rowRest.row;
                     const oRow = sourceDataRowIdData[rowid];
-                    if (oRow) {
-                        if (arguments.length > 1) {
-                            return !eqCellValue(oRow, row, field);
+                    if (!oRow) {
+                        return false;
+                    }
+                    if (arguments.length > 1) {
+                        return !eqCellValue(oRow, row, field).result;
+                    }
+                    for (let i = 0; i < keepFields.length; i++) {
+                        if (!eqCellValue(oRow, row, keepFields[i]).result) {
+                            return true;
+                        }
+                    }
+                }
+                return false;
+            },
+            getUpdateCells() {
+                const { keepSource, treeConfig } = props;
+                const { tableFullData, tableFullTreeData, fullDataRowIdData, sourceDataRowIdData, fullColumnFieldData } = internalData;
+                const treeOpts = computeTreeOpts.value;
+                const keepFields = computeKeepFields.value;
+                const cellList = [];
+                if (keepSource) {
+                    const { handleGetRowId } = createHandleGetRowId($xeTable);
+                    const handleCell = (item) => {
+                        const rowid = handleGetRowId(item);
+                        const rowRest = fullDataRowIdData[rowid];
+                        // 新增的数据不需要检测
+                        if (!rowRest) {
+                            return;
+                        }
+                        const row = rowRest.row;
+                        const oRow = sourceDataRowIdData[rowid];
+                        if (!oRow) {
+                            return;
                         }
                         for (let i = 0; i < keepFields.length; i++) {
-                            if (!eqCellValue(oRow, row, keepFields[i])) {
-                                return true;
+                            const field = keepFields[i];
+                            const { result, newValue, oldValue } = eqCellValue(oRow, row, field);
+                            if (!result) {
+                                const column = fullColumnFieldData[field] ? fullColumnFieldData[field].column : null;
+                                cellList.push({ row, rowid, column, field, newValue, oldValue });
                             }
                         }
+                    };
+                    if (treeConfig) {
+                        XEUtils.eachTree(tableFullTreeData, handleCell, treeOpts);
+                    }
+                    else {
+                        tableFullData.forEach(handleCell);
                     }
                 }
-                return false;
+                return cellList;
             },
             /**
              * 获取表格的可视列，也可以指定索引获取列
@@ -29464,8 +29520,7 @@ var VxeTableComponent = defineVxeComponent({
             }
             if ((props.showOverflow === true || props.showOverflow === 'tooltip') ||
                 (props.showHeaderOverflow === true || props.showHeaderOverflow === 'tooltip') ||
-                (props.showFooterOverflow === true || props.showFooterOverflow === 'tooltip') ||
-                props.tooltipConfig || props.editRules) {
+                (props.showFooterOverflow === true || props.showFooterOverflow === 'tooltip')) {
                 if (!VxeUITooltipComponent) {
                     if (props.showOverflow === true) {
                         errLog$2('vxe.error.errProp', ['show-overflow=true', 'show-overflow=title']);
@@ -30117,7 +30172,7 @@ var VxeToolbarComponent = defineVxeComponent({
 const { warnLog, errLog } = createComponentLog('grid');
 const { getConfig, getI18n, commands, hooks, useFns, createEvent, globalEvents, GLOBAL_EVENT_KEYS, renderEmptyElement } = VxeUI;
 const tableComponentPropKeys = Object.keys(tableProps);
-const tableComponentMethodKeys = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'setRow', 'createData', 'createRow', 'revertData', 'clearData', 'isRemoveByRow', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getFullColumns', 'getData', 'getCheckboxRecords', 'getParentRow', 'getTreeRowChildren', 'getTreeRowLevel', 'getTreeParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'getFullData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'recalcRowHeight', 'setRowHeightConf', 'getRowHeightConf', 'setRowHeight', 'getRowHeight', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'setCheckboxRowKey', 'isCheckedByCheckboxRow', 'isCheckedByCheckboxRowKey', 'isIndeterminateByCheckboxRow', 'isIndeterminateByCheckboxRowKey', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'isCheckedByRadioRowKey', 'setRadioRow', 'setRadioRowKey', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'setPendingRow', 'togglePendingRow', 'hasPendingByRow', 'isPendingByRow', 'getPendingRecords', 'clearPendingRow', 'setFilterByEvent', 'sort', 'setSort', 'setSortByEvent', 'clearSort', 'clearSortByEvent', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'clearFilterByEvent', 'isActiveFilterByColumn', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'isRowExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'getScrollData', 'scrollTo', 'scrollToStartRow', 'scrollToEndRow', 'scrollToRow', 'scrollToStartColumn', 'scrollToEndColumn', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'setMergeHeaderCells', 'removeMergeHeaderCells', 'getMergeHeaderCells', 'clearMergeHeaderCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'setCustomStoreData', 'getCustomStoreData', 'setRowGroupExpand', 'setRowGroupExpandByField', 'setAllRowGroupExpand', 'clearRowGroupExpand', 'isRowGroupExpandByRow', 'isRowGroupRecord', 'isAggregateRecord', 'isAggregateExpandByRow', 'getAggregateContentByRow', 'getAggregateRowChildren', 'setRowGroups', 'clearRowGroups', 'openTooltip', 'moveColumnTo', 'moveRowTo', 'getCellLabel', 'updateCellLabel', 'clearFormatterCache', 'getFooterCellLabel', 'updateFooterCellLabel', 'clearFooterFormatterCache', 'undo', 'redo', 'effectCellData', 'getCellElement', 'focus', 'blur', 'connect', 'connectToolbar'];
+const tableComponentMethodKeys = ['clearAll', 'syncData', 'updateData', 'loadData', 'reloadData', 'reloadRow', 'loadColumn', 'reloadColumn', 'getRowNode', 'getColumnNode', 'getRowIndex', 'getVTRowIndex', 'getVMRowIndex', 'getColumnIndex', 'getVTColumnIndex', 'getVMColumnIndex', 'setRow', 'createData', 'createRow', 'revertData', 'clearData', 'isRemoveByRow', 'isInsertByRow', 'isUpdateByRow', 'getColumns', 'getColumnById', 'getColumnByField', 'getTableColumn', 'getFullColumns', 'getData', 'getCheckboxRecords', 'getParentRow', 'getTreeRowChildren', 'getTreeRowLevel', 'getTreeParentRow', 'getRowSeq', 'getRowById', 'getRowid', 'getTableData', 'getFullData', 'setColumnFixed', 'clearColumnFixed', 'setColumnWidth', 'getColumnWidth', 'recalcRowHeight', 'setRowHeightConf', 'getRowHeightConf', 'setRowHeight', 'getRowHeight', 'hideColumn', 'showColumn', 'resetColumn', 'refreshColumn', 'refreshScroll', 'recalculate', 'closeTooltip', 'isAllCheckboxChecked', 'isAllCheckboxIndeterminate', 'getCheckboxIndeterminateRecords', 'setCheckboxRow', 'setCheckboxRowKey', 'isCheckedByCheckboxRow', 'isCheckedByCheckboxRowKey', 'isIndeterminateByCheckboxRow', 'isIndeterminateByCheckboxRowKey', 'toggleCheckboxRow', 'setAllCheckboxRow', 'getRadioReserveRecord', 'clearRadioReserve', 'getCheckboxReserveRecords', 'clearCheckboxReserve', 'toggleAllCheckboxRow', 'clearCheckboxRow', 'setCurrentRow', 'isCheckedByRadioRow', 'isCheckedByRadioRowKey', 'setRadioRow', 'setRadioRowKey', 'clearCurrentRow', 'clearRadioRow', 'getCurrentRecord', 'getRadioRecord', 'getCurrentColumn', 'setCurrentColumn', 'clearCurrentColumn', 'setPendingRow', 'togglePendingRow', 'hasPendingByRow', 'isPendingByRow', 'getPendingRecords', 'clearPendingRow', 'setFilterByEvent', 'sort', 'setSort', 'setSortByEvent', 'clearSort', 'clearSortByEvent', 'isSort', 'getSortColumns', 'closeFilter', 'isFilter', 'clearFilterByEvent', 'isActiveFilterByColumn', 'isRowExpandLoaded', 'clearRowExpandLoaded', 'reloadRowExpand', 'reloadRowExpand', 'toggleRowExpand', 'setAllRowExpand', 'setRowExpand', 'isExpandByRow', 'isRowExpandByRow', 'clearRowExpand', 'clearRowExpandReserve', 'getRowExpandRecords', 'getTreeExpandRecords', 'isTreeExpandLoaded', 'clearTreeExpandLoaded', 'reloadTreeExpand', 'reloadTreeChilds', 'toggleTreeExpand', 'setAllTreeExpand', 'setTreeExpand', 'isTreeExpandByRow', 'clearTreeExpand', 'clearTreeExpandReserve', 'getScroll', 'getScrollData', 'scrollTo', 'scrollToStartRow', 'scrollToEndRow', 'scrollToRow', 'scrollToStartColumn', 'scrollToEndColumn', 'scrollToColumn', 'clearScroll', 'updateFooter', 'updateStatus', 'setMergeCells', 'removeInsertRow', 'removeMergeCells', 'getMergeCells', 'setMergeHeaderCells', 'removeMergeHeaderCells', 'getMergeHeaderCells', 'clearMergeHeaderCells', 'clearMergeCells', 'setMergeFooterItems', 'removeMergeFooterItems', 'getMergeFooterItems', 'clearMergeFooterItems', 'setCustomStoreData', 'getCustomStoreData', 'setRowGroupExpand', 'setRowGroupExpandByField', 'setAllRowGroupExpand', 'clearRowGroupExpand', 'isRowGroupExpandByRow', 'isRowGroupRecord', 'isAggregateRecord', 'isAggregateExpandByRow', 'getAggregateContentByRow', 'getAggregateRowChildren', 'setRowGroups', 'clearRowGroups', 'openTooltip', 'moveColumnTo', 'moveRowTo', 'getCellLabel', 'updateCellLabel', 'clearFormatterCache', 'getFooterCellLabel', 'updateFooterCellLabel', 'clearFooterFormatterCache', 'getUpdateCells', 'undo', 'redo', 'effectCellData', 'getCellElement', 'focus', 'blur', 'connect', 'connectToolbar'];
 function createReactData() {
     var _a;
     return {