vxe-pc-ui 4.19.0 → 4.19.2

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.2"}`;
 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.2";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -36798,6 +36798,39 @@ function scrollbar_createInternalData() {
           viewEl.scrollIntoView();
         }
       },
+      setScrollTop(top) {
+        const viewEl = refViewElem.value;
+        if (viewEl) {
+          viewEl.scrollTop = top;
+        }
+      },
+      setScrollLeft(left) {
+        const viewEl = refViewElem.value;
+        if (viewEl) {
+          viewEl.scrollLeft = left;
+        }
+      },
+      getScrollTop() {
+        const viewEl = refViewElem.value;
+        if (viewEl) {
+          return viewEl.scrollTop;
+        }
+        return 0;
+      },
+      getScrollLeft() {
+        const viewEl = refViewElem.value;
+        if (viewEl) {
+          return viewEl.scrollLeft;
+        }
+        return 0;
+      },
+      clearScroll() {
+        const viewEl = refViewElem.value;
+        if (viewEl) {
+          viewEl.scrollTop = 0;
+          viewEl.scrollLeft = 0;
+        }
+      },
       recalculate() {
         updateThumbSize();
         updateThumbOffset();
@@ -37206,6 +37239,7 @@ const Scrollbar = VxeScrollbar;
 
 
 
+
 /* harmony default export */ var layout_aside = (defineVxeComponent({
   name: 'VxeLayoutAside',
   props: {
@@ -37215,6 +37249,10 @@ const Scrollbar = VxeScrollbar;
     loading: Boolean,
     padding: Boolean,
     collapseConfig: Object,
+    useScrollbar: {
+      type: Boolean,
+      default: () => getConfig().layoutAside.useScrollbar
+    },
     scrollbarConfig: Object,
     size: {
       type: String,
@@ -37282,7 +37320,8 @@ const Scrollbar = VxeScrollbar;
       const {
         collapsed,
         loading,
-        padding
+        padding,
+        useScrollbar
       } = props;
       const varStyle = computeVarStyle.value;
       const vSize = computeSize.value;
@@ -37307,8 +37346,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 +37354,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-view--loading',
+        modelValue: loading
       })]);
     };
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.provide)('$xeLayoutAside', $xeLayoutAside);
@@ -37352,6 +37397,7 @@ const LayoutAside = VxeLayoutAside;
 
 
 
+
 function layout_body_createInternalData() {
   return {};
 }
@@ -37368,6 +37414,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 +37475,8 @@ function layout_body_createReactData() {
       const {
         loading,
         padding,
-        showBacktop
+        showBacktop,
+        useScrollbar
       } = props;
       const backtopOpts = computeBacktopOpts.value;
       const scrollbarOpts = computeScrollbarOpts.value;
@@ -37460,8 +37511,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 +37520,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-layout-body-view--loading',
+        modelValue: loading
       }),
       /**
        * 回到顶部
@@ -37966,6 +38026,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],
@@ -37982,6 +38046,8 @@ let nemuUniqueKey = 100000000;
     const $xeLayoutAside = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.inject)('$xeLayoutAside', null);
     const refElem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const refCollapseElem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
+    const refCollapseBodyElem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
+    const refCollapseBodyScrollbar = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const {
       computeSize
     } = useSize(props);
@@ -38168,14 +38234,19 @@ let nemuUniqueKey = 100000000;
           const isCollapsed = computeIsCollapsed.value;
           const el = refElem.value;
           if (el) {
-            const clientRect = el.getBoundingClientRect();
-            const parentNode = el.parentNode;
-            reactData.collapseStyle = isCollapsed ? {
-              top: toCssUnit(clientRect.top),
-              left: toCssUnit(clientRect.left),
-              height: toCssUnit(parentNode.clientHeight),
-              zIndex: reactData.collapseZindex
-            } : {};
+            let clientRect = el.getBoundingClientRect();
+            const parentElement = el.parentElement;
+            if (parentElement) {
+              if (clientRect.top < 0) {
+                clientRect = parentElement.getBoundingClientRect();
+              }
+              reactData.collapseStyle = isCollapsed ? {
+                top: toCssUnit(clientRect.top),
+                left: toCssUnit(clientRect.left),
+                height: toCssUnit(parentElement.clientHeight),
+                zIndex: reactData.collapseZindex
+              } : {};
+            }
           }
         });
       }
@@ -38345,6 +38416,14 @@ let nemuUniqueKey = 100000000;
       }
     };
     const handleMenuMouseleave = () => {
+      const $collapseBodyScrollbar = refCollapseBodyScrollbar.value;
+      const collapseBodyEl = refCollapseBodyElem.value;
+      if (collapseBodyEl) {
+        collapseBodyEl.scrollTop = 0;
+      }
+      if ($collapseBodyScrollbar) {
+        $collapseBodyScrollbar.clearScroll();
+      }
       reactData.isEnterCollapse = false;
     };
     const callSlot = (slotFunc, params) => {
@@ -38600,7 +38679,8 @@ let nemuUniqueKey = 100000000;
       const {
         loading,
         collapseFixed,
-        appendTo
+        appendTo,
+        useScrollbar
       } = props;
       const {
         initialized,
@@ -38613,6 +38693,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 +38738,18 @@ 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 && isEnterCollapse ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(packages_scrollbar, {
+        ref: refCollapseBodyScrollbar,
+        class: 'vxe-menu--scrollbar-body',
+        ...scrollbarOpts,
+        viewClassName: 'vxe-menu--scrollbar-body-view' + (viewClassName ? ' ' + viewClassName : ''),
+        viewInnerClassName: 'vxe-menu--scrollbar-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', {
+        ref: refCollapseBodyElem,
+        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)] : [])]),
       /**