vxe-pc-ui 3.20.0 → 3.20.2

package/es/layout-body/src/layout-body.js

@@ -1,6 +1,7 @@
 import { defineVxeComponent } from '../../ui/src/comp';
 import { getConfig, createEvent, globalMixins, renderEmptyElement } from '../../ui';
 import XEUtils from 'xe-utils';
+import { getDefaultConfig } from '../../ui/src/utils';
 import VxeLoadingComponent from '../../loading';
 import VxeScrollbarComponent from '../../scrollbar';
 import VxeUIBacktopComponent from '../../backtop';
@@ -25,7 +26,7 @@ export default {
         backtopConfig: Object,
         useScrollbar: {
             type: Boolean,
-            default: () => getConfig().layoutBody.useScrollbar
+            default: () => getDefaultConfig(getConfig().layoutBody.useScrollbar, getConfig().useScrollbar)
         },
         scrollbarConfig: Object,
         size: {
@@ -53,6 +54,26 @@ export default {
             const $xeLayoutBody = this;
             const props = $xeLayoutBody;
             return Object.assign({}, getConfig().layoutBody.scrollbarConfig, props.scrollbarConfig);
+        },
+        computeScrollbarProps() {
+            const $xeLayoutBody = this;
+            const props = $xeLayoutBody;
+            const backtopId = $xeLayoutBody.backtopId;
+            const { showBacktop } = props;
+            const scrollbarOpts = $xeLayoutBody.computeScrollbarOpts;
+            const { className, viewClassName, viewInnerClassName } = scrollbarOpts;
+            return {
+                width: scrollbarOpts.width,
+                height: scrollbarOpts.height,
+                autoHide: scrollbarOpts.autoHide,
+                visible: scrollbarOpts.visible,
+                xConfig: scrollbarOpts.xConfig,
+                yConfig: scrollbarOpts.yConfig,
+                className: 'vxe-layout-body--scrollbar' + (className ? (' ' + className) : ''),
+                viewAttrs: Object.assign(Object.assign({}, scrollbarOpts.viewAttrs), { id: showBacktop ? (backtopId || null) : null }),
+                viewClassName: 'vxe-layout-body--scrollbar-view' + (viewClassName ? (' ' + viewClassName) : ''),
+                viewInnerClassName: 'vxe-layout-body--scrollbar-inner' + (viewInnerClassName ? (' ' + viewInnerClassName) : '')
+            };
         } }),
     methods: {
         //
@@ -72,8 +93,7 @@ export default {
             const backtopId = $xeLayoutBody.backtopId;
             const { loading, padding, showBacktop, useScrollbar } = props;
             const backtopOpts = $xeLayoutBody.computeBacktopOpts;
-            const scrollbarOpts = $xeLayoutBody.computeScrollbarOpts;
-            const { native, xConfig, yConfig, className, viewAttrs, viewClassName, viewInnerClassName } = scrollbarOpts;
+            const scrollbarProps = $xeLayoutBody.computeScrollbarProps;
             const vSize = $xeLayoutBody.computeSize;
             const defaultSlot = slots.default;
             const backtopSlot = slots.backtop;
@@ -98,15 +118,7 @@ export default {
             }, [
                 useScrollbar
                     ? h(VxeScrollbarComponent, {
-                        props: {
-                            native,
-                            xConfig,
-                            yConfig,
-                            className: 'vxe-layout-body--scrollbar' + (className ? (' ' + className) : ''),
-                            viewAttrs: Object.assign(Object.assign({}, viewAttrs), { id: showBacktop ? (backtopId || null) : null }),
-                            viewClassName: 'vxe-layout-body--scrollbar-view' + (viewClassName ? (' ' + viewClassName) : ''),
-                            viewInnerClassName: 'vxe-layout-body--scrollbar-inner' + (viewInnerClassName ? (' ' + viewInnerClassName) : '')
-                        },
+                        props: scrollbarProps,
                         scopedSlots: {
                             default: () => defaultSlot ? defaultSlot({}) : []
                         }

package/es/list/src/list.js

@@ -3,7 +3,7 @@ import XEUtils from 'xe-utils';
 import { VxeUI, getConfig, getIcon, getI18n, domUtils, menus, globalEvents, globalResize, createEvent, globalMixins, renderEmptyElement } from '../../ui';
 import { crossListDragRowGlobal, getCrossListDragRowInfo } from './store';
 import { addClass, getTpImg, hasClass, isScale, removeClass, toCssUnit } from '../../ui/src/dom';
-import { isEnableConf, getText, enModelValue, deModelValue } from '../../ui/src/utils';
+import { isEnableConf, getText, enModelValue, deModelValue, getDefaultConfig } from '../../ui/src/utils';
 import { getSlotVNs } from '../../ui/src/vn';
 import { createComponentLog } from '../../ui/src/log';
 import { moveRowAnimateToTb, clearRowAnimate } from '../../ui/src/anime';
@@ -57,8 +57,9 @@ function createInternalData() {
         afterList: [],
         fullKeyMaps: {},
         rowMaps: {},
-        // 滚动条
         // resizeObserver: undefined,
+        // 滚动条
+        // scrollObserver: undefined,
         // isThumbDrag: false,
         thumbDragOffset: 0,
         yThumbTop: 0,
@@ -123,7 +124,7 @@ export default {
         scrollY: Object,
         useScrollbar: {
             type: Boolean,
-            default: () => getConfig().list.useScrollbar
+            default: () => getDefaultConfig(getConfig().list.useScrollbar, getConfig().useScrollbar)
         },
         scrollbarConfig: Object
     },
@@ -185,17 +186,15 @@ export default {
         computeWrapperStyles() {
             const $xeList = this;
             const rowHeight = $xeList.computeRowHeight;
-            const scrollbarXOpts = $xeList.computeScrollbarXOpts;
-            const scrollbarYOpts = $xeList.computeScrollbarYOpts;
+            const barWidth = $xeList.computeScrollYWidth;
+            const barHeight = $xeList.computeScrollXHeight;
             const stys = {};
             if (rowHeight) {
                 stys['--vxe-ui-list-row-height'] = toCssUnit(rowHeight);
             }
-            if (scrollbarYOpts.width) {
-                stys['--vxe-ui-scrollbar-y-width'] = toCssUnit(scrollbarYOpts.width);
-            }
-            if (scrollbarXOpts.height) {
-                stys['--vxe-ui-scrollbar-x-height'] = toCssUnit(scrollbarXOpts.height);
+            if (barWidth || barHeight) {
+                stys['--vxe-ui-scrollbar-y-width'] = toCssUnit(barWidth || barHeight);
+                stys['--vxe-ui-scrollbar-x-height'] = toCssUnit(barHeight || barWidth);
             }
             return stys;
         },
@@ -230,26 +229,57 @@ export default {
             const scrollbarOpts = $xeList.computeScrollbarOpts;
             return Object.assign({}, getConfig().scrollbar.yConfig, scrollbarOpts.yConfig);
         },
-        computeScrollbarWrapperClss() {
+        computeScrollXHeight() {
+            const $xeList = this;
+            const scrollbarOpts = $xeList.computeScrollbarOpts;
+            const scrollbarXOpts = $xeList.computeScrollbarXOpts;
+            return getDefaultConfig(getDefaultConfig(scrollbarXOpts.height, scrollbarOpts.height), getConfig().scrollbar.height);
+        },
+        computeScrollYWidth() {
+            const $xeList = this;
+            const scrollbarOpts = $xeList.computeScrollbarOpts;
+            const scrollbarYOpts = $xeList.computeScrollbarYOpts;
+            return getDefaultConfig(getDefaultConfig(scrollbarYOpts.width, scrollbarOpts.width), getConfig().scrollbar.width);
+        },
+        computeScrollXVisible() {
+            const $xeList = this;
+            const scrollbarOpts = $xeList.computeScrollbarOpts;
+            const scrollbarXOpts = $xeList.computeScrollbarXOpts;
+            return getDefaultConfig(scrollbarXOpts.visible, scrollbarOpts.visible);
+        },
+        computeScrollYVisible() {
+            const $xeList = this;
+            const scrollbarOpts = $xeList.computeScrollbarOpts;
+            const scrollbarYOpts = $xeList.computeScrollbarYOpts;
+            return getDefaultConfig(scrollbarYOpts.visible, scrollbarOpts.visible);
+        },
+        computeScrollXAutoHide() {
             const $xeList = this;
-            const reactData = $xeList.reactData;
             const scrollbarOpts = $xeList.computeScrollbarOpts;
-            const { padding } = scrollbarOpts;
-            const { yThumbHeight, xThumbWidth } = reactData;
             const scrollbarXOpts = $xeList.computeScrollbarXOpts;
+            return getDefaultConfig(getDefaultConfig(scrollbarXOpts.autoHide, scrollbarOpts.autoHide), getConfig().scrollbar.autoHide);
+        },
+        computeScrollYAutoHide() {
+            const $xeList = this;
+            const scrollbarOpts = $xeList.computeScrollbarOpts;
             const scrollbarYOpts = $xeList.computeScrollbarYOpts;
+            return getDefaultConfig(getDefaultConfig(scrollbarYOpts.autoHide, scrollbarOpts.autoHide), getConfig().scrollbar.autoHide);
+        },
+        computeScrollbarWrapperClss() {
+            const $xeList = this;
+            const reactData = $xeList.reactData;
+            const { yThumbHeight, xThumbWidth } = reactData;
             const scrollbarXToTop = $xeList.computeScrollbarXToTop;
             const scrollbarYToLeft = $xeList.computeScrollbarYToLeft;
+            const scrollXVisible = $xeList.computeScrollXVisible;
+            const scrollYVisible = $xeList.computeScrollYVisible;
             return domUtils.buildClass([
                 'vxe-scrollbar is--virtual',
-                `ov-x--${scrollbarXOpts.visible || 'visible'}`,
-                `ov-y--${scrollbarYOpts.visible || 'visible'}`,
+                `ov-x--${scrollXVisible === false ? 'hidden' : 'visible'}`,
+                `ov-y--${scrollYVisible === false ? 'hidden' : 'visible'}`,
                 `sx-pos--${scrollbarXToTop ? 'top' : 'bottom'}`,
                 `sy-pos--${scrollbarYToLeft ? 'left' : 'right'}`
             ], {
-                'is--padding': padding,
-                'ov-x--auto-hide': scrollbarXOpts.autoHide,
-                'ov-y--auto-hide': scrollbarYOpts.autoHide,
                 'overflow-y': yThumbHeight,
                 'overflow-x': xThumbWidth
             });
@@ -415,6 +445,11 @@ export default {
             const { fullData } = internalData;
             return fullData;
         },
+        getParentElem() {
+            const $xeList = this;
+            const el = $xeList.$refs.refElem;
+            return el ? el.parentElement : null;
+        },
         calcTableHeight(key) {
             const $xeList = this;
             const props = $xeList;
@@ -2315,7 +2350,7 @@ export default {
             const reactData = $xeList.reactData;
             const slots = $xeList.$scopedSlots;
             const { showCheckbox, className, loading, useScrollbar } = props;
-            const { bodyHeight, topSpaceHeight, rowList, isAllChecked, isAllIndeterminate } = reactData;
+            const { bodyHeight, topSpaceHeight, rowList, isAllChecked, isAllIndeterminate, xThumbWidth, yThumbHeight } = reactData;
             const defaultSlot = slots.default;
             const headerSlot = slots.header;
             const footerSlot = slots.footer;
@@ -2329,8 +2364,13 @@ export default {
             const rowOpts = $xeList.computeRowOpts;
             const { isHover, padding } = rowOpts;
             const isDrag = $xeList.computeIsDrag;
-            const scrollbarXOpts = $xeList.computeScrollbarXOpts;
-            const scrollbarYOpts = $xeList.computeScrollbarYOpts;
+            const scrollbarOpts = $xeList.computeScrollbarOpts;
+            const scrollXVisible = $xeList.computeScrollXVisible;
+            const scrollYVisible = $xeList.computeScrollYVisible;
+            const scrollbarXToTop = $xeList.computeScrollbarXToTop;
+            const scrollbarYToLeft = $xeList.computeScrollbarYToLeft;
+            const scrollXAutoHide = $xeList.computeScrollXAutoHide;
+            const scrollYAutoHide = $xeList.computeScrollYAutoHide;
             const scrollbarWrapperClss = $xeList.computeScrollbarWrapperClss;
             const showDefChekboxHead = showCheckbox && checkboxOpts.showHeader !== false;
             const leOns = {};
@@ -2339,14 +2379,25 @@ export default {
             }
             return h('div', {
                 ref: 'refElem',
-                class: ['vxe-list', className ? (XEUtils.isFunction(className) ? className({ $list: $xeList }) : className) : '', {
+                class: [
+                    'vxe-list',
+                    useScrollbar ? `ov-x--${scrollXVisible === false ? 'hidden' : 'visible'}` : '',
+                    useScrollbar ? `ov-y--${scrollYVisible === false ? 'hidden' : 'visible'}` : '',
+                    useScrollbar ? `sx-pos--${scrollbarXToTop ? 'top' : 'bottom'}` : '',
+                    useScrollbar ? `sy-pos--${scrollbarYToLeft ? 'left' : 'right'}` : '',
+                    className ? (XEUtils.isFunction(className) ? className({ $list: $xeList }) : className) : '',
+                    {
                         [`size--${vSize}`]: vSize,
                         'is--virtual-scrollbar': useScrollbar,
-                        'ov-x--auto-hide': useScrollbar && scrollbarXOpts.autoHide,
-                        'ov-y--auto-hide': useScrollbar && scrollbarYOpts.autoHide,
+                        'ov-padding': useScrollbar && scrollbarOpts.padding,
+                        'ov-x--auto-hide': useScrollbar && scrollXAutoHide,
+                        'ov-y--auto-hide': useScrollbar && scrollYAutoHide,
+                        'overflow-y': yThumbHeight,
+                        'overflow-x': xThumbWidth,
                         'is--drag': isDrag,
                         'is--loading': loading
-                    }],
+                    }
+                ],
                 on: leOns,
                 style: wrapperStyles
             }, [
@@ -2407,15 +2458,7 @@ export default {
                         style: {
                             marginTop: topSpaceHeight ? `${topSpaceHeight}px` : ''
                         }
-                    }, useScrollbar
-                        ? (defaultSlot ? defaultSlot({ items: rowList, $list: $xeList }) : rowList.map((row, i) => $xeList.renderRow(h, row, i)))
-                        : [
-                            h('div', {
-                                key: 'vi',
-                                ref: 'refViewInnerElem',
-                                class: 'vxe-scrollbar--view-inner'
-                            }, defaultSlot ? defaultSlot({ items: rowList, $list: $xeList }) : rowList.map((row, i) => $xeList.renderRow(h, row, i)))
-                        ])
+                    }, defaultSlot ? defaultSlot({ items: rowList, $list: $xeList }) : rowList.map((row, i) => $xeList.renderRow(h, row, i)))
                 ]),
                 footerSlot
                     ? h('div', {
@@ -2430,7 +2473,7 @@ export default {
                     ? h('div', {
                         class: scrollbarWrapperClss
                     }, [
-                        scrollbarXOpts.visible === 'hidden'
+                        scrollXVisible === false
                             ? renderEmptyElement($xeList)
                             : h('div', {
                                 ref: 'refTrackXElem',
@@ -2451,7 +2494,7 @@ export default {
                                     }
                                 })
                             ]),
-                        scrollbarYOpts.visible === 'hidden'
+                        scrollYVisible === false
                             ? renderEmptyElement($xeList)
                             : h('div', {
                                 ref: 'refTrackYElem',
@@ -2508,13 +2551,37 @@ export default {
             const $xeList = this;
             $xeList.reFlag++;
         },
+        useScrollbar() {
+            const $xeList = this;
+            $xeList.reFlag++;
+        },
         computeRowHeight() {
             const $xeList = this;
             $xeList.reFlag++;
         },
-        reFlag() {
+        computeScrollYWidth() {
+            const $xeList = this;
+            $xeList.reFlag++;
+        },
+        computeScrollXHeight() {
+            const $xeList = this;
+            $xeList.reFlag++;
+        },
+        computeScrollXVisible() {
+            const $xeList = this;
+            $xeList.$nextTick(() => {
+                $xeList.reFlag++;
+            });
+        },
+        computeScrollYVisible() {
             const $xeList = this;
             $xeList.$nextTick(() => {
+                $xeList.reFlag++;
+            });
+        },
+        reFlag() {
+            const $xeList = this;
+            $xeList.recalculate().then(() => {
                 $xeList.recalculate();
             });
         },
@@ -2559,20 +2626,32 @@ export default {
         if (useKey && !keyField) {
             errLog('vxe.error.reqSupportProp', ['row-config.useKey', 'row-config.keyField']);
         }
-        if (useScrollbar || autoResize) {
-            const el = $xeList.$refs.refElem;
-            const viewInnerEl = $xeList.$refs.refViewInnerElem;
-            const resizeObserver = globalResize.create(() => {
+        const el = $xeList.$refs.refElem;
+        if (useScrollbar) {
+            const viewInnerEl = $xeList.$refs.refVirtualBody;
+            const scrollObserver = globalResize.create(() => {
                 $xeList.reFlag++;
             });
-            resizeObserver.observe(el);
-            if (autoResize) {
-                if (el) {
-                    resizeObserver.observe(el.parentElement);
-                }
+            if (el) {
+                scrollObserver.observe(el);
             }
             if (viewInnerEl) {
-                resizeObserver.observe(viewInnerEl);
+                scrollObserver.observe(viewInnerEl);
+            }
+            internalData.scrollObserver = scrollObserver;
+        }
+        if (autoResize) {
+            const parentEl = $xeList.getParentElem();
+            const resizeObserver = globalResize.create(() => {
+                if (props.autoResize) {
+                    $xeList.reFlag++;
+                }
+            });
+            if (el) {
+                resizeObserver.observe(el);
+            }
+            if (parentEl) {
+                resizeObserver.observe(parentEl);
             }
             internalData.resizeObserver = resizeObserver;
         }
@@ -2591,10 +2670,13 @@ export default {
         const $xeList = this;
         const reactData = $xeList.reactData;
         const internalData = $xeList.internalData;
-        const { resizeObserver } = internalData;
+        const { scrollObserver, resizeObserver } = internalData;
         if (resizeObserver) {
             resizeObserver.disconnect();
         }
+        if (scrollObserver) {
+            scrollObserver.disconnect();
+        }
         globalEvents.off($xeList, 'resize');
         XEUtils.assign(reactData, createReactData());
         XEUtils.assign(internalData, createInternalData());

package/es/list/style.css

@@ -381,17 +381,24 @@
   vertical-align: middle;
 }
 
-.vxe-list > .vxe-scrollbar {
-  position: unset;
+.vxe-list.ov-padding.overflow-x.sx-pos--top {
+  padding-top: var(--vxe-ui-scrollbar-x-height);
 }
-.vxe-list.is--virtual-scrollbar > .vxe-list--virtual-wrapper {
-  scrollbar-width: none;
-  -ms-overflow-style: none;
+.vxe-list.ov-padding.overflow-x.sx-pos--bottom {
+  padding-bottom: var(--vxe-ui-scrollbar-x-height);
 }
-.vxe-list.is--virtual-scrollbar > .vxe-list--virtual-wrapper::-webkit-scrollbar {
-  display: none;
+.vxe-list.ov-padding.overflow-y.sy-pos--left {
+  padding-left: var(--vxe-ui-scrollbar-y-width);
+}
+.vxe-list.ov-padding.overflow-y.sy-pos--right {
+  padding-right: var(--vxe-ui-scrollbar-y-width);
+}
+.vxe-list.ov-x--hidden > .vxe-list--virtual-wrapper {
+  overflow-x: hidden;
+}
+.vxe-list.ov-y--hidden > .vxe-list--virtual-wrapper {
+  overflow-y: hidden;
 }
-
 .vxe-list.is--virtual-scrollbar.ov-x--auto-hide:hover > .vxe-scrollbar > .vxe-scrollbar--track-x {
   opacity: 1;
 }
@@ -405,4 +412,14 @@
 .vxe-list.is--virtual-scrollbar.ov-y--auto-hide > .vxe-scrollbar > .vxe-scrollbar--track-y {
   opacity: 0;
   transition: opacity 0.8s ease-in-out;
+}
+.vxe-list > .vxe-scrollbar {
+  position: unset;
+}
+.vxe-list.is--virtual-scrollbar > .vxe-list--virtual-wrapper {
+  scrollbar-width: none;
+  -ms-overflow-style: none;
+}
+.vxe-list.is--virtual-scrollbar > .vxe-list--virtual-wrapper::-webkit-scrollbar {
+  display: none;
 }

package/es/list/style.min.css

@@ -1 +1 @@
-@charset "UTF-8";.vxe-list{--vxe-ui-list-current-font-size:var(--vxe-ui-font-size-default);--vxe-ui-list-current-padding:var(--vxe-ui-layout-padding-default)}.vxe-list.size--medium{--vxe-ui-list-current-font-size:var(--vxe-ui-font-size-medium);--vxe-ui-list-current-padding:var(--vxe-ui-layout-padding-medium)}.vxe-list.size--small{--vxe-ui-list-current-font-size:var(--vxe-ui-font-size-small);--vxe-ui-list-current-padding:var(--vxe-ui-layout-padding-small)}.vxe-list.size--mini{--vxe-ui-list-current-font-size:var(--vxe-ui-font-size-mini);--vxe-ui-list-current-padding:var(--vxe-ui-layout-padding-mini)}.vxe-list{position:relative;display:block;padding:0;font-size:var(--vxe-ui-list-current-font-size);color:var(--vxe-ui-font-color);font-family:var(--vxe-ui-font-family);direction:ltr}.vxe-list .vxe-list--virtual-wrapper{position:relative;overflow-x:auto;overflow-y:auto;outline:0}.vxe-list .vxe-list--y-space{width:0;float:left}.vxe-list .vxe-list--body,.vxe-list .vxe-list--virtual-wrapper{padding:0;margin:0;border:0;outline:0}.vxe-list--header-wrapper{display:flex;flex-direction:row;align-items:center;min-height:var(--vxe-ui-list-row-height)}.vxe-list--header-left{display:flex;flex-direction:row;align-items:center;flex-shrink:0}.vxe-list--header-content{flex-grow:1;overflow:auto}.vxe-list--body.trigger--row>.vxe-list--row:not(.is--drag-disabled):active{cursor:grabbing}.vxe-list--body.is--padding>.vxe-list--row{padding:0 var(--vxe-ui-list-current-padding)}.vxe-list--body.checkbox--highlight .vxe-list--row.is-checkbox--checked{background-color:var(--vxe-ui-list-row-checkbox-checked-background-color)}.vxe-list--body.radio--highlight .vxe-list--row.is-radio--checked{background-color:var(--vxe-ui-list-row-radio-checked-background-color)}.vxe-list--body.row--hover .vxe-list--row:hover{background-color:var(--vxe-ui-list-row-hover-background-color)}.vxe-list--body.row--hover .vxe-list--row:hover.is--current{background-color:var(--vxe-ui-list-row-hover-current-background-color)}.vxe-list--body.row--hover.radio--highlight .vxe-list--row.is-radio--checked:hover{background-color:var(--vxe-ui-list-row-hover-radio-checked-background-color)}.vxe-list--body.row--hover.checkbox--highlight .vxe-list--row.is-checkbox--checked:hover{background-color:var(--vxe-ui-list-row-hover-checkbox-checked-background-color)}.vxe-list--row.is--current{background-color:var(--vxe-ui-list-row-current-background-color)}.vxe-list--virtual-wrapper{height:100px}.vxe-list--row{display:flex;flex-direction:row;align-items:center}.vxe-list--row-content,.vxe-list--row-drag,.vxe-list--row-extra{display:flex;flex-direction:row;align-items:center}.vxe-list--row-drag{flex-shrink:0;padding-right:var(--vxe-ui-list-current-padding)}.vxe-list--row-content{flex-grow:1;height:var(--vxe-ui-list-row-height);overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.vxe-list--row-extra{flex-shrink:0}.vxe-list--drag-handle:not(.is--disabled){cursor:grab}.vxe-list--drag-handle:not(.is--disabled):active{cursor:grabbing}.vxe-list--drag-handle:not(.is--disabled):hover{color:var(--vxe-ui-font-primary-color)}.vxe-list--drag-handle.is--disabled{color:var(--vxe-ui-input-disabled-color);cursor:not-allowed}.vxe-list--row.row--drag-move{transition:transform .5s ease}.vxe-list--row.row--drag-origin{opacity:.3}.vxe-list--drag-row-line{display:none;position:absolute;top:0;left:0;z-index:11;pointer-events:none}.vxe-list--drag-row-line{width:100%;height:1px;border:2px solid transparent}.vxe-list--drag-row-line[drag-pos=top]{border-top-color:var(--vxe-ui-font-primary-color)}.vxe-list--drag-row-line[drag-pos=bottom]{border-bottom-color:var(--vxe-ui-font-primary-color)}.vxe-list--drag-row-line[drag-to-child=y]{border-top-color:transparent;border-bottom-color:transparent;border-left-color:var(--vxe-ui-status-success-color)}.vxe-list--drag-row-line.is--guides{background-color:var(--vxe-ui-list-drag-over-background-color)}.vxe-body--row-list-move{transition-property:transform;transition-duration:.35s}.vxe-list--drag-sort-tip{display:none;position:absolute;top:0;left:0;padding:.6em 1.4em;max-width:50%;min-width:100px;border-radius:var(--vxe-ui-border-radius);overflow:hidden;text-overflow:ellipsis;white-space:nowrap;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;pointer-events:none;background-color:var(--vxe-ui-layout-background-color);box-shadow:0 0 10px 0 rgba(0,0,0,.2);z-index:33}.vxe-list--drag-sort-tip[drag-status=normal] .vxe-list--drag-sort-tip-normal-status{display:block}.vxe-list--drag-sort-tip[drag-status=sub] .vxe-list--drag-sort-tip-sub-status{display:block}.vxe-list--drag-sort-tip[drag-status=disabled] .vxe-list--drag-sort-tip-disabled-status{display:block}.vxe-list--drag-sort-tip-wrapper{display:flex;flex-direction:row;align-items:center}.vxe-list--drag-sort-tip-status{padding-right:.4em}.vxe-list--drag-sort-tip-disabled-status{display:none;flex-shrink:0;color:var(--vxe-ui-status-error-color)}.vxe-list--drag-sort-tip-normal-status,.vxe-list--drag-sort-tip-sub-status{display:none}.vxe-list--drag-sort-tip-content{flex-grow:1;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.vxe-list--checkbox-header{padding-right:var(--vxe-ui-list-current-padding);-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vxe-list--checkbox-header{cursor:pointer}.vxe-list--checkbox-header .vxe-checkbox--icon{font-size:1.22em;transition:all .2s ease-in-out}.vxe-list--checkbox-header .vxe-checkbox--icon{color:var(--vxe-ui-input-border-color);vertical-align:middle;font-weight:700;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vxe-list--checkbox-header.is--checked,.vxe-list--checkbox-header.is--indeterminate{color:var(--vxe-ui-font-primary-color)}.vxe-list--checkbox-header.is--checked .vxe-checkbox--icon,.vxe-list--checkbox-header.is--indeterminate .vxe-checkbox--icon{color:var(--vxe-ui-font-primary-color)}.vxe-list--checkbox-header:not(.is--disabled):hover .vxe-checkbox--icon{color:var(--vxe-ui-font-primary-color)}.vxe-list--checkbox-header.is--hidden{cursor:default}.vxe-list--checkbox-header.is--readonly{cursor:auto}.vxe-list--checkbox-header.is--disabled{color:var(--vxe-ui-font-disabled-color);cursor:not-allowed}.vxe-list--checkbox-header.is--disabled .vxe-checkbox--icon{color:var(--vxe-ui-input-disabled-color)}.vxe-list--checkbox-header .vxe-checkbox--label{padding-left:.4em;vertical-align:middle}.vxe-list--checkbox-option{padding-right:var(--vxe-ui-list-current-padding)}.vxe-list--checkbox-option{cursor:pointer}.vxe-list--checkbox-option .vxe-checkbox--icon{font-size:1.22em;transition:all .2s ease-in-out}.vxe-list--checkbox-option .vxe-checkbox--icon{color:var(--vxe-ui-input-border-color);vertical-align:middle;font-weight:700;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vxe-list--checkbox-option.is--checked,.vxe-list--checkbox-option.is--indeterminate{color:var(--vxe-ui-font-primary-color)}.vxe-list--checkbox-option.is--checked .vxe-checkbox--icon,.vxe-list--checkbox-option.is--indeterminate .vxe-checkbox--icon{color:var(--vxe-ui-font-primary-color)}.vxe-list--checkbox-option:not(.is--disabled):hover .vxe-checkbox--icon{color:var(--vxe-ui-font-primary-color)}.vxe-list--checkbox-option.is--hidden{cursor:default}.vxe-list--checkbox-option.is--readonly{cursor:auto}.vxe-list--checkbox-option.is--disabled{color:var(--vxe-ui-font-disabled-color);cursor:not-allowed}.vxe-list--checkbox-option.is--disabled .vxe-checkbox--icon{color:var(--vxe-ui-input-disabled-color)}.vxe-list--checkbox-option .vxe-checkbox--label{padding-left:.4em;vertical-align:middle}.vxe-list--radio-option{padding-right:var(--vxe-ui-list-current-padding)}.vxe-list--radio-option{cursor:pointer}.vxe-list--radio-option .vxe-radio--icon{font-size:1.26em;transition:all .2s ease-in-out}.vxe-list--radio-option .vxe-radio--icon{color:var(--vxe-ui-input-border-color);border-radius:50%;vertical-align:middle;font-weight:700;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vxe-list--radio-option.is--checked{color:var(--vxe-ui-font-primary-color)}.vxe-list--radio-option.is--checked .vxe-radio--icon{color:var(--vxe-ui-font-primary-color)}.vxe-list--radio-option:not(.is--disabled):hover .vxe-radio--icon{color:var(--vxe-ui-font-primary-color)}.vxe-list--radio-option.is--readonly{cursor:auto}.vxe-list--radio-option.is--disabled{color:var(--vxe-ui-font-disabled-color);cursor:not-allowed}.vxe-list--radio-option.is--disabled .vxe-radio--icon{color:var(--vxe-ui-input-disabled-color)}.vxe-list--radio-option .vxe-radio--label{padding-left:.4em;vertical-align:middle}.vxe-list>.vxe-scrollbar{position:unset}.vxe-list.is--virtual-scrollbar>.vxe-list--virtual-wrapper{scrollbar-width:none;-ms-overflow-style:none}.vxe-list.is--virtual-scrollbar>.vxe-list--virtual-wrapper::-webkit-scrollbar{display:none}.vxe-list.is--virtual-scrollbar.ov-x--auto-hide:hover>.vxe-scrollbar>.vxe-scrollbar--track-x{opacity:1}.vxe-list.is--virtual-scrollbar.ov-x--auto-hide>.vxe-scrollbar>.vxe-scrollbar--track-x{opacity:0;transition:opacity .8s ease-in-out}.vxe-list.is--virtual-scrollbar.ov-y--auto-hide:hover>.vxe-scrollbar>.vxe-scrollbar--track-y{opacity:1}.vxe-list.is--virtual-scrollbar.ov-y--auto-hide>.vxe-scrollbar>.vxe-scrollbar--track-y{opacity:0;transition:opacity .8s ease-in-out}
+@charset "UTF-8";.vxe-list{--vxe-ui-list-current-font-size:var(--vxe-ui-font-size-default);--vxe-ui-list-current-padding:var(--vxe-ui-layout-padding-default)}.vxe-list.size--medium{--vxe-ui-list-current-font-size:var(--vxe-ui-font-size-medium);--vxe-ui-list-current-padding:var(--vxe-ui-layout-padding-medium)}.vxe-list.size--small{--vxe-ui-list-current-font-size:var(--vxe-ui-font-size-small);--vxe-ui-list-current-padding:var(--vxe-ui-layout-padding-small)}.vxe-list.size--mini{--vxe-ui-list-current-font-size:var(--vxe-ui-font-size-mini);--vxe-ui-list-current-padding:var(--vxe-ui-layout-padding-mini)}.vxe-list{position:relative;display:block;padding:0;font-size:var(--vxe-ui-list-current-font-size);color:var(--vxe-ui-font-color);font-family:var(--vxe-ui-font-family);direction:ltr}.vxe-list .vxe-list--virtual-wrapper{position:relative;overflow-x:auto;overflow-y:auto;outline:0}.vxe-list .vxe-list--y-space{width:0;float:left}.vxe-list .vxe-list--body,.vxe-list .vxe-list--virtual-wrapper{padding:0;margin:0;border:0;outline:0}.vxe-list--header-wrapper{display:flex;flex-direction:row;align-items:center;min-height:var(--vxe-ui-list-row-height)}.vxe-list--header-left{display:flex;flex-direction:row;align-items:center;flex-shrink:0}.vxe-list--header-content{flex-grow:1;overflow:auto}.vxe-list--body.trigger--row>.vxe-list--row:not(.is--drag-disabled):active{cursor:grabbing}.vxe-list--body.is--padding>.vxe-list--row{padding:0 var(--vxe-ui-list-current-padding)}.vxe-list--body.checkbox--highlight .vxe-list--row.is-checkbox--checked{background-color:var(--vxe-ui-list-row-checkbox-checked-background-color)}.vxe-list--body.radio--highlight .vxe-list--row.is-radio--checked{background-color:var(--vxe-ui-list-row-radio-checked-background-color)}.vxe-list--body.row--hover .vxe-list--row:hover{background-color:var(--vxe-ui-list-row-hover-background-color)}.vxe-list--body.row--hover .vxe-list--row:hover.is--current{background-color:var(--vxe-ui-list-row-hover-current-background-color)}.vxe-list--body.row--hover.radio--highlight .vxe-list--row.is-radio--checked:hover{background-color:var(--vxe-ui-list-row-hover-radio-checked-background-color)}.vxe-list--body.row--hover.checkbox--highlight .vxe-list--row.is-checkbox--checked:hover{background-color:var(--vxe-ui-list-row-hover-checkbox-checked-background-color)}.vxe-list--row.is--current{background-color:var(--vxe-ui-list-row-current-background-color)}.vxe-list--virtual-wrapper{height:100px}.vxe-list--row{display:flex;flex-direction:row;align-items:center}.vxe-list--row-content,.vxe-list--row-drag,.vxe-list--row-extra{display:flex;flex-direction:row;align-items:center}.vxe-list--row-drag{flex-shrink:0;padding-right:var(--vxe-ui-list-current-padding)}.vxe-list--row-content{flex-grow:1;height:var(--vxe-ui-list-row-height);overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.vxe-list--row-extra{flex-shrink:0}.vxe-list--drag-handle:not(.is--disabled){cursor:grab}.vxe-list--drag-handle:not(.is--disabled):active{cursor:grabbing}.vxe-list--drag-handle:not(.is--disabled):hover{color:var(--vxe-ui-font-primary-color)}.vxe-list--drag-handle.is--disabled{color:var(--vxe-ui-input-disabled-color);cursor:not-allowed}.vxe-list--row.row--drag-move{transition:transform .5s ease}.vxe-list--row.row--drag-origin{opacity:.3}.vxe-list--drag-row-line{display:none;position:absolute;top:0;left:0;z-index:11;pointer-events:none}.vxe-list--drag-row-line{width:100%;height:1px;border:2px solid transparent}.vxe-list--drag-row-line[drag-pos=top]{border-top-color:var(--vxe-ui-font-primary-color)}.vxe-list--drag-row-line[drag-pos=bottom]{border-bottom-color:var(--vxe-ui-font-primary-color)}.vxe-list--drag-row-line[drag-to-child=y]{border-top-color:transparent;border-bottom-color:transparent;border-left-color:var(--vxe-ui-status-success-color)}.vxe-list--drag-row-line.is--guides{background-color:var(--vxe-ui-list-drag-over-background-color)}.vxe-body--row-list-move{transition-property:transform;transition-duration:.35s}.vxe-list--drag-sort-tip{display:none;position:absolute;top:0;left:0;padding:.6em 1.4em;max-width:50%;min-width:100px;border-radius:var(--vxe-ui-border-radius);overflow:hidden;text-overflow:ellipsis;white-space:nowrap;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;pointer-events:none;background-color:var(--vxe-ui-layout-background-color);box-shadow:0 0 10px 0 rgba(0,0,0,.2);z-index:33}.vxe-list--drag-sort-tip[drag-status=normal] .vxe-list--drag-sort-tip-normal-status{display:block}.vxe-list--drag-sort-tip[drag-status=sub] .vxe-list--drag-sort-tip-sub-status{display:block}.vxe-list--drag-sort-tip[drag-status=disabled] .vxe-list--drag-sort-tip-disabled-status{display:block}.vxe-list--drag-sort-tip-wrapper{display:flex;flex-direction:row;align-items:center}.vxe-list--drag-sort-tip-status{padding-right:.4em}.vxe-list--drag-sort-tip-disabled-status{display:none;flex-shrink:0;color:var(--vxe-ui-status-error-color)}.vxe-list--drag-sort-tip-normal-status,.vxe-list--drag-sort-tip-sub-status{display:none}.vxe-list--drag-sort-tip-content{flex-grow:1;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.vxe-list--checkbox-header{padding-right:var(--vxe-ui-list-current-padding);-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vxe-list--checkbox-header{cursor:pointer}.vxe-list--checkbox-header .vxe-checkbox--icon{font-size:1.22em;transition:all .2s ease-in-out}.vxe-list--checkbox-header .vxe-checkbox--icon{color:var(--vxe-ui-input-border-color);vertical-align:middle;font-weight:700;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vxe-list--checkbox-header.is--checked,.vxe-list--checkbox-header.is--indeterminate{color:var(--vxe-ui-font-primary-color)}.vxe-list--checkbox-header.is--checked .vxe-checkbox--icon,.vxe-list--checkbox-header.is--indeterminate .vxe-checkbox--icon{color:var(--vxe-ui-font-primary-color)}.vxe-list--checkbox-header:not(.is--disabled):hover .vxe-checkbox--icon{color:var(--vxe-ui-font-primary-color)}.vxe-list--checkbox-header.is--hidden{cursor:default}.vxe-list--checkbox-header.is--readonly{cursor:auto}.vxe-list--checkbox-header.is--disabled{color:var(--vxe-ui-font-disabled-color);cursor:not-allowed}.vxe-list--checkbox-header.is--disabled .vxe-checkbox--icon{color:var(--vxe-ui-input-disabled-color)}.vxe-list--checkbox-header .vxe-checkbox--label{padding-left:.4em;vertical-align:middle}.vxe-list--checkbox-option{padding-right:var(--vxe-ui-list-current-padding)}.vxe-list--checkbox-option{cursor:pointer}.vxe-list--checkbox-option .vxe-checkbox--icon{font-size:1.22em;transition:all .2s ease-in-out}.vxe-list--checkbox-option .vxe-checkbox--icon{color:var(--vxe-ui-input-border-color);vertical-align:middle;font-weight:700;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vxe-list--checkbox-option.is--checked,.vxe-list--checkbox-option.is--indeterminate{color:var(--vxe-ui-font-primary-color)}.vxe-list--checkbox-option.is--checked .vxe-checkbox--icon,.vxe-list--checkbox-option.is--indeterminate .vxe-checkbox--icon{color:var(--vxe-ui-font-primary-color)}.vxe-list--checkbox-option:not(.is--disabled):hover .vxe-checkbox--icon{color:var(--vxe-ui-font-primary-color)}.vxe-list--checkbox-option.is--hidden{cursor:default}.vxe-list--checkbox-option.is--readonly{cursor:auto}.vxe-list--checkbox-option.is--disabled{color:var(--vxe-ui-font-disabled-color);cursor:not-allowed}.vxe-list--checkbox-option.is--disabled .vxe-checkbox--icon{color:var(--vxe-ui-input-disabled-color)}.vxe-list--checkbox-option .vxe-checkbox--label{padding-left:.4em;vertical-align:middle}.vxe-list--radio-option{padding-right:var(--vxe-ui-list-current-padding)}.vxe-list--radio-option{cursor:pointer}.vxe-list--radio-option .vxe-radio--icon{font-size:1.26em;transition:all .2s ease-in-out}.vxe-list--radio-option .vxe-radio--icon{color:var(--vxe-ui-input-border-color);border-radius:50%;vertical-align:middle;font-weight:700;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vxe-list--radio-option.is--checked{color:var(--vxe-ui-font-primary-color)}.vxe-list--radio-option.is--checked .vxe-radio--icon{color:var(--vxe-ui-font-primary-color)}.vxe-list--radio-option:not(.is--disabled):hover .vxe-radio--icon{color:var(--vxe-ui-font-primary-color)}.vxe-list--radio-option.is--readonly{cursor:auto}.vxe-list--radio-option.is--disabled{color:var(--vxe-ui-font-disabled-color);cursor:not-allowed}.vxe-list--radio-option.is--disabled .vxe-radio--icon{color:var(--vxe-ui-input-disabled-color)}.vxe-list--radio-option .vxe-radio--label{padding-left:.4em;vertical-align:middle}.vxe-list.ov-padding.overflow-x.sx-pos--top{padding-top:var(--vxe-ui-scrollbar-x-height)}.vxe-list.ov-padding.overflow-x.sx-pos--bottom{padding-bottom:var(--vxe-ui-scrollbar-x-height)}.vxe-list.ov-padding.overflow-y.sy-pos--left{padding-left:var(--vxe-ui-scrollbar-y-width)}.vxe-list.ov-padding.overflow-y.sy-pos--right{padding-right:var(--vxe-ui-scrollbar-y-width)}.vxe-list.ov-x--hidden>.vxe-list--virtual-wrapper{overflow-x:hidden}.vxe-list.ov-y--hidden>.vxe-list--virtual-wrapper{overflow-y:hidden}.vxe-list.is--virtual-scrollbar.ov-x--auto-hide:hover>.vxe-scrollbar>.vxe-scrollbar--track-x{opacity:1}.vxe-list.is--virtual-scrollbar.ov-x--auto-hide>.vxe-scrollbar>.vxe-scrollbar--track-x{opacity:0;transition:opacity .8s ease-in-out}.vxe-list.is--virtual-scrollbar.ov-y--auto-hide:hover>.vxe-scrollbar>.vxe-scrollbar--track-y{opacity:1}.vxe-list.is--virtual-scrollbar.ov-y--auto-hide>.vxe-scrollbar>.vxe-scrollbar--track-y{opacity:0;transition:opacity .8s ease-in-out}.vxe-list>.vxe-scrollbar{position:unset}.vxe-list.is--virtual-scrollbar>.vxe-list--virtual-wrapper{scrollbar-width:none;-ms-overflow-style:none}.vxe-list.is--virtual-scrollbar>.vxe-list--virtual-wrapper::-webkit-scrollbar{display:none}

package/es/menu/src/menu.js

@@ -2,7 +2,7 @@ import { defineVxeComponent } from '../../ui/src/comp';
 import XEUtils from 'xe-utils';
 import { VxeUI, createEvent, permission, globalMixins, globalEvents, renderEmptyElement } from '../../ui';
 import { getPopupAppendElement, scrollToView, toCssUnit } from '../../ui/src/dom';
-import { getLastZIndex, nextZIndex, isEnableConf } from '../../ui/src/utils';
+import { getLastZIndex, nextZIndex, isEnableConf, getDefaultConfig } from '../../ui/src/utils';
 import { getSlotVNs } from '../../ui/src/vn';
 import { createComponentLog } from '../../ui/src/log';
 import VxeLoadingComponent from '../../loading';
@@ -69,7 +69,7 @@ export default {
         menuConfig: Object,
         useScrollbar: {
             type: Boolean,
-            default: () => getConfig().menu.useScrollbar
+            default: () => getDefaultConfig(getConfig().menu.useScrollbar, getConfig().useScrollbar)
         },
         scrollbarConfig: Object,
         appendTo: {

package/es/modal/src/modal.js

@@ -2,12 +2,13 @@ import { defineVxeComponent } from '../../ui/src/comp';
 import XEUtils from 'xe-utils';
 import { VxeUI, getConfig, getI18n, getIcon, createEvent, globalEvents, globalMixins, renderEmptyElement, GLOBAL_EVENT_KEYS } from '../../ui';
 import { getEventTargetNode, getPopupAppendElement, getPopupWrapperElement, isScale, toCssUnit } from '../../ui/src/dom';
-import { getLastZIndex, nextZIndex, getSubLastZIndex, nextSubZIndex, getFuncText, handleBooleanDefaultValue } from '../../ui/src/utils';
+import { getLastZIndex, nextZIndex, getSubLastZIndex, nextSubZIndex, getFuncText, handleBooleanDefaultValue, getDefaultConfig } from '../../ui/src/utils';
 import { getSlotVNs } from '../../ui/src/vn';
 import { createComponentLog } from '../../ui/src/log';
 import { allActiveModals } from './store';
 import VxeButtonComponent from '../../button';
 import VxeLoadingComponent from '../../loading';
+import VxeScrollbarComponent from '../../scrollbar';
 const { warnLog, errLog } = createComponentLog('modal');
 function createInternalData() {
     return {
@@ -217,6 +218,11 @@ export default {
         },
         beforeHideMethod: Function,
         slots: Object,
+        useScrollbar: {
+            type: Boolean,
+            default: () => getDefaultConfig(getConfig().modal.useScrollbar, getConfig().useScrollbar)
+        },
+        scrollbarConfig: Object,
         /**
          * 已废弃
          * @deprecated
@@ -302,6 +308,28 @@ export default {
             const $xeModal = this;
             const props = $xeModal;
             return Object.assign({}, getConfig().modal.zoomConfig, props.zoomConfig);
+        },
+        computeScrollbarOpts() {
+            const $xeModal = this;
+            const props = $xeModal;
+            return Object.assign({}, getConfig().modal.scrollbarConfig, props.scrollbarConfig);
+        },
+        computeScrollbarProps() {
+            const $xeModal = this;
+            const scrollbarOpts = $xeModal.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-modal--scrollbar-content-view' + (viewClassName ? (' ' + viewClassName) : ''),
+                viewInnerClassName: 'vxe-modal--scrollbar-content-inner' + (viewClassName ? (' ' + viewInnerClassName) : '')
+            };
         } }),
     watch: {
         width() {
@@ -1465,9 +1493,10 @@ export default {
             const $xeModal = this;
             const props = $xeModal;
             const slots = $xeModal.$scopedSlots;
-            const { slots: propSlots = {}, status, message, iconStatus, useHtml } = props;
+            const { slots: propSlots = {}, status, message, iconStatus, useScrollbar, useHtml } = props;
             const content = props.content || message;
             const isMsg = $xeModal.computeIsMsg;
+            const scrollbarProps = $xeModal.computeScrollbarProps;
             const defaultSlot = slots.default || propSlots.default;
             const leftSlot = slots.left || propSlots.left;
             const rightSlot = slots.right || propSlots.right;
@@ -1481,18 +1510,48 @@ export default {
                     })
                 ]));
             }
-            contVNs.push(useHtml && !defaultSlot
-                ? h('div', {
-                    key: 'hc',
-                    class: 'vxe-modal--content',
-                    domProps: {
-                        innerHTML: getFuncText(content)
-                    }
-                })
-                : h('div', {
-                    key: 'dc',
-                    class: 'vxe-modal--content'
-                }, defaultSlot ? $xeModal.callSlot(defaultSlot, { $modal: $xeModal }, h) : getFuncText(content)));
+            if (useHtml && !defaultSlot) {
+                contVNs.push(useScrollbar
+                    ? h(VxeScrollbarComponent, {
+                        key: 'shc',
+                        class: 'vxe-modal--scrollbar-content',
+                        props: scrollbarProps,
+                        scopedSlots: {
+                            default() {
+                                return [
+                                    h('div', {
+                                        class: 'vxe-modal--scrollbar-content-html',
+                                        domProps: {
+                                            innerHTML: getFuncText(content)
+                                        }
+                                    })
+                                ];
+                            }
+                        }
+                    })
+                    : h('div', {
+                        key: 'hc',
+                        class: 'vxe-modal--content',
+                        domProps: {
+                            innerHTML: getFuncText(content)
+                        }
+                    }));
+            }
+            else {
+                contVNs.push(useScrollbar
+                    ? h(VxeScrollbarComponent, {
+                        key: 'sdc',
+                        class: 'vxe-modal--scrollbar-content',
+                        props: scrollbarProps,
+                        scopedSlots: {
+                            default: () => defaultSlot ? $xeModal.callSlot(defaultSlot, { $modal: $xeModal }, h) : getFuncText(content)
+                        }
+                    })
+                    : h('div', {
+                        key: 'dc',
+                        class: 'vxe-modal--content'
+                    }, defaultSlot ? $xeModal.callSlot(defaultSlot, { $modal: $xeModal }, h) : getFuncText(content)));
+            }
             return h('div', {
                 class: 'vxe-modal--body'
             }, [

package/es/modal/style.css

@@ -450,4 +450,8 @@ html[data-vxe-lock-scroll] body {
 
 .vxe-modal--wrapper[data-effect] {
   overflow: hidden;
+}
+
+.vxe-modal--scrollbar-content {
+  width: 100%;
 }