vxe-table 3.17.9 → 3.18.0-beta.0

package/es/components.js

@@ -1,4 +1,4 @@
-import { VxeUI } from '@vxe-ui/core';
+import { VxeUI } from './ui';
 import { VxeColumn } from './column';
 import { VxeColgroup } from './colgroup';
 import { VxeGrid } from './grid';

package/es/grid/src/grid.js

@@ -47,9 +47,7 @@ export default {
     mixins: [
         globalMixins.sizeMixin
     ],
-    props: Object.assign(Object.assign({ 
-        // 以下仅用于类型
-        round: { type: Boolean, default: () => getConfig().table.round }, height: [Number, String], minHeight: { type: [Number, String], default: () => getConfig().table.minHeight }, maxHeight: [Number, String], seqConfig: Object, sortConfig: Object, filterConfig: Object, editConfig: [Boolean, Object], loading: Boolean, validConfig: Object, editRules: Object, animat: { type: Boolean, default: () => getConfig().table.animat } }, tableProps), { layouts: Array, columns: Array, pagerConfig: Object, proxyConfig: Object, toolbarConfig: Object, formConfig: Object, zoomConfig: Object, size: {
+    props: Object.assign(Object.assign({}, tableProps), { layouts: Array, columns: Array, pagerConfig: Object, proxyConfig: Object, toolbarConfig: Object, formConfig: Object, zoomConfig: Object, size: {
             type: String,
             default: () => getConfig().grid.size || getConfig().size
         } }),
@@ -1158,7 +1156,10 @@ export default {
         zoom() {
             const $xeGrid = this;
             const reactData = $xeGrid.reactData;
-            return $xeGrid[reactData.isZMax ? 'revert' : 'maximize']();
+            if (reactData.isZMax) {
+                return $xeGrid.revert();
+            }
+            return $xeGrid.maximize();
         },
         isMaximized() {
             const $xeGrid = this;
@@ -1386,9 +1387,8 @@ export default {
             const slots = $xeGrid.$scopedSlots;
             const { toolbarConfig } = props;
             const toolbarSlot = slots.toolbar;
-            const hasToolbar = !!(toolbarSlot || isEnableConf(toolbarConfig) || toolbar);
             const toolbarOpts = $xeGrid.computeToolbarOpts;
-            if (hasToolbar) {
+            if ((toolbarConfig && isEnableConf(toolbarOpts)) || toolbarSlot) {
                 return h('div', {
                     key: 'toolbar',
                     ref: 'refToolbarWrapper',