vxe-table 3.19.11 → 3.19.13

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;

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

@@ -306,7 +306,7 @@ export default {
             const $xeGantt = $xeTable.$xeGantt;
             const internalData = $xeTable;
             // 如果一级菜单有配置 code 则允许点击，否则不能点击
-            if (!menu.disabled && (menu.code || !menu.children || !menu.children.length)) {
+            if (!menu.loading && !menu.disabled && (menu.code || !menu.children || !menu.children.length)) {
                 const gMenuOpts = menus.get(menu.code);
                 const params = Object.assign({}, internalData._currMenuParams, { menu, $table: $xeTable, $grid: $xeGrid, $gantt: $xeGantt, $event: evnt });
                 if (gMenuOpts && gMenuOpts.menuMethod) {

package/es/table/module/menu/panel.js

@@ -2,7 +2,7 @@ import { VxeUI } from '../../../ui';
 import XEUtils from 'xe-utils';
 import { getFuncText } from '../../../ui/src/utils';
 import { getSlotVNs } from '../../../ui/src/vn';
-const { getIcon, renderEmptyElement } = VxeUI;
+const { getIcon, getI18n, renderEmptyElement } = VxeUI;
 export default {
     name: 'VxeTableMenuPanel',
     props: {
@@ -52,7 +52,8 @@ export default {
                         class: 'vxe-context-menu--option-wrapper',
                         key: gIndex
                     }, options.map((item, index) => {
-                        const hasChildMenus = item.children && item.children.some((child) => child.visible !== false);
+                        const { children, loading } = item;
+                        const hasChildMenus = children && children.some((child) => child.visible !== false);
                         const prefixOpts = Object.assign({}, item.prefixConfig);
                         const prefixIcon = prefixOpts.icon || item.prefixIcon;
                         const suffixOpts = Object.assign({}, item.suffixConfig);
@@ -62,6 +63,7 @@ export default {
                             ? renderEmptyElement($xeTable)
                             : h('li', {
                                 class: [item.className, {
+                                        'link--loading': loading,
                                         'link--disabled': item.disabled,
                                         'link--active': item === ctxMenuStore.selected
                                     }],
@@ -84,11 +86,17 @@ export default {
                                     h('div', {
                                         class: ['vxe-context-menu--link-prefix', prefixOpts.className || '']
                                     }, [
-                                        prefixIcon && XEUtils.isFunction(prefixIcon)
-                                            ? h('span', {}, getSlotVNs(prefixIcon.call($xeTable, {})))
-                                            : h('i', {
-                                                class: prefixIcon
-                                            }),
+                                        loading
+                                            ? h('span', {
+                                                class: getIcon('TABLE_MENU_OPTION_LOADING')
+                                            })
+                                            : (prefixIcon && XEUtils.isFunction(prefixIcon)
+                                                ? h('span', {}, getSlotVNs(prefixIcon.call($xeTable, {})))
+                                                : h('span', {}, [
+                                                    h('i', {
+                                                        class: prefixIcon
+                                                    })
+                                                ])),
                                         prefixOpts.content ? h('span', {}, `${prefixOpts.content}`) : renderEmptyElement($xeTable)
                                     ]),
                                     h('span', {
@@ -96,7 +104,7 @@ export default {
                                         attrs: {
                                             title: menuContent
                                         }
-                                    }, menuContent),
+                                    }, loading ? getI18n('vxe.table.menuLoading') : menuContent),
                                     h('div', {
                                         class: ['vxe-context-menu--link-suffix', suffixOpts.className || '']
                                     }, [
@@ -114,6 +122,7 @@ export default {
                                                 'is--show': item === ctxMenuStore.selected && ctxMenuStore.showChild
                                             }]
                                     }, item.children.map((child, cIndex) => {
+                                        const { loading: childLoading } = child;
                                         const childPrefixOpts = Object.assign({}, child.prefixConfig);
                                         const childPrefixIcon = childPrefixOpts.icon || child.prefixIcon;
                                         const childSuffixOpts = Object.assign({}, child.suffixConfig);
@@ -123,6 +132,7 @@ export default {
                                             ? null
                                             : h('li', {
                                                 class: [child.className, {
+                                                        'link--loading': childLoading,
                                                         'link--disabled': child.disabled,
                                                         'link--active': child === ctxMenuStore.selectChild
                                                     }],
@@ -145,11 +155,17 @@ export default {
                                                     h('div', {
                                                         class: ['vxe-context-menu--link-prefix', childPrefixOpts.className || '']
                                                     }, [
-                                                        childPrefixIcon && XEUtils.isFunction(childPrefixIcon)
-                                                            ? h('span', {}, getSlotVNs(childPrefixIcon.call($xeTable, {})))
-                                                            : h('i', {
-                                                                class: childPrefixIcon
-                                                            }),
+                                                        child.loading
+                                                            ? h('span', {
+                                                                class: getIcon('TABLE_MENU_OPTION_LOADING')
+                                                            })
+                                                            : (childPrefixIcon && XEUtils.isFunction(childPrefixIcon)
+                                                                ? h('span', {}, getSlotVNs(childPrefixIcon({})))
+                                                                : h('span', {}, [
+                                                                    h('i', {
+                                                                        class: childPrefixIcon
+                                                                    })
+                                                                ])),
                                                         childPrefixOpts.content ? h('span', `${childPrefixOpts.content}`) : renderEmptyElement($xeTable)
                                                     ]),
                                                     h('span', {
@@ -157,7 +173,7 @@ export default {
                                                         attrs: {
                                                             title: childMenuContent
                                                         }
-                                                    }, childMenuContent),
+                                                    }, childLoading ? getI18n('vxe.table.menuLoading') : childMenuContent),
                                                     h('div', {
                                                         class: ['vxe-context-menu--link-suffix', childSuffixOpts.className || '']
                                                     }, [

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,40 +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, {
-        cellValue: itemValue,
-        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

@@ -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/table/style.css

@@ -1716,17 +1716,20 @@
 .vxe-table--context-menu-clild-wrapper li.link--active > .vxe-context-menu--link {
   color: #2B2B2B;
 }
-.vxe-context-menu--option-wrapper li.link--disabled > .vxe-context-menu--link,
+.vxe-context-menu--option-wrapper li.link--loading > .vxe-context-menu--link, .vxe-context-menu--option-wrapper li.link--disabled > .vxe-context-menu--link,
+.vxe-table--context-menu-clild-wrapper li.link--loading > .vxe-context-menu--link,
 .vxe-table--context-menu-clild-wrapper li.link--disabled > .vxe-context-menu--link {
   color: var(--vxe-ui-font-disabled-color);
   cursor: no-drop;
 }
-.vxe-context-menu--option-wrapper li.link--disabled.link--active,
+.vxe-context-menu--option-wrapper li.link--loading.link--active, .vxe-context-menu--option-wrapper li.link--disabled.link--active,
+.vxe-table--context-menu-clild-wrapper li.link--loading.link--active,
 .vxe-table--context-menu-clild-wrapper li.link--disabled.link--active {
   border-color: #C0C1C2;
   background-color: #EEEEEE;
 }
-.vxe-context-menu--option-wrapper li.link--disabled.link--active:hover,
+.vxe-context-menu--option-wrapper li.link--loading.link--active:hover, .vxe-context-menu--option-wrapper li.link--disabled.link--active:hover,
+.vxe-table--context-menu-clild-wrapper li.link--loading.link--active:hover,
 .vxe-table--context-menu-clild-wrapper li.link--disabled.link--active:hover {
   background-color: inherit;
 }