vxe-pc-ui 4.16.5 → 4.16.7

package/lib/index.umd.js

@@ -4657,7 +4657,7 @@ function checkDynamic() {
 const {
   log: log_log
 } = VxeUI;
-const uiVersion = `ui v${"4.16.5"}`;
+const uiVersion = `ui v${"4.16.7"}`;
 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.5";
+const ui_version = "4.16.7";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -5171,8 +5171,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',
@@ -12524,7 +12524,12 @@ let crossListDragRowObj = null;
       const el = refElem.value;
       if (el) {
         const parentEl = el.parentElement;
-        reactData.parentHeight = parentEl ? parentEl.clientHeight : 0;
+        let parentHeight = 0;
+        if (parentEl) {
+          const parentStyle = getComputedStyle(parentEl);
+          parentHeight = parentEl.clientHeight - Math.ceil(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(parentStyle.paddingLeft) + external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(parentStyle.paddingRight));
+        }
+        reactData.parentHeight = parentHeight;
         updateHeight();
         if (el.clientWidth && el.clientHeight) {
           return computeScrollLoad();
@@ -13318,7 +13323,7 @@ let crossListDragRowObj = null;
       emitCheckboxMode(value);
       return updateCheckboxStatus();
     };
-    const getCheckboxRows = () => {
+    const getCheckboxRecords = () => {
       const {
         updateCheckboxFlag
       } = reactData;
@@ -13738,7 +13743,8 @@ let crossListDragRowObj = null;
       clearRadioRow,
       setCheckboxRow,
       setCheckboxRowByKey,
-      getCheckboxRows,
+      getCheckboxRecords,
+      getCheckboxRows: getCheckboxRecords,
       getCheckboxRowKeys,
       clearCheckboxRow,
       setAllCheckboxRow,
@@ -13850,6 +13856,12 @@ let crossListDragRowObj = null;
       isRemoveByRow(row) {
         const rowid = getRowId(row);
         return !!reactData.removeRowFlag && !!internalData.removeRowMaps[rowid];
+      },
+      getRecordset() {
+        return {
+          insertRecords: $xeList.getInsertRecords(),
+          removeRecords: $xeList.getRemoveRecords()
+        };
       }
     };
     const listPrivateMethods = {
@@ -14216,6 +14228,12 @@ let crossListDragRowObj = null;
         isCheckboxChecked = !!(updateCheckboxFlag && selectCheckboxMaps[rowid]);
       }
       const ctVNs = [];
+      if (showRadio) {
+        ctVNs.push(renderRadio(row, rowid, isRadioChecked));
+      }
+      if (showCheckbox) {
+        ctVNs.push(renderCheckbox(row, rowid, isCheckboxChecked));
+      }
       let isDragDisabled = false;
       if (isDrag && keyField && (!visibleMethod || visibleMethod(rowParams))) {
         const handleOns = {};
@@ -14238,12 +14256,6 @@ let crossListDragRowObj = null;
           class: icon || getIcon().LIST_DRAG
         })])]));
       }
-      if (showRadio) {
-        ctVNs.push(renderRadio(row, rowid, isRadioChecked));
-      }
-      if (showCheckbox) {
-        ctVNs.push(renderCheckbox(row, rowid, isCheckboxChecked));
-      }
       ctVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         key: 'ct5',
         class: 'vxe-list--row-content'
@@ -36127,6 +36139,23 @@ const {
   getConfig: menu_getConfig,
   getIcon: menu_getIcon
 } = VxeUI;
+function menu_createInternalData() {
+  return {
+    menuEffectMaps: {}
+  };
+}
+function menu_createReactData() {
+  return {
+    initialized: false,
+    isEnterCollapse: false,
+    collapseStyle: {},
+    collapseZindex: 0,
+    activeName: '',
+    menuList: [],
+    itemHeight: 1
+  };
+}
+let nemuUniqueKey = 100000000;
 /* harmony default export */ var menu = (defineVxeComponent({
   name: 'VxeMenu',
   props: {
@@ -36165,15 +36194,8 @@ const {
     const {
       computeSize
     } = useSize(props);
-    const reactData = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.reactive)({
-      initialized: !!props.collapsed,
-      isEnterCollapse: false,
-      collapseStyle: {},
-      collapseZindex: 0,
-      activeName: props.modelValue,
-      menuList: [],
-      itemHeight: 1
-    });
+    const reactData = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.reactive)(menu_createReactData());
+    const internalData = menu_createInternalData();
     const refMaps = {
       refElem
     };
@@ -36256,6 +36278,7 @@ const {
           ...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,
@@ -36325,12 +36348,20 @@ const {
         accordion
       } = props;
       const {
+        menuEffectMaps
+      } = internalData;
+      const {
+        itemId,
         hasChild,
         isExpand
       } = item;
+      const expanded = !isExpand;
       if (hasChild) {
         evnt.stopPropagation();
         evnt.preventDefault();
+        if (menuEffectMaps[itemId]) {
+          clearTimeout(menuEffectMaps[itemId]);
+        }
         if (accordion) {
           itemList.forEach(obj => {
             if (obj !== item) {
@@ -36338,7 +36369,32 @@ const {
             }
           });
         }
-        item.isExpand = !isExpand;
+        item.isExpand = expanded;
+        const el = refElem.value;
+        if (el) {
+          const nemuEl = el.querySelector(`.vxe-menu--item-wrapper[data-menu-id="${itemId}"]`);
+          const groupEl = nemuEl ? nemuEl.querySelector('.vxe-menu--item-group') : null;
+          if (groupEl) {
+            if (expanded) {
+              groupEl.style.height = '0';
+              groupEl.setAttribute('data-effect', 'y');
+              requestAnimationFrame(() => {
+                groupEl.style.height = `${groupEl.scrollHeight}px`;
+              });
+            } else {
+              groupEl.style.height = `${groupEl.scrollHeight}px`;
+              groupEl.setAttribute('data-effect', 'y');
+              requestAnimationFrame(() => {
+                groupEl.style.height = '0';
+              });
+            }
+            menuEffectMaps[itemId] = setTimeout(() => {
+              delete menuEffectMaps[itemId];
+              groupEl.removeAttribute('data-effect');
+              groupEl.style.height = '';
+            }, 350);
+          }
+        }
       }
     };
     const emitModel = value => {
@@ -36501,6 +36557,7 @@ const {
     };
     const renderDefaultChildren = (item, itemList) => {
       const {
+        itemId,
         itemKey,
         level,
         hasChild,
@@ -36525,7 +36582,8 @@ const {
           'is--exact-active': isExactActive,
           'is--active': isActive,
           'is--expand': (!isCollapsed || isEnterCollapse) && isExpand
-        }]
+        }],
+        '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',
         to: routerLink,
@@ -36551,6 +36609,7 @@ const {
     };
     const renderCollapseChildren = (item, itemList) => {
       const {
+        itemId,
         itemKey,
         level,
         hasChild,
@@ -36569,7 +36628,8 @@ const {
         class: ['vxe-menu--item-wrapper', `vxe-menu--item-level${level}`, {
           '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',
         to: routerLink,
@@ -36676,7 +36736,6 @@ const {
       updateCollapseStyle();
     });
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onBeforeUnmount)(() => {
-      globalEvents.off($xeMenu, 'resize');
       const collapseEl = refCollapseElem.value;
       if (collapseEl) {
         const parentNode = collapseEl.parentNode;
@@ -36684,7 +36743,12 @@ const {
           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());
     });
+    reactData.initialized = !!props.collapsed;
+    reactData.activeName = props.modelValue;
     updateMenuConfig();
     updateActiveMenu(true);
     $xeMenu.renderVN = renderVN;
@@ -51647,6 +51711,9 @@ let crossTreeDragNodeObj = null;
         return nodeKeys;
       },
       getCheckboxNodes() {
+        return $xeTree.getCheckboxRecords();
+      },
+      getCheckboxRecords() {
         const {
           nodeMaps,
           selectCheckboxMaps
@@ -52135,7 +52202,13 @@ let crossTreeDragNodeObj = null;
         const nodeid = getNodeId(node);
         return !!reactData.removeNodeFlag && !!internalData.removeNodeMaps[nodeid];
       },
-      closeTooltip
+      closeTooltip,
+      getRecordset() {
+        return {
+          insertRecords: $xeTree.getInsertRecords(),
+          removeRecords: $xeTree.getRemoveRecords()
+        };
+      }
     };
     const handleNodeDragEndClearStatus = () => {
       clearNodeDragData();
@@ -53210,7 +53283,7 @@ let crossTreeDragNodeObj = null;
         }
       }, iconSlot ? vn_getSlotVNs(iconSlot(nParams)) : [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
         class: isLazyLoading ? iconLoaded || tree_getIcon().TREE_NODE_LOADED : isExpand ? iconOpen || tree_getIcon().TREE_NODE_OPEN : iconClose || tree_getIcon().TREE_NODE_CLOSE
-      })])] : []), renderDragIcon(node, nodeid), renderRadio(node, nodeid, isExistChild, nLevel, isRadioChecked), renderCheckbox(node, nodeid, isExistChild, nLevel, isCheckboxChecked, isIndeterminate), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+      })])] : []), renderRadio(node, nodeid, isExistChild, nLevel, isRadioChecked), renderCheckbox(node, nodeid, isExistChild, nLevel, isCheckboxChecked, isIndeterminate), renderDragIcon(node, nodeid), (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-tree--node-item-inner'
       }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         class: 'vxe-tree--node-item-wrapper'
@@ -53493,6 +53566,7 @@ let crossTreeDragNodeObj = null;
         }
         internalData.resizeObserver = resizeObserver;
       }
+      recalculate();
       globalEvents.on($xeTree, 'resize', handleGlobalResizeEvent);
     });
     (0,external_commonjs_vue_commonjs2_vue_root_Vue_.onBeforeUnmount)(() => {