vxe-table 3.19.10 → 3.19.12

package/es/table/module/export/mixin.js

@@ -236,15 +236,12 @@ function getFooterCellValue($xeTable, opts, row, column) {
     if (!footLabelMethod) {
         footLabelMethod = columnOpts.footerExportMethod;
     }
-    const _columnIndex = $xeTable.getVTColumnIndex(column);
     if (footLabelMethod) {
+        const _columnIndex = $xeTable.getVTColumnIndex(column);
         return footLabelMethod({ $table: $xeTable, items: row, itemIndex: _columnIndex, row, _columnIndex, column, options: opts });
     }
-    // 兼容老模式
-    if (XEUtils.isArray(row)) {
-        return XEUtils.toValueString(row[_columnIndex]);
-    }
-    return XEUtils.get(row, column.field);
+    const cellValue = $xeTable.getFooterCellLabel(row, column);
+    return cellValue;
 }
 function getFooterData($xeTable, opts, footerTableData) {
     const $xeGrid = $xeTable.$xeGrid;
@@ -777,7 +774,7 @@ function handleImport($xeTable, content, opts) {
             if (opts.mode === 'insert' || opts.mode === 'insertBottom') {
                 loadRest = $xeTable.insertAt(data, -1);
             }
-            if (opts.mode === 'insertTop') {
+            else if (opts.mode === 'insertTop') {
                 loadRest = $xeTable.insert(data);
             }
             else {

package/es/table/src/cell.js

@@ -4,7 +4,7 @@ import { getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../ui/sr
 import { updateCellTitle } from '../../ui/src/dom';
 import { createColumn, getRowid } from './util';
 import { getSlotVNs } from '../../ui/src/vn';
-const { getI18n, getIcon, renderer, formats, renderEmptyElement } = VxeUI;
+const { getI18n, getIcon, renderer, renderEmptyElement } = VxeUI;
 function renderTitlePrefixIcon(h, params) {
     const { $table, column } = params;
     const titlePrefix = column.titlePrefix || column.titleHelp;
@@ -216,39 +216,21 @@ function renderTitleContent(h, params, content) {
     ];
 }
 function getFooterContent(h, params) {
-    const { $table, column, _columnIndex, row, items } = params;
-    const { slots, editRender, cellRender, footerFormatter } = column;
+    const { $table, column, row } = params;
+    const { slots, editRender, cellRender } = column;
     const renderOpts = editRender || cellRender;
     if (slots && slots.footer) {
         return $table.callSlot(slots.footer, params, h);
     }
-    let itemValue = '';
-    // 兼容老模式
-    if (XEUtils.isArray(items)) {
-        itemValue = items[_columnIndex];
-    }
-    else {
-        itemValue = XEUtils.get(row, column.field);
-    }
-    const footParams = Object.assign(params, {
-        itemValue
-    });
-    if (footerFormatter) {
-        if (XEUtils.isFunction(footerFormatter)) {
-            return `${footerFormatter(footParams)}`;
-        }
-        const isArr = XEUtils.isArray(footerFormatter);
-        const gFormatOpts = isArr ? formats.get(footerFormatter[0]) : formats.get(footerFormatter);
-        const footerFormatMethod = gFormatOpts ? gFormatOpts.tableFooterCellFormatMethod : null;
-        if (footerFormatMethod) {
-            return `${isArr ? footerFormatMethod(footParams, ...footerFormatter.slice(1)) : footerFormatMethod(footParams)}`;
-        }
-        return '';
-    }
+    const itemValue = $table.getFooterCellLabel(row, column);
     if (renderOpts) {
         const compConf = renderer.get(renderOpts.name);
         const rtFooter = compConf ? (compConf.renderTableFooter || compConf.renderFooter) : null;
         if (rtFooter) {
+            const footParams = Object.assign(params, {
+                cellValue: itemValue,
+                itemValue
+            });
             return getSlotVNs(rtFooter.call($table, h, renderOpts, footParams));
         }
     }

package/es/table/src/columnInfo.js

@@ -11,7 +11,7 @@ export class ColumnInfo {
         const $xeGrid = $xeTable.$xeGrid;
         const $xeGantt = $xeTable.$xeGantt;
         const $xeGGWrapper = $xeGrid || $xeGantt;
-        const { field, editRender, filterRender } = _vm;
+        const { field, editRender, filterRender, headerFormatter } = _vm;
         const colId = _vm.colId || XEUtils.uniqueId('col_');
         const proxyOpts = $xeGrid ? $xeGrid.computeProxyOpts : null;
         const formatter = _vm.formatter;
@@ -19,6 +19,9 @@ export class ColumnInfo {
         const flCompConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null;
         const ctFilterOptions = flCompConf ? flCompConf.createTableFilterOptions : null;
         const filters = toFilters(_vm.filters, colId);
+        if (headerFormatter) {
+            errLog('vxe.error.notProp', ['header-formatter']);
+        }
         const types = ['seq', 'checkbox', 'radio', 'expand', 'html'];
         if (_vm.type && types.indexOf(_vm.type) === -1) {
             warnLog('vxe.error.errProp', [`type=${_vm.type}`, types.join(', ')]);

package/es/table/src/methods.js

@@ -3254,9 +3254,9 @@ function loadTableData($xeTable, datas, isReset) {
             // if (!props.showOverflow) {
             //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
             // }
-            if (props.spanMethod) {
-                errLog('vxe.error.scrollErrProp', ['table.span-method']);
-            }
+            // if (props.spanMethod) {
+            //   warnLog('vxe.error.scrollErrProp', ['span-method'])
+            // }
         }
         handleReserveStatus($xeTable);
         $xeTable.checkSelectionStatus();
@@ -4905,6 +4905,76 @@ const Methods = {
         }
         return cellLabel;
     },
+    getFooterCellLabel(row, fieldOrColumn) {
+        const $xeTable = this;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
+        const column = handleFieldOrColumn($xeTable, fieldOrColumn);
+        if (!column) {
+            return null;
+        }
+        const { footerFormatter } = column;
+        const _columnIndex = $xeTable.getVTColumnIndex(column);
+        let itemValue = '';
+        // 兼容老模式
+        if (XEUtils.isArray(row)) {
+            itemValue = row[_columnIndex];
+        }
+        else {
+            itemValue = XEUtils.get(row, column.field);
+        }
+        let cellLabel = itemValue;
+        if (footerFormatter) {
+            let formatData;
+            const { footerTableData } = reactData;
+            const { footerFullDataRowData } = internalData;
+            const colid = column.id;
+            const $rowIndex = footerTableData.indexOf(row);
+            let rowRest = null;
+            if ($rowIndex > -1) {
+                rowRest = footerFullDataRowData[$rowIndex];
+                if (!rowRest) {
+                    rowRest = footerFullDataRowData[$rowIndex] = {};
+                }
+                formatData = rowRest.formatData;
+                if (!formatData) {
+                    formatData = footerFullDataRowData[$rowIndex].formatData = {};
+                }
+                if (rowRest && formatData[colid]) {
+                    if (formatData[colid].value === itemValue) {
+                        return formatData[colid].label;
+                    }
+                }
+            }
+            const footerFormatParams = {
+                cellValue: itemValue,
+                itemValue,
+                row,
+                items: row,
+                $rowIndex,
+                column,
+                _columnIndex,
+                columnIndex: $xeTable.getColumnIndex(column)
+            };
+            if (XEUtils.isString(footerFormatter)) {
+                const gFormatOpts = formats.get(footerFormatter);
+                const fcFormatMethod = gFormatOpts ? gFormatOpts.tableFooterCellFormatMethod : null;
+                cellLabel = fcFormatMethod ? fcFormatMethod(footerFormatParams) : '';
+            }
+            else if (XEUtils.isArray(footerFormatter)) {
+                const gFormatOpts = formats.get(footerFormatter[0]);
+                const fcFormatMethod = gFormatOpts ? gFormatOpts.tableFooterCellFormatMethod : null;
+                cellLabel = fcFormatMethod ? fcFormatMethod(footerFormatParams, ...footerFormatter.slice(1)) : '';
+            }
+            else {
+                cellLabel = footerFormatter(footerFormatParams);
+            }
+            if (formatData) {
+                formatData[colid] = { value: itemValue, label: cellLabel };
+            }
+        }
+        return cellLabel;
+    },
     /**
      * 检查是否为临时行数据
      */

package/es/table/src/table.js

@@ -1538,6 +1538,8 @@ export default {
         },
         footFlag() {
             const $xeTable = this;
+            const internalData = $xeTable;
+            internalData.footerFullDataRowData = {};
             $xeTable.updateFooter();
         },
         syncResize(value) {

package/es/table/src/util.js

@@ -76,6 +76,7 @@ export function createInternalData() {
         fullDataRowIdData: {},
         // 数据集（仅可视）
         visibleDataRowIdData: {},
+        footerFullDataRowData: {},
         // 渲染中缓存数据
         sourceDataRowIdData: {},
         fullColumnIdData: {},

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.19.10";
+export const version = "3.19.12";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.19.10"}`;
+const version = `table v${"3.19.12"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);