vxe-table 4.13.46 → 4.13.47

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

@@ -39,15 +39,17 @@ export default defineVxeComponent({
     const refDragLineElem = ref() as Ref<HTMLDivElement>
     const refDragTipElem = ref() as Ref<HTMLDivElement>
 
-    const customPanelReactData: TableCustomPanelReactData = reactive({
+    const customPanelReactData = reactive<TableCustomPanelReactData>({
       dragCol: null,
-      prevDragGroup: null,
-      prevDragValues: null,
+      dragGroupField: null,
+      dragAggFnCol: null,
       dragTipText: ''
     })
 
     const customPanelInternalData: TableCustomPanelInternalData = {
       // prevDragCol: undefined,
+      // prevDragGroupField: undefined,
+      // prevDragAggFnColid: undefined,
       // prevDragToChild: false,
       // prevDragPos: null
     }
@@ -230,8 +232,8 @@ export default defineVxeComponent({
       const { prevDragToChild } = customPanelInternalData
       const bodyWrapperRect = bodyWrapperElem.getBoundingClientRect()
       const customBodyRect = customBodyElem.getBoundingClientRect()
+      const dragLineEl = refDragLineElem.value
       if (optEl) {
-        const dragLineEl = refDragLineElem.value
         if (dragLineEl) {
           if (showLine) {
             const optRect = optEl.getBoundingClientRect()
@@ -246,6 +248,10 @@ export default defineVxeComponent({
             dragLineEl.style.display = ''
           }
         }
+      } else {
+        if (dragLineEl) {
+          dragLineEl.style.display = 'node'
+        }
       }
       const dragTipEl = refDragTipElem.value
       if (dragTipEl) {
@@ -293,6 +299,8 @@ export default defineVxeComponent({
       const column = $xeTable.getColumnById(colid)
       trEl.draggable = true
       customPanelReactData.dragCol = column
+      customPanelReactData.dragGroupField = null
+      customPanelReactData.dragAggFnCol = null
       updateColDropTipContent()
       addClass(trEl, 'active--drag-origin')
     }
@@ -305,6 +313,8 @@ export default defineVxeComponent({
       hideDropTip()
       trEl.draggable = false
       customPanelReactData.dragCol = null
+      customPanelReactData.dragGroupField = null
+      customPanelReactData.dragAggFnCol = null
       removeClass(trEl, 'active--drag-origin')
     }
 
@@ -312,8 +322,8 @@ export default defineVxeComponent({
       if (evnt.dataTransfer) {
         evnt.dataTransfer.setDragImage(getTpImg(), 0, 0)
       }
-      customPanelInternalData.prevDragGroup = null
-      customPanelInternalData.prevDragValues = null
+      customPanelInternalData.prevDragGroupField = null
+      customPanelInternalData.prevDragAggFnColid = null
     }
 
     const sortDragendEvent = (evnt: DragEvent) => {
@@ -326,10 +336,10 @@ export default defineVxeComponent({
       const columnDragOpts = computeColumnDragOpts.value
       const { isCrossDrag, isSelfToChildDrag, isToChildDrag, dragEndMethod } = columnDragOpts
       const { dragCol } = customPanelReactData
-      const { prevDragCol, prevDragGroup, prevDragValues, prevDragPos, prevDragToChild } = customPanelInternalData
+      const { prevDragCol, prevDragGroupField, prevDragAggFnColid, prevDragPos, prevDragToChild } = customPanelInternalData
       const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0
 
-      if (prevDragGroup || prevDragValues) {
+      if (prevDragGroupField || prevDragAggFnColid) {
         if ($xeTable.handlePivotTableAggregatePanelDragendEvent) {
           $xeTable.handlePivotTableAggregatePanelDragendEvent(evnt)
         }
@@ -499,8 +509,10 @@ export default defineVxeComponent({
 
       hideDropTip()
       customPanelReactData.dragCol = null
-      customPanelInternalData.prevDragGroup = null
-      customPanelInternalData.prevDragValues = 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')
@@ -517,14 +529,15 @@ export default defineVxeComponent({
       const colid = optEl.getAttribute('colid')
       const column = $xeTable.getColumnById(colid)
       const { dragCol } = customPanelReactData
-      customPanelInternalData.prevDragGroup = null
-      customPanelInternalData.prevDragValues = 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

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

package/packages/table/src/table.ts

@@ -249,6 +249,7 @@ export default defineVxeComponent({
       isRowGroupStatus: false,
       rowGroupList: [],
       aggHandleFields: [],
+      aggHandleAggColumns: [],
 
       rowGroupExpandedFlag: 1,
       rowExpandedFlag: 1,
@@ -1544,7 +1545,8 @@ export default defineVxeComponent({
       const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom)
       const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom)
       const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom)
-      if (storage && (customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
+      const isCustomAggFunc = hangleStorageDefaultValue(storageOpts.aggFunc, isAllCustom)
+      if (storage && (customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort || isCustomAggFunc)) {
         if (!tableId) {
           errLog('vxe.error.reqProp', ['id'])
           return
@@ -3148,6 +3150,17 @@ export default defineVxeComponent({
       })
     }
 
+    const handleUpdateAggValues = () => {
+      const { visibleColumn } = internalData
+      const aggCols: VxeTableDefines.ColumnInfo[] = []
+      visibleColumn.forEach(column => {
+        if (column.aggFunc) {
+          aggCols.push(column)
+        }
+      })
+      reactData.aggHandleAggColumns = aggCols
+    }
+
     const handleUpdateRowGroup = (groupFields?: string[]) => {
       const aggFields: string[] = []
       const aggConfs: { field: string }[] = []
@@ -3161,6 +3174,7 @@ export default defineVxeComponent({
       }
       reactData.rowGroupList = aggConfs
       reactData.aggHandleFields = aggFields
+      handleUpdateAggValues()
     }
 
     const handleeGroupSummary = (aggList: VxeTableDefines.AggregateRowInfo[]) => {
@@ -3645,6 +3659,7 @@ export default defineVxeComponent({
         }
       })
       handleTableColumn()
+      handleUpdateAggValues()
       if (isReset) {
         updateColumnOffsetLeft()
         return $xeTable.updateFooter().then(() => {
@@ -6769,15 +6784,18 @@ export default defineVxeComponent({
         const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom)
         const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom)
         const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom)
+        const isCustomAggFunc = hangleStorageDefaultValue(storageOpts.aggFunc, isAllCustom)
         const resizableData: Record<string, number> = {}
         const sortData: Record<string, number> = {}
         const visibleData: Record<string, boolean> = {}
         const fixedData: Record<string, VxeColumnPropTypes.Fixed> = {}
+        const aggFuncData: Record<string, VxeColumnPropTypes.AggFunc> = {}
         const storeData: VxeTableDefines.CustomStoreData = {
           resizableData: undefined,
           sortData: undefined,
           visibleData: undefined,
-          fixedData: undefined
+          fixedData: undefined,
+          aggFuncData: undefined
         }
         if (!id) {
           if (storage) {
@@ -6789,6 +6807,7 @@ export default defineVxeComponent({
         let hasSort = 0
         let hasFixed = 0
         let hasVisible = 0
+        let hasAggFunc = 0
         XEUtils.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
           const colKey = column.getKey()
           if (!colKey) {
@@ -6819,6 +6838,10 @@ export default defineVxeComponent({
               visibleData[colKey] = true
             }
           }
+          if (isCustomAggFunc && column.aggFunc !== column.defaultAggFunc) {
+            hasAggFunc = 1
+            aggFuncData[colKey] = column.aggFunc
+          }
         })
         if (hasResizable) {
           storeData.resizableData = resizableData
@@ -6832,6 +6855,9 @@ export default defineVxeComponent({
         if (hasVisible) {
           storeData.visibleData = visibleData
         }
+        if (hasAggFunc) {
+          storeData.aggFuncData = aggFuncData
+        }
         return storeData
       },
       focus () {
@@ -8260,11 +8286,12 @@ export default defineVxeComponent({
         const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom)
         const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom)
         const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom)
+        const isCustomAggFunc = hangleStorageDefaultValue(storageOpts.aggFunc, isAllCustom)
         if (type !== 'reset') {
           // fix：修复拖动列宽，重置按钮无法点击的问题
           reactData.isCustomStatus = true
         }
-        if (storage && (customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
+        if (storage && (customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort || isCustomAggFunc)) {
           if (!tableId) {
             errLog('vxe.error.reqProp', ['id'])
             return nextTick()
@@ -10634,6 +10661,9 @@ export default defineVxeComponent({
           }
         }
       },
+      handleUpdateAggData () {
+        return loadTableData(internalData.tableSynchData, true)
+      },
       updateZindex () {
         if (props.zIndex) {
           internalData.tZindex = props.zIndex
@@ -11651,6 +11681,16 @@ export default defineVxeComponent({
             return
           }
         }
+        if (!$xeTable.handlePivotTableAggregateData) {
+          if (customOpts.allowGroup) {
+            errLog('vxe.error.notProp', ['custom-config.allowGroup'])
+            return
+          }
+          if (customOpts.allowValues) {
+            errLog('vxe.error.notProp', ['custom-config.allowValues'])
+            return
+          }
+        }
         if (treeConfig && rowOpts.drag && !treeOpts.transform) {
           errLog('vxe.error.notSupportProp', ['column-config.drag', 'tree-config.transform=false', 'tree-config.transform=true'])
         }
@@ -11663,8 +11703,8 @@ export default defineVxeComponent({
         if (aggregateOpts.countFields) {
           warnLog('vxe.error.delProp', ['row-group-config.countFields', 'column.agg-func'])
         }
-        if (aggregateOpts.countMethod) {
-          warnLog('vxe.error.delProp', ['row-group-config.countMethod', 'aggregate-config.aggregateMethod'])
+        if (aggregateOpts.aggregateMethod) {
+          warnLog('vxe.error.delProp', ['row-group-config.aggregateMethod', 'aggregate-config.countMethod'])
         }
         if (props.treeConfig && treeOpts.children) {
           warnLog('vxe.error.delProp', ['tree-config.children', 'tree-config.childrenField'])

package/packages/ui/index.ts

@@ -108,6 +108,7 @@ VxeUI.setConfig({
         // rowGroup: false,
         // aggFunc: false
       },
+      // autoAggGroupValues: false,
       //  checkMethod () {},
       modalOptions: {
         showMaximize: true,
@@ -321,10 +322,10 @@ VxeUI.setIcon({
   TABLE_DRAG_DISABLED: iconPrefix + 'no-drop',
   TABLE_ROW_GROUP_OPEN: iconPrefix + 'arrow-right rotate90',
   TABLE_ROW_GROUP_CLOSE: iconPrefix + 'arrow-right',
-  TABLE_AGGREGATION_GROUPING: iconPrefix + 'grouping',
-  TABLE_AGGREGATION_VALUES: iconPrefix + 'values',
-  TABLE_AGGREGATION_SORT: iconPrefix + 'drag-handle',
-  TABLE_AGGREGATION_DELETE: iconPrefix + 'close',
+  TABLE_AGGREGATE_GROUPING: iconPrefix + 'grouping',
+  TABLE_AGGREGATE_VALUES: iconPrefix + 'values',
+  TABLE_AGGREGATE_SORT: iconPrefix + 'drag-handle',
+  TABLE_AGGREGATE_DELETE: iconPrefix + 'close',
 
   // toolbar
   TOOLBAR_TOOLS_REFRESH: iconPrefix + 'repeat',