vxe-table 4.13.39 → 4.13.41

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

@@ -558,6 +558,12 @@ export default {
           replaceSuccess: 'تم استبدال خلايا {0} بنجاح'
         }
       },
+      extendPivotTable: {
+        aggregation: {
+          grouping: '分组',
+          values: '值'
+        }
+      },
       filterComplexInput: {
         menus: {
           fixedColumn: 'عمود تجميد',

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

@@ -558,6 +558,12 @@ export default {
           replaceSuccess: 'Erfolgreich ersetzt {0} Zellen'
         }
       },
+      extendPivotTable: {
+        aggregation: {
+          grouping: '分组',
+          values: '值'
+        }
+      },
       filterComplexInput: {
         menus: {
           fixedColumn: 'Einfrierensäule',

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

@@ -558,6 +558,12 @@ export default {
           replaceSuccess: 'Successfully replaced {0} cells'
         }
       },
+      extendPivotTable: {
+        aggregation: {
+          grouping: 'Group',
+          values: 'Values'
+        }
+      },
       filterComplexInput: {
         menus: {
           fixedColumn: 'Freeze column',

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

@@ -558,6 +558,12 @@ export default {
           replaceSuccess: 'Reemplazó con éxito {0} celdas'
         }
       },
+      extendPivotTable: {
+        aggregation: {
+          grouping: '分组',
+          values: '值'
+        }
+      },
       filterComplexInput: {
         menus: {
           fixedColumn: 'Columna de congelación',

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

@@ -558,6 +558,12 @@ export default {
           replaceSuccess: 'Cellules {0} remplacées avec succès'
         }
       },
+      extendPivotTable: {
+        aggregation: {
+          grouping: '分组',
+          values: '值'
+        }
+      },
       filterComplexInput: {
         menus: {
           fixedColumn: 'Colonne de gel',

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

@@ -558,6 +558,12 @@ export default {
           replaceSuccess: 'Sikeresen cserélte a {0} sejteket'
         }
       },
+      extendPivotTable: {
+        aggregation: {
+          grouping: '分组',
+          values: '值'
+        }
+      },
       filterComplexInput: {
         menus: {
           fixedColumn: 'Fagyasztási oszlop',

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

@@ -558,6 +558,12 @@ export default {
           replaceSuccess: '成功替换 {0} 个单元格'
         }
       },
+      extendPivotTable: {
+        aggregation: {
+          grouping: '分组',
+          values: '值'
+        }
+      },
       filterComplexInput: {
         menus: {
           fixedColumn: '冻结列',

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

@@ -558,6 +558,12 @@ export default {
           replaceSuccess: 'Berhasil menggantikan {0} sel'
         }
       },
+      extendPivotTable: {
+        aggregation: {
+          grouping: '分组',
+          values: '值'
+        }
+      },
       filterComplexInput: {
         menus: {
           fixedColumn: 'Kolom beku',

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

@@ -558,6 +558,12 @@ export default {
           replaceSuccess: 'Sostituire correttamente le celle {0}'
         }
       },
+      extendPivotTable: {
+        aggregation: {
+          grouping: '分组',
+          values: '值'
+        }
+      },
       filterComplexInput: {
         menus: {
           fixedColumn: 'Colonna di congelamento',

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

@@ -558,6 +558,12 @@ export default {
           replaceSuccess: '{0}セルを正常に交換しました'
         }
       },
+      extendPivotTable: {
+        aggregation: {
+          grouping: '分组',
+          values: '值'
+        }
+      },
       filterComplexInput: {
         menus: {
           fixedColumn: 'フリーズコラム',

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

@@ -558,6 +558,12 @@ export default {
           replaceSuccess: '{0} 세포를 성공적으로 대체했습니다'
         }
       },
+      extendPivotTable: {
+        aggregation: {
+          grouping: '分组',
+          values: '值'
+        }
+      },
       filterComplexInput: {
         menus: {
           fixedColumn: '동결 열',

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

@@ -558,6 +558,12 @@ export default {
           replaceSuccess: '{0} sel berjaya diganti'
         }
       },
+      extendPivotTable: {
+        aggregation: {
+          grouping: '分组',
+          values: '值'
+        }
+      },
       filterComplexInput: {
         menus: {
           fixedColumn: 'Lajur membekukan',

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

@@ -558,6 +558,12 @@ export default {
           replaceSuccess: 'Vellykket erstattet {0} celler'
         }
       },
+      extendPivotTable: {
+        aggregation: {
+          grouping: '分组',
+          values: '值'
+        }
+      },
       filterComplexInput: {
         menus: {
           fixedColumn: 'Frysekolonne',

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

@@ -558,6 +558,12 @@ export default {
           replaceSuccess: 'Células substituídas com sucesso {0}'
         }
       },
+      extendPivotTable: {
+        aggregation: {
+          grouping: '分组',
+          values: '值'
+        }
+      },
       filterComplexInput: {
         menus: {
           fixedColumn: 'Coluna de congelamento',

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

@@ -558,6 +558,12 @@ export default {
           replaceSuccess: 'Успешно заменен {0} ячейки'
         }
       },
+      extendPivotTable: {
+        aggregation: {
+          grouping: '分组',
+          values: '值'
+        }
+      },
       filterComplexInput: {
         menus: {
           fixedColumn: 'Замораживание колонки',

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

@@ -558,6 +558,12 @@ export default {
           replaceSuccess: 'แทนที่เซลล์ {0} สำเร็จ'
         }
       },
+      extendPivotTable: {
+        aggregation: {
+          grouping: '分组',
+          values: '值'
+        }
+      },
       filterComplexInput: {
         menus: {
           fixedColumn: 'คอลัมน์แช่แข็ง',

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

@@ -558,6 +558,12 @@ export default {
           replaceSuccess: 'جەمئىي {0} دانە ئۇچۇر ئالماشتۇرۇلدى'
         }
       },
+      extendPivotTable: {
+        aggregation: {
+          grouping: '分组',
+          values: '值'
+        }
+      },
       filterComplexInput: {
         menus: {
           fixedColumn: 'قۇر توڭلىتىش',

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

@@ -558,6 +558,12 @@ export default {
           replaceSuccess: 'Успішно замінив {0} комірок'
         }
       },
+      extendPivotTable: {
+        aggregation: {
+          grouping: '分组',
+          values: '值'
+        }
+      },
       filterComplexInput: {
         menus: {
           fixedColumn: 'Заморожування стовпчика',

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

@@ -558,6 +558,12 @@ export default {
           replaceSuccess: '{0} hujayralar muvaffaqiyatli almashtirildi'
         }
       },
+      extendPivotTable: {
+        aggregation: {
+          grouping: '分组',
+          values: '值'
+        }
+      },
       filterComplexInput: {
         menus: {
           fixedColumn: 'Muzlatish ustuni',

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

@@ -558,6 +558,12 @@ export default {
           replaceSuccess: 'Đã thay thế thành công {0} ô'
         }
       },
+      extendPivotTable: {
+        aggregation: {
+          grouping: '分组',
+          values: '值'
+        }
+      },
       filterComplexInput: {
         menus: {
           fixedColumn: 'Đóng băng cột',

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

@@ -558,6 +558,12 @@ export default {
           replaceSuccess: '成功替換 {0} 個單元格'
         }
       },
+      extendPivotTable: {
+        aggregation: {
+          grouping: '分组',
+          values: '值'
+        }
+      },
       filterComplexInput: {
         menus: {
           fixedColumn: '凍結列',

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

@@ -558,6 +558,12 @@ export default {
           replaceSuccess: '成功替换 {0} 个单元格'
         }
       },
+      extendPivotTable: {
+        aggregation: {
+          grouping: '分组',
+          values: '值'
+        }
+      },
       filterComplexInput: {
         menus: {
           fixedColumn: '冻结列',

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

@@ -9,7 +9,7 @@ const tableCustomMethodKeys: (keyof TableCustomMethods)[] = ['openCustom', 'clos
 VxeUI.hooks.add('tableCustomModule', {
   setupTable ($xeTable) {
     const { reactData, internalData } = $xeTable
-    const { computeCustomOpts } = $xeTable.getComputeMaps()
+    const { computeCustomOpts, computeRowGroupFields } = $xeTable.getComputeMaps()
     const { refElem } = $xeTable.getRefMaps()
 
     const $xeGrid = $xeTable.xeGrid
@@ -71,7 +71,7 @@ VxeUI.hooks.add('tableCustomModule', {
     }
 
     const saveCustom = () => {
-      const { customColumnList } = reactData
+      const { customColumnList, aggHandleFields, rowGroupList } = reactData
       const customOpts = computeCustomOpts.value
       const { allowVisible, allowSort, allowFixed, allowResizable } = customOpts
       XEUtils.eachTree(customColumnList, (column, index, items, path, parentColumn) => {
@@ -104,7 +104,18 @@ VxeUI.hooks.add('tableCustomModule', {
       setTimeout(() => {
         reactData.isDragColMove = false
       }, 1000)
-      return $xeTable.saveCustomStore('confirm')
+      return $xeTable.saveCustomStore('confirm').then(() => {
+        if (($xeTable as any).handlePivotTableAggregateData) {
+          if (rowGroupList.length !== aggHandleFields.length || rowGroupList.some((conf, i) => conf.field !== aggHandleFields[i])) {
+          // 改动聚合分组
+            if (aggHandleFields.length) {
+              $xeTable.setRowGroups(aggHandleFields)
+            } else {
+              $xeTable.clearRowGroups()
+            }
+          }
+        }
+      })
     }
 
     const cancelCustom = () => {
@@ -179,6 +190,7 @@ VxeUI.hooks.add('tableCustomModule', {
       saveCustom,
       cancelCustom,
       resetCustom (options) {
+        const { rowGroupList } = reactData
         const { collectColumn } = internalData
         const customOpts = computeCustomOpts.value
         const { checkMethod } = customOpts
@@ -205,7 +217,18 @@ VxeUI.hooks.add('tableCustomModule', {
         })
         reactData.isCustomStatus = false
         $xeTable.saveCustomStore('reset')
-        return $xeTable.handleCustom()
+        return $xeTable.handleCustom().then(() => {
+          if (($xeTable as any).handlePivotTableAggregateData) {
+            const rowGroupFields = computeRowGroupFields.value
+            if (rowGroupFields ? rowGroupFields.length : rowGroupList.length) {
+              if (rowGroupFields && rowGroupFields.length) {
+                $xeTable.setRowGroups(rowGroupFields)
+              } else {
+                $xeTable.clearRowGroups()
+              }
+            }
+          }
+        })
       },
       toggleCustomAllCheckbox () {
         const { customStore } = reactData

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

@@ -1,4 +1,5 @@
-import { defineComponent, h, inject, ref, Ref, VNode, PropType, nextTick, TransitionGroup, createCommentVNode } from 'vue'
+import { h, inject, ref, Ref, VNode, PropType, nextTick, TransitionGroup, createCommentVNode } from 'vue'
+import { defineVxeComponent } from '../../../ui/src/comp'
 import { VxeUI } from '../../../ui'
 import { formatText } from '../../../ui/src/utils'
 import { getTpImg, addClass, removeClass, hasControlKey } from '../../../ui/src/dom'
@@ -10,7 +11,7 @@ import type { VxeTableDefines, VxeTablePrivateMethods, VxeTableConstructor, VxeT
 
 const { getI18n, getIcon, renderEmptyElement } = VxeUI
 
-export default defineComponent({
+export default defineVxeComponent({
   name: 'TableCustomPanel',
   props: {
     customStore: {
@@ -509,8 +510,10 @@ export default defineComponent({
 
     const renderSimplePanel = () => {
       const $xeGrid = $xeTable.xeGrid
+      const tableProps = $xeTable.props
 
       const { customStore } = props
+      const { treeConfig, rowGroupConfig, aggregateConfig } = tableProps
       const { isCustomStatus, customColumnList } = reactData
       const customOpts = computeCustomOpts.value
       const { immediate } = customOpts
@@ -665,112 +668,121 @@ export default defineComponent({
           : {}
       }, customStore.visible
         ? [
+            !treeConfig && (aggregateConfig || rowGroupConfig) && $xeTable.getPivotTableAggregateSimplePanel
+              ? h($xeTable.getPivotTableAggregateSimplePanel(), {
+                customStore
+              })
+              : renderEmptyElement($xeTable),
             h('div', {
-              class: 'vxe-table-custom--header'
-            }, headerSlot
-              ? $xeTable.callSlot(headerSlot, params)
-              : [
-                  h('ul', {
-                    class: 'vxe-table-custom--panel-list'
-                  }, [
-                    h('li', {
-                      class: 'vxe-table-custom--option'
+              class: 'vxe-table-custom--handle-wrapper'
+            }, [
+              h('div', {
+                class: 'vxe-table-custom--header'
+              }, headerSlot
+                ? $xeTable.callSlot(headerSlot, params)
+                : [
+                    h('ul', {
+                      class: 'vxe-table-custom--panel-list'
                     }, [
-                      allowVisible
-                        ? h('div', {
-                          class: ['vxe-table-custom--checkbox-option', {
-                            'is--checked': isAllChecked,
-                            'is--indeterminate': isAllIndeterminate
-                          }],
-                          title: getI18n('vxe.table.allTitle'),
-                          onClick: allOptionEvent
-                        }, [
-                          h('span', {
-                            class: ['vxe-checkbox--icon', isAllIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : (isAllChecked ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED)]
-                          }),
-                          h('span', {
+                      h('li', {
+                        class: 'vxe-table-custom--option'
+                      }, [
+                        allowVisible
+                          ? h('div', {
+                            class: ['vxe-table-custom--checkbox-option', {
+                              'is--checked': isAllChecked,
+                              'is--indeterminate': isAllIndeterminate
+                            }],
+                            title: getI18n('vxe.table.allTitle'),
+                            onClick: allOptionEvent
+                          }, [
+                            h('span', {
+                              class: ['vxe-checkbox--icon', isAllIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : (isAllChecked ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED)]
+                            }),
+                            h('span', {
+                              class: 'vxe-checkbox--label'
+                            }, getI18n('vxe.toolbar.customAll'))
+                          ])
+                          : h('span', {
                             class: 'vxe-checkbox--label'
-                          }, getI18n('vxe.toolbar.customAll'))
-                        ])
-                        : h('span', {
-                          class: 'vxe-checkbox--label'
-                        }, getI18n('vxe.table.customTitle'))
+                          }, getI18n('vxe.table.customTitle'))
+                      ])
                     ])
-                  ])
-                ]),
-            h('div', {
-              ref: bodyElemRef,
-              class: 'vxe-table-custom--body'
-            }, [
-              topSlot
-                ? h('div', {
-                  class: 'vxe-table-custom--panel-top'
-                }, $xeTable.callSlot(topSlot, params))
-                : renderEmptyElement($xeTable),
-              defaultSlot
-                ? h('div', {
-                  class: 'vxe-table-custom--panel-body'
-                }, $xeTable.callSlot(defaultSlot, params))
-                : h(TransitionGroup, {
-                  class: 'vxe-table-custom--panel-list',
-                  name: 'vxe-table-custom--list',
-                  tag: 'ul',
-                  ...customWrapperOns
-                }, {
-                  default: () => colVNs
-                }),
-              bottomSlot
+                  ]),
+              h('div', {
+                ref: bodyElemRef,
+                class: 'vxe-table-custom--body'
+              }, [
+                topSlot
+                  ? h('div', {
+                    class: 'vxe-table-custom--panel-top'
+                  }, $xeTable.callSlot(topSlot, params))
+                  : renderEmptyElement($xeTable),
+                defaultSlot
+                  ? h('div', {
+                    class: 'vxe-table-custom--panel-body'
+                  }, $xeTable.callSlot(defaultSlot, params))
+                  : h(TransitionGroup, {
+                    class: 'vxe-table-custom--panel-list',
+                    name: 'vxe-table-custom--list',
+                    tag: 'ul',
+                    ...customWrapperOns
+                  }, {
+                    default: () => colVNs
+                  }),
+                bottomSlot
+                  ? h('div', {
+                    class: 'vxe-table-custom--panel-bottom'
+                  }, $xeTable.callSlot(bottomSlot, params))
+                  : renderEmptyElement($xeTable),
+                renderDragTip()
+              ]),
+              customOpts.showFooter
                 ? h('div', {
-                  class: 'vxe-table-custom--panel-bottom'
-                }, $xeTable.callSlot(bottomSlot, params))
-                : renderEmptyElement($xeTable),
-              renderDragTip()
-            ]),
-            customOpts.showFooter
-              ? h('div', {
-                class: 'vxe-table-custom--footer'
-              }, footerSlot
-                ? $xeTable.callSlot(footerSlot, params)
-                : [
-                    h('div', {
-                      class: 'vxe-table-custom--footer-buttons'
-                    }, [
-                      VxeUIButtonComponent
-                        ? h(VxeUIButtonComponent, {
-                          mode: 'text',
-                          content: customOpts.resetButtonText || getI18n('vxe.table.customRestore'),
-                          disabled: !isCustomStatus,
-                          onClick: resetCustomEvent
-                        })
-                        : createCommentVNode(),
-                      immediate
-                        ? (VxeUIButtonComponent
-                            ? h(VxeUIButtonComponent, {
-                              mode: 'text',
-                              content: customOpts.closeButtonText || getI18n('vxe.table.customClose'),
-                              onClick: cancelCloseEvent
-                            })
-                            : createCommentVNode())
-                        : (VxeUIButtonComponent
-                            ? h(VxeUIButtonComponent, {
-                              mode: 'text',
-                              content: customOpts.cancelButtonText || getI18n('vxe.table.customCancel'),
-                              onClick: cancelCustomEvent
-                            })
-                            : createCommentVNode()),
-                      immediate
-                        ? createCommentVNode()
-                        : (VxeUIButtonComponent
-                            ? h(VxeUIButtonComponent, {
-                              mode: 'text',
-                              status: 'primary',
-                              content: customOpts.confirmButtonText || getI18n('vxe.table.customConfirm'),
-                              onClick: confirmCustomEvent
-                            })
-                            : createCommentVNode())
+                  class: 'vxe-table-custom--footer'
+                }, footerSlot
+                  ? $xeTable.callSlot(footerSlot, params)
+                  : [
+                      h('div', {
+                        class: 'vxe-table-custom--footer-buttons'
+                      }, [
+                        VxeUIButtonComponent
+                          ? h(VxeUIButtonComponent, {
+                            mode: 'text',
+                            content: customOpts.resetButtonText || getI18n('vxe.table.customRestore'),
+                            disabled: !isCustomStatus,
+                            onClick: resetCustomEvent
+                          })
+                          : createCommentVNode(),
+                        immediate
+                          ? (VxeUIButtonComponent
+                              ? h(VxeUIButtonComponent, {
+                                mode: 'text',
+                                content: customOpts.closeButtonText || getI18n('vxe.table.customClose'),
+                                onClick: cancelCloseEvent
+                              })
+                              : createCommentVNode())
+                          : (VxeUIButtonComponent
+                              ? h(VxeUIButtonComponent, {
+                                mode: 'text',
+                                content: customOpts.cancelButtonText || getI18n('vxe.table.customCancel'),
+                                onClick: cancelCustomEvent
+                              })
+                              : createCommentVNode()),
+                        immediate
+                          ? createCommentVNode()
+                          : (VxeUIButtonComponent
+                              ? h(VxeUIButtonComponent, {
+                                mode: 'text',
+                                status: 'primary',
+                                content: customOpts.confirmButtonText || getI18n('vxe.table.customConfirm'),
+                                onClick: confirmCustomEvent
+                              })
+                              : createCommentVNode())
+                      ])
                     ])
-                  ])
-              : null
+                : null
+            ])
           ]
         : [])
     }

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

@@ -1,4 +1,5 @@
-import { defineComponent, h, createCommentVNode, ref, Ref, computed, reactive, inject, nextTick } from 'vue'
+import { h, createCommentVNode, ref, Ref, computed, reactive, inject, nextTick } from 'vue'
+import { defineVxeComponent } from '../../../ui/src/comp'
 import { VxeUI } from '../../../ui'
 import XEUtils from 'xe-utils'
 import { formatText } from '../../../ui/src/utils'
@@ -9,7 +10,7 @@ import type { VxeTablePrivateMethods, VxeTableConstructor, VxeTableMethods } fro
 
 const { getI18n, getIcon } = VxeUI
 
-export default defineComponent({
+export default defineVxeComponent({
   name: 'VxeTableExportPanel',
   props: {
     defaultOptions: Object as any,

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

@@ -1,4 +1,5 @@
-import { defineComponent, h, ref, Ref, computed, inject, reactive, nextTick, createCommentVNode } from 'vue'
+import { h, ref, Ref, computed, inject, reactive, nextTick, createCommentVNode } from 'vue'
+import { defineVxeComponent } from '../../../ui/src/comp'
 import { VxeUI } from '../../../ui'
 import XEUtils from 'xe-utils'
 import { parseFile } from '../../../ui/src/utils'
@@ -9,7 +10,7 @@ import type { VxeTablePrivateMethods, VxeTableConstructor, VxeTableMethods } fro
 
 const { getI18n, getIcon } = VxeUI
 
-export default defineComponent({
+export default defineVxeComponent({
   name: 'VxeTableImportPanel',
   props: {
     defaultOptions: Object as any,