vxe-table 3.16.5 → 3.16.7

package/packages/table/src/cell.ts

@@ -395,7 +395,7 @@ export const Cell = {
       const { fullColumnFieldData } = tableInternalData
       const aggregateOpts = $table.computeAggregateOpts
       const { mode, showTotal, totalMethod, countFields, contentMethod, mapChildrenField } = aggregateOpts
-      const aggMethod = aggregateOpts.aggregateMethod || aggregateOpts.countMethod
+      const aggCalcMethod = (aggregateOpts as any).calcValuesMethod || aggregateOpts.countMethod || aggregateOpts.aggregateMethod
       const groupField = aggRow.groupField
       const groupContent = aggRow.groupContent
       const childList = mapChildrenField ? (aggRow[mapChildrenField] || []) : []
@@ -428,9 +428,9 @@ export const Cell = {
       } else if ($table.getPivotTableAggregateCellAggValue) {
         cellValue = $table.getPivotTableAggregateCellAggValue(params)
       } else if (aggFunc === true || (countFields && countFields.includes(field))) {
-        if (aggMethod) {
+        if (aggCalcMethod) {
           ctParams.aggValue = childCount
-          cellValue = `${aggMethod(ctParams)}`
+          cellValue = `${aggCalcMethod(ctParams)}`
         }
       }
     } else {
@@ -480,14 +480,14 @@ export const Cell = {
     const { rowGroupExpandedFlag } = tableReactData
     const { rowGroupExpandedMaps } = tableInternalData
     const aggregateOpts = $table.computeAggregateOpts
-    const { padding, indent } = aggregateOpts
+    const { mode, padding, indent } = aggregateOpts
     const rowid = getRowid($table, row)
     const isExpand = !!rowGroupExpandedFlag && !!rowGroupExpandedMaps[rowid]
     return h('div', {
       class: ['vxe-row-group--tree-node', {
         'is--expanded': isExpand
       }],
-      style: padding && indent
+      style: mode !== 'column' && padding && indent
         ? {
             paddingLeft: `${level * indent}px`
           }

package/packages/table/src/footer.ts

@@ -131,7 +131,7 @@ function renderRows (h: CreateElement, _vm: any, isOptimizeMode: boolean, tableC
     const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto')
 
     let isVNPreEmptyStatus = false
-    if (isOptimizeMode && !isMergeCell) {
+    if (isOptimizeMode && overflowX && !isMergeCell) {
       if (scrollXLoad && !column.fixed && !virtualXOpts.immediate && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
         isVNPreEmptyStatus = true
       }

package/packages/table/src/header.ts

@@ -100,7 +100,7 @@ const renderRows = (h: CreateElement, _vm: any, isGroup: boolean, isOptimizeMode
     const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto')
 
     let isVNPreEmptyStatus = false
-    if (isOptimizeMode && !isGroup) {
+    if (isOptimizeMode && overflowX && !isGroup) {
       if (!dragCol || dragCol.id !== colid) {
         if (scrollXLoad && !column.fixed && !virtualXOpts.immediate && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
           isVNPreEmptyStatus = true

package/packages/table/src/methods.ts

@@ -8948,10 +8948,10 @@ const Methods = {
 
     return handleSortEvent($xeTable, null, sortConfs, isUpdate)
   },
-  setSortByEvent (evnt: Event, sortConfs: VxeTableDefines.SortConfs | VxeTableDefines.SortConfs[], isUpdate?: boolean) {
+  setSortByEvent (evnt: Event, sortConfs: VxeTableDefines.SortConfs | VxeTableDefines.SortConfs[]) {
     const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
 
-    return handleSortEvent($xeTable, evnt, sortConfs, isUpdate)
+    return handleSortEvent($xeTable, evnt, sortConfs, true)
   },
   /**
    * 清空指定列的排序条件
@@ -8984,6 +8984,7 @@ const Methods = {
 
     const { tableFullColumn } = internalData
     const sortOpts = $xeTable.computeSortOpts
+    const { multiple } = sortOpts
     const sortCols: VxeTableDefines.ColumnInfo[] = []
     let column: VxeTableDefines.ColumnInfo<any> | null = null
     if (evnt) {
@@ -9003,11 +9004,18 @@ const Methods = {
       if (!sortOpts.remote) {
         $xeTable.handleTableData(true)
       }
-      if (sortCols.length) {
+
+      if (!multiple) {
+        column = sortCols[0]
+      }
+
+      if (column) {
+        $xeTable.handleColumnSortEvent(evnt, column)
+      }
+
+      if (multiple && sortCols.length) {
         const params = { $table: $xeTable, $event: evnt, cols: sortCols, sortList: [] }
         $xeTable.dispatchEvent('clear-all-sort', params, evnt)
-      } else if (column) {
-        $xeTable.handleColumnSortEvent(evnt, column)
       }
     }
     return $xeTable.$nextTick().then(() => {
@@ -9041,15 +9049,13 @@ const Methods = {
     }
     return sortList
   },
-  setFilterByEvent (evnt: Event, fieldOrColumn: VxeColumnPropTypes.Field | VxeTableDefines.ColumnInfo<any>, options: VxeColumnPropTypes.FilterItem[], isUpdate?: boolean) {
+  setFilterByEvent (evnt: Event, fieldOrColumn: VxeColumnPropTypes.Field | VxeTableDefines.ColumnInfo<any>, options: VxeColumnPropTypes.FilterItem[]) {
     const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
 
     const column = handleFieldOrColumn($xeTable, fieldOrColumn)
     if (column && column.filters) {
       column.filters = toFilters(options || [])
-      if (isUpdate) {
-        return $xeTable.handleColumnConfirmFilter(column, evnt)
-      }
+      return $xeTable.handleColumnConfirmFilter(column, evnt)
     }
     return $xeTable.$nextTick()
   },
@@ -9101,6 +9107,7 @@ const Methods = {
     const { filterStore } = reactData
     const { tableFullColumn } = internalData
     const filterOpts = $xeTable.computeFilterOpts
+    const { multiple } = filterOpts
     const filterCols: VxeTableDefines.ColumnInfo[] = []
     let column: VxeTableDefines.ColumnInfo<any> | null = null
     if (fieldOrColumn) {
@@ -9123,19 +9130,49 @@ const Methods = {
         style: null,
         options: [],
         column: null,
-        multiple: false,
+        multiple: false, // 选项是覅多选
         visible: false
       })
     }
+
     if (!filterOpts.remote) {
       $xeTable.updateData()
     }
-    if (filterCols.length) {
+
+    if (!multiple) {
+      column = filterCols[0]
+    }
+
+    if (column) {
+      const filterList = () => $xeTable.getCheckedFilters()
+      const values: any[] = []
+      const datas: any[] = []
+      column.filters.forEach((item: any) => {
+        if (item.checked) {
+          values.push(item.value)
+          datas.push(item.data)
+        }
+      })
+      const params = {
+        $table: $xeTable,
+        $event: evnt as Event,
+        column,
+        field: column.field,
+        property: column.field,
+        values,
+        datas,
+        filters: filterList,
+        filterList
+      }
+      $xeTable.dispatchEvent('filter-change', params, evnt)
+      $xeTable.dispatchEvent('clear-filter', params, evnt)
+    }
+
+    if (multiple && filterCols.length) {
       const params = { $table: $xeTable, $event: evnt, cols: filterCols, filterList: [] }
       $xeTable.dispatchEvent('clear-all-filter', params, evnt)
-    } else if (column) {
-      $xeTable.dispatchEvent('clear-filter', { filterList: () => $xeTable.getCheckedFilters() }, evnt)
     }
+
     return $xeTable.$nextTick()
   },
   /**

package/packages/table/src/table.ts

@@ -1724,7 +1724,10 @@ export default {
       warnLog('vxe.error.delProp', ['row-group-config.countFields', 'column.agg-func'])
     }
     if (aggregateOpts.aggregateMethod) {
-      warnLog('vxe.error.delProp', ['row-group-config.aggregateMethod', 'aggregate-config.countMethod'])
+      warnLog('vxe.error.delProp', ['row-group-config.aggregateMethod', 'aggregate-config.calcValuesMethod'])
+    }
+    if (aggregateOpts.countMethod) {
+      warnLog('vxe.error.delProp', ['aggregate-config.countMethod', 'aggregate-config.calcValuesMethod'])
     }
     if (props.treeConfig && treeOpts.children) {
       warnLog('vxe.error.delProp', ['tree-config.children', 'tree-config.childrenField'])

package/packages/ui/index.ts

@@ -140,6 +140,7 @@ VxeUI.setConfig({
       // filterMethod: null,
       // destroyOnClose: false,
       // isEvery: false,
+      multiple: true,
       showIcon: true
     },
     aggregateConfig: {