vxe-pc-ui 3.16.6 → 3.16.7

package/lib/index.umd.js

@@ -13256,7 +13256,7 @@ var es_array_join = __webpack_require__(8598);
 
 
 var log_log = VxeUI.log;
-var uiVersion = "ui v".concat("3.16.6");
+var uiVersion = "ui v".concat("3.16.7");
 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.6";
+var ui_version = "3.16.7";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -13770,8 +13770,8 @@ setIcon({
   BUTTON_LOADING: iconPrefix + 'spinner roll',
   BUTTON_TOOLTIP_ICON: iconPrefix + 'question-circle-fill',
   // menu
-  MENU_ITEM_EXPAND_OPEN: iconPrefix + 'arrow-down rotate180',
-  MENU_ITEM_EXPAND_CLOSE: iconPrefix + 'arrow-down',
+  MENU_ITEM_EXPAND_OPEN: iconPrefix + 'arrow-right rotate90',
+  MENU_ITEM_EXPAND_CLOSE: iconPrefix + 'arrow-right',
   // select
   SELECT_LOADED: iconPrefix + 'spinner roll',
   SELECT_OPEN: iconPrefix + 'caret-down rotate180',
@@ -47150,6 +47150,23 @@ var menu_createComponentLog = createComponentLog('menu'),
 var menu_menus = VxeUI.menus,
   menu_getConfig = VxeUI.getConfig,
   menu_getIcon = VxeUI.getIcon;
+function menu_createInternalData() {
+  return {
+    menuEffectMaps: {}
+  };
+}
+function menu_createReactData() {
+  return {
+    initialized: false,
+    isEnterCollapse: false,
+    collapseStyle: {},
+    collapseZindex: 0,
+    activeName: '',
+    menuList: [],
+    itemHeight: 1
+  };
+}
+var nemuUniqueKey = 100000000;
 /* harmony default export */ var menu = (/* define-vxe-component start */defineVxeComponent({
   name: 'VxeMenu',
   mixins: [globalMixins.sizeMixin, globalMixins.permissionMixin],
@@ -47188,19 +47205,11 @@ var menu_menus = VxeUI.menus,
     }
   },
   data: function data() {
-    var reactData = {
-      initialized: false,
-      isEnterCollapse: false,
-      collapseStyle: {},
-      collapseZindex: 0,
-      activeName: null,
-      menuList: [],
-      itemHeight: 1
-    };
-    return {
+    var reactData = menu_createReactData();
+    return _objectSpread2(_objectSpread2({}, {}), {}, {
       xID: external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().uniqueId(),
       reactData: reactData
-    };
+    });
   },
   computed: _objectSpread2(_objectSpread2({}, {}), {}, {
     computeMenuOpts: function computeMenuOpts() {
@@ -47315,6 +47324,7 @@ var menu_menus = VxeUI.menus,
         var objItem = _objectSpread2(_objectSpread2({}, item), {}, {
           parentKey: parent ? parent.name || path.slice(0, path.length - 1).join(',') : '',
           level: path.length,
+          itemId: ++nemuUniqueKey,
           itemKey: item.name || path.join(','),
           isExactActive: false,
           isActive: false,
@@ -47380,12 +47390,19 @@ var menu_menus = VxeUI.menus,
     handleClickIconCollapse: function handleClickIconCollapse(evnt, item, itemList) {
       var $xeMenu = this;
       var props = $xeMenu;
+      var internalData = $xeMenu.internalData;
       var accordion = props.accordion;
-      var hasChild = item.hasChild,
+      var menuEffectMaps = internalData.menuEffectMaps;
+      var itemId = item.itemId,
+        hasChild = item.hasChild,
         isExpand = item.isExpand;
+      var expanded = !isExpand;
       if (hasChild) {
         evnt.stopPropagation();
         evnt.preventDefault();
+        if (menuEffectMaps[itemId]) {
+          clearTimeout(menuEffectMaps[itemId]);
+        }
         if (accordion) {
           itemList.forEach(function (obj) {
             if (obj !== item) {
@@ -47393,7 +47410,32 @@ var menu_menus = VxeUI.menus,
             }
           });
         }
-        item.isExpand = !isExpand;
+        item.isExpand = expanded;
+        var el = $xeMenu.$refs.refElem;
+        if (el) {
+          var nemuEl = el.querySelector(".vxe-menu--item-wrapper[data-menu-id=\"".concat(itemId, "\"]"));
+          var groupEl = nemuEl ? nemuEl.querySelector('.vxe-menu--item-group') : null;
+          if (groupEl) {
+            if (expanded) {
+              groupEl.style.height = '0';
+              groupEl.setAttribute('data-effect', 'y');
+              requestAnimationFrame(function () {
+                groupEl.style.height = "".concat(groupEl.scrollHeight, "px");
+              });
+            } else {
+              groupEl.style.height = "".concat(groupEl.scrollHeight, "px");
+              groupEl.setAttribute('data-effect', 'y');
+              requestAnimationFrame(function () {
+                groupEl.style.height = '0';
+              });
+            }
+            menuEffectMaps[itemId] = setTimeout(function () {
+              delete menuEffectMaps[itemId];
+              groupEl.removeAttribute('data-effect');
+              groupEl.style.height = '';
+            }, 350);
+          }
+        }
       }
     },
     handleContextmenuEvent: function handleContextmenuEvent(evnt, item) {
@@ -47480,7 +47522,7 @@ var menu_menus = VxeUI.menus,
       var $xeMenu = this;
       var reactData = $xeMenu.reactData;
       var collapseStyle = reactData.collapseStyle;
-      var el = this.$refs.refElem;
+      var el = $xeMenu.$refs.refElem;
       reactData.collapseStyle = Object.assign({}, collapseStyle, {
         width: el ? toCssUnit(el.offsetWidth) : ''
       });
@@ -47533,7 +47575,8 @@ var menu_menus = VxeUI.menus,
     renderDefaultChildren: function renderDefaultChildren(h, item, itemList) {
       var $xeMenu = this;
       var reactData = $xeMenu.reactData;
-      var itemKey = item.itemKey,
+      var itemId = item.itemId,
+        itemKey = item.itemKey,
         level = item.level,
         hasChild = item.hasChild,
         isActive = item.isActive,
@@ -47554,7 +47597,10 @@ var menu_menus = VxeUI.menus,
           'is--exact-active': isExactActive,
           'is--active': isActive,
           'is--expand': (!isCollapsed || isEnterCollapse) && isExpand
-        }]
+        }],
+        attrs: {
+          'data-menu-id': itemId
+        }
       }, [routerLink ? h('router-link', {
         class: 'vxe-menu--item-link',
         props: {
@@ -47587,7 +47633,8 @@ var menu_menus = VxeUI.menus,
     },
     renderCollapseChildren: function renderCollapseChildren(h, item, itemList) {
       var $xeMenu = this;
-      var itemKey = item.itemKey,
+      var itemId = item.itemId,
+        itemKey = item.itemKey,
         level = item.level,
         hasChild = item.hasChild,
         isActive = item.isActive,
@@ -47604,7 +47651,10 @@ var menu_menus = VxeUI.menus,
         class: ['vxe-menu--item-wrapper', "vxe-menu--item-level".concat(level), {
           'is--exact-active': isExactActive,
           'is--active': isActive
-        }]
+        }],
+        attrs: {
+          'data-menu-id': itemId
+        }
       }, [routerLink ? h('router-link', {
         class: 'vxe-menu--item-link',
         props: {
@@ -47703,6 +47753,16 @@ var menu_menus = VxeUI.menus,
       $xeMenu.handleCollapseMenu();
     }
   },
+  created: function created() {
+    var $xeMenu = this;
+    var props = $xeMenu;
+    $xeMenu.internalData = menu_createInternalData();
+    var reactData = $xeMenu.reactData;
+    reactData.initialized = !!props.collapsed;
+    reactData.activeName = props.value;
+    $xeMenu.updateMenuConfig();
+    $xeMenu.updateActiveMenu(true);
+  },
   mounted: function mounted() {
     var $xeMenu = this;
     var props = $xeMenu;
@@ -47711,12 +47771,13 @@ var menu_menus = VxeUI.menus,
     if (menuConfig && !VxeUIContextMenu) {
       menu_errLog('vxe.error.reqComp', ['vxe-context-menu']);
     }
-    globalEvents.on($xeMenu, 'resize', $xeMenu.updateCollapseStyle);
     $xeMenu.updateCollapseStyle();
+    globalEvents.on($xeMenu, 'resize', $xeMenu.updateCollapseStyle);
   },
   beforeDestroy: function beforeDestroy() {
     var $xeMenu = this;
-    globalEvents.off($xeMenu, 'resize');
+    var reactData = $xeMenu.reactData;
+    var internalData = $xeMenu.internalData;
     var collapseEl = $xeMenu.$refs.refCollapseElem;
     if (collapseEl) {
       var parentNode = collapseEl.parentNode;
@@ -47724,15 +47785,9 @@ var menu_menus = VxeUI.menus,
         parentNode.removeChild(collapseEl);
       }
     }
-  },
-  created: function created() {
-    var $xeMenu = this;
-    var props = $xeMenu;
-    var reactData = $xeMenu.reactData;
-    reactData.initialized = !!props.collapsed;
-    reactData.activeName = props.value;
-    $xeMenu.updateMenuConfig();
-    $xeMenu.updateActiveMenu(true);
+    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());
   },
   render: function render(h) {
     return this.renderVN(h);