vxe-table 3.19.20 → 3.19.22

package/packages/table/src/methods.ts

@@ -21,6 +21,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE'
 const maxYHeight = 5e6
 const maxXWidth = 5e6
 
+const sourceType = 'table'
+
 let crossTableDragRowObj: {
   $oldTable: VxeTableConstructor & VxeTablePrivateMethods
   $newTable: (VxeTableConstructor & VxeTablePrivateMethods) | null
@@ -2552,23 +2554,48 @@ const calcCellHeight = ($xeTable: VxeTableConstructor) => {
 }
 
 function getOrderField ($xeTable: VxeTableConstructor, column: VxeTableDefines.ColumnInfo) {
-  const { sortBy, sortType } = column
-  return (row: any) => {
-    let cellValue
-    if (sortBy) {
-      cellValue = XEUtils.isFunction(sortBy) ? sortBy({ row, column }) : XEUtils.get(row, sortBy)
-    } else {
-      cellValue = $xeTable.getCellLabel(row, column)
-    }
-    if (!sortType || sortType === 'auto') {
-      return isNaN(cellValue) ? cellValue : XEUtils.toNumber(cellValue)
-    } else if (sortType === 'number') {
-      return XEUtils.toNumber(cellValue)
-    } else if (sortType === 'string') {
-      return XEUtils.toValueString(cellValue)
-    }
-    return cellValue
-  }
+  const reactData = $xeTable as unknown as TableReactData
+
+  const { isRowGroupStatus } = reactData
+  const { sortBy, sortType, aggFunc } = column
+  return isRowGroupStatus && aggFunc
+    ? (row: any) => {
+        if (row.isAggregate) {
+          const aggData = row.aggData
+          const currAggData = aggData ? aggData[column.field] : null
+          return currAggData ? currAggData.value : null
+        }
+        let cellValue
+        if (sortBy) {
+          cellValue = XEUtils.isFunction(sortBy) ? sortBy({ row, column }) : XEUtils.get(row, sortBy)
+        } else {
+          cellValue = $xeTable.getCellLabel(row, column)
+        }
+        if (!sortType || sortType === 'auto') {
+          return isNaN(cellValue) ? cellValue : XEUtils.toNumber(cellValue)
+        } else if (sortType === 'number') {
+          return XEUtils.toNumber(cellValue)
+        } else if (sortType === 'string') {
+          return XEUtils.toValueString(cellValue)
+        }
+        return cellValue
+      }
+    : (row: any) => {
+        let cellValue
+        if (sortBy) {
+          cellValue = XEUtils.isFunction(sortBy) ? sortBy({ row, column }) : XEUtils.get(row, sortBy)
+        } else {
+          cellValue = $xeTable.getCellLabel(row, column)
+        }
+        if (!sortType || sortType === 'auto') {
+          return isNaN(cellValue) ? cellValue : XEUtils.toNumber(cellValue)
+        } else if (sortType === 'number') {
+          return XEUtils.toNumber(cellValue)
+        } else if (sortType === 'string') {
+          return XEUtils.toValueString(cellValue)
+        }
+        return cellValue
+      }
 }
 
 function handleTargetEnterEvent ($xeTable: VxeTableConstructor, isClear: boolean) {
@@ -3149,8 +3176,13 @@ function handleUpdateRowGroup ($xeTable: VxeTableConstructor & VxeTablePrivateMe
 }
 
 function handleeGroupSummary ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, aggList: VxeTableDefines.AggregateRowInfo[]) {
+  const internalData = $xeTable as unknown as TableInternalData
+
+  const { fullColumnFieldData } = internalData
   const aggregateOpts = $xeTable.computeAggregateOpts
+  const aggFuncColumns = $xeTable.computeAggFuncColumns
   const { mapChildrenField } = aggregateOpts
+  const aggCalcMethod = aggregateOpts.calcValuesMethod || aggregateOpts.countMethod || aggregateOpts.aggregateMethod
   if (mapChildrenField) {
     XEUtils.lastEach(aggList, aggRow => {
       let count = 0
@@ -3165,6 +3197,65 @@ function handleeGroupSummary ($xeTable: VxeTableConstructor & VxeTablePrivateMet
     })
     if ($xeTable.handlePivotTableAggregateData) {
       $xeTable.handlePivotTableAggregateData(aggList)
+    } else {
+      XEUtils.lastEach(aggList, aggRow => {
+        const aggDtObj: Record<string, {
+          type: string
+          value: any
+          label: any
+        }> = {}
+        const aggData = aggRow.aggData
+        const groupField = aggRow.groupField
+        const groupContent = aggRow.groupContent
+        const childList = mapChildrenField ? (aggRow[mapChildrenField] || []) : []
+        const childCount = aggRow.childCount
+        const colRest = fullColumnFieldData[groupField] || {}
+        aggFuncColumns.forEach(column => {
+          const { field } = column
+          const currAggData = aggData ? aggData[field] : null
+          const ctParams = {
+            $table: $xeTable,
+            groupField,
+            groupColumn: (colRest ? colRest.column : null) as VxeTableDefines.ColumnInfo,
+            column,
+            groupValue: groupContent,
+            childList,
+            childCount,
+            aggValue: currAggData ? currAggData.value : 0,
+
+            /**
+             * 已废弃
+             * @deprecated
+             */
+            children: childList,
+            /**
+             * 已废弃
+             * @deprecated
+             */
+            totalValue: childCount
+          }
+          let aggVal = 0
+          // 如果下层同时也是分组
+          if (childList.length && childList[0].isAggregate) {
+            XEUtils.each(childList, (row: VxeTableDefines.AggregateRowInfo) => {
+              if (row.isAggregate) {
+                const currAggData = row.aggData[field]
+                if (currAggData) {
+                  aggVal += currAggData.value
+                }
+              }
+            })
+          } else {
+            aggVal = aggCalcMethod ? aggCalcMethod(ctParams) : aggRow.childCount
+          }
+          aggDtObj[field] = {
+            type: 'count',
+            value: aggVal,
+            label: aggVal
+          }
+        })
+        aggRow.aggData = aggDtObj
+      })
     }
   }
 }
@@ -4278,7 +4369,37 @@ function handleRowExpandScroll ($xeTable: VxeTableConstructor & VxeTablePrivateM
   }
 }
 
-const Methods = {
+function handleColumnVisible (this: any, visible: boolean) {
+  const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+
+  return function (fieldOrColumn: string | string[] | VxeTableDefines.ColumnInfo | VxeTableDefines.ColumnInfo[]) {
+    let status = false
+    const cols = XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn]
+    cols.forEach(item => {
+      const column = handleFieldOrColumn($xeTable, item)
+      if (column) {
+        if (column.children && column.children.length) {
+          XEUtils.eachTree([column], (item) => {
+            item.visible = visible
+            item.renderVisible = visible
+          })
+        } else {
+          column.visible = visible
+          column.renderVisible = visible
+        }
+        if (!status) {
+          status = true
+        }
+      }
+    })
+    if (status) {
+      return $xeTable.handleCustom()
+    }
+    return $xeTable.$nextTick()
+  }
+}
+
+const tableMethods = {
   callSlot (slotFunc: any, params: any, h: any, vNodes: any) {
     const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
     // const slots = $xeTable.$scopedSlots
@@ -5096,16 +5217,22 @@ const Methods = {
   },
   getCellLabel (row: any, fieldOrColumn: string | VxeTableDefines.ColumnInfo) {
     const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const props = $xeTable
     const internalData = $xeTable as unknown as TableInternalData
 
-    const column = handleFieldOrColumn(this, fieldOrColumn)
+    const column = handleFieldOrColumn($xeTable, fieldOrColumn)
     if (!column) {
       return null
     }
-    const formatter = column.formatter
+    const { editConfig } = props
+    const { formatter, editRender, cellRender } = column
+    // formatter > tableCellFormatter
+    const renderOpts = formatter ? null : (editConfig && isEnableConf(editRender) ? editRender : (isEnableConf(cellRender) ? cellRender : null))
+    const compConf = renderOpts ? renderer.get(renderOpts.name) : null
+    const tcFormatter = compConf ? compConf.tableCellFormatter : null
     const cellValue = getCellValue(row, column)
     let cellLabel = cellValue
-    if (formatter) {
+    if (formatter || tcFormatter) {
       let formatData
       const { fullAllDataRowIdData } = internalData
       const rowid = getRowid($xeTable, row)
@@ -5122,17 +5249,28 @@ const Methods = {
           }
         }
       }
-      const formatParams = { cellValue, row, rowIndex: this.getRowIndex(row), column, columnIndex: this.getColumnIndex(column) }
-      if (XEUtils.isString(formatter)) {
-        const gFormatOpts = formats.get(formatter)
-        const tcFormatMethod = gFormatOpts ? (gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod) : null
-        cellLabel = tcFormatMethod ? tcFormatMethod(formatParams) : ''
-      } else if (XEUtils.isArray(formatter)) {
-        const gFormatOpts = formats.get(formatter[0])
-        const tcFormatMethod = gFormatOpts ? (gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod) : null
-        cellLabel = tcFormatMethod ? tcFormatMethod(formatParams, ...formatter.slice(1)) : ''
-      } else {
-        cellLabel = formatter(formatParams)
+      const formatParams = {
+        $table: $xeTable,
+        cellValue,
+        row,
+        rowIndex: $xeTable.getRowIndex(row),
+        column,
+        columnIndex: $xeTable.getColumnIndex(column)
+      }
+      if (formatter) {
+        if (XEUtils.isString(formatter)) {
+          const gFormatOpts = formats.get(formatter)
+          const tcFormatMethod = gFormatOpts ? (gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod) : null
+          cellLabel = tcFormatMethod ? tcFormatMethod(formatParams) : ''
+        } else if (XEUtils.isArray(formatter)) {
+          const gFormatOpts = formats.get(formatter[0])
+          const tcFormatMethod = gFormatOpts ? (gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod) : null
+          cellLabel = tcFormatMethod ? tcFormatMethod(formatParams, ...formatter.slice(1)) : ''
+        } else {
+          cellLabel = formatter(formatParams)
+        }
+      } else if (renderOpts && tcFormatter) {
+        cellLabel = `${tcFormatter(renderOpts, formatParams)}`
       }
       if (formatData) {
         formatData[colid] = { value: cellValue, label: cellLabel }
@@ -5182,6 +5320,7 @@ const Methods = {
         }
       }
       const footerFormatParams = {
+        $table: $xeTable,
         cellValue: itemValue,
         itemValue,
         row,
@@ -5747,47 +5886,11 @@ const Methods = {
   /**
    * 隐藏指定列
    */
-  hideColumn (fieldOrColumn: string | string[] | VxeTableDefines.ColumnInfo | VxeTableDefines.ColumnInfo[]) {
-    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
-
-    let status = false
-    const cols = XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn]
-    cols.forEach(item => {
-      const column = handleFieldOrColumn($xeTable, item)
-      if (column && column.visible) {
-        column.visible = false
-        if (!status) {
-          status = true
-        }
-      }
-    })
-    if (status) {
-      return $xeTable.handleCustom()
-    }
-    return $xeTable.$nextTick()
-  },
+  hideColumn: handleColumnVisible(false),
   /**
    * 显示指定列
    */
-  showColumn (fieldOrColumn: string | string[] | VxeTableDefines.ColumnInfo | VxeTableDefines.ColumnInfo[]) {
-    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
-
-    let status = false
-    const cols = XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn]
-    cols.forEach(item => {
-      const column = handleFieldOrColumn($xeTable, item)
-      if (column && !column.visible) {
-        column.visible = true
-        if (!status) {
-          status = true
-        }
-      }
-    })
-    if (status) {
-      return $xeTable.handleCustom()
-    }
-    return $xeTable.$nextTick()
-  },
+  showColumn: handleColumnVisible(true),
   setColumnWidth (fieldOrColumn: VxeColumnPropTypes.Field | VxeTableDefines.ColumnInfo | VxeColumnPropTypes.Field[] | VxeTableDefines.ColumnInfo[], width: number | string) {
     const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
     const internalData = $xeTable as unknown as TableInternalData
@@ -11203,6 +11306,7 @@ const Methods = {
     }
     reactData.lastScrollTime = Date.now()
     const evntParams = {
+      source: sourceType,
       scrollTop,
       scrollLeft,
       bodyHeight,
@@ -12455,7 +12559,7 @@ const Methods = {
 const funcs = 'setFilter,openFilter,clearFilter,saveFilter,saveFilterByEvent,resetFilter,resetFilterByEvent,saveFilterPanel,saveFilterPanelByEvent,resetFilterPanel,resetFilterPanelByEvent,getCheckedFilters,updateFilterOptionStatus,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,insertChild,insertChildAt,insertChildNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getEditCell,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,fullValidateField,validateField,openExport,closeExport,openPrint,closePrint,getPrintHtml,exportData,openImport,closeImport,importData,saveFile,readFile,importByFile,print,getCustomVisible,openCustom,closeCustom,toggleCustom,saveCustom,cancelCustom,resetCustom,toggleCustomAllCheckbox,setCustomAllCheckbox'.split(',')
 
 funcs.forEach(name => {
-  Methods[name] = function (...args: any[]) {
+  tableMethods[name] = function (...args: any[]) {
     // if (!this[`_${name}`]) {
     //   if ('openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').includes(name)) {
     //     errLog('vxe.error.reqModule', ['Export'])
@@ -12473,4 +12577,4 @@ funcs.forEach(name => {
   }
 })
 
-export default Methods
+export default tableMethods

package/packages/table/src/table.ts

@@ -1554,6 +1554,16 @@ export default {
       })
       return rgColumns
     },
+    computeAggFuncColumns () {
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+      const reactData = $xeTable as unknown as TableReactData
+
+      const { rowGroupList, tableColumn } = reactData
+      if (rowGroupList.length) {
+        return tableColumn.filter(column => column.field && column.aggFunc)
+      }
+      return []
+    },
     tabsResizeFlag () {
       const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
       const $xeTabs = $xeTable.$xeTabs
@@ -2145,8 +2155,9 @@ export default {
     if (this.$resize) {
       this.$resize.disconnect()
     }
-    this.closeFilter()
-    this.closeMenu()
+    $xeTable.closeTooltip()
+    $xeTable.closeFilter()
+    $xeTable.closeMenu()
 
     globalEvents.off($xeTable, 'paste')
     globalEvents.off($xeTable, 'copy')

package/packages/ui/index.ts

@@ -287,9 +287,10 @@ VxeUI.setConfig({
       showResponseMsg: true,
       showActionMsg: true,
       response: {
-        list: null,
+        list: 'list',
         result: 'result',
         total: 'page.total',
+        footerData: 'footerData',
         message: 'message'
       }
       // beforeItem: null,