vxe-pc-ui 3.16.10 → 3.16.11

package/lib/index.umd.js

@@ -11680,7 +11680,7 @@ var es_regexp_exec = __webpack_require__(7495);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.match.js
 var es_string_match = __webpack_require__(1761);
 ;// ./node_modules/@vxe-ui/core/es/src/core.js
-var coreVersion = "3.4.17";
+var coreVersion = "3.4.18";
 var VxeCore = {
   coreVersion: coreVersion,
   uiVersion: '',
@@ -12440,7 +12440,7 @@ function createLog(type, name) {
     return msg;
   };
 }
-var version = "3.4.17";
+var version = "3.4.18";
 var log = {
   create: createLog,
   warn: createLog('warn', "v".concat(version)),
@@ -13256,7 +13256,7 @@ var es_array_join = __webpack_require__(8598);
 
 
 var log_log = VxeUI.log;
-var uiVersion = "ui v".concat("3.16.10");
+var uiVersion = "ui v".concat("3.16.11");
 function createComponentLog(name) {
   var tableVersion = VxeUI.tableVersion ? "table v".concat(VxeUI.tableVersion) : '';
   var ganttVersion = VxeUI.ganttVersion ? "gantt v".concat(VxeUI.ganttVersion) : '';
@@ -13274,7 +13274,7 @@ var errLog = log_log.create('error', uiVersion);
 
 
 
-var ui_version = "3.16.10";
+var ui_version = "3.16.11";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -14047,7 +14047,7 @@ setIcon({
       expError: '导出失败',
       expFilename: '导出_{0}',
       expOriginFilename: '导出_源_{0}',
-      customTitle: '列设置',
+      customTitle: '个性化设置',
       customAll: '全部',
       customConfirm: '确认',
       customClose: '关闭',
@@ -14131,7 +14131,7 @@ setIcon({
       search: '搜索'
     },
     custom: {
-      cstmTitle: '列设置',
+      cstmTitle: '个性化设置',
       cstmRestore: '恢复默认',
       cstmCancel: '取消',
       cstmConfirm: '确定',
@@ -14257,7 +14257,7 @@ setIcon({
       refresh: '刷新',
       zoomIn: '全屏',
       zoomOut: '还原',
-      custom: '列设置',
+      custom: '个性化设置',
       customAll: '全部',
       customConfirm: '确认',
       customRestore: '重置',
@@ -46626,22 +46626,19 @@ var ImagePreview = VxeImagePreview;
       var props = $xeLayoutAside;
       return Object.assign({}, getConfig().layoutAside.collapseConfig, props.collapseConfig);
     },
-    computeWrapperWidth: function computeWrapperWidth() {
+    computeVarStyle: function computeVarStyle() {
       var $xeLayoutAside = this;
       var props = $xeLayoutAside;
       var width = props.width,
-        collapsed = props.collapsed,
         collapseWidth = props.collapseWidth;
-      if (collapsed) {
-        if (collapseWidth) {
-          return toCssUnit(collapseWidth);
-        }
-      } else {
-        if (width) {
-          return toCssUnit(width);
-        }
+      var 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;
     }
   }),
   methods: {
@@ -46661,19 +46658,16 @@ var ImagePreview = VxeImagePreview;
       var $xeLayoutAside = this;
       var props = $xeLayoutAside;
       var slots = $xeLayoutAside.$scopedSlots;
-      var width = props.width,
-        collapsed = props.collapsed,
+      var collapsed = props.collapsed,
         loading = props.loading,
         padding = props.padding;
-      var wrapperWidth = $xeLayoutAside.computeWrapperWidth;
+      var varStyle = $xeLayoutAside.computeVarStyle;
       var vSize = $xeLayoutAside.computeSize;
       var collapseOpts = $xeLayoutAside.computeCollapseOpts;
       var defaultSlot = slots.default;
       return h('aside', {
-        class: ['vxe-layout-aside', _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--animat', collapseOpts.animation !== false), 'is--padding', padding), 'is--default-width', !width), 'is--collapse', collapsed), 'is--loading', loading)],
-        style: wrapperWidth ? {
-          width: wrapperWidth
-        } : {}
+        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('div', {
         class: 'vxe-layout-aside--inner'
       }, defaultSlot ? defaultSlot({}) : []),
@@ -47232,6 +47226,10 @@ var menu_menus = VxeUI.menus,
   menu_getIcon = VxeUI.getIcon;
 function menu_createInternalData() {
   return {
+    lastActiveTime: 0,
+    menuInitMaps: {},
+    menuCacheMaps: {},
+    menuKeyMaps: {},
     menuEffectMaps: {}
   };
 }
@@ -47253,12 +47251,25 @@ var nemuUniqueKey = 100000000;
   props: {
     value: [String, Number],
     expandAll: Boolean,
+    expandKeys: Array,
     accordion: {
       type: Boolean,
       default: function _default() {
         return menu_getConfig().menu.accordion;
       }
     },
+    border: {
+      type: [Boolean, String],
+      default: function _default() {
+        return menu_getConfig().menu.border;
+      }
+    },
+    optionProps: {
+      type: Object,
+      default: function _default() {
+        return menu_getConfig().menu.optionProps;
+      }
+    },
     collapsed: {
       type: Boolean,
       default: null
@@ -47292,6 +47303,45 @@ var nemuUniqueKey = 100000000;
     });
   },
   computed: _objectSpread2(_objectSpread2({}, {}), {}, {
+    computePropsOpts: function computePropsOpts() {
+      var $xeMenu = this;
+      var props = $xeMenu;
+      return Object.assign({}, menu_getConfig().menu.optionProps, props.optionProps);
+    },
+    computeTitleField: function computeTitleField() {
+      var $xeMenu = this;
+      var propsOpts = $xeMenu.computePropsOpts;
+      return propsOpts.title || 'title';
+    },
+    computeKeyField: function computeKeyField() {
+      var $xeMenu = this;
+      var propsOpts = $xeMenu.computePropsOpts;
+      return propsOpts.name || 'name';
+    },
+    computeChildrenField: function computeChildrenField() {
+      var $xeMenu = this;
+      var propsOpts = $xeMenu.computePropsOpts;
+      return propsOpts.children || 'children';
+    },
+    computeLinkUrlField: function computeLinkUrlField() {
+      var $xeMenu = this;
+      var propsOpts = $xeMenu.computePropsOpts;
+      return propsOpts.linkUrl || 'href';
+    },
+    computeRouterLinkField: function computeRouterLinkField() {
+      var $xeMenu = this;
+      var propsOpts = $xeMenu.computePropsOpts;
+      return propsOpts.routerLink || 'routerLink';
+    },
+    computeCurrBorder: function computeCurrBorder() {
+      var $xeMenu = this;
+      var props = $xeMenu;
+      var border = props.border;
+      if (border) {
+        return border === true ? 'first-group' : border;
+      }
+      return '';
+    },
     computeMenuOpts: function computeMenuOpts() {
       var $xeMenu = this;
       var props = $xeMenu;
@@ -47309,14 +47359,14 @@ var nemuUniqueKey = 100000000;
       }
       return false;
     },
-    computeCollapseWidth: function computeCollapseWidth() {
+    computeVarStyle: function computeVarStyle() {
       var $xeMenu = this;
       var $xeLayoutAside = $xeMenu.$xeLayoutAside;
-      var collapseWidth = '';
       if ($xeLayoutAside) {
-        collapseWidth = $xeLayoutAside.collapseWidth || '';
+        var asideVarStyle = $xeLayoutAside.computeVarStyle;
+        return asideVarStyle;
       }
-      return collapseWidth;
+      return {};
     },
     computeCollapseEnterWidth: function computeCollapseEnterWidth() {
       var $xeMenu = this;
@@ -47363,6 +47413,80 @@ var nemuUniqueKey = 100000000;
       }
       return [];
     },
+    setExpandByMenuKey: function setExpandByMenuKey(menuKeys, expanded) {
+      var $xeMenu = this;
+      var internalData = $xeMenu.internalData;
+      var menuKeyMaps = internalData.menuKeyMaps,
+        menuInitMaps = internalData.menuInitMaps;
+      if (menuKeys) {
+        if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(menuKeys)) {
+          menuKeys = [menuKeys];
+        }
+        menuKeys.forEach(function (mKey) {
+          var menuItem = menuKeyMaps[mKey];
+          if (menuItem) {
+            if (expanded) {
+              menuInitMaps[menuItem.itemId] = true;
+            }
+            menuItem.isExpand = !!expanded;
+          }
+        });
+      }
+      return $xeMenu.$nextTick();
+    },
+    clearAllExpandMenu: function clearAllExpandMenu() {
+      var $xeMenu = this;
+      var reactData = $xeMenu.reactData;
+      var internalData = $xeMenu.internalData;
+      var menuList = reactData.menuList;
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(menuList, function (item) {
+        item.isExpand = false;
+      }, {
+        children: 'childList'
+      });
+      internalData.menuInitMaps = {};
+      return $xeMenu.$nextTick();
+    },
+    handleScrollToView: function handleScrollToView(itemId) {
+      var $xeMenu = this;
+      var el = $xeMenu.$refs.refElem;
+      var nemuEl = el ? el.querySelector(".vxe-menu--item-wrapper[data-menu-id=\"".concat(itemId, "\"]")) : null;
+      if (nemuEl) {
+        scrollToView(nemuEl);
+        return true;
+      }
+      return false;
+    },
+    scrollToMenuKey: function scrollToMenuKey(menuKey) {
+      var $xeMenu = this;
+      var internalData = $xeMenu.internalData;
+      var menuKeyMaps = internalData.menuKeyMaps;
+      var menuItem = menuKeyMaps[menuKey];
+      if (!menuItem) {
+        return $xeMenu.$nextTick();
+      }
+      var itemId = menuItem.itemId;
+      if ($xeMenu.handleScrollToView(itemId)) {
+        return $xeMenu.$nextTick();
+      }
+      return $xeMenu.$nextTick().then(function () {
+        $xeMenu.handleScrollToView(itemId);
+      });
+    },
+    scrollToActiveMenu: function scrollToActiveMenu() {
+      var $xeMenu = this;
+      var reactData = $xeMenu.reactData;
+      var activeName = reactData.activeName;
+      if (activeName) {
+        return $xeMenu.scrollToMenuKey(activeName);
+      }
+      return $xeMenu.$nextTick().then(function () {
+        var activeName = reactData.activeName;
+        if (activeName) {
+          return $xeMenu.scrollToMenuKey(activeName);
+        }
+      });
+    },
     getMenuTitle: function getMenuTitle(item) {
       return "".concat(item.title || item.name);
     },
@@ -47376,13 +47500,16 @@ var nemuUniqueKey = 100000000;
     updateActiveMenu: function updateActiveMenu(isDefExpand) {
       var $xeMenu = this;
       var reactData = $xeMenu.reactData;
+      var internalData = $xeMenu.internalData;
       var activeName = reactData.activeName;
+      var menuInitMaps = internalData.menuInitMaps;
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(reactData.menuList, function (item, index, items, path, parent, nodes) {
         if (item.itemKey === activeName) {
           nodes.forEach(function (obj) {
             obj.isActive = true;
             if (isDefExpand) {
               obj.isExpand = true;
+              menuInitMaps[obj.itemId] = true;
             }
           });
           item.isExactActive = true;
@@ -47398,24 +47525,67 @@ var nemuUniqueKey = 100000000;
       var $xeMenu = this;
       var props = $xeMenu;
       var reactData = $xeMenu.reactData;
+      var internalData = $xeMenu.internalData;
       var options = props.options,
-        expandAll = props.expandAll;
-      reactData.menuList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().mapTree(options, function (item, index, items, path, parent) {
-        var objItem = _objectSpread2(_objectSpread2({}, item), {}, {
-          parentKey: parent ? parent.name || path.slice(0, path.length - 1).join(',') : '',
+        expandAll = props.expandAll,
+        expandKeys = props.expandKeys;
+      var muInitMaps = {};
+      var titleField = $xeMenu.computeTitleField;
+      var keyField = $xeMenu.computeKeyField;
+      var childrenField = $xeMenu.computeChildrenField;
+      var linkUrlField = $xeMenu.computeLinkUrlField;
+      var routerLinkField = $xeMenu.computeRouterLinkField;
+      var defaultExpandMaps = {};
+      if (expandKeys) {
+        expandKeys.forEach(function (key) {
+          defaultExpandMaps[key] = true;
+        });
+      }
+      var muCacheMaps = {};
+      var muKeyMaps = {};
+      reactData.menuList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().mapTree(options, function (item, index, items, path, parentItem) {
+        var itemId = ++nemuUniqueKey;
+        var itemKey = item[keyField] || path.join(',');
+        var childList = item[childrenField];
+        var hasChild = childList && childList.length > 0;
+        var 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;
+        }
+        var objItem = {
+          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: itemId,
+          itemKey: 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: isExpand,
+          hasChild: 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;
     },
     updateCollapseStyle: function updateCollapseStyle() {
       var $xeMenu = this;
@@ -47424,10 +47594,7 @@ var nemuUniqueKey = 100000000;
       var collapseFixed = props.collapseFixed;
       if (collapseFixed) {
         $xeMenu.$nextTick(function () {
-          var isEnterCollapse = reactData.isEnterCollapse;
           var isCollapsed = $xeMenu.computeIsCollapsed;
-          var collapseEnterWidth = $xeMenu.computeCollapseEnterWidth;
-          var collapseWidth = $xeMenu.computeCollapseWidth;
           var el = $xeMenu.$refs.refElem;
           if (el) {
             var clientRect = el.getBoundingClientRect();
@@ -47436,7 +47603,6 @@ var 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
             } : {};
           }
@@ -47472,7 +47638,8 @@ var nemuUniqueKey = 100000000;
       var props = $xeMenu;
       var internalData = $xeMenu.internalData;
       var accordion = props.accordion;
-      var menuEffectMaps = internalData.menuEffectMaps;
+      var menuEffectMaps = internalData.menuEffectMaps,
+        menuInitMaps = internalData.menuInitMaps;
       var itemId = item.itemId,
         hasChild = item.hasChild,
         isExpand = item.isExpand;
@@ -47492,6 +47659,7 @@ var nemuUniqueKey = 100000000;
           });
         }
         item.isExpand = expanded;
+        menuInitMaps[itemId] = true;
         var wrapperEl = isCollapsed ? $xeMenu.$refs.refCollapseElem : $xeMenu.$refs.refElem;
         if (wrapperEl) {
           var nemuEl = wrapperEl.querySelector(".vxe-menu--item-wrapper[data-menu-id=\"".concat(itemId, "\"]"));
@@ -47530,7 +47698,8 @@ var nemuUniqueKey = 100000000;
         if (!visibleMethod || visibleMethod({
           $menu: $xeMenu,
           options: options,
-          currentMenu: item
+          currentMenu: item,
+          currentOption: item.itemConf
         })) {
           if (VxeUI.contextMenu) {
             VxeUI.contextMenu.openByEvent(evnt, {
@@ -47543,6 +47712,7 @@ var nemuUniqueKey = 100000000;
                   var params = {
                     menu: option,
                     currentMenu: item,
+                    currentOption: item.itemConf,
                     $event: evnt,
                     $menu: $xeMenu
                   };
@@ -47562,20 +47732,29 @@ var nemuUniqueKey = 100000000;
     },
     handleClickMenu: function handleClickMenu(evnt, item, itemList) {
       var $xeMenu = this;
+      var reactData = $xeMenu.reactData;
+      var internalData = $xeMenu.internalData;
       var itemKey = item.itemKey,
+        linkUrl = item.linkUrl,
         routerLink = item.routerLink,
         hasChild = item.hasChild;
-      if (routerLink) {
+      if (linkUrl || routerLink) {
         $xeMenu.emitModel(itemKey);
+        reactData.isEnterCollapse = false;
+        internalData.lastActiveTime = Date.now();
       } else {
         if (hasChild) {
           $xeMenu.handleClickIconCollapse(evnt, item, itemList);
         } else {
           $xeMenu.emitModel(itemKey);
+          reactData.isEnterCollapse = false;
+          internalData.lastActiveTime = Date.now();
         }
       }
       var params = {
         currentMenu: item,
+        currentOption: item.itemConf,
+        option: item.itemConf,
         // 已废弃
         menu: item
       };
@@ -47584,29 +47763,15 @@ var nemuUniqueKey = 100000000;
     handleMenuMouseenter: function handleMenuMouseenter() {
       var $xeMenu = this;
       var reactData = $xeMenu.reactData;
-      var collapseStyle = reactData.collapseStyle;
-      var collapseEnterWidth = $xeMenu.computeCollapseEnterWidth;
-      reactData.collapseStyle = Object.assign({}, collapseStyle, {
-        width: collapseEnterWidth ? toCssUnit(collapseEnterWidth) : ''
-      });
-      reactData.isEnterCollapse = true;
-    },
-    handleMenuMouseover: function handleMenuMouseover() {
-      var $xeMenu = this;
-      var reactData = $xeMenu.reactData;
-      var isEnterCollapse = reactData.isEnterCollapse;
-      if (!isEnterCollapse) {
-        $xeMenu.handleMenuMouseenter();
+      var internalData = $xeMenu.internalData;
+      var lastActiveTime = internalData.lastActiveTime;
+      if (lastActiveTime < Date.now() - 500) {
+        reactData.isEnterCollapse = true;
       }
     },
     handleMenuMouseleave: function handleMenuMouseleave() {
       var $xeMenu = this;
       var reactData = $xeMenu.reactData;
-      var collapseStyle = reactData.collapseStyle;
-      var el = $xeMenu.$refs.refElem;
-      reactData.collapseStyle = Object.assign({}, collapseStyle, {
-        width: el ? toCssUnit(el.offsetWidth) : ''
-      });
       reactData.isEnterCollapse = false;
     },
     //
@@ -47627,9 +47792,9 @@ var nemuUniqueKey = 100000000;
       var isCollapsed = $xeMenu.computeIsCollapsed;
       var params = {
         currentMenu: item,
-        collapsed: isCollapsed,
-        // 已废弃
-        option: item
+        currentOption: item.itemConf,
+        option: item.itemConf,
+        collapsed: isCollapsed
       };
       return [optionSlot ? renderEmptyElement($xeMenu) : h('div', {
         class: 'vxe-menu--item-link-icon'
@@ -47656,6 +47821,7 @@ var nemuUniqueKey = 100000000;
     renderDefaultChildren: function renderDefaultChildren(h, item, itemList) {
       var $xeMenu = this;
       var reactData = $xeMenu.reactData;
+      var internalData = $xeMenu.internalData;
       var itemId = item.itemId,
         itemKey = item.itemKey,
         level = item.level,
@@ -47663,54 +47829,61 @@ var nemuUniqueKey = 100000000;
         isActive = item.isActive,
         isExactActive = item.isExactActive,
         isExpand = item.isExpand,
+        linkUrl = item.linkUrl,
         routerLink = item.routerLink,
+        linkTarget = item.linkTarget,
         childList = item.childList;
       var isEnterCollapse = reactData.isEnterCollapse;
+      var menuInitMaps = internalData.menuInitMaps;
       var isCollapsed = $xeMenu.computeIsCollapsed;
       if (item.permissionCode) {
         if (!permission.checkVisible(item.permissionCode)) {
           return renderEmptyElement($xeMenu);
         }
       }
+      var isExpandChild = (!isCollapsed || isEnterCollapse) && isExpand;
+      var linkOns = {
+        contextmenu: function contextmenu(evnt) {
+          $xeMenu.handleContextmenuEvent(evnt, item);
+        },
+        click: function click(evnt) {
+          $xeMenu.handleClickMenu(evnt, item, itemList);
+        }
+      };
       return h('div', {
         key: itemKey,
         class: ['vxe-menu--item-wrapper', "vxe-menu--item-level".concat(level), {
+          'has--child': hasChild,
           'is--exact-active': isExactActive,
           'is--active': isActive,
-          'is--expand': (!isCollapsed || isEnterCollapse) && isExpand
+          'is--expand': isExpandChild
         }],
         attrs: {
           'data-menu-id': itemId
         }
-      }, [routerLink ? h('router-link', {
-        class: 'vxe-menu--item-link',
+      }, [linkUrl ? h('a', {
+        class: 'vxe-menu--item-link is--link',
+        attrs: {
+          href: linkUrl,
+          target: linkTarget
+        },
+        on: linkOns
+      }, $xeMenu.renderMenuTitle(h, item, itemList)) : routerLink ? h('router-link', {
+        class: 'vxe-menu--item-link is--router',
         props: {
           custom: true,
-          to: routerLink
+          to: routerLink,
+          target: linkTarget
         },
-        on: {
-          contextmenu: function contextmenu(evnt) {
-            $xeMenu.handleContextmenuEvent(evnt, item);
-          },
-          click: function click(evnt) {
-            $xeMenu.handleClickMenu(evnt, item, itemList);
-          }
-        }
+        on: linkOns
       }, $xeMenu.renderMenuTitle(h, item, itemList)) : h('div', {
-        class: 'vxe-menu--item-link',
-        on: {
-          contextmenu: function contextmenu(evnt) {
-            $xeMenu.handleContextmenuEvent(evnt, item);
-          },
-          click: function click(evnt) {
-            $xeMenu.handleClickMenu(evnt, item, itemList);
-          }
-        }
+        class: 'vxe-menu--item-link is--default',
+        on: linkOns
       }, $xeMenu.renderMenuTitle(h, item, itemList)), hasChild ? h('div', {
         class: 'vxe-menu--item-group'
-      }, childList.map(function (child) {
+      }, isExpandChild || menuInitMaps[itemId] ? childList.map(function (child) {
         return $xeMenu.renderDefaultChildren(h, child, childList);
-      })) : renderEmptyElement($xeMenu)]);
+      }) : []) : renderEmptyElement($xeMenu)]);
     },
     renderCollapseChildren: function renderCollapseChildren(h, item, itemList) {
       var $xeMenu = this;
@@ -47721,45 +47894,50 @@ var nemuUniqueKey = 100000000;
         isActive = item.isActive,
         isExactActive = item.isExactActive,
         routerLink = item.routerLink,
+        linkUrl = item.linkUrl,
+        linkTarget = item.linkTarget,
         childList = item.childList;
       if (item.permissionCode) {
         if (!permission.checkVisible(item.permissionCode)) {
           return renderEmptyElement($xeMenu);
         }
       }
+      var linkOns = {
+        contextmenu: function contextmenu(evnt) {
+          $xeMenu.handleContextmenuEvent(evnt, item);
+        },
+        click: function click(evnt) {
+          $xeMenu.handleClickMenu(evnt, item, itemList);
+        }
+      };
       return h('div', {
         key: itemKey,
         class: ['vxe-menu--item-wrapper', "vxe-menu--item-level".concat(level), {
+          'has--child': hasChild,
           'is--exact-active': isExactActive,
           'is--active': isActive
         }],
         attrs: {
           'data-menu-id': itemId
         }
-      }, [routerLink ? h('router-link', {
-        class: 'vxe-menu--item-link',
+      }, [linkUrl ? h('a', {
+        class: 'vxe-menu--item-link is--link',
+        attrs: {
+          href: linkUrl,
+          target: linkTarget
+        },
+        on: linkOns
+      }, $xeMenu.renderMenuTitle(h, item, itemList)) : routerLink ? h('router-link', {
+        class: 'vxe-menu--item-link is--router',
         props: {
           custom: true,
-          to: routerLink
+          to: routerLink,
+          target: linkTarget
         },
-        on: {
-          contextmenu: function contextmenu(evnt) {
-            $xeMenu.handleContextmenuEvent(evnt, item);
-          },
-          click: function click(evnt) {
-            $xeMenu.handleClickMenu(evnt, item, itemList);
-          }
-        }
+        on: linkOns
       }, $xeMenu.renderMenuTitle(h, item, itemList)) : h('div', {
-        class: 'vxe-menu--item-link',
-        on: {
-          contextmenu: function contextmenu(evnt) {
-            $xeMenu.handleContextmenuEvent(evnt, item);
-          },
-          click: function click(evnt) {
-            $xeMenu.handleClickMenu(evnt, item, itemList);
-          }
-        }
+        class: 'vxe-menu--item-link is--default',
+        on: linkOns
       }, $xeMenu.renderMenuTitle(h, item, itemList)), hasChild ? h('div', {
         class: 'vxe-menu--item-group'
       }, childList.map(function (child) {
@@ -47769,6 +47947,7 @@ var nemuUniqueKey = 100000000;
     renderVN: function renderVN(h) {
       var $xeMenu = this;
       var props = $xeMenu;
+      var slots = $xeMenu.$scopedSlots;
       var reactData = $xeMenu.reactData;
       var loading = props.loading,
         collapseFixed = props.collapseFixed;
@@ -47778,31 +47957,45 @@ var nemuUniqueKey = 100000000;
         isEnterCollapse = reactData.isEnterCollapse;
       var vSize = $xeMenu.computeSize;
       var isCollapsed = $xeMenu.computeIsCollapsed;
+      var currBorder = $xeMenu.computeCurrBorder;
+      var varStyle = $xeMenu.computeVarStyle;
+      var headerSlot = slots.header;
+      var footerSlot = slots.footer;
       var ons = {};
       if (collapseFixed) {
         ons = {
           mouseenter: $xeMenu.handleMenuMouseenter,
-          mouseover: $xeMenu.handleMenuMouseover,
           mouseleave: $xeMenu.handleMenuMouseleave
         };
       }
+      var stParams = {
+        collapsed: isCollapsed
+      };
       return h('div', {
         ref: 'refElem',
-        class: ['vxe-menu', _defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--collapsed', isCollapsed), 'is--loading', loading)]
-      }, [h('div', {
-        class: 'vxe-menu--item-list'
+        class: ['vxe-menu', _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "border--".concat(currBorder), currBorder), "size--".concat(vSize), vSize), 'is--collapsed', isCollapsed), 'is--loading', loading)]
+      }, [headerSlot ? h('div', {
+        class: 'vxe-menu--header'
+      }, headerSlot(stParams)) : renderEmptyElement($xeMenu), h('div', {
+        class: 'vxe-menu--body'
       }, menuList.map(function (child) {
         return isCollapsed ? $xeMenu.renderCollapseChildren(h, child, menuList) : $xeMenu.renderDefaultChildren(h, child, menuList);
-      })), initialized ? h('div', {
+      })), footerSlot ? h('div', {
+        class: 'vxe-menu--footer'
+      }, footerSlot(stParams)) : renderEmptyElement($xeMenu), initialized ? h('div', {
         ref: 'refCollapseElem',
         class: ['vxe-menu--collapse-wrapper', _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--collapsed', isCollapsed), 'is--enter', isEnterCollapse), 'is--loading', loading)],
-        style: collapseStyle,
+        style: Object.assign({}, varStyle, collapseStyle),
         on: ons
-      }, [isCollapsed ? h('div', {
-        class: 'vxe-menu--item-list'
+      }, isCollapsed ? [headerSlot ? h('div', {
+        class: 'vxe-menu--header'
+      }, headerSlot(stParams)) : renderEmptyElement($xeMenu), h('div', {
+        class: 'vxe-menu--body'
       }, menuList.map(function (child) {
         return $xeMenu.renderDefaultChildren(h, child, menuList);
-      })) : renderEmptyElement($xeMenu)]) : renderEmptyElement($xeMenu),
+      })), footerSlot ? h('div', {
+        class: 'vxe-menu--footer'
+      }, footerSlot(stParams)) : renderEmptyElement($xeMenu)] : []) : renderEmptyElement($xeMenu),
       /**
        * 加载中
        */
@@ -48454,12 +48647,12 @@ var lockScrollCssWidthKey = '--vxe-ui-modal-lock-scroll-view-width';
         var posTop = '';
         var posLeft = '';
         if (left && !leftCenter) {
-          posLeft = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(left) ? "".concat(left, "px") : left;
+          posLeft = toCssUnit(left);
         } else {
           posLeft = "".concat(Math.max(marginSize, clientVisibleWidth / 2 - boxElem.offsetWidth / 2), "px");
         }
         if (top && !topCenter) {
-          posTop = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(top) ? "".concat(top, "px") : top;
+          posTop = toCssUnit(top);
         } else {
           posTop = "".concat(Math.max(marginSize, clientVisibleHeight / 2 - boxElem.offsetHeight / 2), "px");
         }
@@ -66411,7 +66604,7 @@ function tree_select_createInternalData() {
     computePropsOpts: function computePropsOpts() {
       var $xeTreeSelect = this;
       var props = $xeTreeSelect;
-      return Object.assign({}, props.optionProps);
+      return Object.assign({}, getConfig().treeSelect.optionProps, props.optionProps);
     },
     computeNodeKeyField: function computeNodeKeyField() {
       var $xeTreeSelect = this;