vxe-pc-ui 4.16.9 → 4.16.11

package/lib/index.umd.js

@@ -3346,7 +3346,7 @@ if (typeof window !== 'undefined') {
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
 var es_array_push = __webpack_require__(4114);
 ;// ./node_modules/@vxe-ui/core/es/src/core.js
-const coreVersion = "4.4.17";
+const coreVersion = "4.4.18";
 const VxeCore = {
   coreVersion,
   uiVersion: '',
@@ -3973,7 +3973,7 @@ function createLog(type, name) {
     return msg;
   };
 }
-const version = "4.4.17";
+const version = "4.4.18";
 const log = {
   create: createLog,
   warn: createLog('warn', `v${version}`),
@@ -4657,7 +4657,7 @@ function checkDynamic() {
 const {
   log: log_log
 } = VxeUI;
-const uiVersion = `ui v${"4.16.9"}`;
+const uiVersion = `ui v${"4.16.11"}`;
 function createComponentLog(name) {
   const tableVersion = VxeUI.tableVersion ? `table v${VxeUI.tableVersion}` : '';
   const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
@@ -4675,7 +4675,7 @@ const errLog = log_log.create('error', uiVersion);
 
 
 
-const ui_version = "4.16.9";
+const ui_version = "4.16.11";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -5448,7 +5448,7 @@ setIcon({
       expError: '导出失败',
       expFilename: '导出_{0}',
       expOriginFilename: '导出_源_{0}',
-      customTitle: '列设置',
+      customTitle: '个性化设置',
       customAll: '全部',
       customConfirm: '确认',
       customClose: '关闭',
@@ -5532,7 +5532,7 @@ setIcon({
       search: '搜索'
     },
     custom: {
-      cstmTitle: '列设置',
+      cstmTitle: '个性化设置',
       cstmRestore: '恢复默认',
       cstmCancel: '取消',
       cstmConfirm: '确定',
@@ -5658,7 +5658,7 @@ setIcon({
       refresh: '刷新',
       zoomIn: '全屏',
       zoomOut: '还原',
-      custom: '列设置',
+      custom: '个性化设置',
       customAll: '全部',
       customConfirm: '确认',
       customRestore: '重置',
@@ -35566,25 +35566,23 @@ const ImagePreview = VxeImagePreview;
     const computeCollapseOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       return Object.assign({}, getConfig().layoutAside.collapseConfig, props.collapseConfig);
     });
-    const computeWrapperWidth = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+    const computeVarStyle = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       const {
         width,
-        collapsed,
         collapseWidth
       } = props;
-      if (collapsed) {
-        if (collapseWidth) {
-          return toCssUnit(collapseWidth);
-        }
-      } else {
-        if (width) {
-          return toCssUnit(width);
-        }
+      const stys = {};
+      if (collapseWidth) {
+        stys['--vxe-ui-layout-aside-collapse-width'] = toCssUnit(collapseWidth);
       }
-      return '';
+      if (width) {
+        stys['--vxe-ui-layout-aside-default-width'] = toCssUnit(width);
+      }
+      return stys;
     });
     const computeMaps = {
-      computeSize
+      computeSize,
+      computeVarStyle
     };
     const $xeLayoutAside = {
       xID,
@@ -35606,12 +35604,11 @@ const ImagePreview = VxeImagePreview;
     Object.assign($xeLayoutAside, layoutAsideMethods, layoutAsidePrivateMethods);
     const renderVN = () => {
       const {
-        width,
         collapsed,
         loading,
         padding
       } = props;
-      const wrapperWidth = computeWrapperWidth.value;
+      const varStyle = computeVarStyle.value;
       const vSize = computeSize.value;
       const collapseOpts = computeCollapseOpts.value;
       const defaultSlot = slots.default;
@@ -35621,13 +35618,10 @@ const ImagePreview = VxeImagePreview;
           [`size--${vSize}`]: vSize,
           'is--animat': collapseOpts.animation !== false,
           'is--padding': padding,
-          'is--default-width': !width,
           'is--collapse': collapsed,
           'is--loading': loading
         }],
-        style: wrapperWidth ? {
-          width: wrapperWidth
-        } : null
+        style: varStyle
       }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-layout-aside--inner'
       }, defaultSlot ? defaultSlot({}) : []),
@@ -36210,6 +36204,10 @@ const {
 } = VxeUI;
 function menu_createInternalData() {
   return {
+    lastActiveTime: 0,
+    menuInitMaps: {},
+    menuCacheMaps: {},
+    menuKeyMaps: {},
     menuEffectMaps: {}
   };
 }
@@ -36230,10 +36228,19 @@ let nemuUniqueKey = 100000000;
   props: {
     modelValue: [String, Number],
     expandAll: Boolean,
+    expandKeys: Array,
     accordion: {
       type: Boolean,
       default: () => menu_getConfig().menu.accordion
     },
+    border: {
+      type: [Boolean, String],
+      default: () => menu_getConfig().menu.border
+    },
+    optionProps: {
+      type: Object,
+      default: () => menu_getConfig().menu.optionProps
+    },
     collapsed: {
       type: Boolean,
       default: null
@@ -36271,6 +36278,38 @@ let nemuUniqueKey = 100000000;
     const computeMenuOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       return Object.assign({}, menu_getConfig().menu.menuConfig, props.menuConfig);
     });
+    const computePropsOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      return Object.assign({}, menu_getConfig().menu.optionProps, props.optionProps);
+    });
+    const computeTitleField = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      const propsOpts = computePropsOpts.value;
+      return propsOpts.title || 'title';
+    });
+    const computeKeyField = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      const propsOpts = computePropsOpts.value;
+      return propsOpts.name || 'name';
+    });
+    const computeChildrenField = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      const propsOpts = computePropsOpts.value;
+      return propsOpts.children || 'children';
+    });
+    const computeLinkUrlField = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      const propsOpts = computePropsOpts.value;
+      return propsOpts.linkUrl || 'href';
+    });
+    const computeRouterLinkField = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      const propsOpts = computePropsOpts.value;
+      return propsOpts.routerLink || 'routerLink';
+    });
+    const computeCurrBorder = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      const {
+        border
+      } = props;
+      if (border) {
+        return border === true ? 'first-group' : border;
+      }
+      return '';
+    });
     const computeIsCollapsed = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       const {
         collapsed
@@ -36283,19 +36322,15 @@ let nemuUniqueKey = 100000000;
       }
       return false;
     });
-    const computeCollapseWidth = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
-      let collapseWidth = '';
-      if ($xeLayoutAside) {
-        collapseWidth = $xeLayoutAside.props.collapseWidth || '';
-      }
-      return collapseWidth;
-    });
-    const computeCollapseEnterWidth = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
-      let width = '';
+    const computeVarStyle = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       if ($xeLayoutAside) {
-        width = $xeLayoutAside.props.width || '';
+        const {
+          computeVarStyle: asideComputeVarStyle
+        } = $xeLayoutAside.getComputeMaps();
+        const asideVarStyle = asideComputeVarStyle.value;
+        return asideVarStyle;
       }
-      return width;
+      return {};
     });
     const computeMaps = {
       computeSize
@@ -36305,6 +36340,7 @@ let nemuUniqueKey = 100000000;
       props,
       context,
       reactData,
+      internalData,
       getRefMaps: () => refMaps,
       getComputeMaps: () => computeMaps
     };
@@ -36320,12 +36356,16 @@ let nemuUniqueKey = 100000000;
       const {
         activeName
       } = reactData;
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(reactData.menuList, (item, index, items, path, parent, nodes) => {
+      const {
+        menuInitMaps
+      } = internalData;
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(reactData.menuList, (item, index, items, path, parentItem, nodes) => {
         if (item.itemKey === activeName) {
           nodes.forEach(obj => {
             obj.isActive = true;
             if (isDefExpand) {
               obj.isExpand = true;
+              menuInitMaps[obj.itemId] = true;
             }
           });
           item.isExactActive = true;
@@ -36340,25 +36380,66 @@ let nemuUniqueKey = 100000000;
     const updateMenuConfig = () => {
       const {
         options,
-        expandAll
+        expandAll,
+        expandKeys
       } = props;
-      reactData.menuList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().mapTree(options, (item, index, items, path, parent) => {
+      const muInitMaps = {};
+      const titleField = computeTitleField.value;
+      const keyField = computeKeyField.value;
+      const childrenField = computeChildrenField.value;
+      const linkUrlField = computeLinkUrlField.value;
+      const routerLinkField = computeRouterLinkField.value;
+      const defaultExpandMaps = {};
+      if (expandKeys) {
+        expandKeys.forEach(key => {
+          defaultExpandMaps[key] = true;
+        });
+      }
+      const muCacheMaps = {};
+      const muKeyMaps = {};
+      reactData.menuList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().mapTree(options, (item, index, items, path, parentItem) => {
+        const itemId = ++nemuUniqueKey;
+        const itemKey = item[keyField] || path.join(',');
+        const childList = item[childrenField];
+        const hasChild = childList && childList.length > 0;
+        const isExpand = hasChild ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(item.expanded) ? item.expanded : defaultExpandMaps[itemKey] || !!expandAll : false;
+        if (isExpand) {
+          muInitMaps[itemId] = true;
+        }
         const objItem = {
-          ...item,
-          parentKey: parent ? parent.name || path.slice(0, path.length - 1).join(',') : '',
+          itemConf: item,
+          title: item[titleField],
+          name: item[keyField],
+          icon: item.icon,
+          linkUrl: item[linkUrlField],
+          linkTarget: item.linkTarget,
+          routerLink: item[routerLinkField],
+          permissionCode: item.permissionCode,
+          children: childList,
+          slots: item.slots,
+          parentKey: parentItem ? parentItem.name || path.slice(0, path.length - 1).join(',') : '',
           level: path.length,
-          itemId: ++nemuUniqueKey,
-          itemKey: item.name || path.join(','),
+          itemId,
+          itemKey,
           isExactActive: false,
           isActive: false,
-          isExpand: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(item.expanded) ? item.expanded : !!expandAll,
-          hasChild: item.children && item.children.length > 0
+          isExpand,
+          hasChild,
+          childList: []
         };
+        if (muKeyMaps[itemKey]) {
+          menu_errLog('vxe.error.repeatKey', [keyField, item[keyField]]);
+        }
+        muCacheMaps[itemId] = objItem;
+        muKeyMaps[itemKey] = objItem;
         return objItem;
       }, {
         children: 'children',
         mapChildren: 'childList'
       });
+      internalData.menuInitMaps = muInitMaps;
+      internalData.menuCacheMaps = muCacheMaps;
+      internalData.menuKeyMaps = muKeyMaps;
     };
     const updateCollapseStyle = () => {
       const {
@@ -36366,12 +36447,7 @@ let nemuUniqueKey = 100000000;
       } = props;
       if (collapseFixed) {
         (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
-          const {
-            isEnterCollapse
-          } = reactData;
           const isCollapsed = computeIsCollapsed.value;
-          const collapseEnterWidth = computeCollapseEnterWidth.value;
-          const collapseWidth = computeCollapseWidth.value;
           const el = refElem.value;
           if (el) {
             const clientRect = el.getBoundingClientRect();
@@ -36380,7 +36456,6 @@ let nemuUniqueKey = 100000000;
               top: toCssUnit(clientRect.top),
               left: toCssUnit(clientRect.left),
               height: toCssUnit(parentNode.clientHeight),
-              width: isEnterCollapse ? collapseEnterWidth ? toCssUnit(collapseEnterWidth) : '' : collapseWidth ? toCssUnit(collapseWidth) : '',
               zIndex: reactData.collapseZindex
             } : {};
           }
@@ -36399,12 +36474,6 @@ let nemuUniqueKey = 100000000;
         if (isCollapsed) {
           if (!initialized) {
             reactData.initialized = true;
-            (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
-              const collapseEl = refCollapseElem.value;
-              if (collapseEl) {
-                document.body.appendChild(collapseEl);
-              }
-            });
           }
         }
         reactData.isEnterCollapse = false;
@@ -36417,7 +36486,8 @@ let nemuUniqueKey = 100000000;
         accordion
       } = props;
       const {
-        menuEffectMaps
+        menuEffectMaps,
+        menuInitMaps
       } = internalData;
       const {
         itemId,
@@ -36440,6 +36510,7 @@ let nemuUniqueKey = 100000000;
           });
         }
         item.isExpand = expanded;
+        menuInitMaps[itemId] = true;
         const wrapperEl = isCollapsed ? refCollapseElem.value : refElem.value;
         if (wrapperEl) {
           const nemuEl = wrapperEl.querySelector(`.vxe-menu--item-wrapper[data-menu-id="${itemId}"]`);
@@ -36484,7 +36555,8 @@ let nemuUniqueKey = 100000000;
         if (!visibleMethod || visibleMethod({
           $menu: $xeMenu,
           options,
-          currentMenu: item
+          currentMenu: item,
+          currentOption: item.itemConf
         })) {
           if (VxeUI.contextMenu) {
             VxeUI.contextMenu.openByEvent(evnt, {
@@ -36499,6 +36571,7 @@ let nemuUniqueKey = 100000000;
                   const params = {
                     menu: option,
                     currentMenu: item,
+                    currentOption: item.itemConf,
                     $event: evnt,
                     $menu: $xeMenu
                   };
@@ -36519,22 +36592,27 @@ let nemuUniqueKey = 100000000;
     const handleClickMenu = (evnt, item, itemList) => {
       const {
         itemKey,
+        linkUrl,
         routerLink,
         hasChild
       } = item;
-      if (routerLink) {
+      if (linkUrl || routerLink) {
         emitModel(itemKey);
-        handleMenuMouseleave();
+        reactData.isEnterCollapse = false;
+        internalData.lastActiveTime = Date.now();
       } else {
         if (hasChild) {
           handleClickIconCollapse(evnt, item, itemList);
         } else {
           emitModel(itemKey);
-          handleMenuMouseleave();
+          reactData.isEnterCollapse = false;
+          internalData.lastActiveTime = Date.now();
         }
       }
       const params = {
         currentMenu: item,
+        currentOption: item.itemConf,
+        option: item.itemConf,
         // 已废弃
         menu: item
       };
@@ -36542,30 +36620,13 @@ let nemuUniqueKey = 100000000;
     };
     const handleMenuMouseenter = () => {
       const {
-        collapseStyle
-      } = reactData;
-      const collapseEnterWidth = computeCollapseEnterWidth.value;
-      reactData.collapseStyle = Object.assign({}, collapseStyle, {
-        width: collapseEnterWidth ? toCssUnit(collapseEnterWidth) : ''
-      });
-      reactData.isEnterCollapse = true;
-    };
-    const handleMenuMouseover = () => {
-      const {
-        isEnterCollapse
-      } = reactData;
-      if (!isEnterCollapse) {
-        handleMenuMouseenter();
+        lastActiveTime
+      } = internalData;
+      if (lastActiveTime < Date.now() - 500) {
+        reactData.isEnterCollapse = true;
       }
     };
     const handleMenuMouseleave = () => {
-      const {
-        collapseStyle
-      } = reactData;
-      const el = refElem.value;
-      reactData.collapseStyle = Object.assign({}, collapseStyle, {
-        width: el ? toCssUnit(el.offsetWidth) : ''
-      });
       reactData.isEnterCollapse = false;
     };
     const callSlot = (slotFunc, params) => {
@@ -36584,8 +36645,84 @@ let nemuUniqueKey = 100000000;
         $menu: $xeMenu
       }, params));
     };
+    const handleScrollToView = itemId => {
+      const wrapperEl = refElem.value;
+      const nemuEl = wrapperEl ? wrapperEl.querySelector(`.vxe-menu--item-wrapper[data-menu-id="${itemId}"]`) : null;
+      if (nemuEl) {
+        scrollToView(nemuEl);
+        return true;
+      }
+      return false;
+    };
     const menuMethods = {
-      dispatchEvent
+      dispatchEvent,
+      setExpandByMenuKey(menuKeys, expanded) {
+        const {
+          menuKeyMaps,
+          menuInitMaps
+        } = internalData;
+        if (menuKeys) {
+          if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(menuKeys)) {
+            menuKeys = [menuKeys];
+          }
+          menuKeys.forEach(mKey => {
+            const menuItem = menuKeyMaps[mKey];
+            if (menuItem) {
+              if (expanded) {
+                menuInitMaps[menuItem.itemId] = true;
+              }
+              menuItem.isExpand = !!expanded;
+            }
+          });
+        }
+        return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+      },
+      clearAllExpandMenu() {
+        const {
+          menuList
+        } = reactData;
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(menuList, item => {
+          item.isExpand = false;
+        }, {
+          children: 'childList'
+        });
+        internalData.menuInitMaps = {};
+        return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+      },
+      scrollToMenuKey(menuKey) {
+        const {
+          menuKeyMaps
+        } = internalData;
+        const menuItem = menuKeyMaps[menuKey];
+        if (!menuItem) {
+          return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+        }
+        const {
+          itemId
+        } = menuItem;
+        if (handleScrollToView(itemId)) {
+          return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+        }
+        return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
+          handleScrollToView(itemId);
+        });
+      },
+      scrollToActiveMenu() {
+        const {
+          activeName
+        } = reactData;
+        if (activeName) {
+          return $xeMenu.scrollToMenuKey(activeName);
+        }
+        return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
+          const {
+            activeName
+          } = reactData;
+          if (activeName) {
+            return $xeMenu.scrollToMenuKey(activeName);
+          }
+        });
+      }
     };
     const menuPrivateMethods = {};
     Object.assign($xeMenu, menuMethods, menuPrivateMethods);
@@ -36603,9 +36740,9 @@ let nemuUniqueKey = 100000000;
       const isCollapsed = computeIsCollapsed.value;
       const params = {
         currentMenu: item,
-        collapsed: isCollapsed,
-        // 已废弃
-        option: item
+        currentOption: item.itemConf,
+        option: item.itemConf,
+        collapsed: isCollapsed
       };
       return [optionSlot ? renderEmptyElement($xeMenu) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-menu--item-link-icon'
@@ -36634,48 +36771,59 @@ let nemuUniqueKey = 100000000;
         isActive,
         isExactActive,
         isExpand,
+        linkUrl,
         routerLink,
+        linkTarget,
         childList
       } = item;
       const {
         isEnterCollapse
       } = reactData;
+      const {
+        menuInitMaps
+      } = internalData;
       const isCollapsed = computeIsCollapsed.value;
       if (item.permissionCode) {
         if (!permission.checkVisible(item.permissionCode)) {
           return renderEmptyElement($xeMenu);
         }
       }
+      const isExpandChild = (!isCollapsed || isEnterCollapse) && isExpand;
+      const linkOns = {
+        onContextmenu(evnt) {
+          handleContextmenuEvent(evnt, item);
+        },
+        onClick(evnt) {
+          handleClickMenu(evnt, item, itemList);
+        }
+      };
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         key: itemKey,
         class: ['vxe-menu--item-wrapper', `vxe-menu--item-level${level}`, {
+          'has--child': hasChild,
           'is--exact-active': isExactActive,
           'is--active': isActive,
-          'is--expand': (!isCollapsed || isEnterCollapse) && isExpand
+          'is--expand': isExpandChild
         }],
         'data-menu-id': itemId
-      }, [routerLink ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)('router-link'), {
-        class: 'vxe-menu--item-link',
+      }, [linkUrl ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('a', {
+        class: 'vxe-menu--item-link is--link',
+        href: linkUrl,
+        target: linkTarget,
+        ...linkOns
+      }, renderMenuTitle(item, itemList)) : routerLink ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)('router-link'), {
+        class: 'vxe-menu--item-link is--router',
         to: routerLink,
-        onContextmenu(evnt) {
-          handleContextmenuEvent(evnt, item);
-        },
-        onClick(evnt) {
-          handleClickMenu(evnt, item, itemList);
-        }
+        target: linkTarget,
+        ...linkOns
       }, {
         default: () => renderMenuTitle(item, itemList)
       }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
-        class: 'vxe-menu--item-link',
-        onContextmenu(evnt) {
-          handleContextmenuEvent(evnt, item);
-        },
-        onClick(evnt) {
-          handleClickMenu(evnt, item, itemList);
-        }
+        class: 'vxe-menu--item-link is--default',
+        ...linkOns
       }, renderMenuTitle(item, itemList)), hasChild ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-menu--item-group'
-      }, childList.map(child => renderDefaultChildren(child, childList))) : renderEmptyElement($xeMenu)]);
+      }, isExpandChild || menuInitMaps[itemId] ? childList.map(child => renderDefaultChildren(child, childList)) : []) : renderEmptyElement($xeMenu)]);
     };
     const renderCollapseChildren = (item, itemList) => {
       const {
@@ -36686,6 +36834,8 @@ let nemuUniqueKey = 100000000;
         isActive,
         isExactActive,
         routerLink,
+        linkUrl,
+        linkTarget,
         childList
       } = item;
       if (item.permissionCode) {
@@ -36693,32 +36843,37 @@ let nemuUniqueKey = 100000000;
           return renderEmptyElement($xeMenu);
         }
       }
+      const linkOns = {
+        onContextmenu(evnt) {
+          handleContextmenuEvent(evnt, item);
+        },
+        onClick(evnt) {
+          handleClickMenu(evnt, item, itemList);
+        }
+      };
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         key: itemKey,
         class: ['vxe-menu--item-wrapper', `vxe-menu--item-level${level}`, {
+          'has--child': hasChild,
           'is--exact-active': isExactActive,
           'is--active': isActive
         }],
         'data-menu-id': itemId
-      }, [routerLink ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)('router-link'), {
-        class: 'vxe-menu--item-link',
+      }, [linkUrl ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('a', {
+        class: 'vxe-menu--item-link is--link',
+        href: linkUrl,
+        target: linkTarget,
+        ...linkOns
+      }, renderMenuTitle(item, itemList)) : routerLink ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)('router-link'), {
+        class: 'vxe-menu--item-link is--router',
         to: routerLink,
-        onContextmenu(evnt) {
-          handleContextmenuEvent(evnt, item);
-        },
-        onClick(evnt) {
-          handleClickMenu(evnt, item, itemList);
-        }
+        target: linkTarget,
+        ...linkOns
       }, {
         default: () => renderMenuTitle(item, itemList)
       }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
-        class: 'vxe-menu--item-link',
-        onContextmenu(evnt) {
-          handleContextmenuEvent(evnt, item);
-        },
-        onClick(evnt) {
-          handleClickMenu(evnt, item, itemList);
-        }
+        class: 'vxe-menu--item-link is--default',
+        ...linkOns
       }, renderMenuTitle(item, itemList)), hasChild ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-menu--item-group'
       }, childList.map(child => renderDefaultChildren(child, childList))) : renderEmptyElement($xeMenu)]);
@@ -36736,24 +36891,38 @@ let nemuUniqueKey = 100000000;
       } = reactData;
       const vSize = computeSize.value;
       const isCollapsed = computeIsCollapsed.value;
+      const currBorder = computeCurrBorder.value;
+      const varStyle = computeVarStyle.value;
+      const headerSlot = slots.header;
+      const footerSlot = slots.footer;
       let ons = {};
       if (collapseFixed) {
         ons = {
           onMouseenter: handleMenuMouseenter,
-          onMouseover: handleMenuMouseover,
           onMouseleave: handleMenuMouseleave
         };
       }
+      const stParams = {
+        collapsed: isCollapsed
+      };
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         ref: refElem,
         class: ['vxe-menu', {
+          [`border--${currBorder}`]: currBorder,
           [`size--${vSize}`]: vSize,
           'is--collapsed': isCollapsed,
           'is--loading': loading
         }]
+      }, [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)('div', {
+        class: 'vxe-menu--body'
+      }, menuList.map(child => isCollapsed ? renderCollapseChildren(child, menuList) : renderDefaultChildren(child, menuList))), footerSlot ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+        class: 'vxe-menu--footer'
+      }, footerSlot(stParams)) : renderEmptyElement($xeMenu), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(external_commonjs_vue_commonjs2_vue_root_Vue_.Teleport, {
+        to: 'body',
+        disabled: !initialized
       }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
-        class: 'vxe-menu--item-list'
-      }, menuList.map(child => isCollapsed ? renderCollapseChildren(child, menuList) : renderDefaultChildren(child, menuList))), initialized ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         ref: refCollapseElem,
         class: ['vxe-menu--collapse-wrapper', {
           [`size--${vSize}`]: vSize,
@@ -36761,11 +36930,15 @@ let nemuUniqueKey = 100000000;
           'is--enter': isEnterCollapse,
           'is--loading': loading
         }],
-        style: collapseStyle,
+        style: Object.assign({}, varStyle, collapseStyle),
         ...ons
-      }, [isCollapsed ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
-        class: 'vxe-menu--item-list'
-      }, menuList.map(child => renderDefaultChildren(child, menuList))) : renderEmptyElement($xeMenu)]) : renderEmptyElement($xeMenu),
+      }, 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)('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)] : [])]),
       /**
        * 加载中
        */
@@ -36806,13 +36979,6 @@ let nemuUniqueKey = 100000000;
       updateCollapseStyle();
     });
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onBeforeUnmount)(() => {
-      const collapseEl = refCollapseElem.value;
-      if (collapseEl) {
-        const parentNode = collapseEl.parentNode;
-        if (parentNode) {
-          parentNode.removeChild(collapseEl);
-        }
-      }
       globalEvents.off($xeMenu, 'resize');
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().assign(reactData, menu_createReactData());
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().assign(internalData, menu_createInternalData());
@@ -37188,12 +37354,12 @@ const lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
         let posTop = '';
         let posLeft = '';
         if (left && !leftCenter) {
-          posLeft = isNaN(left) ? left : `${left}px`;
+          posLeft = toCssUnit(left);
         } else {
           posLeft = `${Math.max(marginSize, clientVisibleWidth / 2 - boxElem.offsetWidth / 2)}px`;
         }
         if (top && !topCenter) {
-          posTop = isNaN(top) ? top : `${top}px`;
+          posTop = toCssUnit(top);
         } else {
           posTop = `${Math.max(marginSize, clientVisibleHeight / 2 - boxElem.offsetHeight / 2)}px`;
         }
@@ -53952,7 +54118,7 @@ function tree_select_createInternalData() {
       });
     });
     const computePropsOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
-      return props.optionProps || {};
+      return Object.assign({}, getConfig().treeSelect.optionProps, props.optionProps);
     });
     const computeNodeKeyField = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       const treeOpts = computeTreeOpts.value;