vxe-table 3.15.40 → 3.15.42

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

@@ -8925,8 +8925,10 @@ const Methods = {
         }
         internalData.rowGroupExpandedMaps = rgExpandedMaps;
         handleVirtualTreeToList($xeTable);
+        $xeTable.handleTableData();
+        updateAfterDataIndex($xeTable);
         reactData.rowGroupExpandedFlag++;
-        return $xeTable.handleTableData();
+        return $xeTable.recalculate(true);
     },
     clearRowGroupExpand() {
         const $xeTable = this;
@@ -8934,8 +8936,10 @@ const Methods = {
         const internalData = $xeTable;
         internalData.rowGroupExpandedMaps = {};
         handleVirtualTreeToList($xeTable);
+        $xeTable.handleTableData();
+        updateAfterDataIndex($xeTable);
         reactData.rowGroupExpandedFlag++;
-        return $xeTable.handleTableData();
+        return $xeTable.recalculate(true);
     },
     getTreeExpandRecords() {
         const $xeTable = this;

package/es/toolbar/src/toolbar.js

@@ -12,11 +12,17 @@ export default {
     props: {
         loading: Boolean,
         refresh: [Boolean, Object],
+        refreshOptions: Object,
         import: [Boolean, Object],
+        importOptions: Object,
         export: [Boolean, Object],
+        exportOptions: Object,
         print: [Boolean, Object],
+        printOptions: Object,
         zoom: [Boolean, Object],
+        zoomOptions: Object,
         custom: [Boolean, Object],
+        customOptions: Object,
         buttons: {
             type: Array,
             default: () => getConfig().toolbar.buttons
@@ -59,32 +65,32 @@ export default {
     computed: Object.assign(Object.assign({}, {}), { computeRefreshOpts() {
             const $xeToolbar = this;
             const props = $xeToolbar;
-            return Object.assign({}, XEUtils.clone(getConfig().toolbar.refresh, true), props.refresh);
+            return Object.assign({}, XEUtils.clone(getConfig().toolbar.refresh, true), props.refreshOptions, props.refresh);
         },
         computeImportOpts() {
             const $xeToolbar = this;
             const props = $xeToolbar;
-            return Object.assign({}, XEUtils.clone(getConfig().toolbar.import, true), props.import);
+            return Object.assign({}, XEUtils.clone(getConfig().toolbar.import, true), props.importOptions, props.import);
         },
         computeExportOpts() {
             const $xeToolbar = this;
             const props = $xeToolbar;
-            return Object.assign({}, XEUtils.clone(getConfig().toolbar.export, true), props.export);
+            return Object.assign({}, XEUtils.clone(getConfig().toolbar.export, true), props.exportOptions, props.export);
         },
         computePrintOpts() {
             const $xeToolbar = this;
             const props = $xeToolbar;
-            return Object.assign({}, XEUtils.clone(getConfig().toolbar.print, true), props.print);
+            return Object.assign({}, XEUtils.clone(getConfig().toolbar.print, true), props.printOptions, props.print);
         },
         computeZoomOpts() {
             const $xeToolbar = this;
             const props = $xeToolbar;
-            return Object.assign({}, XEUtils.clone(getConfig().toolbar.zoom, true), props.zoom);
+            return Object.assign({}, XEUtils.clone(getConfig().toolbar.zoom, true), props.zoomOptions, props.zoom);
         },
         computeCustomOpts() {
             const $xeToolbar = this;
             const props = $xeToolbar;
-            return Object.assign({}, XEUtils.clone(getConfig().toolbar.custom, true), props.custom);
+            return Object.assign({}, XEUtils.clone(getConfig().toolbar.custom, true), props.customOptions, props.custom);
         },
         computeTableCustomOpts() {
             const $xeToolbar = this;
@@ -203,73 +209,44 @@ export default {
             if ($xeGrid) {
                 $xeGrid.triggerZoomEvent($event);
             }
+            else {
+                warnLog('vxe.error.notProp', ['zoom']);
+            }
         },
-        btnEvent(evnt, item) {
+        importEvent() {
             const $xeToolbar = this;
             const internalData = $xeToolbar.internalData;
-            const $xeGrid = $xeToolbar.$xeGrid;
-            const { connectTable } = internalData;
-            const $table = connectTable;
-            const { code } = item;
-            if (code) {
-                if ($xeGrid) {
-                    $xeGrid.triggerToolbarBtnEvent(item, evnt);
-                }
-                else {
-                    const gCommandOpts = commands.get(code);
-                    const params = { code, button: item, $table: $table, $grid: $xeGrid, $event: evnt };
-                    if (gCommandOpts) {
-                        const tCommandMethod = gCommandOpts.tableCommandMethod || gCommandOpts.commandMethod;
-                        if (tCommandMethod) {
-                            tCommandMethod(params);
-                        }
-                        else {
-                            errLog('vxe.error.notCommands', [code]);
-                        }
-                    }
-                    $xeToolbar.dispatchEvent('button-click', params, evnt);
+            if ($xeToolbar.checkTable()) {
+                const { connectTable } = internalData;
+                const $table = connectTable;
+                if ($table) {
+                    $table.importData();
                 }
             }
         },
-        tolEvent(evnt, item) {
+        openImportEvent() {
             const $xeToolbar = this;
             const internalData = $xeToolbar.internalData;
-            const $xeGrid = $xeToolbar.$xeGrid;
-            const { connectTable } = internalData;
-            const $table = connectTable;
-            const { code } = item;
-            if (code) {
-                if ($xeGrid) {
-                    $xeGrid.triggerToolbarTolEvent(item, evnt);
-                }
-                else {
-                    const gCommandOpts = commands.get(code);
-                    const params = { code, button: null, tool: item, $table: $table, $grid: $xeGrid, $event: evnt };
-                    if (gCommandOpts) {
-                        const tCommandMethod = gCommandOpts.tableCommandMethod || gCommandOpts.commandMethod;
-                        if (tCommandMethod) {
-                            tCommandMethod(params);
-                        }
-                        else {
-                            errLog('vxe.error.notCommands', [code]);
-                        }
-                    }
-                    $xeToolbar.dispatchEvent('tool-click', params, evnt);
+            if ($xeToolbar.checkTable()) {
+                const { connectTable } = internalData;
+                const $table = connectTable;
+                if ($table) {
+                    $table.openImport();
                 }
             }
         },
-        importEvent() {
+        exportEvent() {
             const $xeToolbar = this;
             const internalData = $xeToolbar.internalData;
             if ($xeToolbar.checkTable()) {
                 const { connectTable } = internalData;
                 const $table = connectTable;
                 if ($table) {
-                    $table.openImport();
+                    $table.exportData();
                 }
             }
         },
-        exportEvent() {
+        openExportEvent() {
             const $xeToolbar = this;
             const internalData = $xeToolbar.internalData;
             if ($xeToolbar.checkTable()) {
@@ -281,6 +258,17 @@ export default {
             }
         },
         printEvent() {
+            const $xeToolbar = this;
+            const internalData = $xeToolbar.internalData;
+            if ($xeToolbar.checkTable()) {
+                const { connectTable } = internalData;
+                const $table = connectTable;
+                if ($table) {
+                    $table.print();
+                }
+            }
+        },
+        openPrintEvent() {
             const $xeToolbar = this;
             const internalData = $xeToolbar.internalData;
             if ($xeToolbar.checkTable()) {
@@ -291,6 +279,101 @@ export default {
                 }
             }
         },
+        handleDefaultCodeEvent(eventParams, item, cb) {
+            const $xeToolbar = this;
+            switch (item.code) {
+                case 'print':
+                    $xeToolbar.printEvent();
+                    break;
+                case 'open_print':
+                    $xeToolbar.openPrintEvent();
+                    break;
+                case 'custom':
+                    $xeToolbar.handleClickSettingEvent(eventParams);
+                    break;
+                case 'export':
+                    $xeToolbar.exportEvent();
+                    break;
+                case 'open_export':
+                    $xeToolbar.openExportEvent();
+                    break;
+                case 'import':
+                    $xeToolbar.importEvent();
+                    break;
+                case 'open_import':
+                    $xeToolbar.openImportEvent();
+                    break;
+                case 'zoom':
+                    $xeToolbar.zoomEvent(eventParams);
+                    break;
+                case 'refresh':
+                    $xeToolbar.refreshEvent(eventParams);
+                    break;
+                default:
+                    cb();
+                    break;
+            }
+        },
+        btnEvent(eventParams, item) {
+            const $xeToolbar = this;
+            const internalData = $xeToolbar.internalData;
+            const $xeGrid = $xeToolbar.$xeGrid;
+            const { $event } = eventParams;
+            const { connectTable } = internalData;
+            const $table = connectTable;
+            const { code } = item;
+            if (code) {
+                $xeToolbar.handleDefaultCodeEvent(eventParams, item, () => {
+                    if ($xeGrid) {
+                        $xeGrid.triggerToolbarBtnEvent(item, $event);
+                    }
+                    else {
+                        const gCommandOpts = commands.get(code);
+                        const params = { code, button: item, $table: $table, $grid: $xeGrid, $event };
+                        if (gCommandOpts) {
+                            const tCommandMethod = gCommandOpts.tableCommandMethod || gCommandOpts.commandMethod;
+                            if (tCommandMethod) {
+                                tCommandMethod(params);
+                            }
+                            else {
+                                errLog('vxe.error.notCommands', [code]);
+                            }
+                        }
+                        $xeToolbar.dispatchEvent('button-click', params, $event);
+                    }
+                });
+            }
+        },
+        tolEvent(eventParams, item) {
+            const $xeToolbar = this;
+            const internalData = $xeToolbar.internalData;
+            const $xeGrid = $xeToolbar.$xeGrid;
+            const { $event } = eventParams;
+            const { connectTable } = internalData;
+            const $table = connectTable;
+            const { code } = item;
+            if (code) {
+                $xeToolbar.handleDefaultCodeEvent(eventParams, item, () => {
+                    if ($xeGrid) {
+                        $xeGrid.triggerToolbarTolEvent(item, $event);
+                    }
+                    else {
+                        const gCommandOpts = commands.get(code);
+                        const params = { code, button: null, tool: item, $table: $table, $grid: $xeGrid, $event };
+                        if (gCommandOpts) {
+                            const tCommandMethod = gCommandOpts.tableCommandMethod || gCommandOpts.commandMethod;
+                            if (tCommandMethod) {
+                                tCommandMethod(params);
+                            }
+                            else {
+                                errLog('vxe.error.notCommands', [code]);
+                            }
+                        }
+                        $xeToolbar.dispatchEvent('tool-click', params, $event);
+                    }
+                });
+            }
+        },
         //
         // Render
         //
@@ -325,7 +408,7 @@ export default {
                                 suffixTooltip: child.suffixTooltip
                             },
                             on: {
-                                click: ({ $event }) => isBtn ? $xeToolbar.btnEvent($event, child) : $xeToolbar.tolEvent($event, child)
+                                click: (eventParams) => isBtn ? $xeToolbar.btnEvent(eventParams, child) : $xeToolbar.tolEvent(eventParams, child)
                             }
                         })
                         : renderEmptyElement($xeToolbar);
@@ -388,11 +471,11 @@ export default {
                                         transfer: item.transfer
                                     },
                                     on: {
-                                        click: ({ $event }) => this.btnEvent($event, item)
+                                        click: (eventParams) => $xeToolbar.btnEvent(eventParams, item)
                                     },
                                     scopedSlots: dropdowns && dropdowns.length
                                         ? {
-                                            dropdowns: () => this.renderDropdowns(h, item, true)
+                                            dropdowns: () => $xeToolbar.renderDropdowns(h, item, true)
                                         }
                                         : {}
                                 }));
@@ -464,7 +547,7 @@ export default {
                                         transfer: item.transfer
                                     },
                                     on: {
-                                        click: ({ $event }) => $xeToolbar.tolEvent($event, item)
+                                        click: (eventParams) => $xeToolbar.tolEvent(eventParams, item)
                                     },
                                     scopedSlots: dropdowns && dropdowns.length
                                         ? {
@@ -496,7 +579,7 @@ export default {
                         title: getI18n('vxe.toolbar.import')
                     },
                     on: {
-                        click: $xeToolbar.importEvent
+                        click: $xeToolbar.openImportEvent
                     }
                 })
                 : renderEmptyElement($xeToolbar);
@@ -515,7 +598,7 @@ export default {
                         title: getI18n('vxe.toolbar.export')
                     },
                     on: {
-                        click: $xeToolbar.exportEvent
+                        click: $xeToolbar.openExportEvent
                     }
                 })
                 : renderEmptyElement($xeToolbar);
@@ -534,7 +617,7 @@ export default {
                         title: getI18n('vxe.toolbar.print')
                     },
                     on: {
-                        click: $xeToolbar.printEvent
+                        click: $xeToolbar.openPrintEvent
                     }
                 })
                 : renderEmptyElement($xeToolbar);
@@ -655,13 +738,30 @@ export default {
         const props = $xeToolbar;
         const $xeGrid = $xeToolbar.$xeGrid;
         $xeToolbar.$nextTick(() => {
-            const { refresh } = props;
             const refreshOpts = $xeToolbar.computeRefreshOpts;
-            const $xeTable = this.fintTable();
+            const $xeTable = $xeToolbar.fintTable();
             const queryMethod = refreshOpts.queryMethod || refreshOpts.query;
-            if (refresh && !$xeGrid && !queryMethod) {
+            if (props.refresh && !$xeGrid && !queryMethod) {
                 warnLog('vxe.error.notFunc', ['queryMethod']);
             }
+            if (XEUtils.isPlainObject(props.custom)) {
+                warnLog('vxe.error.delProp', ['custom={...}', 'custom=boolean & custom-options={...}']);
+            }
+            if (XEUtils.isPlainObject(props.print)) {
+                warnLog('vxe.error.delProp', ['print={...}', 'print=boolean & print-options={...}']);
+            }
+            if (XEUtils.isPlainObject(props.export)) {
+                warnLog('vxe.error.delProp', ['export={...}', 'export=boolean & export-options={...}']);
+            }
+            if (XEUtils.isPlainObject(props.import)) {
+                warnLog('vxe.error.delProp', ['import={...}', 'import=boolean & import-options={...}']);
+            }
+            if (XEUtils.isPlainObject(props.refresh)) {
+                warnLog('vxe.error.delProp', ['refresh={...}', 'refresh=boolean & refresh-options={...}']);
+            }
+            if (XEUtils.isPlainObject(props.refresh)) {
+                warnLog('vxe.error.delProp', ['zoom={...}', 'zoom=boolean & zoom-options={...}']);
+            }
             if ($xeTable) {
                 $xeTable.connect(this);
             }

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.15.39";
+export const version = "3.15.42";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -95,6 +95,14 @@ VxeUI.setConfig({
             showFooter: true,
             placement: 'top-right',
             //  storage: false,
+            storeOptions: {
+                visible: true,
+                resizable: true,
+                sort: true,
+                fixed: true
+                // rowGroup: false,
+                // aggFunc: false
+            },
             //  checkMethod () {},
             modalOptions: {
                 showMaximize: true,

package/es/ui/src/log.js

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