vxe-table 3.13.14 → 3.13.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.13.14",
+  "version": "3.13.16",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、拖拽排序，懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -28,7 +28,7 @@
   "style": "lib/style.css",
   "typings": "types/index.d.ts",
   "dependencies": {
-    "vxe-pc-ui": "^3.3.102"
+    "vxe-pc-ui": "^3.3.104"
   },
   "devDependencies": {
     "@babel/plugin-transform-modules-commonjs": "^7.25.7",

package/packages/locale/lang/ar-EG.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: '分组列头应该使用 "{0}" 而不是 "{1}"，这可能会出现错误',
       scrollErrProp: '启用虚拟滚动后不支持该参数 "{0}"',
       errConflicts: '参数 "{0}" 与 "{1}" 有冲突',
+      notSupportProp: '当启用参数 "{0}" 时不支持 "{1}"，应该为 "{2}"，否则将会出现错误',
       unableInsert: '无法插入到指定位置，请检查参数是否正确',
       useErr: '安装 "{0}" 模块时发生错误，可能顺序不正确，依赖的模块需要在 Table 之前安装',
       barUnableLink: '工具栏无法关联表格',

package/packages/locale/lang/de-DE.ts

@@ -18,6 +18,7 @@ export default
       groupTag: 'Bei der Gruppierung von Spaltenüberschriften sollte „{0}“ anstelle von „{1}“ verwendet werden, was zu Fehlern führen kann',
       scrollErrProp: 'Der Parameter „{0}“ wird nicht unterstützt, wenn virtuelles Scrollen aktiviert ist',
       errConflicts: 'Parameter „{0}“ stehen im Konflikt mit „{1}“',
+      notSupportProp: '当启用参数 "{0}" 时不支持 "{1}"，应该为 "{2}"，否则将会出现错误',
       unableInsert: 'Das Einfügen an der angegebenen Position ist nicht möglich. Bitte überprüfen Sie, ob die Parameter korrekt sind',
       useErr: 'Bei der Installation des Moduls „{0}“ ist möglicherweise die falsche Reihenfolge aufgetreten. Die abhängigen Module müssen vor der Tabelle installiert werden.',
       barUnableLink: 'Die Symbolleiste kann nicht mit der Tabelle verknüpft werden',

package/packages/locale/lang/en-US.ts

@@ -11,12 +11,13 @@ export default {
     },
     error: {
       downErr: 'Download failed',
-      errLargeData: '当绑定的数据量过大时，应该请使用 {0}，否则可能会出现卡顿',
+      errLargeData: 'When the amount of data bound is too large, you should use "{0}"; otherwise, a stall may occur',
       groupFixed: 'If using group headers, frozen columns must be set by group',
       groupMouseRange: 'The group header and "{0}" cannot be used at the same time, which may cause an error.',
       groupTag: 'Grouping column headers should use "{0}" instead of "{1}", which may cause errors',
       scrollErrProp: 'The parameter "{0}" is not supported when virtual scrolling is enabled',
-      errConflicts: 'Parameters "{0}" conflict with "{1}"',
+      errConflicts: '"{1}" is not supported when parameter "{0}", it should be "{2}", otherwise an error will occur',
+      notSupportProp: '"{1}" is not supported when parameter "{0}" is enabled, it should be "{2}", otherwise an error will occur',
       unableInsert: 'Unable to insert into the specified position, please check whether the parameters are correct',
       useErr: 'An error occurred while installing the "{0}" module. The order may be incorrect. The dependent modules need to be installed before Table.',
       barUnableLink: 'The toolbar cannot be associated with the table',

package/packages/locale/lang/es-ES.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: 'El encabezado de columna de agrupación debería utilizar "{0}" en lugar de "{1}", lo que puede causar errores.',
       scrollErrProp: 'El parámetro "{0}" no es compatible cuando el desplazamiento virtual está habilitado.',
       errConflicts: 'El argumento "{0}" entra en conflicto con "{1}"',
+      notSupportProp: '当启用参数 "{0}" 时不支持 "{1}"，应该为 "{2}"，否则将会出现错误',
       unableInsert: 'No se puede insertar en la ubicación especificada.',
       useErr: 'Error al instalar el módulo "{0}", posiblemente en el orden equivocado, los módulos dependientes deben ser instalados antes de la tabla.',
       barUnableLink: 'La barra de herramientas no puede asociarse con la tabla.',

package/packages/locale/lang/fr-FR.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: '分组列头应该使用 "{0}" 而不是 "{1}"，这可能会出现错误',
       scrollErrProp: '启用虚拟滚动后不支持该参数 "{0}"',
       errConflicts: '参数 "{0}" 与 "{1}" 有冲突',
+      notSupportProp: '当启用参数 "{0}" 时不支持 "{1}"，应该为 "{2}"，否则将会出现错误',
       unableInsert: '无法插入到指定位置，请检查参数是否正确',
       useErr: '安装 "{0}" 模块时发生错误，可能顺序不正确，依赖的模块需要在 Table 之前安装',
       barUnableLink: '工具栏无法关联表格',

package/packages/locale/lang/hu-HU.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: 'A csoportosító oszlopfejlécben a „{0}” értéket kell használni a „{1}” helyett, ami hibákat okozhat',
       scrollErrProp: 'A "{0}" paraméter nem támogatott, ha a virtuális görgetés engedélyezve van',
       errConflicts: 'A "{0}" paraméter ütközik a következővel: "{1}"',
+      notSupportProp: '当启用参数 "{0}" 时不支持 "{1}"，应该为 "{2}"，否则将会出现错误',
       unableInsert: 'Nem sikerült beilleszteni a megadott pozícióba, ellenőrizze, hogy a paraméterek helyesek-e',
       useErr: 'Hiba történt a "{0}" modul telepítésekor. Lehet, hogy a sorrend helytelen. A függő modulokat a táblázat előtt kell telepíteni.',
       barUnableLink: 'Az eszköztár nem társítható a táblázathoz',

package/packages/locale/lang/hy-AM.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: '分组列头应该使用 "{0}" 而不是 "{1}"，这可能会出现错误',
       scrollErrProp: '启用虚拟滚动后不支持该参数 "{0}"',
       errConflicts: '参数 "{0}" 与 "{1}" 有冲突',
+      notSupportProp: '当启用参数 "{0}" 时不支持 "{1}"，应该为 "{2}"，否则将会出现错误',
       unableInsert: '无法插入到指定位置，请检查参数是否正确',
       useErr: '安装 "{0}" 模块时发生错误，可能顺序不正确，依赖的模块需要在 Table 之前安装',
       barUnableLink: '工具栏无法关联表格',

package/packages/locale/lang/id-ID.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: '分组列头应该使用 "{0}" 而不是 "{1}"，这可能会出现错误',
       scrollErrProp: '启用虚拟滚动后不支持该参数 "{0}"',
       errConflicts: '参数 "{0}" 与 "{1}" 有冲突',
+      notSupportProp: '当启用参数 "{0}" 时不支持 "{1}"，应该为 "{2}"，否则将会出现错误',
       unableInsert: '无法插入到指定位置，请检查参数是否正确',
       useErr: '安装 "{0}" 模块时发生错误，可能顺序不正确，依赖的模块需要在 Table 之前安装',
       barUnableLink: '工具栏无法关联表格',

package/packages/locale/lang/it-IT.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: 'Le intestazioni delle colonne di raggruppamento devono utilizzare "{0}" anziché "{1}", il che potrebbe causare errori',
       scrollErrProp: 'Il parametro "{0}" non è supportato quando è abilitato lo scorrimento virtuale',
       errConflicts: 'I parametri "{0}" sono in conflitto con "{1}"',
+      notSupportProp: '当启用参数 "{0}" 时不支持 "{1}"，应该为 "{2}"，否则将会出现错误',
       unableInsert: 'Impossibile inserire nella posizione specificata, verificare se i parametri sono corretti',
       useErr: "Si è verificato un errore durante l'installazione del modulo \"{0}\". L'ordine potrebbe essere errato. I moduli dipendenti devono essere installati prima della Tabella.",
       barUnableLink: 'La barra degli strumenti non può essere associata alla tabella',

package/packages/locale/lang/ja-JP.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: 'ヘッダー結合は "{0}" を使ってください。 "{1}" はエラーが発生する可能性があります',
       scrollErrProp: '仮想スクロールはこのパラメータを使えません： "{0}"',
       errConflicts: 'パラメータ "{0}" と "{1}" は同時に使えません',
+      notSupportProp: '当启用参数 "{0}" 时不支持 "{1}"，应该为 "{2}"，否则将会出现错误',
       unableInsert: '指定された位置に挿入できない',
       useErr: '"{0}" モジュールをインストールする際にエラーが発生し、順序が正しくない可能性がある。依存するモジュールはTableの前にインストールする必要がある',
       barUnableLink: 'ツールバーはフォームを関連付けることができない',

package/packages/locale/lang/ko-KR.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: '그룹화된 열 헤더는 "{0}"을 사용해야 하며, "{1}"을 사용하면 오류가 발생할 수 있습니다.',
       scrollErrProp: '가상 스크롤을 활성화한 경우, 매개변수 "{0}"은 지원되지 않습니다.',
       errConflicts: '매개변수 "{0}"과(와) "{1}"은(는) 충돌합니다.',
+      notSupportProp: '当启用参数 "{0}" 时不支持 "{1}"，应该为 "{2}"，否则将会出现错误',
       unableInsert: '지정된 위치에 삽입할 수 없습니다. 매개변수가 올바른지 확인하세요.',
       useErr: '"{0}" 모듈 설치 중 오류가 발생했습니다. 순서가 잘못되었을 수 있으며, 테이블 전에 종속 모듈이 설치되어야 합니다.',
       barUnableLink: '도구 모음과 테이블을 연결할 수 없습니다.',

package/packages/locale/lang/nb-NO.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: '分组列头应该使用 "{0}" 而不是 "{1}"，这可能会出现错误',
       scrollErrProp: '启用虚拟滚动后不支持该参数 "{0}"',
       errConflicts: '参数 "{0}" 与 "{1}" 有冲突',
+      notSupportProp: '当启用参数 "{0}" 时不支持 "{1}"，应该为 "{2}"，否则将会出现错误',
       unableInsert: '无法插入到指定位置，请检查参数是否正确',
       useErr: '安装 "{0}" 模块时发生错误，可能顺序不正确，依赖的模块需要在 Table 之前安装',
       barUnableLink: '工具栏无法关联表格',

package/packages/locale/lang/pt-BR.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: 'O cabeçalho da coluna de agrupamento deve usar "{0}" em vez de "{1}", o que pode causar erros.',
       scrollErrProp: 'O parâmetro "{0}" não é suportado quando a rolagem virtual está habilitada.',
       errConflicts: 'O argumento "{0}" entra em conflito com "{1}"',
+      notSupportProp: '当启用参数 "{0}" 时不支持 "{1}"，应该为 "{2}"，否则将会出现错误',
       unableInsert: 'Não é possível inserir na localização especificada.',
       useErr: 'Erro ao instalar o módulo "{0}", possivelmente na ordem errada, os módulos dependentes precisam ser instalados antes da Tabela.',
       barUnableLink: 'A barra de ferramentas não pode ser associada à tabela.',

package/packages/locale/lang/ru-RU.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: 'При группировке заголовков столбцов следует использовать "{0}" вместо "{1}", что может привести к ошибкам.',
       scrollErrProp: 'Параметр "{0}" не поддерживается, если включена виртуальная прокрутка.',
       errConflicts: 'Параметры "{0}" конфликтуют с "{1}"',
+      notSupportProp: '当启用参数 "{0}" 时不支持 "{1}"，应该为 "{2}"，否则将会出现错误',
       unableInsert: 'Невозможно вставить в указанную позицию, проверьте правильность параметров.',
       useErr: 'Произошла ошибка при установке модуля "{0}". Порядок может быть неправильным. Зависимые модули необходимо установить перед Табл.',
       barUnableLink: 'Панель инструментов не может быть связана с таблицей',

package/packages/locale/lang/th-TH.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: 'การจัดกลุ่มส่วนหัวคอลัมน์ควรใช้ "{0}" แทน "{1}" ซึ่งอาจทำให้เกิดข้อผิดพลาด',
       scrollErrProp: 'ไม่สนับสนุนพารามิเตอร์ "{0}" เมื่อเปิดใช้งานการเลื่อนเสมือน',
       errConflicts: 'พารามิเตอร์ "{0}" ขัดแย้งกับ "{1}"',
+      notSupportProp: '当启用参数 "{0}" 时不支持 "{1}"，应该为 "{2}"，否则将会出现错误',
       unableInsert: 'ไม่สามารถแทรกลงในตำแหน่งที่ระบุได้ โปรดตรวจสอบว่าพารามิเตอร์ถูกต้องหรือไม่',
       useErr: 'เกิดข้อผิดพลาดขณะติดตั้งโมดูล "{0}" ลำดับอาจไม่ถูกต้อง จำเป็นต้องติดตั้งโมดูลที่ต้องพึ่งพาก่อนตาราง',
       barUnableLink: 'แถบเครื่องมือไม่สามารถเชื่อมโยงกับตารางได้',

package/packages/locale/lang/ug-CN.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: 'گۇرۇپپا قۇر بىشىغا چوقۇم  "{0}" نى ئىشلىتىشىڭىز كىرەك،ھەرگىزمۇ "{1}"نى ئەمەس ،بولمىسا بۇ بەلكىم خاتالىق كەلتۈرۈپ چىقىرىشى مومكىن',
       scrollErrProp: 'مەۋھۇم يۇمىلاتما ئىقىدارىنى قوزغاتقاندىن كىيىن بۇ سېپىرنى تەكشەشكە بولمايدۇ "{0}"',
       errConflicts: 'سان سىپىر "{0}" بىلەن "{1}" دە ماسلاشماسلىق ئەھۋالى مەۋجۇت',
+      notSupportProp: '当启用参数 "{0}" 时不支持 "{1}"，应该为 "{2}"，否则将会出现错误',
       unableInsert: 'بىكىتىلگەن ئورۇنغا قىستۇرۇشقا بولمايدۇ، پارامېتىرىڭىزنىڭ توغرا-خاتالىقىنى تەكشۈرۈڭ ',
       useErr: 'قاچىلاش: "{0}" پارچىنى قاچىلىغاندا خاتالىق كۆرۈلدى ،بەلكىم رەت تەرتىۋىدە بىنۇرماللىق كۆرۈلگەن بولۇشى مومكىن，مۇناسىۋەتلىك پارچە چوقۇم  Table دىن ئاۋۋال قاچىلىنىشى كىرەك',
       barUnableLink: 'ئەسۋاب ئىستونى جەدىۋەل بىلەن ئۇلىنىشقا ئامالسىز',

package/packages/locale/lang/uk-UA.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: 'Груповані заголовки повинні використовувати "{0}", а не "{1}", це може спричинити помилки',
       scrollErrProp: 'Параметр "{0}" не підтримується після включення віртуального скролінгу',
       errConflicts: 'Параметри "{0}" та "{1}" конфліктують',
+      notSupportProp: '当启用参数 "{0}" 时不支持 "{1}"，应该为 "{2}"，否则将会出现错误',
       unableInsert: 'Неможливо вставити в задане місце, перевірте правильність параметрів',
       useErr: 'Сталася помилка під час встановлення модуля "{0}", можливо, порядок неправильний, залежні модулі повинні бути встановлені до таблиці',
       barUnableLink: "Панель інструментів не може бути пов'язана з таблицею",

package/packages/locale/lang/vi-VN.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: '分组列头应该使用 "{0}" 而不是 "{1}"，这可能会出现错误',
       scrollErrProp: '启用虚拟滚动后不支持该参数 "{0}"',
       errConflicts: '参数 "{0}" 与 "{1}" 有冲突',
+      notSupportProp: '当启用参数 "{0}" 时不支持 "{1}"，应该为 "{2}"，否则将会出现错误',
       unableInsert: '无法插入到指定位置，请检查参数是否正确',
       useErr: '安装 "{0}" 模块时发生错误，可能顺序不正确，依赖的模块需要在 Table 之前安装',
       barUnableLink: '工具栏无法关联表格',

package/packages/locale/lang/zh-CHT.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: '分組列頭應該使用 "{0}" 而不是 "{1}"，這可能會出現錯誤',
       scrollErrProp: '啟用虛擬滾動後不支援此參數 "{0}"',
       errConflicts: '參數 "{0}" 與 "{1}" 有衝突',
+      notSupportProp: '当启用参数 "{0}" 时不支持 "{1}"，应该为 "{2}"，否则将会出现错误',
       unableInsert: '無法插入指定位置，請檢查參數是否正確',
       useErr: '安裝 "{0}" 模組時發生錯誤，可能順序不正確，依賴的模組需要在 Table 之前安裝',
       barUnableLink: '工具列無法關聯表格',

package/packages/locale/lang/zh-CN.ts

@@ -17,6 +17,7 @@ export default {
       groupTag: '分组列头应该使用 "{0}" 而不是 "{1}"，这可能会出现错误',
       scrollErrProp: '启用虚拟滚动后不支持该参数 "{0}"',
       errConflicts: '参数 "{0}" 与 "{1}" 有冲突',
+      notSupportProp: '当启用参数 "{0}" 时不支持 "{1}"，应该为 "{2}"，否则将会出现错误',
       unableInsert: '无法插入到指定位置，请检查参数是否正确',
       useErr: '安装 "{0}" 模块时发生错误，可能顺序不正确，依赖的模块需要在 Table 之前安装',
       barUnableLink: '工具栏无法关联表格',

package/packages/table/module/custom/panel.ts

@@ -5,7 +5,7 @@ import { getTpImg, addClass, removeClass } from '../../../ui/src/dom'
 import { errLog } from '../../../ui/src/log'
 import XEUtils from 'xe-utils'
 
-import type { VxeTableDefines } from '../../../../types'
+import type { VxeTableDefines, VxeTableConstructor, VxeTablePrivateMethods, TableReactData, TableInternalData } from '../../../../types'
 import type { VxeModalComponent, VxeDrawerComponent, VxeButtonComponent, VxeRadioGroupComponent, VxeInputComponent } from 'vxe-pc-ui'
 
 const { getI18n, getIcon, renderEmptyElement } = VxeUI
@@ -1083,10 +1083,10 @@ export default {
       }
     },
     sortDragendEvent (evnt: any) {
-      const $xeTable = this.$xetable
+      const $xeTable = this.$xetable as VxeTableConstructor & VxeTablePrivateMethods
       const tableProps = $xeTable
-      const reactData = $xeTable
-      const internalData = $xeTable
+      const reactData = $xeTable as unknown as TableReactData
+      const internalData = $xeTable as unknown as TableInternalData
 
       const { dragCol, prevDragPos, prevDragCol, prevDragToChild } = this
 
@@ -1102,13 +1102,14 @@ export default {
       if (prevDragCol && dragCol) {
         // 判断是否有拖动
         if (prevDragCol !== dragCol) {
-          const oldColumn: VxeTableDefines.ColumnInfo = dragCol
+          const dragColumn: VxeTableDefines.ColumnInfo = dragCol
           const newColumn: VxeTableDefines.ColumnInfo = prevDragCol
           Promise.resolve(
             dragEndMethod
               ? dragEndMethod({
-                oldColumn,
+                oldColumn: dragColumn,
                 newColumn,
+                dragColumn,
                 dragPos: prevDragPos as any,
                 dragToChild: !!prevDragToChild,
                 offsetIndex: dragOffsetIndex
@@ -1123,7 +1124,7 @@ export default {
             let nafIndex = -1
 
             const oldAllMaps: Record<string, any> = {}
-            XEUtils.eachTree([oldColumn], column => {
+            XEUtils.eachTree([dragColumn], column => {
               oldAllMaps[column.id] = column
             })
 
@@ -1131,7 +1132,7 @@ export default {
 
             // 只有实时拖拽支持跨层级
             if (immediate) {
-              if (oldColumn.parentId && newColumn.parentId) {
+              if (dragColumn.parentId && newColumn.parentId) {
               // 子到子
 
                 if (!isCrossDrag) {
@@ -1149,7 +1150,7 @@ export default {
                     return
                   }
                 }
-              } else if (oldColumn.parentId) {
+              } else if (dragColumn.parentId) {
               // 子到根
 
                 if (!isCrossDrag) {
@@ -1177,18 +1178,18 @@ export default {
               // 根到根
               }
 
-              const oldewMatchRest = XEUtils.findTree(collectColumn as VxeTableDefines.ColumnInfo[], item => item.id === oldColumn.id)
+              const oldewMatchRest = XEUtils.findTree(collectColumn as VxeTableDefines.ColumnInfo[], item => item.id === dragColumn.id)
 
               // 改变层级
               if (isSelfToChildStatus && (isCrossDrag && isSelfToChildDrag)) {
                 if (oldewMatchRest) {
                   const { items: oCols, index: oIndex } = oldewMatchRest
-                  const childList = oldColumn.children || []
+                  const childList = dragColumn.children || []
                   childList.forEach(column => {
-                    column.parentId = oldColumn.parentId
+                    column.parentId = dragColumn.parentId
                   })
                   oCols.splice(oIndex, 1, ...childList)
-                  oldColumn.children = []
+                  dragColumn.children = []
                 }
               } else {
                 if (oldewMatchRest) {
@@ -1205,11 +1206,11 @@ export default {
                 const { items: nCols, index: nIndex, parent: nParent } = newMatchRest
                 // 转子级
                 if ((isCrossDrag && isToChildDrag) && prevDragToChild) {
-                  oldColumn.parentId = newColumn.id
-                  newColumn.children = (newColumn.children || []).concat([oldColumn])
+                  dragColumn.parentId = newColumn.id
+                  newColumn.children = (newColumn.children || []).concat([dragColumn])
                 } else {
-                  oldColumn.parentId = newColumn.parentId
-                  nCols.splice(nIndex + dragOffsetIndex, 0, oldColumn)
+                  dragColumn.parentId = newColumn.parentId
+                  nCols.splice(nIndex + dragOffsetIndex, 0, dragColumn)
                 }
                 if (!nParent) {
                   nafIndex = nIndex
@@ -1223,11 +1224,11 @@ export default {
                 }
               })
             } else {
-              oafIndex = XEUtils.findIndexOf(customColumnList, item => item.id === oldColumn.id)
+              oafIndex = XEUtils.findIndexOf(customColumnList, item => item.id === dragColumn.id)
               customColumnList.splice(oafIndex, 1)
 
               nafIndex = XEUtils.findIndexOf(customColumnList, item => item.id === newColumn.id)
-              customColumnList.splice(nafIndex + dragOffsetIndex, 0, oldColumn)
+              customColumnList.splice(nafIndex + dragOffsetIndex, 0, dragColumn)
             }
 
             reactData.isDragColMove = true
@@ -1242,8 +1243,9 @@ export default {
             }
 
             $xeTable.dispatchEvent('column-dragend', {
-              oldColumn,
+              oldColumn: dragColumn,
               newColumn,
+              dragColumn,
               dragPos: prevDragPos,
               offsetIndex: dragOffsetIndex,
               _index: {

package/packages/table/module/edit/mixin.ts

@@ -278,7 +278,7 @@ function handleInsertChildRowAt ($xeTable: VxeTableConstructor, records: any, pa
     }
     return handleInsertRowAt($xeTable, records.map((item: any) => Object.assign({}, item, { [parentField]: parentRow[rowField] })), targetRow, isInsertNextRow)
   } else {
-    errLog('vxe.error.errProp', ['tree-config.treeConfig=false', 'tree-config.treeConfig=true'])
+    errLog('vxe.error.errProp', ['tree-config.transform=false', 'tree-config.transform=true'])
   }
   return Promise.resolve({ row: null, rows: [] })
 }
@@ -863,7 +863,9 @@ export default {
       let isPos = false
       if (fieldOrColumn) {
         isPos = true
-        column = XEUtils.isString(fieldOrColumn) ? this.getColumnByField(fieldOrColumn) : fieldOrColumn
+        if (fieldOrColumn !== true) {
+          column = XEUtils.isString(fieldOrColumn) ? this.getColumnByField(fieldOrColumn) : fieldOrColumn
+        }
       }
       return handleEditCell($xeTable, row, column, isPos)
     },

package/packages/table/src/cell.ts

@@ -89,12 +89,13 @@ function renderCellBaseVNs (h: CreateElement, params: VxeTableDefines.CellRender
   const { treeConfig, dragConfig } = tableProps
   const rowOpts = $table.computeRowOpts
   const rowDragOpts = $table.computeRowDragOpts
+  const treeOpts = $table.computeTreeOpts
   const { showIcon, isPeerDrag, isCrossDrag, visibleMethod } = rowDragOpts
   const rVisibleMethod = visibleMethod || (dragConfig ? dragConfig.rowVisibleMethod : null)
   const vns: any[] = XEUtils.isArray(content) ? content : [content]
   if (dragSort && rowOpts.drag && ((showIcon || (dragConfig ? dragConfig.showRowIcon : false)) && (!rVisibleMethod || rVisibleMethod(params)))) {
     if (treeConfig) {
-      if (isPeerDrag || isCrossDrag || !level) {
+      if (treeOpts.transform && (isPeerDrag || isCrossDrag || !level)) {
         vns.unshift(
           renderCellDragIcon(h, params)
         )

package/packages/table/src/column.ts

@@ -148,7 +148,7 @@ Object.keys(columnProps).forEach(name => {
   }
 })
 
-export default defineVxeComponent({
+export default /* define-vxe-component start */ defineVxeComponent({
   name: 'VxeColumn',
   props: columnProps,
   provide () {
@@ -180,4 +180,4 @@ export default defineVxeComponent({
     return h('div', this.$slots.default)
   },
   methods: Cell
-})
+}) /* define-vxe-component end */

package/packages/table/src/group.ts

@@ -3,7 +3,7 @@ import { defineVxeComponent } from '../../ui/src/comp'
 import { assembleColumn, destroyColumn } from './util'
 import { columnProps, columnWatch } from './column'
 
-export default defineVxeComponent({
+export default /* define-vxe-component start */ defineVxeComponent({
   name: 'VxeColgroup',
   props: columnProps,
   provide () {
@@ -43,4 +43,4 @@ export default defineVxeComponent({
     return h('div', this.$slots.default)
   },
   methods: Cell
-})
+}) /* define-vxe-component end */

package/packages/table/src/methods.ts

@@ -6498,6 +6498,7 @@ const Methods = {
         const dragParams = {
           oldRow: dragRow,
           newRow: prevDragRow,
+          dragRow,
           dragPos: prevDragPos as 'top' | 'bottom',
           dragToChild: !!prevDragToChild,
           offsetIndex: dragOffsetIndex as 0 | 1
@@ -6648,6 +6649,7 @@ const Methods = {
           $xeTable.dispatchEvent('row-dragend', {
             oldRow: dragRow,
             newRow: prevDragRow,
+            dragRow,
             dragPos: prevDragPos as any,
             dragToChild: isDragToChildFlag,
             offsetIndex: dragOffsetIndex,
@@ -6813,11 +6815,12 @@ const Methods = {
     if (prevDragCol && dragCol) {
       // 判断是否有拖动
       if (prevDragCol !== dragCol) {
-        const oldColumn = dragCol
+        const dragColumn = dragCol
         const newColumn = prevDragCol
         const dragParams = {
-          oldColumn,
+          oldColumn: dragColumn,
           newColumn,
+          dragColumn,
           dragPos: prevDragPos as 'left' | 'right',
           dragToChild: !!prevDragToChild,
           offsetIndex: dragOffsetIndex as 0 | 1
@@ -6832,17 +6835,17 @@ const Methods = {
           let nafIndex = -1
 
           const oldAllMaps: Record<string, any> = {}
-          XEUtils.eachTree([oldColumn], column => {
+          XEUtils.eachTree([dragColumn], column => {
             oldAllMaps[column.id] = column
           })
 
           let isSelfToChildStatus = false
 
-          if (oldColumn.parentId && newColumn.parentId) {
+          if (dragColumn.parentId && newColumn.parentId) {
             // 子到子
 
             if (isPeerDrag && !isCrossDrag) {
-              if (oldColumn.parentId !== newColumn.parentId) {
+              if (dragColumn.parentId !== newColumn.parentId) {
                 // 非同级
                 return
               }
@@ -6864,7 +6867,7 @@ const Methods = {
                 }
               }
             }
-          } else if (oldColumn.parentId) {
+          } else if (dragColumn.parentId) {
             // 子到根
 
             if (!isCrossDrag) {
@@ -6892,18 +6895,18 @@ const Methods = {
             // 根到根
           }
 
-          const oldewMatchRest = XEUtils.findTree(collectColumn as VxeTableDefines.ColumnInfo[], item => item.id === oldColumn.id)
+          const oldewMatchRest = XEUtils.findTree(collectColumn as VxeTableDefines.ColumnInfo[], item => item.id === dragColumn.id)
 
           // 改变层级
           if (isSelfToChildStatus && (isCrossDrag && isSelfToChildDrag)) {
             if (oldewMatchRest) {
               const { items: oCols, index: oIndex } = oldewMatchRest
-              const childList = oldColumn.children || []
+              const childList = dragColumn.children || []
               childList.forEach(column => {
-                column.parentId = oldColumn.parentId
+                column.parentId = dragColumn.parentId
               })
               oCols.splice(oIndex, 1, ...childList)
-              oldColumn.children = []
+              dragColumn.children = []
             }
           } else {
             if (oldewMatchRest) {
@@ -6920,11 +6923,11 @@ const Methods = {
             const { items: nCols, index: nIndex, parent: nParent } = newMatchRest
             // 转子级
             if ((isCrossDrag && isToChildDrag) && isDragToChildFlag) {
-              oldColumn.parentId = newColumn.id
-              newColumn.children = (newColumn.children || []).concat([oldColumn])
+              dragColumn.parentId = newColumn.id
+              newColumn.children = (newColumn.children || []).concat([dragColumn])
             } else {
-              oldColumn.parentId = newColumn.parentId
-              nCols.splice(nIndex + dragOffsetIndex, 0, oldColumn)
+              dragColumn.parentId = newColumn.parentId
+              nCols.splice(nIndex + dragOffsetIndex, 0, dragColumn)
             }
             if (!nParent) {
               nafIndex = nIndex
@@ -6950,8 +6953,9 @@ const Methods = {
           }
 
           $xeTable.dispatchEvent('column-dragend', {
-            oldColumn,
+            oldColumn: dragColumn,
             newColumn,
+            dragColumn,
             dragPos: prevDragPos,
             dragToChild: isDragToChildFlag,
             offsetIndex: dragOffsetIndex,
@@ -8327,7 +8331,7 @@ const Methods = {
     const reactData = $xeTable as unknown as TableReactData
     const internalData = $xeTable as unknown as TableInternalData
 
-    const { target, deltaY, deltaX } = evnt
+    const { target, deltaY, deltaX, shiftKey } = evnt
     if (target && /^textarea$/i.test((target as HTMLElement).tagName)) {
       return
     }
@@ -8361,8 +8365,8 @@ const Methods = {
     }
 
     const wheelSpeed = getWheelSpeed(reactData.lastScrollTime)
-    const deltaTop = Math.ceil(deltaY * wheelSpeed)
-    const deltaLeft = Math.ceil(deltaX * wheelSpeed)
+    const deltaTop = Math.ceil((shiftKey ? deltaX : deltaY) * wheelSpeed)
+    const deltaLeft = Math.ceil((shiftKey ? deltaY : deltaX) * wheelSpeed)
 
     const isTopWheel = deltaTop < 0
     const currScrollTop = bodyScrollElem.scrollTop