vxe-table 4.13.39 → 4.13.41

package/es/toolbar/src/toolbar.js

@@ -1,19 +1,26 @@
-import { defineComponent, h, ref, computed, inject, createCommentVNode, reactive, nextTick } from 'vue';
+import { h, ref, computed, inject, createCommentVNode, reactive, nextTick } from 'vue';
+import { defineVxeComponent } from '../../ui/src/comp';
 import XEUtils from 'xe-utils';
 import { VxeUI } from '../../ui';
 import { getSlotVNs } from '../../ui/src/vn';
 import { warnLog, errLog } from '../../ui/src/log';
 const { getConfig, getIcon, getI18n, renderer, commands, createEvent, useFns } = VxeUI;
-export default defineComponent({
+export default defineVxeComponent({
     name: 'VxeToolbar',
     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
@@ -65,22 +72,22 @@ export default defineComponent({
         let toolbarMethods = {};
         const $xeGrid = inject('$xeGrid', null);
         const computeRefreshOpts = computed(() => {
-            return Object.assign({}, XEUtils.clone(getConfig().toolbar.refresh, true), props.refresh);
+            return Object.assign({}, XEUtils.clone(getConfig().toolbar.refresh, true), props.refreshOptions, props.refresh);
         });
         const computeImportOpts = computed(() => {
-            return Object.assign({}, XEUtils.clone(getConfig().toolbar.import, true), props.import);
+            return Object.assign({}, XEUtils.clone(getConfig().toolbar.import, true), props.importOptions, props.import);
         });
         const computeExportOpts = computed(() => {
-            return Object.assign({}, XEUtils.clone(getConfig().toolbar.export, true), props.export);
+            return Object.assign({}, XEUtils.clone(getConfig().toolbar.export, true), props.exportOptions, props.export);
         });
         const computePrintOpts = computed(() => {
-            return Object.assign({}, XEUtils.clone(getConfig().toolbar.print, true), props.print);
+            return Object.assign({}, XEUtils.clone(getConfig().toolbar.print, true), props.printOptions, props.print);
         });
         const computeZoomOpts = computed(() => {
-            return Object.assign({}, XEUtils.clone(getConfig().toolbar.zoom, true), props.zoom);
+            return Object.assign({}, XEUtils.clone(getConfig().toolbar.zoom, true), props.zoomOptions, props.zoom);
         });
         const computeCustomOpts = computed(() => {
-            return Object.assign({}, XEUtils.clone(getConfig().toolbar.custom, true), props.custom);
+            return Object.assign({}, XEUtils.clone(getConfig().toolbar.custom, true), props.customOptions, props.custom);
         });
         const computeTableCustomOpts = computed(() => {
             const { connectTable } = internalData;
@@ -162,56 +169,20 @@ export default defineComponent({
             if ($xeGrid) {
                 $xeGrid.triggerZoomEvent($event);
             }
-        };
-        const btnEvent = (evnt, item) => {
-            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);
-                }
+            else {
+                warnLog('vxe.error.notProp', ['zoom']);
             }
         };
-        const tolEvent = (evnt, item) => {
-            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);
+        const importEvent = () => {
+            if (checkTable()) {
+                const { connectTable } = internalData;
+                const $table = connectTable;
+                if ($table) {
+                    $table.importData();
                 }
             }
         };
-        const importEvent = () => {
+        const openImportEvent = () => {
             if (checkTable()) {
                 const { connectTable } = internalData;
                 const $table = connectTable;
@@ -221,6 +192,15 @@ export default defineComponent({
             }
         };
         const exportEvent = () => {
+            if (checkTable()) {
+                const { connectTable } = internalData;
+                const $table = connectTable;
+                if ($table) {
+                    $table.exportData();
+                }
+            }
+        };
+        const openExportEvent = () => {
             if (checkTable()) {
                 const { connectTable } = internalData;
                 const $table = connectTable;
@@ -230,6 +210,15 @@ export default defineComponent({
             }
         };
         const printEvent = () => {
+            if (checkTable()) {
+                const { connectTable } = internalData;
+                const $table = connectTable;
+                if ($table) {
+                    $table.print();
+                }
+            }
+        };
+        const openPrintEvent = () => {
             if (checkTable()) {
                 const { connectTable } = internalData;
                 const $table = connectTable;
@@ -238,6 +227,94 @@ export default defineComponent({
                 }
             }
         };
+        const handleDefaultCodeEvent = (eventParams, item, cb) => {
+            switch (item.code) {
+                case 'print':
+                    printEvent();
+                    break;
+                case 'open_print':
+                    openPrintEvent();
+                    break;
+                case 'custom':
+                    handleClickSettingEvent(eventParams);
+                    break;
+                case 'export':
+                    exportEvent();
+                    break;
+                case 'open_export':
+                    openExportEvent();
+                    break;
+                case 'import':
+                    importEvent();
+                    break;
+                case 'open_import':
+                    openImportEvent();
+                    break;
+                case 'zoom':
+                    zoomEvent(eventParams);
+                    break;
+                case 'refresh':
+                    refreshEvent(eventParams);
+                    break;
+                default:
+                    cb();
+                    break;
+            }
+        };
+        const btnEvent = (eventParams, item) => {
+            const { $event } = eventParams;
+            const { connectTable } = internalData;
+            const $table = connectTable;
+            const { code } = item;
+            if (code) {
+                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);
+                    }
+                });
+            }
+        };
+        const tolEvent = (eventParams, item) => {
+            const { $event } = eventParams;
+            const { connectTable } = internalData;
+            const $table = connectTable;
+            const { code } = item;
+            if (code) {
+                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);
+                    }
+                });
+            }
+        };
         const dispatchEvent = (type, params, evnt) => {
             emit(type, createEvent(evnt, { $toolbar: $xeToolbar }, params));
         };
@@ -275,7 +352,7 @@ export default defineComponent({
                             permissionCode: child.permissionCode,
                             prefixTooltip: child.prefixTooltip,
                             suffixTooltip: child.suffixTooltip,
-                            onClick: ({ $event }) => isBtn ? btnEvent($event, child) : tolEvent($event, child)
+                            onClick: (eventParams) => isBtn ? btnEvent(eventParams, child) : tolEvent(eventParams, child)
                         })
                         : createCommentVNode();
                 });
@@ -329,7 +406,7 @@ export default defineComponent({
                                     destroyOnClose: item.destroyOnClose,
                                     placement: item.placement,
                                     transfer: item.transfer,
-                                    onClick: ({ $event }) => btnEvent($event, item)
+                                    onClick: (eventParams) => btnEvent(eventParams, item)
                                 }, dropdowns && dropdowns.length
                                     ? {
                                         dropdowns: () => renderDropdowns(item, true)
@@ -393,7 +470,7 @@ export default defineComponent({
                                     destroyOnClose: item.destroyOnClose,
                                     placement: item.placement,
                                     transfer: item.transfer,
-                                    onClick: ({ $event }) => tolEvent($event, item)
+                                    onClick: (eventParams) => tolEvent(eventParams, item)
                                 }, dropdowns && dropdowns.length
                                     ? {
                                         dropdowns: () => renderDropdowns(item, false)
@@ -417,7 +494,7 @@ export default defineComponent({
                     circle: true,
                     icon: importOpts.icon || getIcon().TOOLBAR_TOOLS_IMPORT,
                     title: getI18n('vxe.toolbar.import'),
-                    onClick: importEvent
+                    onClick: openImportEvent
                 })
                 : createCommentVNode();
         };
@@ -429,7 +506,7 @@ export default defineComponent({
                     circle: true,
                     icon: exportOpts.icon || getIcon().TOOLBAR_TOOLS_EXPORT,
                     title: getI18n('vxe.toolbar.export'),
-                    onClick: exportEvent
+                    onClick: openExportEvent
                 })
                 : createCommentVNode();
         };
@@ -441,7 +518,7 @@ export default defineComponent({
                     circle: true,
                     icon: printOpts.icon || getIcon().TOOLBAR_TOOLS_PRINT,
                     title: getI18n('vxe.toolbar.print'),
-                    onClick: printEvent
+                    onClick: openPrintEvent
                 })
                 : createCommentVNode();
         };
@@ -524,12 +601,29 @@ export default defineComponent({
         };
         $xeToolbar.renderVN = renderVN;
         nextTick(() => {
-            const { refresh } = props;
             const refreshOpts = computeRefreshOpts.value;
             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={...}']);
+            }
             const customOpts = computeCustomOpts.value;
             if (customOpts.isFooter) {
                 warnLog('vxe.error.delProp', ['toolbar.custom.isFooter', 'table.custom-config.showFooter']);

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.13.39";
+export const version = "4.13.41";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -94,6 +94,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,
@@ -299,6 +307,9 @@ VxeUI.setIcon({
     TABLE_DRAG_DISABLED: iconPrefix + 'no-drop',
     TABLE_ROW_GROUP_OPEN: iconPrefix + 'arrow-right rotate90',
     TABLE_ROW_GROUP_CLOSE: iconPrefix + 'arrow-right',
+    TABLE_AGGREGATION_GROUPING: iconPrefix + 'grouping',
+    TABLE_AGGREGATION_VALUES: iconPrefix + 'values',
+    TABLE_AGGREGATION_DELETE: iconPrefix + 'close',
     // toolbar
     TOOLBAR_TOOLS_REFRESH: iconPrefix + 'repeat',
     TOOLBAR_TOOLS_REFRESH_LOADING: iconPrefix + 'repeat roll',

package/es/ui/src/comp.js

@@ -0,0 +1,2 @@
+import { defineComponent } from 'vue';
+export const defineVxeComponent = defineComponent;

package/es/ui/src/log.js

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

package/es/vxe-table/style.css

@@ -543,7 +543,7 @@
 
 @font-face {
   font-family: "vxetableiconfont";
-  src: url("data:application/x-font-woff2;charset=utf-8;base64,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") format("woff2");
+  src: url("data:application/x-font-woff2;charset=utf-8;base64,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") format("woff2");
 }
 @keyframes rollCircle {
   0% {
@@ -599,6 +599,18 @@
   color: var(--vxe-ui-status-error-color);
 }
 
+.vxe-table-icon-close:before {
+  content: "\e6e9";
+}
+
+.vxe-table-icon-grouping:before {
+  content: "\e66c";
+}
+
+.vxe-table-icon-values:before {
+  content: "\e66f";
+}
+
 .vxe-table-icon-add-sub:before {
   content: "\e6bc";
 }
@@ -759,9 +771,14 @@
   width: 100%;
 }
 
+.vxe-table-custom--handle-wrapper {
+  display: flex;
+  flex-direction: column;
+}
+
 .vxe-table-custom-wrapper {
   display: none;
-  flex-direction: column;
+  flex-direction: row;
   position: absolute;
   text-align: left;
   background-color: var(--vxe-ui-layout-background-color);
@@ -841,8 +858,10 @@
 }
 
 .vxe-table-custom--header {
+  display: flex;
+  align-items: center;
   flex-shrink: 0;
-  padding: 0.28em 0;
+  height: 2.4em;
   font-weight: 700;
   border-bottom: 1px solid var(--vxe-ui-base-popup-border-color);
   -webkit-user-select: none;