vxe-table 4.19.0 → 4.19.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.19.0",
+  "version": "4.19.1",
   "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",

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

@@ -104,7 +104,8 @@ export default {
     select: {
       clear: '清除',
       allChecked: '全选',
-      total: '{0} / {1}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: 'يبحث',
       loadingText: 'تحميل',
       emptyText: 'لا توجد بيانات حتى الآن',
@@ -121,7 +122,8 @@ export default {
       allChecked: '全选',
       allExpand: '全部展开',
       clearExpand: '全部收起',
-      total: '已选 {0}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: 'Search',
       emptyText: '暂无数据'
     },

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

@@ -104,7 +104,8 @@ export default {
     select: {
       clear: 'Klar',
       allChecked: 'Wählen Sie alle aus',
-      total: '{0} / {1}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: 'suchen',
       loadingText: 'Laden',
       emptyText: 'Noch keine Daten',
@@ -121,7 +122,8 @@ export default {
       allChecked: 'Wählen Sie alle aus',
       allExpand: 'Alle erweitern',
       clearExpand: 'Alle schließen',
-      total: 'Ausgewählt {0}',
+      close: '关闭',
+      total: '已选 {0} 项',
       search: 'suchen',
       emptyText: 'Noch keine Daten'
     },

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

@@ -104,7 +104,8 @@ export default {
     select: {
       clear: 'Clear',
       allChecked: 'All',
-      total: '{0} / {1}',
+      total: '{0} items selected',
+      close: 'Close',
       search: 'Search',
       loadingText: 'Loading',
       emptyText: 'No data yet',
@@ -121,7 +122,8 @@ export default {
       allChecked: 'Check all',
       allExpand: 'Expand all',
       clearExpand: 'Collapse all',
-      total: 'Selected {0}',
+      total: '{0} items selected',
+      close: 'Close',
       search: 'Search',
       emptyText: 'No data yet'
     },

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

@@ -104,7 +104,8 @@ export default {
     select: {
       clear: 'Claro',
       allChecked: 'Seleccionar todo',
-      total: '{0} / {1}',
+      total: '{0} items selected',
+      close: 'Close',
       search: 'buscar',
       loadingText: 'cargando',
       emptyText: 'Aún no hay datos',
@@ -121,7 +122,8 @@ export default {
       allChecked: 'Seleccionar todo',
       allExpand: 'Expandir todo',
       clearExpand: 'Cerrar todo',
-      total: 'Seleccionado {0}',
+      total: '{0} items selected',
+      close: 'Close',
       search: 'buscar',
       emptyText: 'Aún no hay datos'
     },

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

@@ -104,7 +104,8 @@ export default {
     select: {
       clear: '清除',
       allChecked: '全选',
-      total: '{0} / {1}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: 'recherche',
       loadingText: 'chargement',
       emptyText: 'Pas encore de données',
@@ -121,7 +122,8 @@ export default {
       allChecked: '全选',
       allExpand: '全部展开',
       clearExpand: '全部收起',
-      total: '已选 {0}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },

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

@@ -104,7 +104,8 @@ export default {
     select: {
       clear: '清除',
       allChecked: '全选',
-      total: '{0} / {1}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: 'keresés',
       loadingText: 'terhelés',
       emptyText: 'Még nincs adat',
@@ -121,7 +122,8 @@ export default {
       allChecked: '全选',
       allExpand: '全部展开',
       clearExpand: '全部收起',
-      total: '已选 {0}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },

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

@@ -104,7 +104,8 @@ export default {
     select: {
       clear: '清除',
       allChecked: '全选',
-      total: '{0} / {1}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: '搜索',
       loadingText: '加载中...',
       emptyText: '暂无数据',
@@ -121,7 +122,8 @@ export default {
       allChecked: '全选',
       allExpand: '全部展开',
       clearExpand: '全部收起',
-      total: '已选 {0}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },

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

@@ -104,7 +104,8 @@ export default {
     select: {
       clear: '清除',
       allChecked: '全选',
-      total: '{0} / {1}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: 'mencari',
       loadingText: 'memuat',
       emptyText: 'Belum ada data',
@@ -121,7 +122,8 @@ export default {
       allChecked: '全选',
       allExpand: '全部展开',
       clearExpand: '全部收起',
-      total: '已选 {0}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },

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

@@ -104,7 +104,8 @@ export default {
     select: {
       clear: '清除',
       allChecked: '全选',
-      total: '{0} / {1}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: 'ricerca',
       loadingText: 'caricamento',
       emptyText: 'Nessun dati ancora',
@@ -121,7 +122,8 @@ export default {
       allChecked: '全选',
       allExpand: '全部展开',
       clearExpand: '全部收起',
-      total: '已选 {0}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },

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

@@ -104,7 +104,8 @@ export default {
     select: {
       clear: 'クリア',
       allChecked: 'すべてを選択します',
-      total: '{0} / {1}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: '検索',
       loadingText: '読み込み',
       emptyText: 'まだデータはありません',
@@ -121,7 +122,8 @@ export default {
       allChecked: 'すべてを選択します',
       allExpand: 'すべて拡張します',
       clearExpand: 'すべてを閉じます',
-      total: '選択{0}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: '検索',
       emptyText: 'まだデータはありません'
     },

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

@@ -104,7 +104,8 @@ export default {
     select: {
       clear: '분명한',
       allChecked: '모두를 선택하십시오',
-      total: '{0} / {1}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: '찾다',
       loadingText: '로딩',
       emptyText: '아직 데이터가 없습니다',
@@ -121,7 +122,8 @@ export default {
       allChecked: '모두를 선택하십시오',
       allExpand: '모든 것을 확장하십시오',
       clearExpand: '모두 닫으십시오',
-      total: '선택된 {0}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: '찾다',
       emptyText: '아직 데이터가 없습니다'
     },

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

@@ -104,7 +104,8 @@ export default {
     select: {
       clear: '清除',
       allChecked: '全选',
-      total: '{0} / {1}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: 'cari',
       loadingText: 'Memuatkan',
       emptyText: 'Belum ada data',
@@ -121,7 +122,8 @@ export default {
       allChecked: '全选',
       allExpand: '全部展开',
       clearExpand: '全部收起',
-      total: '已选 {0}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },

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

@@ -104,7 +104,8 @@ export default {
     select: {
       clear: '清除',
       allChecked: '全选',
-      total: '{0} / {1}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: 'søk',
       loadingText: 'lasting',
       emptyText: 'Ingen data ennå',
@@ -121,7 +122,8 @@ export default {
       allChecked: '全选',
       allExpand: '全部展开',
       clearExpand: '全部收起',
-      total: '已选 {0}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },

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

@@ -104,7 +104,8 @@ export default {
     select: {
       clear: '清除',
       allChecked: '全选',
-      total: '{0} / {1}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: 'procurar',
       loadingText: 'carregando',
       emptyText: 'Ainda não há dados',
@@ -121,7 +122,8 @@ export default {
       allChecked: '全选',
       allExpand: '全部展开',
       clearExpand: '全部收起',
-      total: '已选 {0}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },

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

@@ -104,7 +104,8 @@ export default {
     select: {
       clear: 'Прозрачный',
       allChecked: 'Выберите все',
-      total: '{0} / {1}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: 'поиск',
       loadingText: 'загрузка',
       emptyText: 'Нет данных пока',
@@ -121,7 +122,8 @@ export default {
       allChecked: 'Выберите все',
       allExpand: 'Расширить все',
       clearExpand: 'Закрыть все',
-      total: 'Выбрано {0}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: 'поиск',
       emptyText: 'Нет данных пока'
     },

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

@@ -104,7 +104,8 @@ export default {
     select: {
       clear: '清除',
       allChecked: '全选',
-      total: '{0} / {1}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: 'ค้นหา',
       loadingText: 'การโหลด',
       emptyText: 'ยังไม่มีข้อมูล',
@@ -121,7 +122,8 @@ export default {
       allChecked: '全选',
       allExpand: '全部展开',
       clearExpand: '全部收起',
-      total: '已选 {0}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },

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

@@ -104,7 +104,8 @@ export default {
     select: {
       clear: '清除',
       allChecked: '全选',
-      total: '{0} / {1}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: 'ئىزدەش',
       loadingText: 'يۈكلىنىۋاتىدۇ',
       emptyText: 'ھازىرچە ئۇچۇر يوق',
@@ -121,7 +122,8 @@ export default {
       allChecked: '全选',
       allExpand: '全部展开',
       clearExpand: '全部收起',
-      total: '已选 {0}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },

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

@@ -104,7 +104,8 @@ export default {
     select: {
       clear: '清除',
       allChecked: '全选',
-      total: '{0} / {1}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: 'обшук',
       loadingText: 'навантаження',
       emptyText: 'Ще немає даних',
@@ -121,7 +122,8 @@ export default {
       allChecked: '全选',
       allExpand: '全部展开',
       clearExpand: '全部收起',
-      total: '已选 {0}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },

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

@@ -104,7 +104,8 @@ export default {
     select: {
       clear: '清除',
       allChecked: '全选',
-      total: '{0} / {1}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: 'qidirish',
       loadingText: 'yuklamoq',
       emptyText: "Hali ma'lumot yo'q",
@@ -121,7 +122,8 @@ export default {
       allChecked: '全选',
       allExpand: '全部展开',
       clearExpand: '全部收起',
-      total: '{0} / {1}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },

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

@@ -104,7 +104,8 @@ export default {
     select: {
       clear: 'Thông thoáng',
       allChecked: 'Chọn tất cả',
-      total: '{0} / {1}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: 'tìm kiếm',
       loadingText: 'đang tải',
       emptyText: 'Chưa có dữ liệu',
@@ -121,7 +122,8 @@ export default {
       allChecked: 'Chọn tất cả',
       allExpand: 'Mở rộng tất cả',
       clearExpand: 'Đóng tất cả',
-      total: 'Đã chọn {0}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: 'tìm kiếm',
       emptyText: 'Chưa có dữ liệu'
     },

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

@@ -104,7 +104,8 @@ export default {
     select: {
       clear: '清除',
       allChecked: '全選',
-      total: '{0} / {1}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: '搜尋',
       loadingText: '載入中',
       emptyText: '暫無數據',
@@ -121,7 +122,8 @@ export default {
       allChecked: '全選',
       allExpand: '全部展開',
       clearExpand: '全部收起',
-      total: '已選 {0}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: '搜尋',
       emptyText: '暫無數據'
     },

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

@@ -104,7 +104,8 @@ export default {
     select: {
       clear: '清除',
       allChecked: '全选',
-      total: '{0} / {1}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: '搜索',
       loadingText: '加载中...',
       emptyText: '暂无数据',
@@ -121,7 +122,8 @@ export default {
       allChecked: '全选',
       allExpand: '全部展开',
       clearExpand: '全部收起',
-      total: '已选 {0}',
+      total: '已选 {0} 项',
+      close: '关闭',
       search: '搜索',
       emptyText: '暂无数据'
     },

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

@@ -43,7 +43,7 @@ export default defineVxeComponent({
     const $xeTable = inject('$xeTable', {} as VxeTableConstructor & VxeTableMethods & VxeTablePrivateMethods)
 
     const { props: tableProps, reactData: tableReactData, internalData: tableInternalData } = $xeTable
-    const { computeSize, computeCustomOpts, computeColumnDragOpts, computeColumnOpts, computeIsMaxFixedColumn, computeResizableOpts } = $xeTable.getComputeMaps()
+    const { computeSize, computeCustomOpts, computeColumnDragOpts, computeColumnOpts, computeIsMaxFixedColumn, computeResizableOpts, computeAggregateOpts } = $xeTable.getComputeMaps()
 
     const refElem = ref() as Ref<HTMLDivElement>
     const refBodyWrapperElem = ref() as Ref<HTMLDivElement>
@@ -537,7 +537,7 @@ export default defineVxeComponent({
 
     const sortDragoverEvent = (evnt: DragEvent) => {
       const customOpts = computeCustomOpts.value
-      const { immediate } = customOpts
+      const { showSortDragButton, allowSort, immediate } = customOpts
       const columnDragOpts = computeColumnDragOpts.value
       const { isCrossDrag, isToChildDrag } = columnDragOpts
       const optEl = evnt.currentTarget as HTMLElement
@@ -554,9 +554,12 @@ export default defineVxeComponent({
         const dragPos = offsetY < optEl.clientHeight / 2 ? 'top' : 'bottom'
         if (
           !dragCol ||
+          !(showSortDragButton && allowSort) ||
           (dragCol && dragCol.id === column.id) ||
           (!isCrossDrag && column.level > 1) ||
-          (!immediate && column.level > 1)
+          (!immediate && column.level > 1) ||
+          (!isCrossDrag && dragCol.level > 1) ||
+          (!immediate && dragCol.level > 1)
         ) {
           showDropTip(evnt, optEl, false, dragPos)
           return
@@ -697,7 +700,7 @@ export default defineVxeComponent({
       const { immediate } = customOpts
       const columnDragOpts = computeColumnDragOpts.value
       const { popupStyle } = customStore
-      const { checkMethod, visibleMethod, allowVisible, allowSort, allowFixed, trigger, placement, showSortDragButton, showSortMoveButton, showSortPutButton } = customOpts
+      const { checkMethod, visibleMethod, allowVisible, allowSort, allowFixed, allowGroup, allowValues, trigger, placement, showSortDragButton, showSortMoveButton, showSortPutButton } = customOpts
       const isMaxFixedColumn = computeIsMaxFixedColumn.value
       const vSize = computeSize.value
       const { isCrossDrag } = columnDragOpts
@@ -769,27 +772,31 @@ export default defineVxeComponent({
               h('div', {
                 class: 'vxe-table-custom--name-option'
               }, [
-                allowSort && showSortDragButton && showSortBtn
-                  ? h('div', {
-                    class: 'vxe-table-custom--sort-option'
-                  }, [
-                    h('span', {
-                      class: ['vxe-table-custom--sort-btn', {
-                        'is--disabled': isHidden
-                      }],
-                      title: getI18n('vxe.custom.setting.sortHelpTip'),
-                      ...(isHidden
-                        ? {}
-                        : {
-                            onMousedown: sortMousedownEvent,
-                            onMouseup: sortMouseupEvent
-                          })
-                    }, [
-                      h('i', {
-                        class: getIcon().TABLE_CUSTOM_SORT
-                      })
-                    ])
-                  ])
+                (allowSort && showSortDragButton) || (allowGroup || allowValues)
+                  ? (
+                      showSortBtn || ((allowGroup || allowValues) && !isColGroup)
+                        ? h('div', {
+                          class: 'vxe-table-custom--sort-option'
+                        }, [
+                          h('span', {
+                            class: ['vxe-table-custom--sort-btn', {
+                              'is--disabled': isHidden
+                            }],
+                            title: getI18n('vxe.custom.setting.sortHelpTip'),
+                            ...(isHidden
+                              ? {}
+                              : {
+                                  onMousedown: sortMousedownEvent,
+                                  onMouseup: sortMouseupEvent
+                                })
+                          }, [
+                            h('i', {
+                              class: getIcon().TABLE_CUSTOM_SORT
+                            })
+                          ])
+                        ])
+                        : renderEmptyElement($xeTable)
+                    )
                   : renderEmptyElement($xeTable),
                 column.type === 'html'
                   ? h('div', {
@@ -1030,9 +1037,10 @@ export default defineVxeComponent({
       const { treeConfig, rowGroupConfig, aggregateConfig, resizable: allResizable } = tableProps
       const { isCustomStatus, customColumnList } = tableReactData
       const customOpts = computeCustomOpts.value
-      const { immediate, showSortDragButton, showSortMoveButton, showSortPutButton } = customOpts
       const columnDragOpts = computeColumnDragOpts.value
-      const { mode, modalOptions, drawerOptions, allowVisible, allowSort, allowFixed, allowResizable, checkMethod, visibleMethod } = customOpts
+      const aggregateOpts = computeAggregateOpts.value
+      const { placement: aggPlacement } = aggregateOpts
+      const { mode, immediate, showSortDragButton, showSortMoveButton, showSortPutButton, modalOptions, drawerOptions, allowVisible, allowSort, allowFixed, allowResizable, allowGroup, allowValues, checkMethod, visibleMethod } = customOpts
       const columnOpts = computeColumnOpts.value
       const { maxFixedSize } = columnOpts
       const resizableOpts = computeResizableOpts.value
@@ -1050,6 +1058,7 @@ export default defineVxeComponent({
       const trVNs: VNode[] = []
       const isAllChecked = customStore.isAll
       const isAllIndeterminate = customStore.isIndeterminate
+      const isAggRtBmLayout = aggPlacement === 'right' || aggPlacement === 'bottom'
       const params = {
         $table: $xeTable,
         $grid: $xeGrid,
@@ -1128,27 +1137,29 @@ export default defineVxeComponent({
                 h('div', {
                   class: 'vxe-table-custom-popup--name'
                 }, [
-                  allowSort
-                    ? showSortDragButton && (showSortBtn
-                      ? h('div', {
-                        class: ['vxe-table-custom-popup--column-sort-btn', {
-                          'is--disabled': isHidden
-                        }],
-                        title: getI18n('vxe.custom.setting.sortHelpTip'),
-                        ...(isHidden
-                          ? {}
-                          : {
-                              onMousedown: sortMousedownEvent,
-                              onMouseup: sortMouseupEvent
+                  (allowSort && showSortDragButton) || (allowGroup || allowValues)
+                    ? (
+                        showSortBtn || ((allowGroup || allowValues) && !isColGroup)
+                          ? h('div', {
+                            class: ['vxe-table-custom-popup--column-sort-btn', {
+                              'is--disabled': isHidden
+                            }],
+                            title: getI18n('vxe.custom.setting.sortHelpTip'),
+                            ...(isHidden
+                              ? {}
+                              : {
+                                  onMousedown: sortMousedownEvent,
+                                  onMouseup: sortMouseupEvent
+                                })
+                          }, [
+                            h('i', {
+                              class: getIcon().TABLE_CUSTOM_SORT
                             })
-                      }, [
-                        h('i', {
-                          class: getIcon().TABLE_CUSTOM_SORT
-                        })
-                      ])
-                      : h('div', {
-                        class: 'vxe-table-custom-popup--column-sort-placeholder'
-                      }))
+                          ])
+                          : h('div', {
+                            class: 'vxe-table-custom-popup--column-sort-placeholder'
+                          })
+                      )
                     : renderEmptyElement($xeTable),
                   column.type === 'html'
                     ? h('div', {
@@ -1279,11 +1290,11 @@ export default defineVxeComponent({
         default: () => {
           return h('div', {
             ref: refBodyWrapperElem,
-            class: 'vxe-table-custom-popup--body-wrapper'
+            class: ['vxe-table-custom-popup--body-wrapper', `agg-layout--${aggPlacement}`]
           }, defaultSlot
             ? $xeTable.callSlot(defaultSlot, params)
             : [
-                !treeConfig && (aggregateConfig || rowGroupConfig) && $xeTable.getPivotTableAggregatePopupPanel
+                !isAggRtBmLayout && !treeConfig && (aggregateConfig || rowGroupConfig) && $xeTable.getPivotTableAggregatePopupPanel
                   ? h($xeTable.getPivotTableAggregatePopupPanel(), {
                     customStore
                   })
@@ -1366,7 +1377,12 @@ export default defineVxeComponent({
                     }, $xeTable.callSlot(bottomSlot, params))
                     : renderEmptyElement($xeTable),
                   renderDragTip()
-                ])
+                ]),
+                isAggRtBmLayout && !treeConfig && (aggregateConfig || rowGroupConfig) && $xeTable.getPivotTableAggregatePopupPanel
+                  ? h($xeTable.getPivotTableAggregatePopupPanel(), {
+                    customStore
+                  })
+                  : renderEmptyElement($xeTable)
               ])
         },
         footer: () => {