vxe-pc-ui 3.19.0 → 3.19.1

package/lib/index.umd.js

@@ -13347,7 +13347,7 @@ var es_array_filter = __webpack_require__(2008);
 
 
 var log_log = VxeUI.log;
-var uiVersion = "ui v".concat("3.19.0");
+var uiVersion = "ui v".concat("3.19.1");
 function createComponentLog(name) {
   var tableVersion = VxeUI.tableVersion ? "table v".concat(VxeUI.tableVersion) : '';
   var ganttVersion = VxeUI.ganttVersion ? "gantt v".concat(VxeUI.ganttVersion) : '';
@@ -13367,7 +13367,7 @@ var errLog = log_log.create('error', uiVersion);
 
 
 
-var ui_version = "3.19.0";
+var ui_version = "3.19.1";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -48310,6 +48310,7 @@ var Scrollbar = VxeScrollbar;
 
 
 
+
 /* harmony default export */ var layout_aside = (/* define-vxe-component start */defineVxeComponent({
   name: 'VxeLayoutAside',
   mixins: [globalMixins.sizeMixin],
@@ -48320,6 +48321,12 @@ var Scrollbar = VxeScrollbar;
     loading: Boolean,
     padding: Boolean,
     collapseConfig: Object,
+    useScrollbar: {
+      type: Boolean,
+      default: function _default() {
+        return getConfig().layoutAside.useScrollbar;
+      }
+    },
     scrollbarConfig: Object,
     size: {
       type: String,
@@ -48387,7 +48394,8 @@ var Scrollbar = VxeScrollbar;
       var slots = $xeLayoutAside.$scopedSlots;
       var collapsed = props.collapsed,
         loading = props.loading,
-        padding = props.padding;
+        padding = props.padding,
+        useScrollbar = props.useScrollbar;
       var varStyle = $xeLayoutAside.computeVarStyle;
       var vSize = $xeLayoutAside.computeSize;
       var collapseOpts = $xeLayoutAside.computeCollapseOpts;
@@ -48402,9 +48410,8 @@ var Scrollbar = VxeScrollbar;
       return h('aside', {
         class: ['vxe-layout-aside', _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--animat', collapseOpts.animation !== false), 'is--padding', padding), 'is--collapse', collapsed), 'is--loading', loading)],
         style: varStyle
-      }, [h(packages_scrollbar, {
+      }, [useScrollbar ? h(packages_scrollbar, {
         props: {
-          loading: loading,
           native: native,
           xConfig: {
             visible: 'hidden'
@@ -48412,14 +48419,25 @@ var Scrollbar = VxeScrollbar;
           yConfig: yConfig,
           className: 'vxe-layout-aside--scrollbar' + (className ? ' ' + className : ''),
           viewAttrs: viewAttrs,
-          viewClassName: 'vxe-layout-aside--view' + (viewClassName ? ' ' + viewClassName : ''),
-          viewInnerClassName: 'vxe-layout-aside--inner' + (viewInnerClassName ? ' ' + viewInnerClassName : '')
+          viewClassName: 'vxe-layout-aside--scrollbar-view' + (viewClassName ? ' ' + viewClassName : ''),
+          viewInnerClassName: 'vxe-layout-aside--scrollbar-inner' + (viewInnerClassName ? ' ' + viewInnerClassName : '')
         },
         scopedSlots: {
           default: function _default() {
             return defaultSlot ? defaultSlot({}) : [];
           }
         }
+      }) : h('div', {
+        class: 'vxe-layout-aside--inner'
+      }, defaultSlot ? defaultSlot({}) : []),
+      /**
+       * 加载中
+       */
+      h(packages_loading, {
+        class: 'vxe-layout-aside--loading',
+        props: {
+          value: loading
+        }
       })]);
     }
   },
@@ -48451,6 +48469,7 @@ var LayoutAside = VxeLayoutAside;
 
 
 
+
 function layout_body_createInternalData() {
   return {};
 }
@@ -48470,6 +48489,12 @@ function layout_body_createReactData() {
       }
     },
     backtopConfig: Object,
+    useScrollbar: {
+      type: Boolean,
+      default: function _default() {
+        return getConfig().layoutBody.useScrollbar;
+      }
+    },
     scrollbarConfig: Object,
     size: {
       type: String,
@@ -48523,7 +48548,8 @@ function layout_body_createReactData() {
       var backtopId = $xeLayoutBody.backtopId;
       var loading = props.loading,
         padding = props.padding,
-        showBacktop = props.showBacktop;
+        showBacktop = props.showBacktop,
+        useScrollbar = props.useScrollbar;
       var backtopOpts = $xeLayoutBody.computeBacktopOpts;
       var scrollbarOpts = $xeLayoutBody.computeScrollbarOpts;
       var native = scrollbarOpts.native,
@@ -48550,9 +48576,8 @@ function layout_body_createReactData() {
       }
       return h('div', {
         class: ['vxe-layout-body', _defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--loading', loading), 'is--padding', padding)]
-      }, [h(packages_scrollbar, {
+      }, [useScrollbar ? h(packages_scrollbar, {
         props: {
-          loading: loading,
           native: native,
           xConfig: xConfig,
           yConfig: yConfig,
@@ -48560,14 +48585,28 @@ function layout_body_createReactData() {
           viewAttrs: _objectSpread2(_objectSpread2({}, viewAttrs), {}, {
             id: showBacktop ? backtopId || null : null
           }),
-          viewClassName: 'vxe-layout-body--view' + (viewClassName ? ' ' + viewClassName : ''),
-          viewInnerClassName: 'vxe-layout-body--inner' + (viewInnerClassName ? ' ' + viewInnerClassName : '')
+          viewClassName: 'vxe-layout-body--scrollbar-view' + (viewClassName ? ' ' + viewClassName : ''),
+          viewInnerClassName: 'vxe-layout-body--scrollbar-inner' + (viewInnerClassName ? ' ' + viewInnerClassName : '')
         },
         scopedSlots: {
           default: function _default() {
             return defaultSlot ? defaultSlot({}) : [];
           }
         }
+      }) : h('div', {
+        attrs: {
+          id: showBacktop ? backtopId : ''
+        },
+        class: 'vxe-layout-body--inner'
+      }, defaultSlot ? defaultSlot({}) : []),
+      /**
+       * 加载中
+       */
+      h(packages_loading, {
+        class: 'vxe-list-view--loading',
+        props: {
+          value: loading
+        }
       }),
       /**
        * 回到顶部
@@ -49049,6 +49088,12 @@ var nemuUniqueKey = 100000000;
       }
     },
     menuConfig: Object,
+    useScrollbar: {
+      type: Boolean,
+      default: function _default() {
+        return menu_getConfig().menu.useScrollbar;
+      }
+    },
     scrollbarConfig: Object,
     appendTo: {
       type: [String, Function],
@@ -49723,7 +49768,8 @@ var nemuUniqueKey = 100000000;
       var slots = $xeMenu.$scopedSlots;
       var reactData = $xeMenu.reactData;
       var loading = props.loading,
-        collapseFixed = props.collapseFixed;
+        collapseFixed = props.collapseFixed,
+        useScrollbar = props.useScrollbar;
       var initialized = reactData.initialized,
         menuList = reactData.menuList,
         collapseStyle = reactData.collapseStyle,
@@ -49733,6 +49779,8 @@ var nemuUniqueKey = 100000000;
       var currBorder = $xeMenu.computeCurrBorder;
       var varStyle = $xeMenu.computeVarStyle;
       var scrollbarOpts = $xeMenu.computeScrollbarOpts;
+      var viewClassName = scrollbarOpts.viewClassName,
+        viewInnerClassName = scrollbarOpts.viewInnerClassName;
       var headerSlot = slots.header;
       var footerSlot = slots.footer;
       var ons = {};
@@ -49763,9 +49811,12 @@ var nemuUniqueKey = 100000000;
         on: ons
       }, isCollapsed ? [headerSlot ? h('div', {
         class: 'vxe-menu--header'
-      }, headerSlot(stParams)) : renderEmptyElement($xeMenu), h(packages_scrollbar, {
-        class: 'vxe-menu--body',
-        props: scrollbarOpts,
+      }, headerSlot(stParams)) : renderEmptyElement($xeMenu), useScrollbar ? h(packages_scrollbar, {
+        class: 'vxe-menu--scrollbar-body',
+        props: _objectSpread2(_objectSpread2({}, scrollbarOpts), {}, {
+          viewClassName: 'vxe-menu--body-view' + (viewClassName ? ' ' + viewClassName : ''),
+          viewInnerClassName: 'vxe-menu--body-inner' + (viewClassName ? ' ' + viewInnerClassName : '')
+        }),
         scopedSlots: {
           default: function _default() {
             return menuList.map(function (child) {
@@ -49773,7 +49824,11 @@ var nemuUniqueKey = 100000000;
             });
           }
         }
-      }), footerSlot ? h('div', {
+      }) : h('div', {
+        class: 'vxe-menu--body'
+      }, menuList.map(function (child) {
+        return $xeMenu.renderDefaultChildren(h, child, menuList);
+      })), footerSlot ? h('div', {
         class: 'vxe-menu--footer'
       }, footerSlot(stParams)) : renderEmptyElement($xeMenu)] : []) : renderEmptyElement($xeMenu),
       /**