vxe-table 3.21.2 → 3.21.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.21.2",
+  "version": "3.21.3",
   "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.14.21"
+    "vxe-pc-ui": "3.14.23"
   },
   "vetur": {
     "tags": "helper/vetur/tags.json",

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

@@ -240,6 +240,10 @@ export default {
       expMergeTitle: 'إذا كانت موجودة ، يتم دعم الخلايا ذات الهياكل المدمجة',
       expOptAllExpand: 'توسيع الشجرة',
       expAllExpandTitle: 'إذا كانت موجودة ، فسيتم دعمها لتوسيع جميع البيانات بالهياكل الهرمية',
+      expOptTreeAllExpand: '展开树',
+      expTreeAllExpandTitle: '如果存在，则自动展开所有树层级',
+      expOptRowGroupAllExpand: '展开分组',
+      expRowGroupAllExpandTitle: '如果存在，则自动展开所有分组层级',
       expOptUseStyle: 'أسلوب',
       expUseStyleTitle: 'إذا كانت موجودة ، يتم دعم الخلايا ذات الأناقة',
       expOptOriginal: 'بيانات المصدر',

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

@@ -240,6 +240,10 @@ export default {
       expMergeTitle: 'Wenn vorhanden, werden Zellen mit zusammengeführten Strukturen unterstützt',
       expOptAllExpand: 'Den Baum erweitern',
       expAllExpandTitle: 'Wenn es existiert, wird es unterstützt, alle Daten mit hierarchischen Strukturen zu erweitern',
+      expOptTreeAllExpand: '展开树',
+      expTreeAllExpandTitle: '如果存在，则自动展开所有树层级',
+      expOptRowGroupAllExpand: '展开分组',
+      expRowGroupAllExpandTitle: '如果存在，则自动展开所有分组层级',
       expOptUseStyle: 'Stil',
       expUseStyleTitle: 'Wenn vorhanden, werden Zellen mit Stil unterstützt',
       expOptOriginal: 'Quelldaten',

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

@@ -240,6 +240,10 @@ export default {
       expMergeTitle: 'If present, cells with merged structures are supported',
       expOptAllExpand: 'Expand the tree',
       expAllExpandTitle: 'If it exists, it is supported to expand all data with hierarchical structures',
+      expOptTreeAllExpand: 'Expand tree',
+      expTreeAllExpandTitle: 'If present, automatically expand all tree levels',
+      expOptRowGroupAllExpand: 'Expand group',
+      expRowGroupAllExpandTitle: 'If present, automatically expand all group levels',
       expOptUseStyle: 'style',
       expUseStyleTitle: 'If present, cells with style are supported',
       expOptOriginal: 'Source data',

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

@@ -240,6 +240,10 @@ export default {
       expMergeTitle: 'Si está presente, las células con estructuras fusionadas son compatibles',
       expOptAllExpand: 'Expandir el árbol',
       expAllExpandTitle: 'Si existe, es compatible para expandir todos los datos con estructuras jerárquicas',
+      expOptTreeAllExpand: '展开树',
+      expTreeAllExpandTitle: '如果存在，则自动展开所有树层级',
+      expOptRowGroupAllExpand: '展开分组',
+      expRowGroupAllExpandTitle: '如果存在，则自动展开所有分组层级',
       expOptUseStyle: 'estilo',
       expUseStyleTitle: 'Si está presente, las celdas con estilo son compatibles',
       expOptOriginal: 'Datos de origen',

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

@@ -240,6 +240,10 @@ export default {
       expMergeTitle: 'Si présents, les cellules avec des structures fusionnées sont soutenues',
       expOptAllExpand: "Développer l'arbre",
       expAllExpandTitle: "S'il existe, il est supporté pour étendre toutes les données avec des structures hiérarchiques",
+      expOptTreeAllExpand: '展开树',
+      expTreeAllExpandTitle: '如果存在，则自动展开所有树层级',
+      expOptRowGroupAllExpand: '展开分组',
+      expRowGroupAllExpandTitle: '如果存在，则自动展开所有分组层级',
       expOptUseStyle: 'style',
       expUseStyleTitle: 'Si présents, les cellules avec style sont prises en charge',
       expOptOriginal: 'Données de source',

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

@@ -240,6 +240,10 @@ export default {
       expMergeTitle: 'Ha van jelen, az egyesített struktúrákkal rendelkező sejtek támogatottak',
       expOptAllExpand: 'Bővítse a fát',
       expAllExpandTitle: 'Ha létezik, akkor támogatott, hogy az összes adatot hierarchikus struktúrákkal bővítse',
+      expOptTreeAllExpand: '展开树',
+      expTreeAllExpandTitle: '如果存在，则自动展开所有树层级',
+      expOptRowGroupAllExpand: '展开分组',
+      expRowGroupAllExpandTitle: '如果存在，则自动展开所有分组层级',
       expOptUseStyle: 'stílus',
       expUseStyleTitle: 'Ha van jelen, akkor a stílusú sejtek támogatottak',
       expOptOriginal: 'Forrásadatok',

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

@@ -240,6 +240,10 @@ export default {
       expMergeTitle: '如果存在，则支持带有合并结构的单元格',
       expOptAllExpand: '展开树',
       expAllExpandTitle: '如果存在，则支持将带有层级结构的数据全部展开',
+      expOptTreeAllExpand: '展开树',
+      expTreeAllExpandTitle: '如果存在，则自动展开所有树层级',
+      expOptRowGroupAllExpand: '展开分组',
+      expRowGroupAllExpandTitle: '如果存在，则自动展开所有分组层级',
       expOptUseStyle: '样式',
       expUseStyleTitle: '如果存在，则支持带样式的单元格',
       expOptOriginal: '源数据',

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

@@ -240,6 +240,10 @@ export default {
       expMergeTitle: 'Jika ada, sel dengan struktur gabungan didukung',
       expOptAllExpand: 'Perluas pohon',
       expAllExpandTitle: 'Jika ada, didukung untuk memperluas semua data dengan struktur hierarkis',
+      expOptTreeAllExpand: '展开树',
+      expTreeAllExpandTitle: '如果存在，则自动展开所有树层级',
+      expOptRowGroupAllExpand: '展开分组',
+      expRowGroupAllExpandTitle: '如果存在，则自动展开所有分组层级',
       expOptUseStyle: 'gaya',
       expUseStyleTitle: 'Jika ada, sel dengan gaya didukung',
       expOptOriginal: 'Data sumber',

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

@@ -240,6 +240,10 @@ export default {
       expMergeTitle: 'Se presenti, le cellule con strutture unite sono supportate',
       expOptAllExpand: "Espandere l'albero",
       expAllExpandTitle: 'Se esiste, è supportato per espandere tutti i dati con strutture gerarchiche',
+      expOptTreeAllExpand: '展开树',
+      expTreeAllExpandTitle: '如果存在，则自动展开所有树层级',
+      expOptRowGroupAllExpand: '展开分组',
+      expRowGroupAllExpandTitle: '如果存在，则自动展开所有分组层级',
       expOptUseStyle: 'stile',
       expUseStyleTitle: 'Se presenti, le celle con stile sono supportate',
       expOptOriginal: 'Dati di origine',

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

@@ -240,6 +240,10 @@ export default {
       expMergeTitle: '存在する場合、マージされた構造を持つ細胞がサポートされます',
       expOptAllExpand: 'ツリーを拡張します',
       expAllExpandTitle: '存在する場合、階層構造を使用してすべてのデータを拡張することがサポートされています',
+      expOptTreeAllExpand: '展开树',
+      expTreeAllExpandTitle: '如果存在，则自动展开所有树层级',
+      expOptRowGroupAllExpand: '展开分组',
+      expRowGroupAllExpandTitle: '如果存在，则自动展开所有分组层级',
       expOptUseStyle: 'スタイル',
       expUseStyleTitle: '存在する場合、スタイルのあるセルがサポートされています',
       expOptOriginal: 'ソースデータ',

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

@@ -240,6 +240,10 @@ export default {
       expMergeTitle: '존재하는 경우, 병합 된 구조를 갖는 세포가지지된다',
       expOptAllExpand: '나무를 확장하십시오',
       expAllExpandTitle: '존재하는 경우 계층 구조로 모든 데이터를 확장하도록 지원됩니다.',
+      expOptTreeAllExpand: '展开树',
+      expTreeAllExpandTitle: '如果存在，则自动展开所有树层级',
+      expOptRowGroupAllExpand: '展开分组',
+      expRowGroupAllExpandTitle: '如果存在，则自动展开所有分组层级',
       expOptUseStyle: '스타일',
       expUseStyleTitle: '존재하는 경우 스타일이있는 셀이 지원됩니다',
       expOptOriginal: '소스 데이터',

package/packages/locale/lang/ms-MY.ts

@@ -240,6 +240,10 @@ export default {
       expMergeTitle: 'Sekiranya ada, sel -sel dengan struktur yang digabungkan disokong',
       expOptAllExpand: 'Kembangkan pokok',
       expAllExpandTitle: 'Sekiranya wujud, ia disokong untuk mengembangkan semua data dengan struktur hierarki',
+      expOptTreeAllExpand: '展开树',
+      expTreeAllExpandTitle: '如果存在，则自动展开所有树层级',
+      expOptRowGroupAllExpand: '展开分组',
+      expRowGroupAllExpandTitle: '如果存在，则自动展开所有分组层级',
       expOptUseStyle: 'gaya',
       expUseStyleTitle: 'Sekiranya ada, sel dengan gaya disokong',
       expOptOriginal: 'Data sumber',

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

@@ -240,6 +240,10 @@ export default {
       expMergeTitle: 'Hvis de er til stede, støttes celler med sammenslåtte strukturer',
       expOptAllExpand: 'Utvid treet',
       expAllExpandTitle: 'Hvis det eksisterer, støttes den for å utvide alle data med hierarkiske strukturer',
+      expOptTreeAllExpand: '展开树',
+      expTreeAllExpandTitle: '如果存在，则自动展开所有树层级',
+      expOptRowGroupAllExpand: '展开分组',
+      expRowGroupAllExpandTitle: '如果存在，则自动展开所有分组层级',
       expOptUseStyle: 'stil',
       expUseStyleTitle: 'Hvis de er til stede, støttes celler med stil',
       expOptOriginal: 'Kildedata',

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

@@ -240,6 +240,10 @@ export default {
       expMergeTitle: 'Se presente, as células com estruturas mescladas são suportadas',
       expOptAllExpand: 'Expandir a árvore',
       expAllExpandTitle: 'Se existir, é suportado para expandir todos os dados com estruturas hierárquicas',
+      expOptTreeAllExpand: '展开树',
+      expTreeAllExpandTitle: '如果存在，则自动展开所有树层级',
+      expOptRowGroupAllExpand: '展开分组',
+      expRowGroupAllExpandTitle: '如果存在，则自动展开所有分组层级',
       expOptUseStyle: 'estilo',
       expUseStyleTitle: 'Se presente, células com estilo são suportadas',
       expOptOriginal: 'Dados de origem',

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

@@ -240,6 +240,10 @@ export default {
       expMergeTitle: 'Если присутствует, клетки с объединенными структурами поддерживаются',
       expOptAllExpand: 'Расширить дерево',
       expAllExpandTitle: 'Если он существует, он поддерживается для расширения всех данных с помощью иерархических структур',
+      expOptTreeAllExpand: '展开树',
+      expTreeAllExpandTitle: '如果存在，则自动展开所有树层级',
+      expOptRowGroupAllExpand: '展开分组',
+      expRowGroupAllExpandTitle: '如果存在，则自动展开所有分组层级',
       expOptUseStyle: 'стиль',
       expUseStyleTitle: 'Если присутствует, клетки со стилем поддерживаются',
       expOptOriginal: 'Исходные данные',

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

@@ -240,6 +240,10 @@ export default {
       expMergeTitle: 'หากมีอยู่จะรองรับเซลล์ที่มีโครงสร้างที่ผสานเข้าด้วยกัน',
       expOptAllExpand: 'ขยายต้นไม้',
       expAllExpandTitle: 'หากมีอยู่จะได้รับการสนับสนุนเพื่อขยายข้อมูลทั้งหมดด้วยโครงสร้างแบบลำดับชั้น',
+      expOptTreeAllExpand: '展开树',
+      expTreeAllExpandTitle: '如果存在，则自动展开所有树层级',
+      expOptRowGroupAllExpand: '展开分组',
+      expRowGroupAllExpandTitle: '如果存在，则自动展开所有分组层级',
       expOptUseStyle: 'สไตล์',
       expUseStyleTitle: 'หากมีอยู่จะรองรับเซลล์ที่มีสไตล์',
       expOptOriginal: 'แหล่งข้อมูล',

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

@@ -240,6 +240,10 @@ export default {
       expMergeTitle: 'ئەگەر مەۋجۇت بولسا برىكتۈرۈلگەن قۇرۇلمىلىق ھۆججەت ئىلمىنتىنى قوللايدۇ ',
       expOptAllExpand: '展开树',
       expAllExpandTitle: 'ئەگەر مەۋجۇت بولسا،دەرىجىسى بولغان بارلىق ئۇچۇرلار ئىچىلىدۇ ',
+      expOptTreeAllExpand: '展开树',
+      expTreeAllExpandTitle: '如果存在，则自动展开所有树层级',
+      expOptRowGroupAllExpand: '展开分组',
+      expRowGroupAllExpandTitle: '如果存在，则自动展开所有分组层级',
       expOptUseStyle: 'نۇسخا',
       expUseStyleTitle: 'ئەگەر مەۋجۇت بولسا ،نۇسخىسى بولغان ئىلمىنىتلارغا نۇسخا قوشىلىدۇ',
       expOptOriginal: 'ئەسلىي ئۇچۇر',

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

@@ -240,6 +240,10 @@ export default {
       expMergeTitle: "Якщо вони присутні, підтримуються клітини з об'єднаними структурами",
       expOptAllExpand: 'Розширити дерево',
       expAllExpandTitle: 'Якщо він існує, підтримується розширення всіх даних за допомогою ієрархічних структур',
+      expOptTreeAllExpand: '展开树',
+      expTreeAllExpandTitle: '如果存在，则自动展开所有树层级',
+      expOptRowGroupAllExpand: '展开分组',
+      expRowGroupAllExpandTitle: '如果存在，则自动展开所有分组层级',
       expOptUseStyle: 'стиль',
       expUseStyleTitle: 'Якщо вони присутні, підтримуються клітини зі стилем',
       expOptOriginal: 'Джерело даних',

package/packages/locale/lang/uz-UZ.ts

@@ -240,6 +240,10 @@ export default {
       expMergeTitle: "Agar hozirgi tuzilmalar bo'lgan hujayralar qo'llab-quvvatlansa",
       expOptAllExpand: 'Daraxtni kengaytiring',
       expAllExpandTitle: "Agar mavjud bo'lsa, ierarxik tuzilmalar bilan barcha ma'lumotlarni kengaytirish qo'llab-quvvatlanadi",
+      expOptTreeAllExpand: '展开树',
+      expTreeAllExpandTitle: '如果存在，则自动展开所有树层级',
+      expOptRowGroupAllExpand: '展开分组',
+      expRowGroupAllExpandTitle: '如果存在，则自动展开所有分组层级',
       expOptUseStyle: 'uslub',
       expUseStyleTitle: "Agar mavjud bo'lsa, uslublar bo'lgan hujayralar qo'llab-quvvatlanadi",
       expOptOriginal: "Manba ma'lumotlari",

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

@@ -240,6 +240,10 @@ export default {
       expMergeTitle: 'Nếu có, các tế bào có cấu trúc hợp nhất được hỗ trợ',
       expOptAllExpand: 'Mở rộng cây',
       expAllExpandTitle: 'Nếu nó tồn tại, nó được hỗ trợ để mở rộng tất cả dữ liệu với các cấu trúc phân cấp',
+      expOptTreeAllExpand: '展开树',
+      expTreeAllExpandTitle: '如果存在，则自动展开所有树层级',
+      expOptRowGroupAllExpand: '展开分组',
+      expRowGroupAllExpandTitle: '如果存在，则自动展开所有分组层级',
       expOptUseStyle: 'phong cách',
       expUseStyleTitle: 'Nếu có, các tế bào có phong cách được hỗ trợ',
       expOptOriginal: 'Dữ liệu nguồn',

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

@@ -240,6 +240,10 @@ export default {
       expMergeTitle: '如果存在，則支持帶有合併結構的單元格',
       expOptAllExpand: '展開樹',
       expAllExpandTitle: '如果存在，則支持將帶有層級結構的數據全部展開',
+      expOptTreeAllExpand: '展开树',
+      expTreeAllExpandTitle: '如果存在，则自动展开所有树层级',
+      expOptRowGroupAllExpand: '展开分组',
+      expRowGroupAllExpandTitle: '如果存在，则自动展开所有分组层级',
       expOptUseStyle: '樣式',
       expUseStyleTitle: '如果存在，則支持帶樣式的單元格',
       expOptOriginal: '源數據',

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

@@ -240,6 +240,10 @@ export default {
       expMergeTitle: '如果存在，则支持带有合并结构的单元格',
       expOptAllExpand: '展开树',
       expAllExpandTitle: '如果存在，则支持将带有层级结构的数据全部展开',
+      expOptTreeAllExpand: '展开树',
+      expTreeAllExpandTitle: '如果存在，则自动展开所有树层级',
+      expOptRowGroupAllExpand: '展开分组',
+      expRowGroupAllExpandTitle: '如果存在，则自动展开所有分组层级',
       expOptUseStyle: '样式',
       expUseStyleTitle: '如果存在，则支持带样式的单元格',
       expOptOriginal: '源数据',

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

@@ -420,7 +420,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const { immediate } = customOpts
       const trEl = evnt.currentTarget as HTMLElement
       const columnDragOpts = $xeTable.computeColumnDragOpts
-      const { isCrossDrag, isSelfToChildDrag, isToChildDrag, dragEndMethod } = columnDragOpts
+      const { isCrossDrag, isPeerDrag, isSelfToChildDrag, isToChildDrag, dragEndMethod } = columnDragOpts
       const { dragCol } = customPanelReactData
       const { prevDragCol, prevDragGroupField, prevDragAggFnColid, prevDragPos, prevDragToChild } = customPanelInternalData
       const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0
@@ -465,20 +465,28 @@ export default /* define-vxe-component start */ defineVxeComponent({
               if (dragColumn.parentId && newColumn.parentId) {
               // 子到子
 
-                if (!isCrossDrag) {
-                  return
-                }
-                if (oldAllMaps[newColumn.id]) {
-                  isSelfToChildStatus = true
-                  if (!(isCrossDrag && isSelfToChildDrag)) {
-                    if (VxeUI.modal) {
-                      VxeUI.modal.message({
-                        status: 'error',
-                        content: getI18n('vxe.error.treeDragChild')
-                      })
-                    }
+                if (isPeerDrag && !isCrossDrag) {
+                  if (dragColumn.parentId !== newColumn.parentId) {
+                    // 非同级
+                    return
+                  }
+                } else {
+                  if (!isCrossDrag) {
                     return
                   }
+
+                  if (oldAllMaps[newColumn.id]) {
+                    isSelfToChildStatus = true
+                    if (!(isCrossDrag && isSelfToChildDrag)) {
+                      if (VxeUI.modal) {
+                        VxeUI.modal.message({
+                          status: 'error',
+                          content: getI18n('vxe.error.treeDragChild')
+                        })
+                      }
+                      return
+                    }
+                  }
                 }
               } else if (dragColumn.parentId) {
               // 子到根
@@ -616,7 +624,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const customOpts = $xeTable.computeCustomOpts
       const { showSortDragButton, allowSort, immediate } = customOpts
       const columnDragOpts = $xeTable.computeColumnDragOpts
-      const { isCrossDrag, isToChildDrag } = columnDragOpts
+      const { isCrossDrag, isPeerDrag, isToChildDrag } = columnDragOpts
       const optEl = evnt.currentTarget as HTMLElement
       const isControlKey = hasControlKey(evnt)
       const colid = optEl.getAttribute('colid')
@@ -624,7 +632,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       customPanelInternalData.prevDragGroupField = null
       customPanelInternalData.prevDragAggFnColid = null
       // 是否移入有效列
-      if (column && (isCrossDrag || column.level === 1)) {
+      if (column && (isCrossDrag || isPeerDrag || column.level === 1)) {
         evnt.preventDefault()
         const offsetY = evnt.clientY - optEl.getBoundingClientRect().y
         const dragPos = offsetY < optEl.clientHeight / 2 ? 'top' : 'bottom'
@@ -632,9 +640,9 @@ export default /* define-vxe-component start */ defineVxeComponent({
           !dragCol ||
           !(showSortDragButton && allowSort) ||
           (dragCol && dragCol.id === column.id) ||
-          (!isCrossDrag && column.level > 1) ||
+          (!isCrossDrag && (isPeerDrag ? dragCol.parentId !== column.parentId : column.level > 1)) ||
           (!immediate && column.level > 1) ||
-          (!isCrossDrag && dragCol.level > 1) ||
+          (!isCrossDrag && (isPeerDrag ? dragCol.parentId !== column.parentId : dragCol.level > 1)) ||
           (!immediate && dragCol.level > 1)
         ) {
           showDropTip($xeTableCustomPanel, evnt, optEl, false, dragPos)
@@ -804,7 +812,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const { immediate, checkMethod, visibleMethod, allowVisible, allowSort, allowFixed, allowGroup, allowValues, trigger, placement, showSortDragButton, showSortMoveButton, showSortPutButton } = customOpts
       const isMaxFixedColumn = $xeTable.computeIsMaxFixedColumn
       const vSize = $xeTable.computeSize
-      const { isCrossDrag } = columnDragOpts
+      const { isCrossDrag, isPeerDrag } = columnDragOpts
       const slots = customOpts.slots || {}
       const headerSlot = slots.header
       const topSlot = slots.top
@@ -838,7 +846,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
           const colTitle = formatText(column.getTitle(), 1)
           const isDisabled = checkMethod ? !checkMethod({ $table: $xeTable, column }) : false
           const isHidden = !isChecked
-          const showSortBtn = ((isCrossDrag ? immediate : false) || column.level === 1)
+          const showSortBtn = (isCrossDrag || isPeerDrag ? immediate : false) || column.level === 1
           colVNs.push(
             h('li', {
               key: column.id,
@@ -1207,7 +1215,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const modalOpts = Object.assign({}, modalOptions)
       const drawerOpts = Object.assign({}, drawerOptions)
       const isMaxFixedColumn = $xeTable.computeIsMaxFixedColumn
-      const { isCrossDrag } = columnDragOpts
+      const { isCrossDrag, isPeerDrag } = columnDragOpts
       const slots = customOpts.slots || {}
       const headerSlot = slots.header
       const topSlot = slots.top
@@ -1255,7 +1263,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
           const isColGroup = column.children && column.children.length
           const isDisabled = checkMethod ? !checkMethod({ $table: $xeTable, column }) : false
           const isHidden = !isChecked
-          const showSortBtn = ((isCrossDrag ? immediate : false) || column.level === 1)
+          const showSortBtn = (isCrossDrag || isPeerDrag ? immediate : false) || column.level === 1
           trVNs.push(
             h('tr', {
               key: column.id,

package/packages/table/module/export/export-panel.ts

@@ -242,7 +242,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
 
       const { defaultOptions, storeData } = props
       const { isAll: isAllChecked, isIndeterminate: isAllIndeterminate } = reactData
-      const { hasTree, hasMerge, isPrint, hasColgroup, columns } = storeData
+      const { hasTree, hasRowGroup, hasMerge, isPrint, hasColgroup, columns } = storeData
       const { isHeader } = defaultOptions
       const colVNs: VNode[] = []
       const checkedAll = $xeExportPanel.computeCheckedAll
@@ -494,6 +494,19 @@ export default /* define-vxe-component start */ defineVxeComponent({
                                       }
                                     }
                                   }),
+                                  h('vxe-checkbox', {
+                                    props: {
+                                      value: defaultOptions.isFooter,
+                                      disabled: !storeData.hasFooter,
+                                      title: getI18n('vxe.export.expFooterTitle'),
+                                      content: getI18n('vxe.export.expOptFooter')
+                                    },
+                                    on: {
+                                      input (value: any) {
+                                        defaultOptions.isFooter = value
+                                      }
+                                    }
+                                  }),
                                   h('vxe-checkbox', {
                                     props: {
                                       value: isHeader ? defaultOptions.isTitle : false,
@@ -564,35 +577,34 @@ export default /* define-vxe-component start */ defineVxeComponent({
                                           defaultOptions.useStyle = value
                                         }
                                       }
-                                    }),
+                                    })
+                                ]),
+                                h('div', {
+                                  class: 'vxe-table-export--panel-option-row'
+                                }, [
                                   h('vxe-checkbox', {
                                     props: {
-                                      value: hasTree ? defaultOptions.isAllExpand : false,
+                                      value: hasTree ? defaultOptions.isTreeAllExpanded : false,
                                       disabled: hasEmptyData || !hasTree,
-                                      title: getI18n('vxe.export.expAllExpandTitle'),
-                                      content: getI18n('vxe.export.expOptAllExpand')
+                                      title: getI18n('vxe.export.expTreeAllExpandTitle'),
+                                      content: getI18n('vxe.export.expOptTreeAllExpand')
                                     },
                                     on: {
                                       input (value: any) {
-                                        defaultOptions.isAllExpand = value
+                                        defaultOptions.isTreeAllExpanded = value
                                       }
                                     }
-                                  })
-                                ]),
-
-                                h('div', {
-                                  class: 'vxe-table-export--panel-option-row'
-                                }, [
+                                  }),
                                   h('vxe-checkbox', {
                                     props: {
-                                      value: defaultOptions.isFooter,
-                                      disabled: !storeData.hasFooter,
-                                      title: getI18n('vxe.export.expFooterTitle'),
-                                      content: getI18n('vxe.export.expOptFooter')
+                                      value: hasRowGroup ? defaultOptions.isRowGroupAllExpanded : false,
+                                      disabled: hasEmptyData || !hasRowGroup,
+                                      title: getI18n('vxe.export.expRowGroupAllExpandTitle'),
+                                      content: getI18n('vxe.export.expOptRowGroupAllExpand')
                                     },
                                     on: {
                                       input (value: any) {
-                                        defaultOptions.isFooter = value
+                                        defaultOptions.isRowGroupAllExpanded = value
                                       }
                                     }
                                   })