vxe-table 4.16.0-beta.2 → 4.16.0-beta.4

package/es/toolbar/src/toolbar.js

@@ -53,6 +53,9 @@ export default defineVxeComponent({
         const xID = XEUtils.uniqueId();
         // 使用已安装的组件，如果未安装则不渲染
         const VxeUIButtonComponent = VxeUI.getComponent('VxeButton');
+        const $xeGrid = inject('$xeGrid', null);
+        const $xeGantt = inject('$xeGantt', null);
+        const $xeGGWrapper = $xeGrid || $xeGantt;
         const { computeSize } = useFns.useSize(props);
         const reactData = reactive({
             isRefresh: false,
@@ -73,7 +76,6 @@ export default defineVxeComponent({
             getRefMaps: () => refMaps
         };
         let toolbarMethods = {};
-        const $xeGrid = inject('$xeGrid', null);
         const computeRefreshOpts = computed(() => {
             return Object.assign({}, XEUtils.clone(getConfig().toolbar.refresh, true), props.refreshOptions, props.refresh);
         });
@@ -160,17 +162,17 @@ export default defineVxeComponent({
                         reactData.isRefresh = false;
                     }
                 }
-                else if ($xeGrid) {
+                else if ($xeGGWrapper) {
                     reactData.isRefresh = true;
-                    $xeGrid.triggerToolbarCommitEvent({ code: refreshOpts.code || 'reload' }, $event).catch((e) => e).then(() => {
+                    $xeGGWrapper.triggerToolbarCommitEvent({ code: refreshOpts.code || 'reload' }, $event).catch(() => { }).then(() => {
                         reactData.isRefresh = false;
                     });
                 }
             }
         };
         const zoomEvent = ({ $event }) => {
-            if ($xeGrid) {
-                $xeGrid.triggerZoomEvent($event);
+            if ($xeGGWrapper) {
+                $xeGGWrapper.triggerZoomEvent($event);
             }
             else {
                 warnLog('vxe.error.notProp', ['zoom']);
@@ -271,12 +273,12 @@ export default defineVxeComponent({
             const { code } = item;
             if (code) {
                 handleDefaultCodeEvent(eventParams, item, () => {
-                    if ($xeGrid) {
-                        $xeGrid.triggerToolbarBtnEvent(item, $event);
+                    if ($xeGGWrapper) {
+                        $xeGGWrapper.triggerToolbarBtnEvent(item, $event);
                     }
                     else {
                         const gCommandOpts = commands.get(code);
-                        const params = { code, button: item, $table: $table, $grid: $xeGrid, $gantt: null, $event };
+                        const params = { code, button: item, $table: $table, $grid: $xeGrid, $gantt: $xeGantt, $event };
                         if (gCommandOpts) {
                             const tCommandMethod = gCommandOpts.tableCommandMethod || gCommandOpts.commandMethod;
                             if (tCommandMethod) {
@@ -298,12 +300,12 @@ export default defineVxeComponent({
             const { code } = item;
             if (code) {
                 handleDefaultCodeEvent(eventParams, item, () => {
-                    if ($xeGrid) {
-                        $xeGrid.triggerToolbarTolEvent(item, $event);
+                    if ($xeGGWrapper) {
+                        $xeGGWrapper.triggerToolbarTolEvent(item, $event);
                     }
                     else {
                         const gCommandOpts = commands.get(code);
-                        const params = { code, button: null, tool: item, $table: $table, $grid: $xeGrid, $gantt: null, $event };
+                        const params = { code, button: null, tool: item, $table: $table, $grid: $xeGrid, $gantt: $xeGantt, $event };
                         if (gCommandOpts) {
                             const tCommandMethod = gCommandOpts.tableCommandMethod || gCommandOpts.commandMethod;
                             if (tCommandMethod) {
@@ -373,7 +375,7 @@ export default defineVxeComponent({
             const buttonSuffixSlot = slots.buttonSuffix || slots['button-suffix'];
             const btnVNs = [];
             if (buttonPrefixSlot) {
-                btnVNs.push(...getSlotVNs(buttonPrefixSlot({ buttons: buttons || [], $grid: $xeGrid, $table: $table })));
+                btnVNs.push(...getSlotVNs(buttonPrefixSlot({ buttons: buttons || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })));
             }
             if (buttons) {
                 buttons.forEach((item, index) => {
@@ -382,7 +384,7 @@ export default defineVxeComponent({
                         const compConf = buttonRender ? renderer.get(buttonRender.name) : null;
                         if (buttonRender && compConf && compConf.renderToolbarButton) {
                             const toolbarButtonClassName = compConf.toolbarButtonClassName;
-                            const params = { $grid: $xeGrid, $table: $table, button: item };
+                            const params = { $grid: $xeGrid, $gantt: $xeGantt, $table: $table, button: item };
                             btnVNs.push(h('span', {
                                 key: `br${item.code || index}`,
                                 class: ['vxe-button--item', toolbarButtonClassName ? (XEUtils.isFunction(toolbarButtonClassName) ? toolbarButtonClassName(params) : toolbarButtonClassName) : '']
@@ -421,7 +423,7 @@ export default defineVxeComponent({
                 });
             }
             if (buttonSuffixSlot) {
-                btnVNs.push(...getSlotVNs(buttonSuffixSlot({ buttons: buttons || [], $grid: $xeGrid, $table: $table })));
+                btnVNs.push(...getSlotVNs(buttonSuffixSlot({ buttons: buttons || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })));
             }
             return btnVNs;
         };
@@ -436,7 +438,7 @@ export default defineVxeComponent({
             const toolSuffixSlot = slots.toolSuffix || slots['tool-suffix'];
             const btnVNs = [];
             if (toolPrefixSlot) {
-                btnVNs.push(...getSlotVNs(toolPrefixSlot({ tools: tools || [], $grid: $xeGrid, $table: $table })));
+                btnVNs.push(...getSlotVNs(toolPrefixSlot({ tools: tools || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })));
             }
             if (tools) {
                 tools.forEach((item, tIndex) => {
@@ -446,7 +448,7 @@ export default defineVxeComponent({
                         const compConf = toolRender ? renderer.get(rdName) : null;
                         if (toolRender && compConf && compConf.renderToolbarTool) {
                             const toolbarToolClassName = compConf.toolbarToolClassName;
-                            const params = { $grid: $xeGrid, $table: $table, tool: item };
+                            const params = { $grid: $xeGrid, $gantt: $xeGantt, $table: $table, tool: item };
                             btnVNs.push(h('span', {
                                 key: rdName,
                                 class: ['vxe-tool--item', toolbarToolClassName ? (XEUtils.isFunction(toolbarToolClassName) ? toolbarToolClassName(params) : toolbarToolClassName) : '']
@@ -485,7 +487,7 @@ export default defineVxeComponent({
                 });
             }
             if (toolSuffixSlot) {
-                btnVNs.push(...getSlotVNs(toolSuffixSlot({ tools: tools || [], $grid: $xeGrid, $table: $table })));
+                btnVNs.push(...getSlotVNs(toolSuffixSlot({ tools: tools || [], $grid: $xeGrid, $gantt: $xeGantt, $table: $table })));
             }
             return btnVNs;
         };
@@ -539,12 +541,12 @@ export default defineVxeComponent({
         };
         const renderToolZoom = () => {
             const zoomOpts = computeZoomOpts.value;
-            return $xeGrid && VxeUIButtonComponent
+            return $xeGGWrapper && VxeUIButtonComponent
                 ? h(VxeUIButtonComponent, {
                     key: 'zoom',
                     circle: true,
-                    icon: $xeGrid.isMaximized() ? (zoomOpts.iconOut || getIcon().TOOLBAR_TOOLS_MINIMIZE) : (zoomOpts.iconIn || getIcon().TOOLBAR_TOOLS_FULLSCREEN),
-                    title: getI18n(`vxe.toolbar.zoom${$xeGrid.isMaximized() ? 'Out' : 'In'}`),
+                    icon: $xeGGWrapper.isMaximized() ? (zoomOpts.iconOut || getIcon().TOOLBAR_TOOLS_MINIMIZE) : (zoomOpts.iconIn || getIcon().TOOLBAR_TOOLS_FULLSCREEN),
+                    title: getI18n(`vxe.toolbar.zoom${$xeGGWrapper.isMaximized() ? 'Out' : 'In'}`),
                     onClick: zoomEvent
                 })
                 : createCommentVNode();
@@ -586,10 +588,10 @@ export default defineVxeComponent({
             }, [
                 h('div', {
                     class: 'vxe-buttons--wrapper'
-                }, buttonsSlot ? buttonsSlot({ $grid: $xeGrid, $table: $table }) : renderLeftBtns()),
+                }, buttonsSlot ? buttonsSlot({ $grid: $xeGrid, $gantt: $xeGantt, $table: $table }) : renderLeftBtns()),
                 h('div', {
                     class: 'vxe-tools--wrapper'
-                }, toolsSlot ? toolsSlot({ $grid: $xeGrid, $table: $table }) : renderRightTools()),
+                }, toolsSlot ? toolsSlot({ $grid: $xeGrid, $gantt: $xeGantt, $table: $table }) : renderRightTools()),
                 h('div', {
                     class: 'vxe-tools--operate'
                 }, [
@@ -597,7 +599,7 @@ export default defineVxeComponent({
                     props.export ? renderToolExport() : createCommentVNode(),
                     props.print ? renderToolPrint() : createCommentVNode(),
                     refresh ? renderToolRefresh() : createCommentVNode(),
-                    zoom && $xeGrid ? renderToolZoom() : createCommentVNode(),
+                    zoom && $xeGGWrapper ? renderToolZoom() : createCommentVNode(),
                     custom ? renderToolCustom() : createCommentVNode()
                 ])
             ]);
@@ -606,7 +608,7 @@ export default defineVxeComponent({
         nextTick(() => {
             const refreshOpts = computeRefreshOpts.value;
             const queryMethod = refreshOpts.queryMethod || refreshOpts.query;
-            if (props.refresh && !$xeGrid && !queryMethod) {
+            if (props.refresh && !$xeGGWrapper && !queryMethod) {
                 warnLog('vxe.error.notFunc', ['queryMethod']);
             }
             if (XEUtils.isPlainObject(props.custom)) {

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.16.0-beta.2";
+export const version = "4.16.0-beta.4";
 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${"4.16.0-beta.2"}`;
+const version = `table v${"4.16.0-beta.4"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);