vxe-table 3.15.45 → 3.15.47

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

@@ -79,6 +79,7 @@ export default {
       customCancel: 'キャンセル',
       customRestore: 'デフォルトを復元します',
       maxFixedCol: '凍結柱の最大数は{0}を超えることはできません',
+      maxGroupCol: '最大分组字段的数量不能超过 {0} 个',
       dragTip: '移動：{0}',
       resizeColTip: '幅：{0}ピクセル',
       resizeRowTip: '高さ：{0}ピクセル',
@@ -561,7 +562,19 @@ export default {
       extendPivotTable: {
         aggregation: {
           grouping: '分组',
-          values: '值'
+          values: '值',
+          groupPlaceholder: '拖至此处进行分组',
+          valuesPlaceholder: '拖至此处进行聚合',
+          dragExistCol: '该列已存在'
+        },
+        aggFuncs: {
+          sum: '求和',
+          count: '计数',
+          avg: '平均值',
+          min: '最小值',
+          max: '最大值',
+          first: '首个值',
+          last: '末尾值'
         }
       },
       filterComplexInput: {

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

@@ -79,6 +79,7 @@ export default {
       customCancel: '취소',
       customRestore: '기본값을 복원하십시오',
       maxFixedCol: '냉동 열의 최대 수는 {0}을 초과 할 수 없습니다.',
+      maxGroupCol: '最大分组字段的数量不能超过 {0} 个',
       dragTip: '움직임 : {0}',
       resizeColTip: '너비 : {0} 픽셀',
       resizeRowTip: '높이 : {0} 픽셀',
@@ -561,7 +562,19 @@ export default {
       extendPivotTable: {
         aggregation: {
           grouping: '分组',
-          values: '值'
+          values: '值',
+          groupPlaceholder: '拖至此处进行分组',
+          valuesPlaceholder: '拖至此处进行聚合',
+          dragExistCol: '该列已存在'
+        },
+        aggFuncs: {
+          sum: '求和',
+          count: '计数',
+          avg: '平均值',
+          min: '最小值',
+          max: '最大值',
+          first: '首个值',
+          last: '末尾值'
         }
       },
       filterComplexInput: {

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

@@ -79,6 +79,7 @@ export default {
       customCancel: 'Batalkan',
       customRestore: 'Pulihkan lalai',
       maxFixedCol: 'Bilangan lajur beku maksimum tidak dapat melebihi {0}',
+      maxGroupCol: '最大分组字段的数量不能超过 {0} 个',
       dragTip: 'Bergerak: {0}',
       resizeColTip: 'Lebar: {0} piksel',
       resizeRowTip: 'Tinggi: {0} piksel',
@@ -561,7 +562,19 @@ export default {
       extendPivotTable: {
         aggregation: {
           grouping: '分组',
-          values: '值'
+          values: '值',
+          groupPlaceholder: '拖至此处进行分组',
+          valuesPlaceholder: '拖至此处进行聚合',
+          dragExistCol: '该列已存在'
+        },
+        aggFuncs: {
+          sum: '求和',
+          count: '计数',
+          avg: '平均值',
+          min: '最小值',
+          max: '最大值',
+          first: '首个值',
+          last: '末尾值'
         }
       },
       filterComplexInput: {

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

@@ -79,6 +79,7 @@ export default {
       customCancel: 'Kansellere',
       customRestore: 'Gjenopprett standard',
       maxFixedCol: 'Det maksimale antall frosne kolonner kan ikke overstige {0}',
+      maxGroupCol: '最大分组字段的数量不能超过 {0} 个',
       dragTip: 'Flytt: {0}',
       resizeColTip: 'Bredde: {0} piksler',
       resizeRowTip: 'Høyde: {0} piksler',
@@ -561,7 +562,19 @@ export default {
       extendPivotTable: {
         aggregation: {
           grouping: '分组',
-          values: '值'
+          values: '值',
+          groupPlaceholder: '拖至此处进行分组',
+          valuesPlaceholder: '拖至此处进行聚合',
+          dragExistCol: '该列已存在'
+        },
+        aggFuncs: {
+          sum: '求和',
+          count: '计数',
+          avg: '平均值',
+          min: '最小值',
+          max: '最大值',
+          first: '首个值',
+          last: '末尾值'
         }
       },
       filterComplexInput: {

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

@@ -79,6 +79,7 @@ export default {
       customCancel: 'Cancelar',
       customRestore: 'Restaure o padrão',
       maxFixedCol: 'O número máximo de colunas congeladas não pode exceder {0}',
+      maxGroupCol: '最大分组字段的数量不能超过 {0} 个',
       dragTip: 'Move: {0}',
       resizeColTip: 'Largura: {0} pixels',
       resizeRowTip: 'Altura: {0} pixels',
@@ -561,7 +562,19 @@ export default {
       extendPivotTable: {
         aggregation: {
           grouping: '分组',
-          values: '值'
+          values: '值',
+          groupPlaceholder: '拖至此处进行分组',
+          valuesPlaceholder: '拖至此处进行聚合',
+          dragExistCol: '该列已存在'
+        },
+        aggFuncs: {
+          sum: '求和',
+          count: '计数',
+          avg: '平均值',
+          min: '最小值',
+          max: '最大值',
+          first: '首个值',
+          last: '末尾值'
         }
       },
       filterComplexInput: {

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

@@ -79,6 +79,7 @@ export default {
       customCancel: 'Отмена',
       customRestore: 'Восстановить дефолт',
       maxFixedCol: 'Максимальное количество замороженных столбцов не может превышать {0}',
+      maxGroupCol: '最大分组字段的数量不能超过 {0} 个',
       dragTip: 'MOVE: {0}',
       resizeColTip: 'Ширина: {0} пиксели',
       resizeRowTip: 'Высота: {0} пиксели',
@@ -561,7 +562,19 @@ export default {
       extendPivotTable: {
         aggregation: {
           grouping: '分组',
-          values: '值'
+          values: '值',
+          groupPlaceholder: '拖至此处进行分组',
+          valuesPlaceholder: '拖至此处进行聚合',
+          dragExistCol: '该列已存在'
+        },
+        aggFuncs: {
+          sum: '求和',
+          count: '计数',
+          avg: '平均值',
+          min: '最小值',
+          max: '最大值',
+          first: '首个值',
+          last: '末尾值'
         }
       },
       filterComplexInput: {

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

@@ -79,6 +79,7 @@ export default {
       customCancel: 'ยกเลิก',
       customRestore: 'กู้คืนค่าเริ่มต้น',
       maxFixedCol: 'จำนวนคอลัมน์แช่แข็งสูงสุดไม่เกิน {0}',
+      maxGroupCol: '最大分组字段的数量不能超过 {0} 个',
       dragTip: 'ย้าย: {0}',
       resizeColTip: 'ความกว้าง: {0} พิกเซล',
       resizeRowTip: 'ความสูง: {0} พิกเซล',
@@ -561,7 +562,19 @@ export default {
       extendPivotTable: {
         aggregation: {
           grouping: '分组',
-          values: '值'
+          values: '值',
+          groupPlaceholder: '拖至此处进行分组',
+          valuesPlaceholder: '拖至此处进行聚合',
+          dragExistCol: '该列已存在'
+        },
+        aggFuncs: {
+          sum: '求和',
+          count: '计数',
+          avg: '平均值',
+          min: '最小值',
+          max: '最大值',
+          first: '首个值',
+          last: '末尾值'
         }
       },
       filterComplexInput: {

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

@@ -79,6 +79,7 @@ export default {
       customCancel: 'ئەمەلدىن قالدۇرۇش',
       customRestore: 'ئەسلىگە قايتۇرۇش',
       maxFixedCol: 'توڭلىتىشقا بولىدىغان ئەڭ چوڭ قۇر سانى  {0} دانە',
+      maxGroupCol: '最大分组字段的数量不能超过 {0} 个',
       dragTip: 'يۆتكەش：{0}',
       resizeColTip: '宽：{0} 像素',
       resizeRowTip: '高：{0} 像素',
@@ -561,7 +562,19 @@ export default {
       extendPivotTable: {
         aggregation: {
           grouping: '分组',
-          values: '值'
+          values: '值',
+          groupPlaceholder: '拖至此处进行分组',
+          valuesPlaceholder: '拖至此处进行聚合',
+          dragExistCol: '该列已存在'
+        },
+        aggFuncs: {
+          sum: '求和',
+          count: '计数',
+          avg: '平均值',
+          min: '最小值',
+          max: '最大值',
+          first: '首个值',
+          last: '末尾值'
         }
       },
       filterComplexInput: {

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

@@ -79,6 +79,7 @@ export default {
       customCancel: 'Скасувати',
       customRestore: 'Відновити за замовчуванням',
       maxFixedCol: 'Максимальна кількість заморожених стовпців не може перевищувати {0}',
+      maxGroupCol: '最大分组字段的数量不能超过 {0} 个',
       dragTip: 'Перемістити: {0}',
       resizeColTip: 'Ширина: {0} пікселів',
       resizeRowTip: 'Висота: {0} пікселів',
@@ -561,7 +562,19 @@ export default {
       extendPivotTable: {
         aggregation: {
           grouping: '分组',
-          values: '值'
+          values: '值',
+          groupPlaceholder: '拖至此处进行分组',
+          valuesPlaceholder: '拖至此处进行聚合',
+          dragExistCol: '该列已存在'
+        },
+        aggFuncs: {
+          sum: '求和',
+          count: '计数',
+          avg: '平均值',
+          min: '最小值',
+          max: '最大值',
+          first: '首个值',
+          last: '末尾值'
         }
       },
       filterComplexInput: {

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

@@ -79,6 +79,7 @@ export default {
       customCancel: 'Bekor qilmoq',
       customRestore: 'Standartni tiklash',
       maxFixedCol: 'Muzlatilgan ustunlarning maksimal soni {0} dan oshmaydi',
+      maxGroupCol: '最大分组字段的数量不能超过 {0} 个',
       dragTip: "Ko'chiring: {0}",
       resizeColTip: 'Kengligi: {0} piksel',
       resizeRowTip: 'Yuqori: {0} piksel',
@@ -561,7 +562,19 @@ export default {
       extendPivotTable: {
         aggregation: {
           grouping: '分组',
-          values: '值'
+          values: '值',
+          groupPlaceholder: '拖至此处进行分组',
+          valuesPlaceholder: '拖至此处进行聚合',
+          dragExistCol: '该列已存在'
+        },
+        aggFuncs: {
+          sum: '求和',
+          count: '计数',
+          avg: '平均值',
+          min: '最小值',
+          max: '最大值',
+          first: '首个值',
+          last: '末尾值'
         }
       },
       filterComplexInput: {

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

@@ -79,6 +79,7 @@ export default {
       customCancel: 'Hủy bỏ',
       customRestore: 'Khôi phục mặc định',
       maxFixedCol: 'Số lượng cột đóng băng tối đa không thể vượt quá {0}',
+      maxGroupCol: '最大分组字段的数量不能超过 {0} 个',
       dragTip: 'Di chuyển: {0}',
       resizeColTip: 'Chiều rộng: {0} pixel',
       resizeRowTip: 'Chiều cao: {0} pixel',
@@ -561,7 +562,19 @@ export default {
       extendPivotTable: {
         aggregation: {
           grouping: '分组',
-          values: '值'
+          values: '值',
+          groupPlaceholder: '拖至此处进行分组',
+          valuesPlaceholder: '拖至此处进行聚合',
+          dragExistCol: '该列已存在'
+        },
+        aggFuncs: {
+          sum: '求和',
+          count: '计数',
+          avg: '平均值',
+          min: '最小值',
+          max: '最大值',
+          first: '首个值',
+          last: '末尾值'
         }
       },
       filterComplexInput: {

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

@@ -79,6 +79,7 @@ export default {
       customCancel: '取消',
       customRestore: '恢復默認',
       maxFixedCol: '最大凍結列的數量不能超過 {0} 個',
+      maxGroupCol: '最大分組欄位的數量不能超過 {0} 個',
       dragTip: '移動：{0}',
       resizeColTip: '寬：{0} 像素',
       resizeRowTip: '高：{0} 像素',
@@ -560,8 +561,20 @@ export default {
       },
       extendPivotTable: {
         aggregation: {
-          grouping: '分组',
-          values: '值'
+          grouping: '分組',
+          values: '值',
+          groupPlaceholder: '拖曳至此處進行分組',
+          valuesPlaceholder: '拖曳至此處進行聚合',
+          dragExistCol: '該列已存在'
+        },
+        aggFuncs: {
+          sum: '求和',
+          count: '计数',
+          avg: '平均值',
+          min: '最小值',
+          max: '最大值',
+          first: '首个值',
+          last: '末尾值'
         }
       },
       filterComplexInput: {

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

@@ -79,6 +79,7 @@ export default {
       customCancel: '取消',
       customRestore: '恢复默认',
       maxFixedCol: '最大冻结列的数量不能超过 {0} 个',
+      maxGroupCol: '最大分组字段的数量不能超过 {0} 个',
       dragTip: '移动：{0}',
       resizeColTip: '宽：{0} 像素',
       resizeRowTip: '高：{0} 像素',
@@ -561,7 +562,19 @@ export default {
       extendPivotTable: {
         aggregation: {
           grouping: '分组',
-          values: '值'
+          values: '值',
+          groupPlaceholder: '拖至此处进行分组',
+          valuesPlaceholder: '拖至此处进行聚合',
+          dragExistCol: '该列已存在'
+        },
+        aggFuncs: {
+          sum: '求和',
+          count: '计数',
+          avg: '平均值',
+          min: '最小值',
+          max: '最大值',
+          first: '首个值',
+          last: '末尾值'
         }
       },
       filterComplexInput: {

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

@@ -66,7 +66,7 @@ export default {
 
       const { customColumnList, aggHandleFields, rowGroupList } = reactData
       const customOpts = $xeTable.computeCustomOpts
-      const { allowVisible, allowSort, allowFixed, allowResizable } = customOpts
+      const { allowVisible, allowSort, allowFixed, allowResizable, allowGroup, allowValues } = customOpts
       XEUtils.eachTree(customColumnList, (column, index, items, path, parentColumn) => {
         if (parentColumn) {
           // 更新子列信息
@@ -91,6 +91,9 @@ export default {
         if (allowVisible) {
           column.visible = column.renderVisible
         }
+        if (allowGroup && allowValues) {
+          column.aggFunc = column.renderAggFn
+        }
       })
       reactData.isCustomStatus = true
       reactData.isDragColMove = true
@@ -98,14 +101,17 @@ export default {
         reactData.isDragColMove = false
       }, 1000)
       return $xeTable.saveCustomStore('confirm').then(() => {
-        if (($xeTable as any).handlePivotTableAggregateData) {
+        if (allowGroup && allowValues && ($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()
             }
+          } else {
+            // 更新聚合函数
+            $xeTable.handleUpdateAggData()
           }
         }
       })
@@ -152,7 +158,8 @@ export default {
         visible: true,
         resizable: options === true,
         fixed: options === true,
-        sort: options === true
+        sort: options === true,
+        aggFunc: options === true
       }, options)
       XEUtils.eachTree(collectColumn, (column) => {
         if (opts.resizable) {
@@ -167,12 +174,16 @@ export default {
         if (!checkMethod || checkMethod({ $table: $xeTable, column })) {
           column.visible = column.defaultVisible
         }
+        if (opts.aggFunc) {
+          column.aggFunc = column.defaultAggFunc
+          column.renderAggFn = column.defaultAggFunc
+        }
         column.renderResizeWidth = column.renderWidth
       })
       reactData.isCustomStatus = false
       $xeTable.saveCustomStore('reset')
       return $xeTable.handleCustom().then(() => {
-        if (($xeTable as any).handlePivotTableAggregateData) {
+        if (opts.aggFunc && ($xeTable as any).handlePivotTableAggregateData) {
           const rowGroupFields = $xeTable.computeRowGroupFields
           if (rowGroupFields ? rowGroupFields.length : rowGroupList.length) {
             if (rowGroupFields && rowGroupFields.length) {
@@ -180,6 +191,8 @@ export default {
             } else {
               $xeTable.clearRowGroups()
             }
+          } else {
+            $xeTable.handleUpdateAggData()
           }
         }
       })

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

@@ -24,8 +24,8 @@ function showDropTip ($xeTableCustomPanel: VxeTableCustomPanelConstructor, evnt:
   const { prevDragToChild } = customPanelInternalData
   const bodyWrapperRect = bodyWrapperElem.getBoundingClientRect()
   const customBodyRect = customBodyElem.getBoundingClientRect()
+  const dragLineEl = $xeTableCustomPanel.$refs.refDragLineElem as HTMLDivElement
   if (optEl) {
-    const dragLineEl = $xeTableCustomPanel.$refs.refDragLineElem as HTMLDivElement
     if (dragLineEl) {
       if (showLine) {
         const optRect = optEl.getBoundingClientRect()
@@ -40,6 +40,10 @@ function showDropTip ($xeTableCustomPanel: VxeTableCustomPanelConstructor, evnt:
         dragLineEl.style.display = ''
       }
     }
+  } else {
+    if (dragLineEl) {
+      dragLineEl.style.display = 'node'
+    }
   }
   const dragTipEl = $xeTableCustomPanel.$refs.refDragTipElem as HTMLDivElement
   if (dragTipEl) {
@@ -294,7 +298,7 @@ const renderSimplePanel = (h: CreateElement, _vm: any) => {
     ? [
         h('div', {
           ref: 'refBodyWrapperElem',
-          class: 'vxe-table-custom-body-wrapper'
+          class: 'vxe-table-custom-simple--body-wrapper'
         }, [
           !treeConfig && (aggregateConfig || rowGroupConfig) && $xeTable.getPivotTableAggregateSimplePanel
             ? h($xeTable.getPivotTableAggregateSimplePanel(), {
@@ -879,13 +883,15 @@ export default {
   data () {
     const reactData: TableCustomPanelReactData = {
       dragCol: null,
-      dragGroup: null,
-      dragValues: null,
+      dragGroupField: null,
+      dragAggFnCol: null,
       dragTipText: ''
     }
 
     const internalData: TableCustomPanelInternalData = {
       // prevDragCol: undefined,
+      // prevDragGroupField: undefined,
+      // prevDragAggFnColid: undefined,
       // prevDragToChild: false,
       // prevDragPos: null
     }
@@ -1158,6 +1164,8 @@ export default {
       const column = $xeTable.getColumnById(colid)
       trEl.draggable = true
       customPanelReactData.dragCol = column
+      customPanelReactData.dragGroupField = null
+      customPanelReactData.dragAggFnCol = null
       this.updateColDropTipContent()
       addClass(trEl, 'active--drag-origin')
     },
@@ -1172,17 +1180,19 @@ export default {
       hideDropTip($xeTableCustomPanel)
       trEl.draggable = false
       customPanelReactData.dragCol = null
+      customPanelReactData.dragGroupField = null
+      customPanelReactData.dragAggFnCol = null
       removeClass(trEl, 'active--drag-origin')
     },
     sortDragstartEvent (evnt: any) {
       const $xeTableCustomPanel = this as unknown as VxeTableCustomPanelConstructor
-      const customPanelReactData = $xeTableCustomPanel.reactData
+      const customPanelInternalData = $xeTableCustomPanel.internalData
 
       if (evnt.dataTransfer) {
         evnt.dataTransfer.setDragImage(getTpImg(), 0, 0)
       }
-      customPanelReactData.dragGroup = null
-      customPanelReactData.dragValues = null
+      customPanelInternalData.prevDragGroupField = null
+      customPanelInternalData.prevDragAggFnColid = null
     },
     sortDragendEvent (evnt: any) {
       const $xeTableCustomPanel = this as unknown as VxeTableCustomPanelConstructor
@@ -1201,11 +1211,11 @@ export default {
       const trEl = evnt.currentTarget as HTMLElement
       const columnDragOpts = $xeTable.computeColumnDragOpts
       const { isCrossDrag, isSelfToChildDrag, isToChildDrag, dragEndMethod } = columnDragOpts
-      const { dragCol, dragGroup, dragValues } = customPanelReactData
-      const { prevDragCol, prevDragPos, prevDragToChild } = customPanelInternalData
+      const { dragCol } = customPanelReactData
+      const { prevDragCol, prevDragGroupField, prevDragAggFnColid, prevDragPos, prevDragToChild } = customPanelInternalData
       const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0
 
-      if (dragGroup || dragValues) {
+      if (prevDragGroupField || prevDragAggFnColid) {
         if ($xeTable.handlePivotTableAggregatePanelDragendEvent) {
           $xeTable.handlePivotTableAggregatePanelDragendEvent(evnt)
         }
@@ -1375,8 +1385,10 @@ export default {
 
       hideDropTip($xeTableCustomPanel)
       customPanelReactData.dragCol = null
-      customPanelReactData.dragGroup = null
-      customPanelReactData.dragValues = null
+      customPanelReactData.dragGroupField = null
+      customPanelReactData.dragAggFnCol = null
+      customPanelInternalData.prevDragGroupField = null
+      customPanelInternalData.prevDragAggFnColid = null
       trEl.draggable = false
       trEl.removeAttribute('drag-pos')
       removeClass(trEl, 'active--drag-target')
@@ -1397,14 +1409,15 @@ export default {
       const isControlKey = hasControlKey(evnt)
       const colid = optEl.getAttribute('colid')
       const column = $xeTable.getColumnById(colid)
-      customPanelReactData.dragGroup = null
-      customPanelReactData.dragValues = null
+      customPanelInternalData.prevDragGroupField = null
+      customPanelInternalData.prevDragAggFnColid = null
       // 是否移入有效列
       if (column && (isCrossDrag || column.level === 1)) {
         evnt.preventDefault()
         const offsetY = evnt.clientY - optEl.getBoundingClientRect().y
         const dragPos = offsetY < optEl.clientHeight / 2 ? 'top' : 'bottom'
         if (
+          !dragCol ||
           (dragCol && dragCol.id === column.id) ||
           (!isCrossDrag && column.level > 1) ||
           (!immediate && column.level > 1) ||

package/packages/table/src/columnInfo.ts

@@ -114,6 +114,7 @@ export class ColumnInfo {
       halfVisible: false,
       defaultVisible: visible,
       defaultFixed: _vm.fixed,
+      defaultAggFunc: _vm.aggFunc,
       checked: false,
       halfChecked: false,
       disabled: false,