vxe-table 4.19.17 → 4.19.18

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

@@ -1022,8 +1022,11 @@ export default defineVxeComponent({
                         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/src/columnInfo.js

@@ -141,11 +141,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,
@@ -155,9 +155,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/emits.js

@@ -15,7 +15,7 @@ export const tableEmits = [
     'columns-change',
     'data-change',
     'footer-data-change',
-    'current-change',
+    'current-change', // 已废弃
     'current-row-change',
     'current-row-disabled',
     'current-column-change',
@@ -49,7 +49,7 @@ export const tableEmits = [
     'filter-visible',
     'clear-filter',
     'clear-all-filter',
-    'resizable-change',
+    'resizable-change', // 废弃
     'column-resizable-change',
     'row-resizable-change',
     'toggle-row-group-expand',
@@ -67,7 +67,7 @@ export const tableEmits = [
     'column-dragend',
     'enter-append-row',
     'tab-append-row',
-    'edit-actived',
+    'edit-actived', // 废弃
     'edit-activated',
     'edit-disabled',
     'valid-error',
@@ -78,7 +78,7 @@ export const tableEmits = [
     'custom-visible-all',
     'custom-fixed-change',
     'custom-sort-change',
-    'change-fnr',
+    'change-fnr', // 废弃
     'open-fnr',
     'show-fnr',
     'hide-fnr',

package/es/table/src/footer.js

@@ -206,17 +206,17 @@ export default defineVxeComponent({
         const renderHeads = (isOptimizeMode, renderColumnList) => {
             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) : null
-                }, renderRows(isOptimizeMode, renderColumnList, footerTableData, row, $rowIndex, _rowIndex));
+                }, renderRows(isOptimizeMode, renderColumnList, footerTableData, row, _rowIndex, _rowIndex));
             });
         };
         const renderVN = () => {

package/es/table/src/header.js

@@ -48,7 +48,7 @@ export default defineVxeComponent({
                 $xeTable.dispatchEvent('columns-change', { visibleColgroups, collectColumn, visibleColumn }, null);
             });
         };
-        const renderRows = (isGroup, isOptimizeMode, headerGroups, $rowIndex, cols) => {
+        const renderRows = (isGroup, isOptimizeMode, headerGroups, _rowIndex, cols) => {
             const $xeGrid = $xeTable.xeGrid;
             const $xeGantt = $xeTable.xeGantt;
             const { fixedType } = props;
@@ -63,7 +63,7 @@ export default defineVxeComponent({
             const headerCellOpts = computeHeaderCellOpts.value;
             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 colid = column.id;
@@ -91,7 +91,9 @@ export default defineVxeComponent({
                     $table: $xeTable,
                     $grid: $xeGrid,
                     $gantt: $xeGantt,
-                    $rowIndex,
+                    rowIndex: _rowIndex,
+                    _rowIndex,
+                    $rowIndex: _rowIndex,
                     column,
                     columnIndex,
                     $columnIndex,
@@ -113,7 +115,7 @@ export default defineVxeComponent({
                     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) {
@@ -331,16 +333,16 @@ export default defineVxeComponent({
             const { fixedType } = props;
             const { headerRowClassName, headerRowStyle } = tableProps;
             const floatingFilterOpts = computeFloatingFilterOpts.value;
-            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) : null
-                }, renderRows(isGroup, isOptimizeMode, headerGroups, $rowIndex, cols));
+                }, renderRows(isGroup, isOptimizeMode, headerGroups, _rowIndex, cols));
             });
             if (floatingFilterOpts.enabled) {
                 rowVNs.push(h('tr', {

package/es/table/src/table.js

@@ -6959,7 +6959,7 @@ export default defineVxeComponent({
                         style: null,
                         options: [],
                         column: null,
-                        multiple: false,
+                        multiple: false, // 选项是覅多选
                         visible: false
                     });
                 }
@@ -10668,7 +10668,13 @@ export default defineVxeComponent({
                         }
                         if (editOpts.trigger === 'manual') {
                             if (actived.args && actived.row === row && column !== actived.column) {
-                                handleChangeCell(evnt, params);
+                                if (editOpts.mode === 'row') {
+                                    handleChangeCell(evnt, params);
+                                }
+                                else {
+                                    checkValidate('blur')
+                                        .catch((e) => e);
+                                }
                             }
                         }
                         else if (!actived.args || row !== actived.row || column !== actived.column) {

package/es/ui/index.js

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

package/es/ui/src/log.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const tableVersion = `table v${"4.19.17"}`;
+const tableVersion = `table v${"4.19.18"}`;
 export function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';