releases 3.21.18

Author: xuliangzhan

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.21.17",
+  "version": "3.21.18",
   "description": "A PC-end table component based on Vxe UI, supporting copy-paste, data pivot table, and high-performance virtual list table solution.",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -68,7 +68,7 @@
     "vue-i18n": "^8.15.1",
     "vue-router": "^3.5.1",
     "vue-template-compiler": "2.6.14",
-    "vxe-pc-ui": "3.15.4"
+    "vxe-pc-ui": "3.15.9"
   },
   "vetur": {
     "tags": "helper/vetur/tags.json",

packages/table/module/custom/panel.ts

@@ -1247,8 +1247,11 @@ export default /* define-vxe-component start */ 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) {

packages/table/src/footer.ts

@@ -208,18 +208,18 @@ function renderHeads (h: CreateElement, _vm: any, isOptimizeMode: boolean, rende
 
   const { footerRowClassName, footerRowStyle } = tableProps
 
-  return (footerTableData as any[][]).map((row, $rowIndex) => {
-    const _rowIndex = $rowIndex
-    const rowParams = { $table: $xeTable, row, _rowIndex, $rowIndex, fixed: fixedType, type: renderType }
+  return (footerTableData as any[][]).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) as VxeComponentStyleType : undefined
-    }, renderRows(h, _vm, isOptimizeMode, renderColumnList, footerTableData, row, $rowIndex, _rowIndex))
+    }, renderRows(h, _vm, isOptimizeMode, renderColumnList, footerTableData, row, _rowIndex, _rowIndex))
   })
 }
 

packages/table/src/header.ts

@@ -13,7 +13,7 @@ const { renderer, renderEmptyElement } = VxeUI
 const sourceType = 'table'
 const renderType = 'header'
 
-function renderRows (h: CreateElement, _vm: any, isGroup: boolean, isOptimizeMode: boolean, headerGroups: VxeTableDefines.ColumnInfo[][], $rowIndex: number, cols: VxeTableDefines.ColumnInfo[]) {
+function renderRows (h: CreateElement, _vm: any, isGroup: boolean, isOptimizeMode: boolean, headerGroups: VxeTableDefines.ColumnInfo[][], _rowIndex: number, cols: VxeTableDefines.ColumnInfo[]) {
   const props = _vm
   const $xeTable = _vm.$parent as VxeTableConstructor & VxeTablePrivateMethods
   const $xeGrid = $xeTable.$xeGrid
@@ -34,7 +34,7 @@ function renderRows (h: CreateElement, _vm: any, isGroup: boolean, isOptimizeMod
   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
@@ -66,7 +66,9 @@ function renderRows (h: CreateElement, _vm: any, isGroup: boolean, isOptimizeMod
       $table: $xeTable,
       $grid: $xeGrid,
       $gantt: $xeGantt,
-      $rowIndex,
+      rowIndex: _rowIndex,
+      _rowIndex,
+      $rowIndex: _rowIndex,
       column,
       columnIndex,
       $columnIndex,
@@ -88,7 +90,7 @@ function renderRows (h: CreateElement, _vm: any, isGroup: boolean, isOptimizeMod
       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) {
@@ -339,16 +341,16 @@ function renderHeads (h: CreateElement, _vm: any, isGroup: boolean, isOptimizeMo
 
   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) as VxeComponentStyleType : undefined
-    }, renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, $rowIndex, cols))
+    }, renderRows(h, _vm, isGroup, isOptimizeMode, headerGroups, _rowIndex, cols))
   })
 
   if (floatingFilterOpts.enabled) {

packages/table/src/methods.ts

@@ -9829,7 +9829,12 @@ const tableMethods: any = {
         }
         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: any) => e)
+            }
           }
         } else if (!actived.args || row !== actived.row || column !== actived.column) {
           if (editOpts.trigger === 'click') {

packages/table/src/util.ts

@@ -802,14 +802,7 @@ export function toFilters (filters: any, colid?: string | number) {
 /**
  * 列宽拖动最大宽度
  */
-export function getColReMaxWidth (params: {
-  $table: VxeTableConstructor & VxeTablePrivateMethods;
-  column: VxeTableDefines.ColumnInfo;
-  columnIndex: number;
-  $columnIndex: number;
-  $rowIndex: number;
-  cell: HTMLTableCellElement;
-}) {
+export function getColReMaxWidth (params: (VxeTableDefines.CellRenderHeaderParams| VxeTableDefines.CellRenderBodyParams | VxeTableDefines.CellRenderFooterParams) & { cell: HTMLTableCellElement }) {
   const { $table, column, cell } = params
   const internalData = $table as unknown as TableInternalData
   const { elemStore } = internalData
@@ -846,14 +839,7 @@ export function getColReMaxWidth (params: {
 /**
  * 列宽拖动最小宽度
  */
-export function getColReMinWidth (params: {
-  $table: VxeTableConstructor & VxeTablePrivateMethods;
-  column: VxeTableDefines.ColumnInfo;
-  columnIndex: number;
-  $columnIndex: number;
-  $rowIndex: number;
-  cell: HTMLTableCellElement;
-}) {
+export function getColReMinWidth (params: (VxeTableDefines.CellRenderHeaderParams| VxeTableDefines.CellRenderBodyParams | VxeTableDefines.CellRenderFooterParams) & { cell: HTMLTableCellElement }) {
   const { $table, column, cell } = params
   const tableProps = $table
   const internalData = $table as unknown as TableInternalData