vxe-table 3.15.39 → 3.15.41

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

@@ -44,7 +44,8 @@ export default {
         _saveCustom() {
             const $xeTable = this;
             const reactData = $xeTable;
-            const { customOpts, customColumnList } = this;
+            const { customColumnList, aggHandleFields, rowGroupList } = reactData;
+            const customOpts = $xeTable.computeCustomOpts;
             const { allowVisible, allowSort, allowFixed, allowResizable } = customOpts;
             XEUtils.eachTree(customColumnList, (column, index, items, path, parentColumn) => {
                 if (parentColumn) {
@@ -77,7 +78,19 @@ export default {
             setTimeout(() => {
                 reactData.isDragColMove = false;
             }, 1000);
-            return $xeTable.saveCustomStore('confirm');
+            return $xeTable.saveCustomStore('confirm').then(() => {
+                if ($xeTable.handlePivotTableAggregateData) {
+                    if (rowGroupList.length !== aggHandleFields.length || rowGroupList.some((conf, i) => conf.field !== aggHandleFields[i])) {
+                        // 改动聚合分组
+                        if (aggHandleFields.length) {
+                            $xeTable.setRowGroups(aggHandleFields);
+                        }
+                        else {
+                            $xeTable.clearRowGroups();
+                        }
+                    }
+                }
+            });
         },
         _cancelCustom() {
             const $xeTable = this;
@@ -111,6 +124,7 @@ export default {
             const $xeTable = this;
             const reactData = $xeTable;
             const internalData = $xeTable;
+            const { rowGroupList } = reactData;
             const { collectColumn } = internalData;
             const customOpts = $xeTable.computeCustomOpts;
             const { checkMethod } = customOpts;
@@ -137,7 +151,19 @@ export default {
             });
             reactData.isCustomStatus = false;
             $xeTable.saveCustomStore('reset');
-            return $xeTable.handleCustom();
+            return $xeTable.handleCustom().then(() => {
+                if ($xeTable.handlePivotTableAggregateData) {
+                    const rowGroupFields = $xeTable.computeRowGroupFields;
+                    if (rowGroupFields ? rowGroupFields.length : rowGroupList.length) {
+                        if (rowGroupFields && rowGroupFields.length) {
+                            $xeTable.setRowGroups(rowGroupFields);
+                        }
+                        else {
+                            $xeTable.clearRowGroups();
+                        }
+                    }
+                }
+            });
         },
         _toggleCustomAllCheckbox() {
             const { customStore } = this;

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

@@ -88,9 +88,11 @@ const renderSimplePanel = (h, _vm) => {
     const VxeUIButtonComponent = VxeUI.getComponent('VxeButton');
     const props = _vm;
     const $xeTable = _vm.$xeTable;
+    const tableProps = $xeTable;
     const reactData = $xeTable;
     const $xeGrid = $xeTable.$xeGrid;
     const { customStore } = props;
+    const { treeConfig, rowGroupConfig, aggregateConfig } = tableProps;
     const { isCustomStatus, customColumnList } = reactData;
     const customOpts = $xeTable.computeCustomOpts;
     const { immediate } = customOpts;
@@ -261,124 +263,135 @@ const renderSimplePanel = (h, _vm) => {
             : {}
     }, customStore.visible
         ? [
+            !treeConfig && (aggregateConfig || rowGroupConfig) && $xeTable.getPivotTableAggregateSimplePanel
+                ? h($xeTable.getPivotTableAggregateSimplePanel(), {
+                    props: {
+                        customStore
+                    }
+                })
+                : renderEmptyElement($xeTable),
             h('div', {
-                class: 'vxe-table-custom--header'
-            }, headerSlot
-                ? $xeTable.callSlot(headerSlot, params, h)
-                : [
-                    h('ul', {
-                        class: 'vxe-table-custom--panel-list'
-                    }, [
-                        h('li', {
-                            class: 'vxe-table-custom--option'
+                class: 'vxe-table-custom--handle-wrapper'
+            }, [
+                h('div', {
+                    class: 'vxe-table-custom--header'
+                }, headerSlot
+                    ? $xeTable.callSlot(headerSlot, params, h)
+                    : [
+                        h('ul', {
+                            class: 'vxe-table-custom--panel-list'
                         }, [
-                            allowVisible
-                                ? h('div', {
-                                    class: ['vxe-table-custom--checkbox-option', {
-                                            'is--checked': isAllChecked,
-                                            'is--indeterminate': isAllIndeterminate
-                                        }],
-                                    attrs: {
-                                        title: getI18n('vxe.table.allTitle')
-                                    },
-                                    on: {
-                                        click: _vm.allOptionEvent
-                                    }
-                                }, [
-                                    h('span', {
-                                        class: ['vxe-checkbox--icon', isAllIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : (isAllChecked ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED)]
-                                    }),
-                                    h('span', {
+                            h('li', {
+                                class: 'vxe-table-custom--option'
+                            }, [
+                                allowVisible
+                                    ? h('div', {
+                                        class: ['vxe-table-custom--checkbox-option', {
+                                                'is--checked': isAllChecked,
+                                                'is--indeterminate': isAllIndeterminate
+                                            }],
+                                        attrs: {
+                                            title: getI18n('vxe.table.allTitle')
+                                        },
+                                        on: {
+                                            click: _vm.allOptionEvent
+                                        }
+                                    }, [
+                                        h('span', {
+                                            class: ['vxe-checkbox--icon', isAllIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : (isAllChecked ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED)]
+                                        }),
+                                        h('span', {
+                                            class: 'vxe-checkbox--label'
+                                        }, getI18n('vxe.toolbar.customAll'))
+                                    ])
+                                    : h('span', {
                                         class: 'vxe-checkbox--label'
-                                    }, getI18n('vxe.toolbar.customAll'))
-                                ])
-                                : h('span', {
-                                    class: 'vxe-checkbox--label'
-                                }, getI18n('vxe.table.customTitle'))
+                                    }, getI18n('vxe.table.customTitle'))
+                            ])
                         ])
-                    ])
+                    ]),
+                h('div', {
+                    ref: 'bodyElemRef',
+                    class: 'vxe-table-custom--body'
+                }, [
+                    topSlot
+                        ? h('div', {
+                            class: 'vxe-table-custom--panel-top'
+                        }, $xeTable.callSlot(topSlot, params, h))
+                        : renderEmptyElement($xeTable),
+                    defaultSlot
+                        ? h('div', {
+                            class: 'vxe-table-custom--panel-body'
+                        }, $xeTable.callSlot(defaultSlot, params, h))
+                        : h('transition-group', {
+                            class: 'vxe-table-custom--panel-list',
+                            props: {
+                                name: 'vxe-table-custom--list',
+                                tag: 'ul'
+                            },
+                            on: customWrapperOns
+                        }, colVNs),
+                    bottomSlot
+                        ? h('div', {
+                            class: 'vxe-table-custom--panel-bottom'
+                        }, $xeTable.callSlot(bottomSlot, params, h))
+                        : renderEmptyElement($xeTable),
+                    renderDragTip(h, _vm)
                 ]),
-            h('div', {
-                ref: 'bodyElemRef',
-                class: 'vxe-table-custom--body'
-            }, [
-                topSlot
-                    ? h('div', {
-                        class: 'vxe-table-custom--panel-top'
-                    }, $xeTable.callSlot(topSlot, params, h))
-                    : renderEmptyElement($xeTable),
-                defaultSlot
+                customOpts.showFooter
                     ? h('div', {
-                        class: 'vxe-table-custom--panel-body'
-                    }, $xeTable.callSlot(defaultSlot, params, h))
-                    : h('transition-group', {
-                        class: 'vxe-table-custom--panel-list',
-                        props: {
-                            name: 'vxe-table-custom--list',
-                            tag: 'ul'
-                        },
-                        on: customWrapperOns
-                    }, colVNs),
-                bottomSlot
-                    ? h('div', {
-                        class: 'vxe-table-custom--panel-bottom'
-                    }, $xeTable.callSlot(bottomSlot, params, h))
-                    : renderEmptyElement($xeTable),
-                renderDragTip(h, _vm)
-            ]),
-            customOpts.showFooter
-                ? h('div', {
-                    class: 'vxe-table-custom--footer'
-                }, footerSlot
-                    ? $xeTable.callSlot(footerSlot, params, h)
-                    : [
-                        h('div', {
-                            class: 'vxe-table-custom--footer-buttons'
-                        }, [
-                            h(VxeUIButtonComponent, {
-                                props: {
-                                    mode: 'text',
-                                    content: customOpts.resetButtonText || getI18n('vxe.table.customRestore'),
-                                    disabled: !isCustomStatus
-                                },
-                                on: {
-                                    click: _vm.resetCustomEvent
-                                }
-                            }),
-                            immediate
-                                ? h(VxeUIButtonComponent, {
-                                    props: {
-                                        mode: 'text',
-                                        content: customOpts.closeButtonText || getI18n('vxe.table.customClose')
-                                    },
-                                    on: {
-                                        click: _vm.cancelCloseEvent
-                                    }
-                                })
-                                : h(VxeUIButtonComponent, {
+                        class: 'vxe-table-custom--footer'
+                    }, footerSlot
+                        ? $xeTable.callSlot(footerSlot, params, h)
+                        : [
+                            h('div', {
+                                class: 'vxe-table-custom--footer-buttons'
+                            }, [
+                                h(VxeUIButtonComponent, {
                                     props: {
                                         mode: 'text',
-                                        content: customOpts.resetButtonText || getI18n('vxe.table.customCancel')
+                                        content: customOpts.resetButtonText || getI18n('vxe.table.customRestore'),
+                                        disabled: !isCustomStatus
                                     },
                                     on: {
-                                        click: _vm.cancelCustomEvent
+                                        click: _vm.resetCustomEvent
                                     }
                                 }),
-                            immediate
-                                ? renderEmptyElement($xeTable)
-                                : h(VxeUIButtonComponent, {
-                                    props: {
-                                        mode: 'text',
-                                        status: 'primary',
-                                        content: customOpts.confirmButtonText || getI18n('vxe.table.customConfirm')
-                                    },
-                                    on: {
-                                        click: _vm.confirmCustomEvent
-                                    }
-                                })
+                                immediate
+                                    ? h(VxeUIButtonComponent, {
+                                        props: {
+                                            mode: 'text',
+                                            content: customOpts.closeButtonText || getI18n('vxe.table.customClose')
+                                        },
+                                        on: {
+                                            click: _vm.cancelCloseEvent
+                                        }
+                                    })
+                                    : h(VxeUIButtonComponent, {
+                                        props: {
+                                            mode: 'text',
+                                            content: customOpts.resetButtonText || getI18n('vxe.table.customCancel')
+                                        },
+                                        on: {
+                                            click: _vm.cancelCustomEvent
+                                        }
+                                    }),
+                                immediate
+                                    ? renderEmptyElement($xeTable)
+                                    : h(VxeUIButtonComponent, {
+                                        props: {
+                                            mode: 'text',
+                                            status: 'primary',
+                                            content: customOpts.confirmButtonText || getI18n('vxe.table.customConfirm')
+                                        },
+                                        on: {
+                                            click: _vm.confirmCustomEvent
+                                        }
+                                    })
+                            ])
                         ])
-                    ])
-                : null
+                    : null
+            ])
         ]
         : []);
 };

package/es/table/src/body.js

@@ -564,7 +564,7 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
                 const { showOverflow } = expandColumn || {};
                 const colid = expandColumn.id;
                 const colRest = fullColumnIdData[colid] || {};
-                const hasEllipsis = (XEUtils.isUndefined(showOverflow) || XEUtils.isNull(showOverflow)) ? isAllOverflow : showOverflow;
+                const hasEllipsis = XEUtils.eqNull(showOverflow) ? isAllOverflow : showOverflow;
                 let columnIndex = -1;
                 let $columnIndex = -1;
                 let _columnIndex = -1;
@@ -680,7 +680,8 @@ export default {
         const tableReactData = $xeTable;
         const tableInternalData = $xeTable;
         const $xeGrid = $xeTable.$xeGrid;
-        const { xID, $scopedSlots } = $xeTable;
+        const slots = $xeTable.$scopedSlots;
+        const { xID } = $xeTable;
         const { fixedColumn, fixedType, tableColumn } = props;
         const { spanMethod, footerSpanMethod, mouseConfig } = tableProps;
         const { isGroup, tableData, isRowLoading, isColLoading, overflowX, scrollXLoad, scrollYLoad, isAllOverflow, isDragRowMove, expandColumn, dragRow, dragCol } = tableReactData;
@@ -759,14 +760,16 @@ export default {
             }
         }
         let emptyContent;
-        if ($scopedSlots.empty) {
-            emptyContent = $scopedSlots.empty.call(this, { $table: $xeTable, $grid: $xeGrid });
+        const emptySlot = slots ? slots.empty : null;
+        const emptyParams = { $table: $xeTable, $grid: $xeGrid };
+        if (emptySlot) {
+            emptyContent = emptySlot.call($xeTable, emptyParams);
         }
         else {
             const compConf = emptyOpts.name ? renderer.get(emptyOpts.name) : null;
             const rtEmptyView = compConf ? (compConf.renderTableEmpty || compConf.renderTableEmptyView || compConf.renderEmpty) : null;
             if (rtEmptyView) {
-                emptyContent = getSlotVNs(rtEmptyView.call(this, h, emptyOpts, { $table: $xeTable }));
+                emptyContent = getSlotVNs(rtEmptyView.call($xeTable, h, emptyOpts, emptyParams));
             }
             else {
                 emptyContent = tableProps.emptyText || getI18n('vxe.table.emptyText');

package/es/table/src/cell.js

@@ -358,18 +358,6 @@ export const Cell = {
         const { isRowGroupStatus } = tableReactData;
         const { field, slots, editRender, cellRender, rowGroupNode, aggFunc } = column;
         const renderOpts = editRender || cellRender;
-        if (slots && slots.default) {
-            return renderCellBaseVNs(h, params, $table.callSlot(slots.default, params, h));
-        }
-        if (renderOpts) {
-            const compConf = renderer.get(renderOpts.name);
-            const rtDefault = compConf ? (compConf.renderTableDefault || compConf.renderDefault) : null;
-            const rtCell = compConf ? (compConf.renderTableCell || compConf.renderCell) : null;
-            const renderFn = editRender ? rtCell : rtDefault;
-            if (renderFn) {
-                return renderCellBaseVNs(h, params, getSlotVNs(renderFn.call($table, h, renderOpts, Object.assign({ $type: editRender ? 'edit' : 'cell' }, params))));
-            }
-        }
         let cellValue = '';
         if (isRowGroupStatus && field && row.isAggregate) {
             const aggRow = row;
@@ -417,6 +405,18 @@ export const Cell = {
             }
         }
         else {
+            if (slots && slots.default) {
+                return renderCellBaseVNs(h, params, $table.callSlot(slots.default, params, h));
+            }
+            if (renderOpts) {
+                const compConf = renderer.get(renderOpts.name);
+                const rtDefault = compConf ? (compConf.renderTableDefault || compConf.renderDefault) : null;
+                const rtCell = compConf ? (compConf.renderTableCell || compConf.renderCell) : null;
+                const renderFn = editRender ? rtCell : rtDefault;
+                if (renderFn) {
+                    return renderCellBaseVNs(h, params, getSlotVNs(renderFn.call($table, h, renderOpts, Object.assign({ $type: editRender ? 'edit' : 'cell' }, params))));
+                }
+            }
             cellValue = $table.getCellLabel(row, column);
         }
         const cellPlaceholder = editRender ? editRender.placeholder : '';

package/es/table/src/methods.js

@@ -23,6 +23,9 @@ function eqCellValue(row1, row2, field) {
     }
     return XEUtils.isEqual(val1, val2);
 }
+function hangleStorageDefaultValue(value, isAll) {
+    return XEUtils.isBoolean(value) ? value : isAll;
+}
 function getNextSortOrder($xeTable, column) {
     const sortOpts = $xeTable.computeSortOpts;
     const { orders = [] } = sortOpts;
@@ -157,13 +160,13 @@ function restoreCustomStorage($xeTable) {
     const { customConfig } = props;
     const tableId = $xeTable.computeTableId;
     const customOpts = $xeTable.computeCustomOpts;
-    const { storage, restoreStore } = customOpts;
+    const { storage, restoreStore, storeOptions } = customOpts;
     const isAllCustom = storage === true;
-    const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {});
-    const isCustomResizable = isAllCustom || storageOpts.resizable;
-    const isCustomVisible = isAllCustom || storageOpts.visible;
-    const isCustomFixed = isAllCustom || storageOpts.fixed;
-    const isCustomSort = isAllCustom || storageOpts.sort;
+    const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {}, storeOptions);
+    const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
+    const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
+    const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
+    const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
     if ((customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
         if (!tableId) {
             errLog('vxe.error.reqProp', ['id']);
@@ -2610,13 +2613,18 @@ function handleRecalculateLayout($xeTable, reFull) {
 }
 const handleUpdateRowGroup = ($xeTable, groupFields) => {
     const reactData = $xeTable;
-    reactData.rowGroupList = groupFields
-        ? (XEUtils.isArray(groupFields) ? groupFields : [groupFields]).map(field => {
-            return {
+    const aggFields = [];
+    const aggConfs = [];
+    if (groupFields) {
+        (XEUtils.isArray(groupFields) ? groupFields : [groupFields]).forEach(field => {
+            aggFields.push(field);
+            aggConfs.push({
                 field
-            };
-        })
-        : [];
+            });
+        });
+    }
+    reactData.rowGroupList = aggConfs;
+    reactData.aggHandleFields = aggFields;
 };
 function handleeGroupSummary($xeTable, aggList) {
     const aggregateOpts = $xeTable.computeAggregateOpts;
@@ -2803,9 +2811,9 @@ function loadTableData($xeTable, datas, isReset) {
     internalData.cvCacheMaps = {};
     reactData.isRowLoading = true;
     reactData.scrollVMLoading = false;
-    internalData.treeExpandedMaps = {};
+    // internalData.treeExpandedMaps = {}
     reactData.treeExpandedFlag++;
-    internalData.rowExpandedMaps = {};
+    // internalData.rowExpandedMaps = {}
     reactData.rowExpandedFlag++;
     internalData.insertRowMaps = {};
     reactData.insertRowFlag++;
@@ -4906,13 +4914,13 @@ const Methods = {
         const { customConfig } = props;
         const tableId = $xeTable.computeTableId;
         const customOpts = $xeTable.computeCustomOpts;
-        const { storage, restoreStore } = customOpts;
+        const { storage, restoreStore, storeOptions } = customOpts;
         const isAllCustom = storage === true;
-        const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {});
-        const isCustomResizable = isAllCustom || storageOpts.resizable;
-        const isCustomVisible = isAllCustom || storageOpts.visible;
-        const isCustomFixed = isAllCustom || storageOpts.fixed;
-        const isCustomSort = isAllCustom || storageOpts.sort;
+        const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {}, storeOptions);
+        const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
+        const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
+        const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
+        const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
         if ((customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
             if (!tableId) {
                 errLog('vxe.error.reqProp', ['id']);
@@ -4939,13 +4947,13 @@ const Methods = {
         const { id } = props;
         const customOpts = $xeTable.computeCustomOpts;
         const { collectColumn } = internalData;
-        const { storage, checkMethod } = customOpts;
+        const { storage, checkMethod, storeOptions } = customOpts;
         const isAllCustom = storage === true;
-        const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {});
-        const isCustomResizable = isAllCustom || storageOpts.resizable;
-        const isCustomVisible = isAllCustom || storageOpts.visible;
-        const isCustomFixed = isAllCustom || storageOpts.fixed;
-        const isCustomSort = isAllCustom || storageOpts.sort;
+        const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {}, storeOptions);
+        const isCustomResizable = hangleStorageDefaultValue(storageOpts.resizable, isAllCustom);
+        const isCustomVisible = hangleStorageDefaultValue(storageOpts.visible, isAllCustom);
+        const isCustomFixed = hangleStorageDefaultValue(storageOpts.fixed, isAllCustom);
+        const isCustomSort = hangleStorageDefaultValue(storageOpts.sort, isAllCustom);
         const resizableData = {};
         const sortData = {};
         const visibleData = {};

package/es/table/src/props.js

@@ -144,11 +144,20 @@ export default {
     // 设置表尾所有内容过长时显示为省略号
     showFooterOverflow: { type: [Boolean, String], default: () => getConfig().table.showFooterOverflow },
     /** 高级属性 */
-    // （即将废弃）columnKey 已废弃，被 column-config.useKey 替换
+    /**
+     * （即将废弃）columnKey 已废弃，被 column-config.useKey 替换
+     * @deprecated
+     */
     columnKey: Boolean,
-    // （即将废弃）rowKey 已废弃，被 row-config.useKey 替换
+    /**
+     * （即将废弃）rowKey 已废弃，被 row-config.useKey 替换
+     * @deprecated
+     */
     rowKey: Boolean,
-    // （即将废弃）rowId 已废弃，被 row-config.keyField 替换
+    /**
+     * （即将废弃）rowId 已废弃，被 row-config.keyField 替换
+     * @deprecated
+     */
     rowId: { type: String, default: () => getConfig().table.rowId },
     zIndex: Number,
     emptyText: { type: String, default: () => getConfig().table.emptyText },
@@ -173,11 +182,17 @@ export default {
     rowConfig: Object,
     // 数据聚合配置项
     aggregateConfig: Object,
-    //  已废弃，被 aggregateConfig 替换
+    /**
+     * 已废弃，被 aggregateConfig 替换
+     * @deprecated
+     */
     rowGroupConfig: Object,
     // 当前行配置项
     currentRowConfig: Object,
-    // 已废弃，被 rowDragConfig 替换
+    /**
+     * 已废弃，被 rowDragConfig 替换
+     * @deprecated
+     */
     dragConfig: Object,
     // 行拖拽排序配置项
     rowDragConfig: Object,
@@ -209,7 +224,10 @@ export default {
     treeConfig: [Boolean, Object],
     // 快捷菜单配置项
     menuConfig: [Boolean, Object],
-    // 在 v4 中废弃 contextMenu
+    /**
+     * 在 v4 中废弃 contextMenu
+     * @deprecated
+     */
     contextMenu: [Boolean, Object],
     // 鼠标配置项
     mouseConfig: Object,
@@ -233,9 +251,15 @@ export default {
     emptyRender: [Boolean, Object],
     // 自定义列配置项
     customConfig: Object,
-    // （即将废弃）横向虚拟滚动配置项
+    /**
+     * （即将废弃）横向虚拟滚动配置项
+     * @deprecated
+     */
     scrollX: Object,
-    // （即将废弃）纵向虚拟滚动配置项
+    /**
+     * （即将废弃）纵向虚拟滚动配置项
+     * @deprecated
+     */
     scrollY: Object,
     // 横向虚拟滚动配置项
     virtualXConfig: Object,