vxe-pc-ui 4.19.0 → 4.19.1

package/lib/index.umd.js

@@ -4745,7 +4745,7 @@ function checkDynamic() {
 const {
   log: log_log
 } = VxeUI;
-const uiVersion = `ui v${"4.19.0"}`;
+const uiVersion = `ui v${"4.19.1"}`;
 function createComponentLog(name) {
   const tableVersion = VxeUI.tableVersion ? `table v${VxeUI.tableVersion}` : '';
   const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
@@ -4763,7 +4763,7 @@ const errLog = log_log.create('error', uiVersion);
 
 
 
-const ui_version = "4.19.0";
+const ui_version = "4.19.1";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -37206,6 +37206,7 @@ const Scrollbar = VxeScrollbar;
 
 
 
+
 /* harmony default export */ var layout_aside = (defineVxeComponent({
   name: 'VxeLayoutAside',
   props: {
@@ -37215,6 +37216,10 @@ const Scrollbar = VxeScrollbar;
     loading: Boolean,
     padding: Boolean,
     collapseConfig: Object,
+    useScrollbar: {
+      type: Boolean,
+      default: () => getConfig().layoutAside.useScrollbar
+    },
     scrollbarConfig: Object,
     size: {
       type: String,
@@ -37282,7 +37287,8 @@ const Scrollbar = VxeScrollbar;
       const {
         collapsed,
         loading,
-        padding
+        padding,
+        useScrollbar
       } = props;
       const varStyle = computeVarStyle.value;
       const vSize = computeSize.value;
@@ -37307,8 +37313,7 @@ const Scrollbar = VxeScrollbar;
           'is--loading': loading
         }],
         style: varStyle
-      }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(packages_scrollbar, {
-        loading,
+      }, [useScrollbar ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(packages_scrollbar, {
         native,
         xConfig: {
           visible: 'hidden'
@@ -37316,12 +37321,19 @@ const Scrollbar = VxeScrollbar;
         yConfig,
         className: 'vxe-layout-aside--scrollbar' + (className ? ' ' + className : ''),
         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 : '')
       }, {
-        default: () => {
-          return defaultSlot ? defaultSlot({}) : [];
-        }
+        default: () => defaultSlot ? defaultSlot({}) : []
+      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+        class: 'vxe-layout-aside--inner'
+      }, defaultSlot ? defaultSlot({}) : []),
+      /**
+       * 加载中
+       */
+      (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(packages_loading, {
+        class: 'vxe-layout-aside--loading',
+        modelValue: loading
       })]);
     };
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.provide)('$xeLayoutAside', $xeLayoutAside);
@@ -37352,6 +37364,7 @@ const LayoutAside = VxeLayoutAside;
 
 
 
+
 function layout_body_createInternalData() {
   return {};
 }
@@ -37368,6 +37381,10 @@ function layout_body_createReactData() {
       default: () => getConfig().layoutBody.showBacktop
     },
     backtopConfig: Object,
+    useScrollbar: {
+      type: Boolean,
+      default: () => getConfig().layoutBody.useScrollbar
+    },
     scrollbarConfig: Object,
     size: {
       type: String,
@@ -37425,7 +37442,8 @@ function layout_body_createReactData() {
       const {
         loading,
         padding,
-        showBacktop
+        showBacktop,
+        useScrollbar
       } = props;
       const backtopOpts = computeBacktopOpts.value;
       const scrollbarOpts = computeScrollbarOpts.value;
@@ -37460,8 +37478,7 @@ function layout_body_createReactData() {
           'is--loading': loading,
           'is--padding': padding
         }]
-      }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(packages_scrollbar, {
-        loading,
+      }, [useScrollbar ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(packages_scrollbar, {
         native,
         xConfig,
         yConfig,
@@ -37470,10 +37487,20 @@ function layout_body_createReactData() {
           ...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 : '')
       }, {
         default: () => defaultSlot ? defaultSlot({}) : []
+      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+        id: showBacktop ? backtopId : '',
+        class: 'vxe-layout-body--inner'
+      }, defaultSlot ? defaultSlot({}) : []),
+      /**
+       * 加载中
+       */
+      (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(packages_loading, {
+        class: 'vxe-list-view--loading',
+        modelValue: loading
       }),
       /**
        * 回到顶部
@@ -37966,6 +37993,10 @@ let nemuUniqueKey = 100000000;
       default: () => menu_getConfig().menu.size || menu_getConfig().size
     },
     menuConfig: Object,
+    useScrollbar: {
+      type: Boolean,
+      default: () => menu_getConfig().menu.useScrollbar
+    },
     scrollbarConfig: Object,
     appendTo: {
       type: [String, Function],
@@ -38600,7 +38631,8 @@ let nemuUniqueKey = 100000000;
       const {
         loading,
         collapseFixed,
-        appendTo
+        appendTo,
+        useScrollbar
       } = props;
       const {
         initialized,
@@ -38613,6 +38645,10 @@ let nemuUniqueKey = 100000000;
       const currBorder = computeCurrBorder.value;
       const varStyle = computeVarStyle.value;
       const scrollbarOpts = computeScrollbarOpts.value;
+      const {
+        viewClassName,
+        viewInnerClassName
+      } = scrollbarOpts;
       const headerSlot = slots.header;
       const footerSlot = slots.footer;
       let ons = {};
@@ -38654,12 +38690,16 @@ let nemuUniqueKey = 100000000;
         ...ons
       }, isCollapsed ? [headerSlot ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-menu--header'
-      }, headerSlot(stParams)) : renderEmptyElement($xeMenu), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(packages_scrollbar, {
-        class: 'vxe-menu--body',
-        ...scrollbarOpts
+      }, headerSlot(stParams)) : renderEmptyElement($xeMenu), useScrollbar ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(packages_scrollbar, {
+        class: 'vxe-menu--scrollbar-body',
+        ...scrollbarOpts,
+        viewClassName: 'vxe-menu--body-view' + (viewClassName ? ' ' + viewClassName : ''),
+        viewInnerClassName: 'vxe-menu--body-inner' + (viewClassName ? ' ' + viewInnerClassName : '')
       }, {
         default: () => menuList.map(child => renderDefaultChildren(child, menuList))
-      }), footerSlot ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+        class: 'vxe-menu--body'
+      }, menuList.map(child => renderDefaultChildren(child, menuList))), footerSlot ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-menu--footer'
       }, footerSlot(stParams)) : renderEmptyElement($xeMenu)] : [])]),
       /**