vxe-pc-ui 3.20.0 → 3.20.2

package/es/tabs/src/tabs.js

@@ -3,7 +3,7 @@ import XEUtils from 'xe-utils';
 import { createEvent, getConfig, getIcon, globalEvents, globalMixins, permission, renderEmptyElement } from '../../ui';
 import { getSlotVNs } from '../../ui/src/vn';
 import { toCssUnit, addClass, removeClass } from '../../ui/src/dom';
-import { isEnableConf } from '../../ui/src/utils';
+import { getDefaultConfig, isEnableConf } from '../../ui/src/utils';
 import { createComponentLog } from '../../ui/src/log';
 import VxeLoadingComponent from '../../loading';
 import VxeScrollbarComponent from '../../scrollbar';
@@ -52,7 +52,7 @@ export default {
         },
         useScrollbar: {
             type: Boolean,
-            default: () => getConfig().tabs.useScrollbar
+            default: () => getDefaultConfig(getConfig().tabs.useScrollbar, getConfig().useScrollbar)
         },
         scrollbarConfig: Object,
         // 已废弃
@@ -171,6 +171,23 @@ export default {
             const $xeTabs = this;
             const props = $xeTabs;
             return Object.assign({}, getConfig().tabs.scrollbarConfig, props.scrollbarConfig);
+        },
+        computeScrollbarProps() {
+            const $xeTabs = this;
+            const scrollbarOpts = $xeTabs.computeScrollbarOpts;
+            const { viewClassName, viewInnerClassName } = scrollbarOpts;
+            return {
+                width: scrollbarOpts.width,
+                height: scrollbarOpts.height,
+                autoHide: scrollbarOpts.autoHide,
+                visible: scrollbarOpts.visible,
+                xConfig: scrollbarOpts.xConfig,
+                yConfig: scrollbarOpts.yConfig,
+                className: scrollbarOpts.className,
+                viewAttrs: scrollbarOpts.viewAttrs,
+                viewClassName: 'vxe-tabs-pane--scrollbar-item-view' + (viewClassName ? (' ' + viewClassName) : ''),
+                viewInnerClassName: 'vxe-tabs-pane--scrollbar-item-inner' + (viewClassName ? (' ' + viewInnerClassName) : '')
+            };
         } }),
     methods: {
         //
@@ -801,8 +818,7 @@ export default {
             const { initNames, activeName } = reactData;
             const { name, slots } = item;
             const defaultSlot = slots ? slots.default : null;
-            const scrollbarOpts = $xeTabs.computeScrollbarOpts;
-            const { viewClassName, viewInnerClassName } = scrollbarOpts;
+            const scrollbarProps = $xeTabs.computeScrollbarProps;
             if (name && initNames.includes(name)) {
                 return useScrollbar
                     ? h(VxeScrollbarComponent, {
@@ -810,7 +826,7 @@ export default {
                         class: ['vxe-tabs-pane--scrollbar-item', {
                                 'is--visible': activeName === name
                             }],
-                        props: Object.assign(Object.assign({}, scrollbarOpts), { viewClassName: 'vxe-tabs-pane--scrollbar-item-view' + (viewClassName ? (' ' + viewClassName) : ''), viewInnerClassName: 'vxe-tabs-pane--scrollbar-item-inner' + (viewClassName ? (' ' + viewInnerClassName) : '') }),
+                        props: scrollbarProps,
                         scopedSlots: {
                             default: () => defaultSlot ? $xeTabs.callSlot(defaultSlot, { name }, h) : []
                         }