vxe-table 3.21.17 → 3.21.19

package/es/table/module/custom/panel.js

@@ -1188,8 +1188,11 @@ export default {
                         const resizeParams = {
                             $table: $xeTable,
                             column,
-                            columnIndex: index,
-                            $columnIndex: index,
+                            columnIndex: $xeTable.getColumnIndex(column),
+                            $columnIndex: $xeTable.getVMColumnIndex(column),
+                            _columnIndex: $xeTable.getVTColumnIndex(column),
+                            rowIndex: -1,
+                            _rowIndex: -1,
                             $rowIndex: -1
                         };
                         if (reMinWidth) {

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

@@ -780,16 +780,28 @@ export default {
             const props = $xeTable;
             const internalData = $xeTable;
             const { keepSource, treeConfig } = props;
-            const { tableFullData } = internalData;
+            const { tableFullData, tableFullTreeData } = internalData;
             const treeOpts = $xeTable.computeTreeOpts;
+            const updateRecords = [];
             if (keepSource) {
                 syncActivedCell($xeTable);
                 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;
         },
         /**
          * 处理激活编辑

package/es/table/src/columnInfo.js

@@ -152,11 +152,11 @@ export class ColumnInfo {
             // 跨列
             colSpan: 1,
             // 数据排序
-            order: null,
-            sortTime: 0,
+            order: null, // 用于记录排序类型，升序和倒序
+            sortTime: 0, // 用于多列的先后顺序
             // 列排序
-            sortNumber: 0,
-            renderSortNumber: 0,
+            sortNumber: 0, // 用于记录自定义列顺序
+            renderSortNumber: 0, // 用于记录自定义列顺序
             renderAggFn: '',
             renderAggDigits: null,
             renderAggFormat: null,
@@ -166,9 +166,9 @@ export class ColumnInfo {
             renderHeight: 0,
             renderResizeWidth: 0,
             renderAutoWidth: 0,
-            resizeWidth: 0,
+            resizeWidth: 0, // 手动调整
             renderLeft: 0,
-            renderArgs: [],
+            renderArgs: [], // 渲染参数可用于扩展
             model: {},
             renderHeader: renderHeader || colConfs.renderHeader,
             renderCell: renderCell || colConfs.renderCell,

package/es/table/src/footer.js

@@ -194,17 +194,17 @@ function renderHeads(h, _vm, isOptimizeMode, renderColumnList) {
     const tableProps = $xeTable;
     const { fixedType, footerTableData } = props;
     const { footerRowClassName, footerRowStyle } = tableProps;
-    return footerTableData.map((row, $rowIndex) => {
-        const _rowIndex = $rowIndex;
-        const rowParams = { $table: $xeTable, row, _rowIndex, $rowIndex, fixed: fixedType, type: renderType };
+    return footerTableData.map((row, _rowIndex) => {
+        const $rowIndex = _rowIndex;
+        const rowParams = { $table: $xeTable, row, rowIndex: _rowIndex, _rowIndex, $rowIndex, fixed: fixedType, type: renderType };
         return h('tr', {
-            key: $rowIndex,
+            key: _rowIndex,
             class: [
                 'vxe-footer--row',
                 footerRowClassName ? XEUtils.isFunction(footerRowClassName) ? footerRowClassName(rowParams) : footerRowClassName : ''
             ],
             style: footerRowStyle ? (XEUtils.isFunction(footerRowStyle) ? footerRowStyle(rowParams) : footerRowStyle) : undefined
-        }, renderRows(h, _vm, isOptimizeMode, renderColumnList, footerTableData, row, $rowIndex, _rowIndex));
+        }, renderRows(h, _vm, isOptimizeMode, renderColumnList, footerTableData, row, _rowIndex, _rowIndex));
     });
 }
 export default {

package/es/table/src/header.js

@@ -7,7 +7,7 @@ import { getSlotVNs } from '../../ui/src/vn';
 const { renderer, renderEmptyElement } = VxeUI;
 const sourceType = 'table';
 const renderType = 'header';
-function renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, $rowIndex, cols) {
+function renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, _rowIndex, cols) {
     const props = _vm;
     const $xeTable = _vm.$parent;
     const $xeGrid = $xeTable.$xeGrid;
@@ -27,7 +27,7 @@ function renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, $rowIndex, co
     const headerCellOpts = $xeTable.computeHeaderCellOpts;
     const currCellHeight = getCalcHeight(headerCellOpts.height) || defaultRowHeight;
     const { disabledMethod: dragDisabledMethod, isCrossDrag, isPeerDrag } = columnDragOpts;
-    const isLastRow = $rowIndex === headerGroups.length - 1;
+    const isLastRow = _rowIndex === headerGroups.length - 1;
     return cols.map((column, $columnIndex) => {
         const { type, showHeaderOverflow, headerAlign, align, filters, headerClassName, editRender, cellRender } = column;
         // const { enabled } = tooltipOpts
@@ -56,7 +56,9 @@ function renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, $rowIndex, co
             $table: $xeTable,
             $grid: $xeGrid,
             $gantt: $xeGantt,
-            $rowIndex,
+            rowIndex: _rowIndex,
+            _rowIndex,
+            $rowIndex: _rowIndex,
             column,
             columnIndex,
             $columnIndex,
@@ -78,7 +80,7 @@ function renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, $rowIndex, co
             thAttrs.rowspan = column.rowSpan > 1 ? column.rowSpan : null;
         }
         if (mergeHeadFlag && mergeHeaderList.length && (showCustomHeader || isLastRow)) {
-            const spanRest = mergeHeaderCellMaps[`${$rowIndex}:${showCustomHeader ? $columnIndex : _columnIndex}`];
+            const spanRest = mergeHeaderCellMaps[`${_rowIndex}:${showCustomHeader ? $columnIndex : _columnIndex}`];
             if (spanRest) {
                 const { rowspan, colspan } = spanRest;
                 if (!rowspan || !colspan) {
@@ -317,16 +319,16 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups, renderColumn
     const { fixedType } = props;
     const { headerRowClassName, headerRowStyle } = tableProps;
     const floatingFilterOpts = $xeTable.computeFloatingFilterOpts;
-    const rowVNs = headerGroups.map((cols, $rowIndex) => {
-        const params = { $table: $xeTable, $rowIndex, fixed: fixedType, type: renderType };
+    const rowVNs = headerGroups.map((cols, _rowIndex) => {
+        const params = { $table: $xeTable, rowIndex: _rowIndex, _rowIndex, $rowIndex: _rowIndex, fixed: fixedType, type: renderType };
         return h('tr', {
-            key: $rowIndex,
+            key: _rowIndex,
             class: [
                 'vxe-header--row',
                 headerRowClassName ? XEUtils.isFunction(headerRowClassName) ? headerRowClassName(params) : headerRowClassName : ''
             ],
             style: headerRowStyle ? (XEUtils.isFunction(headerRowStyle) ? headerRowStyle(params) : headerRowStyle) : undefined
-        }, renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, $rowIndex, cols));
+        }, renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, _rowIndex, cols));
     });
     if (floatingFilterOpts.enabled) {
         rowVNs.push(h('tr', {

package/es/table/src/methods.js

@@ -17,16 +17,20 @@ const maxYHeight = 5e6;
 const maxXWidth = 5e6;
 const sourceType = 'table';
 let crossTableDragRowObj = null;
-function eqCellValue(row1, row2, field) {
-    const val1 = XEUtils.get(row1, field);
-    const val2 = XEUtils.get(row2, field);
+function 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;
     }
-    if (XEUtils.isString(val1) || XEUtils.isNumber(val1)) {
-        return ('' + val1) === ('' + val2);
+    else if (XEUtils.isString(val1) || XEUtils.isNumber(val1)) {
+        result = ('' + val1) === ('' + val2);
     }
-    return XEUtils.isEqual(val1, val2);
+    else {
+        result = XEUtils.isEqual(val1, val2);
+    }
+    return { newValue: val1, oldValue: val2, result };
 }
 function hangleStorageDefaultValue(value, isAll) {
     return XEUtils.isBoolean(value) ? value : isAll;
@@ -5815,18 +5819,60 @@ const tableMethods = {
             }
             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 $xeTable = this;
+        const props = $xeTable;
+        const internalData = $xeTable;
+        const { keepSource, treeConfig } = props;
+        const { tableFullData, tableFullTreeData, fullDataRowIdData, sourceDataRowIdData, fullColumnFieldData } = internalData;
+        const treeOpts = $xeTable.computeTreeOpts;
+        const keepFields = $xeTable.computeKeepFields;
+        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;
     },
     /**
      * 获取表格的可视列，也可以指定索引获取列
@@ -9534,7 +9580,13 @@ const tableMethods = {
                 }
                 if (editOpts.trigger === 'manual') {
                     if (actived.args && actived.row === row && column !== actived.column) {
-                        handleChangeCell($xeTable, evnt, params);
+                        if (editOpts.mode === 'row') {
+                            handleChangeCell($xeTable, evnt, params);
+                        }
+                        else {
+                            checkValidate($xeTable, 'blur')
+                                .catch((e) => e);
+                        }
                     }
                 }
                 else if (!actived.args || row !== actived.row || column !== actived.column) {
@@ -11191,7 +11243,7 @@ const tableMethods = {
                 style: null,
                 options: [],
                 column: null,
-                multiple: false,
+                multiple: false, // 选项是覅多选
                 visible: false
             });
         }

package/es/table/src/table.js

@@ -1921,8 +1921,7 @@ export default {
             }
             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('vxe.error.errProp', ['show-overflow=true', 'show-overflow=title']);

package/es/ui/index.js

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

package/es/ui/src/log.js

@@ -1,13 +1,14 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const tableVersion = `table v${"3.21.17"}`;
+const tableVersion = `table v${"3.21.19"}`;
 export 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)
     };
 }
 export const warnLog = log.create('warn', tableVersion);