vxe-table 3.15.47 → 3.15.48

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

@@ -138,7 +138,7 @@ export default {
       cstmDragTarget: 'Move: {0}',
       setting: {
         colSort: 'Sort',
-        sortHelpTip: 'Click and drag the icon to adjust the sort of columns',
+        sortHelpTip: 'Click and drag the icons to adjust the order.',
         colTitle: 'Column title',
         colResizable: 'Column width (pixels)',
         colVisible: 'Whether to display',
@@ -565,7 +565,8 @@ export default {
           values: 'Values',
           groupPlaceholder: 'Drag here to set row groups',
           valuesPlaceholder: 'Drag here to aggregate',
-          dragExistCol: 'The column already exists'
+          dragExistCol: 'The column already exists',
+          sortHelpTip: 'Click and drag the icons to adjust the order.'
         },
         aggFuncs: {
           sum: 'Sum',

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

@@ -138,7 +138,7 @@ export default {
       cstmDragTarget: 'Mover: {0}',
       setting: {
         colSort: 'Clasificar',
-        sortHelpTip: 'Haga clic y arrastre el icono para ajustar el tipo de columnas',
+        sortHelpTip: '点击并拖动图标可以调整顺序',
         colTitle: 'Título de columna',
         colResizable: 'Ancho de columna (píxeles)',
         colVisible: 'Si mostrar',
@@ -565,7 +565,8 @@ export default {
           values: '值',
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
-          dragExistCol: '该列已存在'
+          dragExistCol: '该列已存在',
+          sortHelpTip: '点击并拖动图标可以调整顺序'
         },
         aggFuncs: {
           sum: '求和',

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

@@ -138,7 +138,7 @@ export default {
       cstmDragTarget: 'Déplacer: {0}',
       setting: {
         colSort: 'Trier',
-        sortHelpTip: "Cliquez et faites glisser l'icône pour ajuster le type de colonnes",
+        sortHelpTip: '点击并拖动图标可以调整顺序',
         colTitle: 'Titre de la colonne',
         colResizable: 'Largeur de colonne (pixels)',
         colVisible: "S'il faut afficher",
@@ -565,7 +565,8 @@ export default {
           values: '值',
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
-          dragExistCol: '该列已存在'
+          dragExistCol: '该列已存在',
+          sortHelpTip: '点击并拖动图标可以调整顺序'
         },
         aggFuncs: {
           sum: '求和',

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

@@ -138,7 +138,7 @@ export default {
       cstmDragTarget: 'Mozgás: {0}',
       setting: {
         colSort: 'Fajta',
-        sortHelpTip: 'Kattintson és húzza az ikont az oszlopok beállításához',
+        sortHelpTip: '点击并拖动图标可以调整顺序',
         colTitle: 'Oszlopcím',
         colResizable: 'Oszlop szélessége (pixelek)',
         colVisible: 'Függetlenül attól, hogy megjelenjen',
@@ -565,7 +565,8 @@ export default {
           values: '值',
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
-          dragExistCol: '该列已存在'
+          dragExistCol: '该列已存在',
+          sortHelpTip: '点击并拖动图标可以调整顺序'
         },
         aggFuncs: {
           sum: '求和',

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

@@ -138,7 +138,7 @@ export default {
       cstmDragTarget: '移动：{0}',
       setting: {
         colSort: '排序',
-        sortHelpTip: '点击并拖动图标可以调整列的排序',
+        sortHelpTip: '点击并拖动图标可以调整顺序',
         colTitle: '列标题',
         colResizable: '列宽（像素）',
         colVisible: '是否显示',
@@ -565,7 +565,8 @@ export default {
           values: '值',
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
-          dragExistCol: '该列已存在'
+          dragExistCol: '该列已存在',
+          sortHelpTip: '点击并拖动图标可以调整顺序'
         },
         aggFuncs: {
           sum: '求和',

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

@@ -138,7 +138,7 @@ export default {
       cstmDragTarget: 'Pindahkan: {0}',
       setting: {
         colSort: 'Menyortir',
-        sortHelpTip: 'Klik dan seret ikon untuk menyesuaikan semacam kolom',
+        sortHelpTip: '点击并拖动图标可以调整顺序',
         colTitle: 'Judul kolom',
         colResizable: 'Lebar kolom (piksel)',
         colVisible: 'Apakah akan menampilkan',
@@ -565,7 +565,8 @@ export default {
           values: '值',
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
-          dragExistCol: '该列已存在'
+          dragExistCol: '该列已存在',
+          sortHelpTip: '点击并拖动图标可以调整顺序'
         },
         aggFuncs: {
           sum: '求和',

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

@@ -138,7 +138,7 @@ export default {
       cstmDragTarget: 'Muovi: {0}',
       setting: {
         colSort: 'Ordinare',
-        sortHelpTip: "Fare clic e trascinare l'icona per regolare il tipo di colonne",
+        sortHelpTip: '点击并拖动图标可以调整顺序',
         colTitle: 'Titolo della colonna',
         colResizable: 'Larghezza della colonna (pixel)',
         colVisible: 'Se visualizzare',
@@ -565,7 +565,8 @@ export default {
           values: '值',
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
-          dragExistCol: '该列已存在'
+          dragExistCol: '该列已存在',
+          sortHelpTip: '点击并拖动图标可以调整顺序'
         },
         aggFuncs: {
           sum: '求和',

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

@@ -138,7 +138,7 @@ export default {
       cstmDragTarget: '移動：{0}',
       setting: {
         colSort: '選別',
-        sortHelpTip: 'アイコンをクリックしてドラッグして、列の種類を調整します',
+        sortHelpTip: '点击并拖动图标可以调整顺序',
         colTitle: '列のタイトル',
         colResizable: '列幅（ピクセル）',
         colVisible: '表示するかどうか',
@@ -565,7 +565,8 @@ export default {
           values: '值',
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
-          dragExistCol: '该列已存在'
+          dragExistCol: '该列已存在',
+          sortHelpTip: '点击并拖动图标可以调整顺序'
         },
         aggFuncs: {
           sum: '求和',

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

@@ -138,7 +138,7 @@ export default {
       cstmDragTarget: '움직임 : {0}',
       setting: {
         colSort: '종류',
-        sortHelpTip: '아이콘을 클릭하고 드래그하여 열을 조정합니다.',
+        sortHelpTip: '点击并拖动图标可以调整顺序',
         colTitle: '열 제목',
         colResizable: '열 폭 (픽셀)',
         colVisible: '표시 여부',
@@ -565,7 +565,8 @@ export default {
           values: '值',
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
-          dragExistCol: '该列已存在'
+          dragExistCol: '该列已存在',
+          sortHelpTip: '点击并拖动图标可以调整顺序'
         },
         aggFuncs: {
           sum: '求和',

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

@@ -138,7 +138,7 @@ export default {
       cstmDragTarget: 'Bergerak: {0}',
       setting: {
         colSort: 'Menyusun',
-        sortHelpTip: 'Klik dan seret ikon untuk menyesuaikan jenis lajur',
+        sortHelpTip: '点击并拖动图标可以调整顺序',
         colTitle: 'Tajuk lajur',
         colResizable: 'Lebar lajur (piksel)',
         colVisible: 'Sama ada untuk memaparkan',
@@ -565,7 +565,8 @@ export default {
           values: '值',
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
-          dragExistCol: '该列已存在'
+          dragExistCol: '该列已存在',
+          sortHelpTip: '点击并拖动图标可以调整顺序'
         },
         aggFuncs: {
           sum: '求和',

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

@@ -138,7 +138,7 @@ export default {
       cstmDragTarget: 'Flytt: {0}',
       setting: {
         colSort: 'Sortere',
-        sortHelpTip: 'Klikk og dra ikonet for å justere typen kolonner',
+        sortHelpTip: '点击并拖动图标可以调整顺序',
         colTitle: 'Kolonnetittel',
         colResizable: 'Kolonnebredde (piksler)',
         colVisible: 'Om du skal vise',
@@ -565,7 +565,8 @@ export default {
           values: '值',
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
-          dragExistCol: '该列已存在'
+          dragExistCol: '该列已存在',
+          sortHelpTip: '点击并拖动图标可以调整顺序'
         },
         aggFuncs: {
           sum: '求和',

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

@@ -138,7 +138,7 @@ export default {
       cstmDragTarget: 'Move: {0}',
       setting: {
         colSort: 'Organizar',
-        sortHelpTip: 'Clique e arraste o ícone para ajustar o tipo de colunas',
+        sortHelpTip: '点击并拖动图标可以调整顺序',
         colTitle: 'Título da coluna',
         colResizable: 'Largura da coluna (pixels)',
         colVisible: 'Se deve exibir',
@@ -565,7 +565,8 @@ export default {
           values: '值',
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
-          dragExistCol: '该列已存在'
+          dragExistCol: '该列已存在',
+          sortHelpTip: '点击并拖动图标可以调整顺序'
         },
         aggFuncs: {
           sum: '求和',

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

@@ -138,7 +138,7 @@ export default {
       cstmDragTarget: 'MOVE: {0}',
       setting: {
         colSort: 'Сортировка',
-        sortHelpTip: 'Нажмите и перетащите значок, чтобы настроить тип столбцов',
+        sortHelpTip: '点击并拖动图标可以调整顺序',
         colTitle: 'Заголовок столбца',
         colResizable: 'Ширина столбца (пиксели)',
         colVisible: 'Отображать ли',
@@ -565,7 +565,8 @@ export default {
           values: '值',
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
-          dragExistCol: '该列已存在'
+          dragExistCol: '该列已存在',
+          sortHelpTip: '点击并拖动图标可以调整顺序'
         },
         aggFuncs: {
           sum: '求和',

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

@@ -138,7 +138,7 @@ export default {
       cstmDragTarget: 'ย้าย: {0}',
       setting: {
         colSort: 'เรียงลำดับ',
-        sortHelpTip: 'คลิกและลากไอคอนเพื่อปรับประเภทคอลัมน์',
+        sortHelpTip: '点击并拖动图标可以调整顺序',
         colTitle: 'ชื่อคอลัมน์',
         colResizable: 'ความกว้างของคอลัมน์ (พิกเซล)',
         colVisible: 'ไม่ว่าจะแสดง',
@@ -565,7 +565,8 @@ export default {
           values: '值',
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
-          dragExistCol: '该列已存在'
+          dragExistCol: '该列已存在',
+          sortHelpTip: '点击并拖动图标可以调整顺序'
         },
         aggFuncs: {
           sum: '求和',

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

@@ -138,7 +138,7 @@ export default {
       cstmDragTarget: 'يۆتكەش：{0}',
       setting: {
         colSort: 'تەرتىپلەش',
-        sortHelpTip: 'بىسىپ ياكى سىنبەلگىنى تارتسىڭىز قۇرنى تەرتىپلىيەلەيسىز ',
+        sortHelpTip: '点击并拖动图标可以调整顺序',
         colTitle: '列标题',
         colResizable: 'قۇر كەڭلىڭى(پېكسىل)',
         colVisible: 'كۆرۈنەمدۇ-كۆرۈنمەمدۇ',
@@ -565,7 +565,8 @@ export default {
           values: '值',
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
-          dragExistCol: '该列已存在'
+          dragExistCol: '该列已存在',
+          sortHelpTip: '点击并拖动图标可以调整顺序'
         },
         aggFuncs: {
           sum: '求和',

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

@@ -138,7 +138,7 @@ export default {
       cstmDragTarget: 'Перемістити: {0}',
       setting: {
         colSort: 'Сортувати',
-        sortHelpTip: 'Клацніть та перетягніть значок, щоб відрегулювати стовпці',
+        sortHelpTip: '点击并拖动图标可以调整顺序',
         colTitle: 'Заголовок стовпців',
         colResizable: 'Ширина стовпця (пікселі)',
         colVisible: 'Чи відображати',
@@ -565,7 +565,8 @@ export default {
           values: '值',
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
-          dragExistCol: '该列已存在'
+          dragExistCol: '该列已存在',
+          sortHelpTip: '点击并拖动图标可以调整顺序'
         },
         aggFuncs: {
           sum: '求和',

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

@@ -138,7 +138,7 @@ export default {
       cstmDragTarget: "Ko'chiring: {0}",
       setting: {
         colSort: 'Tartib',
-        sortHelpTip: 'Ustunlar turini sozlash uchun ikonkani bosing va torting',
+        sortHelpTip: '点击并拖动图标可以调整顺序',
         colTitle: 'Ustun unvon',
         colResizable: 'Ustun kengligi (piksellar)',
         colVisible: "Ko'rsatish kerakmi",
@@ -565,7 +565,8 @@ export default {
           values: '值',
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
-          dragExistCol: '该列已存在'
+          dragExistCol: '该列已存在',
+          sortHelpTip: '点击并拖动图标可以调整顺序'
         },
         aggFuncs: {
           sum: '求和',

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

@@ -138,7 +138,7 @@ export default {
       cstmDragTarget: 'Di chuyển: {0}',
       setting: {
         colSort: 'Loại',
-        sortHelpTip: 'Nhấp và kéo biểu tượng để điều chỉnh các loại cột',
+        sortHelpTip: '点击并拖动图标可以调整顺序',
         colTitle: 'Tiêu đề cột',
         colResizable: 'Chiều rộng cột (pixel)',
         colVisible: 'Có hiển thị không',
@@ -565,7 +565,8 @@ export default {
           values: '值',
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
-          dragExistCol: '该列已存在'
+          dragExistCol: '该列已存在',
+          sortHelpTip: '点击并拖动图标可以调整顺序'
         },
         aggFuncs: {
           sum: '求和',

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

@@ -138,7 +138,7 @@ export default {
       cstmDragTarget: '移動：{0}',
       setting: {
         colSort: '排序',
-        sortHelpTip: '點擊並拖動圖標可以調整列的排序',
+        sortHelpTip: '點擊並拖動圖標可以調整順序',
         colTitle: '列標題',
         colResizable: '列寬（像素）',
         colVisible: '是否顯示',
@@ -565,7 +565,8 @@ export default {
           values: '值',
           groupPlaceholder: '拖曳至此處進行分組',
           valuesPlaceholder: '拖曳至此處進行聚合',
-          dragExistCol: '該列已存在'
+          dragExistCol: '該列已存在',
+          sortHelpTip: '點擊並拖動圖標可以調整順序'
         },
         aggFuncs: {
           sum: '求和',

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

@@ -138,7 +138,7 @@ export default {
       cstmDragTarget: '移动：{0}',
       setting: {
         colSort: '排序',
-        sortHelpTip: '点击并拖动图标可以调整列的排序',
+        sortHelpTip: '点击并拖动图标可以调整顺序',
         colTitle: '列标题',
         colResizable: '列宽（像素）',
         colVisible: '是否显示',
@@ -565,7 +565,8 @@ export default {
           values: '值',
           groupPlaceholder: '拖至此处进行分组',
           valuesPlaceholder: '拖至此处进行聚合',
-          dragExistCol: '该列已存在'
+          dragExistCol: '该列已存在',
+          sortHelpTip: '点击并拖动图标可以调整顺序'
         },
         aggFuncs: {
           sum: '求和',

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

@@ -449,7 +449,7 @@ const renderPopupPanel = (h: CreateElement, $xeTableCustomPanel: VxeTableCustomP
   const $xeGrid = $xeTable.$xeGrid
 
   const { customStore } = props
-  const { resizable: allResizable } = tableProps
+  const { treeConfig, rowGroupConfig, aggregateConfig, resizable: allResizable } = tableProps
   const { isCustomStatus, customColumnList } = tableReactData
   const customOpts = $xeTable.computeCustomOpts
   const { immediate } = customOpts
@@ -750,7 +750,14 @@ const renderPopupPanel = (h: CreateElement, $xeTableCustomPanel: VxeTableCustomP
                 }, $xeTable.callSlot(bottomSlot, params, h))
                 : renderEmptyElement($xeTable),
               renderDragTip(h, _vm)
-            ])
+            ]),
+            !treeConfig && (aggregateConfig || rowGroupConfig) && $xeTable.getPivotTableAggregatePopupPanel
+              ? h($xeTable.getPivotTableAggregatePopupPanel(), {
+                props: {
+                  customStore
+                }
+              })
+              : renderEmptyElement($xeTable)
           ])
     },
     footer: () => {

package/packages/table/src/body.ts

@@ -218,6 +218,7 @@ function renderTdColumn (
     $xeTable.triggerCellDblclickEvent(evnt, cellParams)
   }
   let isMergeCell = false
+  let mergeColspan = 1
   let mergeRowspan = 1
   // 合并行或列
   if (mergeBodyFlag && mergeBodyList.length) {
@@ -234,6 +235,7 @@ function renderTdColumn (
       }
       if (colspan > 1) {
         isMergeCell = true
+        mergeColspan = colspan
         tdAttrs.colspan = colspan
       }
     }
@@ -250,6 +252,7 @@ function renderTdColumn (
     }
     if (colspan > 1) {
       isMergeCell = true
+      mergeColspan = colspan
       tdAttrs.colspan = colspan
     }
   }
@@ -293,16 +296,16 @@ function renderTdColumn (
 
   const tcStyle: Record<string, string> = {}
   if (hasEllipsis && resizeWidthFlag) {
-    let tsColspan = tdAttrs.colspan || 0
-    if (tsColspan > 1) {
-      for (let index = 1; index < tsColspan; index++) {
+    let mergeColWidth = 0
+    if (mergeColspan > 1) {
+      for (let index = 1; index < mergeColspan; index++) {
         const nextColumn = visibleColumn[columnIndex + index]
         if (nextColumn) {
-          tsColspan += nextColumn.renderWidth
+          mergeColWidth += nextColumn.renderWidth
         }
       }
     }
-    tcStyle.width = `${column.renderWidth - (cellOffsetWidth * tsColspan)}px`
+    tcStyle.width = `${column.renderWidth + mergeColWidth - cellOffsetWidth}px`
   }
   if (scrollYLoad || hasEllipsis || isCsHeight || isRsHeight) {
     tcStyle.height = `${cellHeight}px`

package/packages/table/src/cell.ts

@@ -165,12 +165,27 @@ function renderHeaderCellBaseVNs (h: CreateElement, params: VxeTableDefines.Cell
   return vns
 }
 
+function getRenderDefaultColumnTitle (h: CreateElement, column: VxeTableDefines.ColumnInfo, content: VxeComponentSlotType | VxeComponentSlotType[]) {
+  if (column.type === 'html' && XEUtils.isString(content)) {
+    return h('span', {
+      key: 'ch',
+      domProps: {
+        innerHTML: content
+      }
+    })
+  }
+  return h('span', {
+    key: 'ct'
+  }, getSlotVNs(content))
+}
+
 function renderTitleContent (h: CreateElement, params: VxeTableDefines.CellRenderHeaderParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }, content: VxeComponentSlotType | VxeComponentSlotType[]) {
   const { $table, column } = params
-  const { type, showHeaderOverflow } = column
+  const { showHeaderOverflow } = column
   const tableProps = $table
   const tableReactData = $table as unknown as TableReactData
   const { showHeaderOverflow: allColumnHeaderOverflow } = tableProps
+  const { isRowGroupStatus } = tableReactData
   const tooltipOpts = $table.computeTooltipOpts
   const showAllTip = tooltipOpts.showAll
   const headOverflow = XEUtils.isUndefined(showHeaderOverflow) || XEUtils.isNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow
@@ -199,19 +214,16 @@ function renderTitleContent (h: CreateElement, params: VxeTableDefines.CellRende
       }
     }
   }
+  const titleVN = getRenderDefaultColumnTitle(h, column, content)
   return [
-    type === 'html' && XEUtils.isString(content)
-      ? h('span', {
-        class: 'vxe-cell--title',
-        domProps: {
-          innerHTML: content
-        },
-        on: ons
-      })
-      : h('span', {
-        class: 'vxe-cell--title',
-        on: ons
-      }, getSlotVNs(content))
+    h('span', {
+      class: 'vxe-cell--title',
+      ...ons
+    }, isRowGroupStatus && column.aggFunc && $table.getPivotTableAggregateRenderColTitles
+      ? $table.getPivotTableAggregateRenderColTitles(h, column, titleVN)
+      : [
+          titleVN
+        ])
   ]
 }
 

package/packages/table/src/methods.ts

@@ -9164,12 +9164,24 @@ const Methods = {
     const internalData = $xeTable as unknown as TableInternalData
 
     const { aggregateConfig, rowGroupConfig } = props
+    const aggregateOpts = $xeTable.computeAggregateOpts
+    const { maxGroupSize } = aggregateOpts
     if (!(aggregateConfig || rowGroupConfig)) {
       errLog('vxe.error.reqProp', ['aggregate-config'])
       return $xeTable.$nextTick()
     }
-    if (fieldOrColumns) {
-      handleUpdateRowGroup($xeTable, (XEUtils.isArray(fieldOrColumns) ? fieldOrColumns : [fieldOrColumns]).map(fieldOrColumn => {
+    const confList = fieldOrColumns ? (XEUtils.isArray(fieldOrColumns) ? fieldOrColumns : [fieldOrColumns]) : []
+    if (maxGroupSize && confList.length > maxGroupSize) {
+      if (VxeUI.modal) {
+        VxeUI.modal.message({
+          status: 'error',
+          content: getI18n('vxe.table.maxGroupCol', [maxGroupSize])
+        })
+      }
+      return $xeTable.$nextTick()
+    }
+    if (confList.length) {
+      handleUpdateRowGroup($xeTable, confList.map(fieldOrColumn => {
         return XEUtils.isString(fieldOrColumn) ? fieldOrColumn : fieldOrColumn.field
       }))
       return loadTableData($xeTable, internalData.tableSynchData, true)

package/packages/ui/index.ts

@@ -150,7 +150,8 @@ VxeUI.setConfig({
       mapChildrenField: '_X_ROW_CHILD_LIST',
       indent: 20,
       showIcon: true,
-      maxGroupSize: 4
+      maxGroupSize: 4,
+      showAggFuncTitle: true
     },
     treeConfig: {
       padding: true,

package/styles/components/table-module/custom.scss

@@ -218,12 +218,16 @@
 
 .vxe-table-custom-popup--body-wrapper {
   position: relative;
-  overflow: auto;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
   height: 100%;
   outline: 0;
 }
 .vxe-table-custom-popup--handle-wrapper {
+  flex-grow: 1;
   outline: 0;
+  overflow: auto;
 }
 
 .vxe-table-custom-popup--table-wrapper {