ele-admin-plus 1.2.1-beta.3 → 1.2.1-beta.5

package/lib/ele-menus/index.d.ts

@@ -1,11 +1,13 @@
 import { NavigationFailure } from 'vue-router';
 import { MenuItemClicked } from 'element-plus';
-import { ElMenuInstance } from '../ele-app/el';
+import { ElMenuInstance, ElSubMenuInstance } from '../ele-app/el';
+import { getPopperClass } from './util';
+import { MenuItem, MenuItemEvent } from './types';
 
 declare const _default: import('vue').DefineComponent<{
     mode: import('vue').PropType<import('./types').MenuMode>;
     items: {
-        type: import('vue').PropType<import('./types').MenuItem[]>;
+        type: import('vue').PropType<MenuItem[]>;
         required: boolean;
     };
     theme: import('vue').PropType<import('./types').MenuTheme>;
@@ -36,28 +38,85 @@ declare const _default: import('vue').DefineComponent<{
     ellipsis: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     popperOffset: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 6, boolean>;
     ellipsisIcon: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>) | ((new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>))[], unknown, unknown, () => any, boolean>;
-    popperEffect: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, "light" | "dark", unknown, "dark", boolean>;
+    popperEffect: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string & {}) | (() => string) | ((new (...args: any[]) => string & {}) | (() => string))[], unknown, unknown, "dark", boolean>;
     popperClass: StringConstructor;
     showTimeout: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 300, boolean>;
     hideTimeout: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 300, boolean>;
 }, {
+    EllipsisOutlined: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
+    getPopperClass: typeof getPopperClass;
+    isWebkit: boolean;
     menuRef: import('vue').Ref<ElMenuInstance>;
-    scrollToActive: () => void;
+    ellipsisRef: import('vue').Ref<ElSubMenuInstance>;
+    menuItems: import('vue').ShallowRef<MenuItem[] | undefined>;
+    moreMenuItems: import('vue').ShallowRef<MenuItem[] | undefined>;
+    tooltipVirtualRef: import('vue').Ref<any>;
+    tooltipContent: import('vue').Ref<string>;
+    tooltipVisible: import('vue').Ref<boolean>;
+    isCompact: import('vue').ComputedRef<boolean>;
+    collapseTooltipDisabled: import('vue').ComputedRef<boolean>;
+    menuProps: import('vue').ComputedRef<import('../ele-app/types').Mutable<Pick<import('@vue/shared').LooseRequired<{
+        readonly showTimeout: number;
+        readonly hideTimeout: number;
+        readonly defaultActive: string;
+        readonly defaultOpeneds: string[];
+        readonly uniqueOpened: boolean;
+        readonly router: boolean;
+        readonly menuTrigger: import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "hover" | "click", unknown>;
+        readonly collapse: boolean;
+        readonly closeOnClickOutside: boolean;
+        readonly collapseTransition: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
+        readonly ellipsis: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
+        readonly popperOffset: number;
+        readonly popperEffect: string;
+        readonly popupTheme: import('./types').PopupMenuTheme;
+        readonly colorful: boolean;
+        readonly popupColorful: import('./types').PopupColorful;
+        readonly tooltipDisabled: boolean;
+        readonly popperClass?: string | undefined;
+        readonly mode?: import('./types').MenuMode | undefined;
+        readonly backgroundColor?: string | undefined;
+        readonly textColor?: string | undefined;
+        readonly activeTextColor?: string | undefined;
+        readonly ellipsisIcon?: import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>) | ((new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>))[], unknown, unknown> | undefined;
+        readonly items?: MenuItem[] | undefined;
+        readonly theme?: import('./types').MenuTheme | undefined;
+        readonly firstPopperClass?: string | undefined;
+        readonly ellipsisProps?: import('./types').EllipsisProps | undefined;
+        readonly textEllipsisTooltip?: import('./types').TextEllipsisTooltip | undefined;
+        readonly onSelect?: ((index: string, indexPath: string[], item: MenuItemClicked, routerResult?: Promise<void | NavigationFailure> | undefined) => any) | undefined;
+        readonly onClose?: ((index: string, indexPath: string[]) => any) | undefined;
+        readonly onOpen?: ((index: string, indexPath: string[]) => any) | undefined;
+        readonly onItemClick?: ((_item: MenuItem, _e: MouseEvent) => any) | undefined;
+        readonly onItemMouseenter?: ((_item: MenuItem, _e: MouseEvent) => any) | undefined;
+        readonly onItemMouseleave?: ((_item: MenuItem, _e: MouseEvent) => any) | undefined;
+        readonly onParentMouseenter?: ((_item: MenuItem, _e: MouseEvent) => any) | undefined;
+        readonly onParentMouseleave?: ((_item: MenuItem, _e: MouseEvent) => any) | undefined;
+    } & {}>, "popperClass" | "showTimeout" | "hideTimeout" | "mode" | "defaultActive" | "defaultOpeneds" | "uniqueOpened" | "router" | "menuTrigger" | "collapse" | "backgroundColor" | "textColor" | "activeTextColor" | "closeOnClickOutside" | "collapseTransition" | "ellipsis" | "popperOffset" | "ellipsisIcon" | "popperEffect">>>;
     open: (index: string) => void;
     close: (index: string) => void;
+    handleOpen: (index: string, indexPath: string[]) => void;
+    handleClose: (index: string, indexPath: string[]) => void;
+    handleSelect: (index: string, indexPath: string[], item: MenuItemClicked, routerResult?: Promise<void | NavigationFailure> | undefined) => void;
+    handleItemClick: MenuItemEvent;
+    handleItemMouseenter: MenuItemEvent;
+    handleItemMouseleave: MenuItemEvent;
+    handleParentMouseenter: MenuItemEvent;
+    handleParentMouseleave: MenuItemEvent;
+    scrollToActive: () => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-    itemClick: (_item: import('./types').MenuItem, _e: MouseEvent) => boolean;
-    itemMouseenter: (_item: import('./types').MenuItem, _e: MouseEvent) => boolean;
-    itemMouseleave: (_item: import('./types').MenuItem, _e: MouseEvent) => boolean;
-    parentMouseenter: (_item: import('./types').MenuItem, _e: MouseEvent) => boolean;
-    parentMouseleave: (_item: import('./types').MenuItem, _e: MouseEvent) => boolean;
+    itemClick: (_item: MenuItem, _e: MouseEvent) => boolean;
+    itemMouseenter: (_item: MenuItem, _e: MouseEvent) => boolean;
+    itemMouseleave: (_item: MenuItem, _e: MouseEvent) => boolean;
+    parentMouseenter: (_item: MenuItem, _e: MouseEvent) => boolean;
+    parentMouseleave: (_item: MenuItem, _e: MouseEvent) => boolean;
     close: (index: string, indexPath: string[]) => boolean;
     open: (index: string, indexPath: string[]) => boolean;
-    select: (index: string, indexPath: string[], item: MenuItemClicked, routerResult?: Promise<void | NavigationFailure> | undefined) => boolean;
+    select: (index: string, indexPath: string[], item: MenuItemClicked, routerResult?: Promise<void | NavigationFailure>) => boolean;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     mode: import('vue').PropType<import('./types').MenuMode>;
     items: {
-        type: import('vue').PropType<import('./types').MenuItem[]>;
+        type: import('vue').PropType<MenuItem[]>;
         required: boolean;
     };
     theme: import('vue').PropType<import('./types').MenuTheme>;
@@ -88,7 +147,7 @@ declare const _default: import('vue').DefineComponent<{
     ellipsis: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     popperOffset: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 6, boolean>;
     ellipsisIcon: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>) | ((new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>))[], unknown, unknown, () => any, boolean>;
-    popperEffect: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, "light" | "dark", unknown, "dark", boolean>;
+    popperEffect: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string & {}) | (() => string) | ((new (...args: any[]) => string & {}) | (() => string))[], unknown, unknown, "dark", boolean>;
     popperClass: StringConstructor;
     showTimeout: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 300, boolean>;
     hideTimeout: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 300, boolean>;
@@ -96,11 +155,11 @@ declare const _default: import('vue').DefineComponent<{
     onSelect?: ((index: string, indexPath: string[], item: MenuItemClicked, routerResult?: Promise<void | NavigationFailure> | undefined) => any) | undefined;
     onClose?: ((index: string, indexPath: string[]) => any) | undefined;
     onOpen?: ((index: string, indexPath: string[]) => any) | undefined;
-    onItemClick?: ((_item: import('./types').MenuItem, _e: MouseEvent) => any) | undefined;
-    onItemMouseenter?: ((_item: import('./types').MenuItem, _e: MouseEvent) => any) | undefined;
-    onItemMouseleave?: ((_item: import('./types').MenuItem, _e: MouseEvent) => any) | undefined;
-    onParentMouseenter?: ((_item: import('./types').MenuItem, _e: MouseEvent) => any) | undefined;
-    onParentMouseleave?: ((_item: import('./types').MenuItem, _e: MouseEvent) => any) | undefined;
+    onItemClick?: ((_item: MenuItem, _e: MouseEvent) => any) | undefined;
+    onItemMouseenter?: ((_item: MenuItem, _e: MouseEvent) => any) | undefined;
+    onItemMouseleave?: ((_item: MenuItem, _e: MouseEvent) => any) | undefined;
+    onParentMouseenter?: ((_item: MenuItem, _e: MouseEvent) => any) | undefined;
+    onParentMouseleave?: ((_item: MenuItem, _e: MouseEvent) => any) | undefined;
 }, {
     showTimeout: number;
     hideTimeout: number;
@@ -115,7 +174,7 @@ declare const _default: import('vue').DefineComponent<{
     ellipsis: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
     popperOffset: number;
     ellipsisIcon: import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>) | ((new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>))[], unknown, unknown>;
-    popperEffect: import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "light" | "dark", unknown>;
+    popperEffect: string;
     popupTheme: import('./types').PopupMenuTheme;
     colorful: boolean;
     popupColorful: import('./types').PopupColorful;

package/lib/ele-menus/props.d.ts

@@ -48,7 +48,7 @@ export declare const menusProps: {
     ellipsis: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     popperOffset: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 6, boolean>;
     ellipsisIcon: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>) | ((new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>))[], unknown, unknown, () => any, boolean>;
-    popperEffect: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, "light" | "dark", unknown, "dark", boolean>;
+    popperEffect: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string & {}) | (() => string) | ((new (...args: any[]) => string & {}) | (() => string))[], unknown, unknown, "dark", boolean>;
     popperClass: StringConstructor;
     showTimeout: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 300, boolean>;
     hideTimeout: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 300, boolean>;
@@ -75,5 +75,5 @@ export declare const menusEmits: {
     parentMouseleave: (_item: MenuItem, _e: MouseEvent) => boolean;
     close: (index: string, indexPath: string[]) => boolean;
     open: (index: string, indexPath: string[]) => boolean;
-    select: (index: string, indexPath: string[], item: import('element-plus').MenuItemClicked, routerResult?: Promise<void | import('vue-router').NavigationFailure> | undefined) => boolean;
+    select: (index: string, indexPath: string[], item: import('element-plus').MenuItemClicked, routerResult?: Promise<void | import('vue-router').NavigationFailure>) => boolean;
 };

package/lib/ele-menus/util.cjs

@@ -1,239 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const vue = require("vue");
-const vueRouter = require("vue-router");
-const elementPlus = require("element-plus");
 const core = require("../utils/core");
-const icons = require("../icons");
-const linkClass = "ele-menu-link";
-const titleClass = "ele-menu-title";
-const triggerClass = "ele-menu-trigger";
-const overflowClass = "ele-menu-overflow";
-const ellipsisClass = "ele-sub-menu-ellipsis";
-function mergeClass(class1, class2) {
-  const classes = [];
-  if (class1 != null && class1 !== "") {
-    classes.push(class1);
-  }
-  if (class2 != null && class2 !== "") {
-    classes.push(class2);
-  }
-  return classes;
-}
-function getLinkNode(path) {
-  if (core.isExternalLink(path)) {
-    return vue.h("a", {
-      href: path,
-      target: "_blank",
-      class: linkClass,
-      onClick: (e) => {
-        e.stopPropagation();
-      }
-    });
-  }
-  if (path) {
-    return vue.h(vueRouter.RouterLink, { to: path, class: linkClass });
-  }
-}
-function getTriggerNode(item, path, onItemClick, onItemMouseenter, onItemMouseleave) {
-  return vue.h(
-    "div",
-    {
-      class: triggerClass,
-      onClick: (e) => {
-        onItemClick && onItemClick(item, e);
-      },
-      onMouseenter: (e) => {
-        onItemMouseenter && onItemMouseenter(item, e);
-      },
-      onMouseleave: (e) => {
-        onItemMouseleave && onItemMouseleave(item, e);
-      }
-    },
-    getLinkNode(path)
-  );
-}
-function getNodes(icons2, titles, badge, trigger) {
-  const nodes = [];
-  if (icons2) {
-    icons2.forEach((t) => {
-      nodes.push(t);
-    });
-  }
-  if (titles) {
-    titles.forEach((t) => {
-      nodes.push(t);
-    });
-  }
-  if (badge) {
-    nodes.push(badge);
-  }
-  if (trigger) {
-    nodes.push(trigger);
-  }
-  return nodes;
-}
-function renderItems(items, sIcon, sTitle, tipDisabled, theme, popTheme, colorful, popupColorful, firstPopClass, first, onItemClick, onItemMouseenter, onItemMouseleave, webkit, onParentMouseenter, onParentMouseleave, parentIsGroup) {
-  const nodes = [];
-  if (!items) {
-    return nodes;
-  }
-  items.forEach((item) => {
-    var _a;
-    const key = item.key || item.index || item.path;
-    const iNodes = sIcon ? sIcon({ item, icon: item.icon }) ?? [] : [];
-    if (!iNodes.length && item.icon) {
-      iNodes.push(
-        vue.h(elementPlus.ElIcon, item.iconProps || {}, () => {
-          return vue.h(item.icon, { style: item.iconStyle });
-        })
-      );
-    }
-    const tNodes = sTitle ? sTitle({ item, title: item.title }) ?? [] : [];
-    if (!tNodes.length && item.title) {
-      tNodes.push(vue.h("span", { class: titleClass }, item.title));
-    }
-    const bNode = item.badge != null ? vue.h(elementPlus.ElBadge, item.badge) : null;
-    if (!((_a = item.children) == null ? void 0 : _a.length)) {
-      const triggerNode = getTriggerNode(
-        item,
-        item.path,
-        onItemClick,
-        onItemMouseenter,
-        onItemMouseleave
-      );
-      nodes.push(
-        vue.h(
-          elementPlus.ElMenuItem,
-          {
-            key: key + "-" + tipDisabled,
-            index: item.index || item.path,
-            route: item.route,
-            disabled: item.disabled,
-            class: mergeClass(
-              item.overflow ? overflowClass : void 0,
-              item.class
-            ),
-            style: item.style,
-            onClick: () => {
-            }
-          },
-          {
-            default: () => {
-              if (first && !tipDisabled) {
-                return getNodes(iNodes, void 0, bNode, triggerNode);
-              }
-              return getNodes(iNodes, tNodes, bNode, triggerNode);
-            },
-            title: first && !tipDisabled ? () => tNodes : void 0
-          }
-        )
-      );
-      return;
-    }
-    const parentTriggerNode = getTriggerNode(
-      item,
-      void 0,
-      void 0,
-      onParentMouseenter,
-      onParentMouseleave
-    );
-    if (item.group === true && !parentIsGroup) {
-      nodes.push(
-        vue.h(
-          elementPlus.ElMenuItemGroup,
-          { key, style: item.style, class: item.class },
-          {
-            default: () => {
-              return renderItems(
-                item.children,
-                sIcon,
-                sTitle,
-                tipDisabled,
-                theme,
-                popTheme,
-                colorful,
-                popupColorful,
-                firstPopClass,
-                first,
-                onItemClick,
-                onItemMouseenter,
-                onItemMouseleave,
-                webkit,
-                onParentMouseenter,
-                onParentMouseleave,
-                true
-              );
-            },
-            title: () => getNodes(iNodes, tNodes, bNode, parentTriggerNode)
-          }
-        )
-      );
-      return;
-    }
-    nodes.push(
-      vue.h(
-        elementPlus.ElSubMenu,
-        {
-          key,
-          index: item.index || item.path,
-          popperClass: getPopperClass(
-            item.popperClass,
-            theme,
-            popTheme,
-            colorful,
-            popupColorful,
-            firstPopClass,
-            first,
-            webkit
-          ),
-          showTimeout: item.showTimeout,
-          hideTimeout: item.hideTimeout,
-          disabled: item.disabled,
-          teleported: item.teleported ?? !!first,
-          popperOffset: item.popperOffset,
-          expandCloseIcon: item.expandCloseIcon ?? icons.ArrowDown,
-          expandOpenIcon: item.expandOpenIcon ?? icons.ArrowDown,
-          collapseCloseIcon: item.collapseCloseIcon ?? icons.ArrowRight,
-          collapseOpenIcon: item.collapseOpenIcon ?? icons.ArrowRight,
-          class: mergeClass(
-            item.overflow ? overflowClass : void 0,
-            item.class
-          ),
-          style: item.style
-        },
-        {
-          default: () => {
-            var _a2;
-            if (((_a2 = item.children) == null ? void 0 : _a2.length) === 1 && item.children[0] == null) {
-              return;
-            }
-            return renderItems(
-              item.children,
-              sIcon,
-              sTitle,
-              tipDisabled,
-              theme,
-              popTheme,
-              colorful,
-              popupColorful,
-              firstPopClass,
-              false,
-              onItemClick,
-              onItemMouseenter,
-              onItemMouseleave,
-              webkit,
-              onParentMouseenter,
-              onParentMouseleave
-            );
-          },
-          title: () => getNodes(iNodes, tNodes, bNode, parentTriggerNode)
-        }
-      )
-    );
-  });
-  return nodes;
-}
 function getPopperClass(customerClass, theme, popTheme, colorful, popupColorful, firstPopClass, first, webkit) {
   const popperClass = ["ele-menu"];
   if (webkit) {
@@ -296,6 +64,7 @@ function getItemWidth(el) {
   return el.offsetWidth + ml + mr;
 }
 function getMenuChilds(el) {
+  const ellipsisClass = "ele-sub-menu-ellipsis";
   return Array.from(el.childNodes ?? []).filter((t) => {
     return t.nodeName === "LI" && !t.classList.contains(ellipsisClass);
   });
@@ -355,19 +124,9 @@ function useMenuEllipsis(option) {
   });
   return { observe, unobserve, computedEllipsis };
 }
-exports.ellipsisClass = ellipsisClass;
 exports.getItemWidth = getItemWidth;
-exports.getLinkNode = getLinkNode;
 exports.getMenuChilds = getMenuChilds;
 exports.getMenuItems = getMenuItems;
 exports.getMenuWidth = getMenuWidth;
-exports.getNodes = getNodes;
 exports.getPopperClass = getPopperClass;
-exports.getTriggerNode = getTriggerNode;
-exports.linkClass = linkClass;
-exports.mergeClass = mergeClass;
-exports.overflowClass = overflowClass;
-exports.renderItems = renderItems;
-exports.titleClass = titleClass;
-exports.triggerClass = triggerClass;
 exports.useMenuEllipsis = useMenuEllipsis;

package/lib/ele-menus/util.d.ts

@@ -1,66 +1,5 @@
-import { VNode, Slot } from 'vue';
-import { ClassValue, ClassValues } from '../ele-app/types';
-import { MenuItem, MenuTheme, PopupMenuTheme, PopupColorful, MenuResult, MenuEllipsisOption, MenuItemEvent } from './types';
+import { MenuItem, MenuTheme, PopupMenuTheme, PopupColorful, MenuResult, MenuEllipsisOption } from './types';
 
-/** 子菜单项链接类名 */
-export declare const linkClass = "ele-menu-link";
-/** 菜单标题类名 */
-export declare const titleClass = "ele-menu-title";
-/** 子菜单项事件触发元素类名 */
-export declare const triggerClass = "ele-menu-trigger";
-/** 菜单溢出隐藏项类名 */
-export declare const overflowClass = "ele-menu-overflow";
-/** 菜单省略项的类名 */
-export declare const ellipsisClass = "ele-sub-menu-ellipsis";
-/**
- * 合并类名
- * @param class1 类名
- * @param class2 用户自定义类名
- */
-export declare function mergeClass(class1?: ClassValue, class2?: ClassValue): ClassValues;
-/**
- * 生成菜单链接节点
- * @param path 链接地址
- */
-export declare function getLinkNode(path?: string): VNode | undefined;
-/**
- * 生成事件触发节点
- * @param item 菜单数据
- * @param path 链接地址
- * @param onItemClick 点击事件
- * @param onItemMouseenter 鼠标进入事件
- * @param onItemMouseleave 鼠标离开事件
- */
-export declare function getTriggerNode(item: MenuItem, path?: string, onItemClick?: MenuItemEvent, onItemMouseenter?: MenuItemEvent, onItemMouseleave?: MenuItemEvent): VNode | undefined;
-/**
- * 生成菜单内容节点
- * @param icons 图标节点
- * @param titles 标题节点
- * @param badge 徽章节点
- * @param trigger 事件触发元素节点
- */
-export declare function getNodes(icons?: VNode[], titles?: VNode[], badge?: VNode | null, trigger?: VNode | null): VNode[];
-/**
- * 递归生成菜单节点
- * @param items 菜单数据
- * @param sIcon 图标插槽
- * @param sTitle 标题插槽
- * @param tipDisabled 是否禁用折叠的tooltip
- * @param theme 主题
- * @param popTheme 气泡菜单主题
- * @param colorful 是否彩色图标
- * @param popupColorful 气泡菜单是否彩色图标
- * @param firstPopClass 第一级气泡菜单类名
- * @param first 是否是第一级菜单
- * @param onItemClick 子菜单项点击事件
- * @param onItemMouseenter 子菜单项鼠标进入事件
- * @param onItemMouseenter 子菜单项鼠标离开事件
- * @param webkit 是否是webkit内核
- * @param onParentMouseenter 父级菜单项鼠标进入事件
- * @param onParentMouseleave 父级菜单项鼠标离开事件
- * @param parentIsGroup 父级是否是分组菜单
- */
-export declare function renderItems(items?: MenuItem[], sIcon?: Slot, sTitle?: Slot, tipDisabled?: boolean, theme?: MenuTheme, popTheme?: PopupMenuTheme, colorful?: boolean, popupColorful?: PopupColorful, firstPopClass?: string, first?: boolean, onItemClick?: MenuItemEvent, onItemMouseenter?: MenuItemEvent, onItemMouseleave?: MenuItemEvent, webkit?: boolean, onParentMouseenter?: MenuItemEvent, onParentMouseleave?: MenuItemEvent, parentIsGroup?: boolean): VNode[];
 /**
  * 生成气泡菜单的类名
  * @param customerClass 自定义的类名

package/lib/ele-modal/index.d.ts

@@ -39,7 +39,7 @@ declare const _default: import('vue').DefineComponent<{
         default: null;
     };
     form: BooleanConstructor;
-    appendTo: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string & {}) | (() => string) | ((new (...args: any[]) => string & {}) | (() => string))[], unknown, unknown, "body", boolean>;
+    appendTo: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => (string | HTMLElement) & {}) | (() => string | HTMLElement) | ((new (...args: any[]) => (string | HTMLElement) & {}) | (() => string | HTMLElement))[], unknown, unknown, "body", boolean>;
     beforeClose: {
         readonly type: import('vue').PropType<import('element-plus').DialogBeforeCloseFn>;
         readonly required: false;
@@ -73,7 +73,7 @@ declare const _default: import('vue').DefineComponent<{
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    trapFocus: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
+    trapFocus: BooleanConstructor;
     headerAriaLevel: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "2", boolean>;
     center: BooleanConstructor;
     alignCenter: BooleanConstructor;
@@ -154,7 +154,7 @@ declare const _default: import('vue').DefineComponent<{
         default: null;
     };
     form: BooleanConstructor;
-    appendTo: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string & {}) | (() => string) | ((new (...args: any[]) => string & {}) | (() => string))[], unknown, unknown, "body", boolean>;
+    appendTo: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => (string | HTMLElement) & {}) | (() => string | HTMLElement) | ((new (...args: any[]) => (string | HTMLElement) & {}) | (() => string | HTMLElement))[], unknown, unknown, "body", boolean>;
     beforeClose: {
         readonly type: import('vue').PropType<import('element-plus').DialogBeforeCloseFn>;
         readonly required: false;
@@ -188,7 +188,7 @@ declare const _default: import('vue').DefineComponent<{
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    trapFocus: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
+    trapFocus: BooleanConstructor;
     headerAriaLevel: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "2", boolean>;
     center: BooleanConstructor;
     alignCenter: BooleanConstructor;
@@ -205,10 +205,10 @@ declare const _default: import('vue').DefineComponent<{
     ariaLevel: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "2", boolean>;
 }>> & {
     "onUpdate:modelValue"?: ((value: boolean) => any) | undefined;
-    onOpenAutoFocus?: (() => any) | undefined;
-    onCloseAutoFocus?: (() => any) | undefined;
     onClose?: (() => any) | undefined;
     onOpen?: (() => any) | undefined;
+    onOpenAutoFocus?: (() => any) | undefined;
+    onCloseAutoFocus?: (() => any) | undefined;
     onOpened?: (() => any) | undefined;
     onClosed?: (() => any) | undefined;
     "onUpdate:fullscreen"?: ((_fullscreen: boolean) => any) | undefined;
@@ -217,9 +217,8 @@ declare const _default: import('vue').DefineComponent<{
     title: string;
     center: boolean;
     modelValue: boolean;
-    multiple: boolean;
     appendToBody: boolean;
-    appendTo: string;
+    appendTo: import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | HTMLElement) & {}) | (() => string | HTMLElement) | ((new (...args: any[]) => (string | HTMLElement) & {}) | (() => string | HTMLElement))[], unknown, unknown>;
     destroyOnClose: boolean;
     closeOnClickModal: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
     closeOnPressEscape: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
@@ -227,7 +226,7 @@ declare const _default: import('vue').DefineComponent<{
     modal: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
     openDelay: number;
     closeDelay: number;
-    trapFocus: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
+    trapFocus: boolean;
     headerAriaLevel: string;
     alignCenter: boolean;
     draggable: boolean;
@@ -237,6 +236,7 @@ declare const _default: import('vue').DefineComponent<{
     ariaLevel: string;
     minWidth: number;
     minHeight: number;
+    multiple: boolean;
     responsive: boolean;
     resetOnClose: boolean;
     maxable: boolean;

package/lib/ele-modal/props.d.ts

@@ -63,7 +63,7 @@ export declare const modalProps: {
     };
     /** 是否是表单弹窗 */
     form: BooleanConstructor;
-    appendTo: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string & {}) | (() => string) | ((new (...args: any[]) => string & {}) | (() => string))[], unknown, unknown, "body", boolean>;
+    appendTo: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => (string | HTMLElement) & {}) | (() => string | HTMLElement) | ((new (...args: any[]) => (string | HTMLElement) & {}) | (() => string | HTMLElement))[], unknown, unknown, "body", boolean>;
     beforeClose: {
         readonly type: import('vue').PropType<import('element-plus').DialogBeforeCloseFn>;
         readonly required: false;
@@ -97,7 +97,7 @@ export declare const modalProps: {
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    trapFocus: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
+    trapFocus: BooleanConstructor;
     headerAriaLevel: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "2", boolean>;
     center: BooleanConstructor;
     alignCenter: BooleanConstructor;

package/lib/ele-modal/util.cjs

@@ -61,10 +61,11 @@ function useModalMove(dialogRef, props, isFullscreen) {
       downOL = modalEl.offsetLeft;
       downOT = modalEl.offsetTop;
     },
-    move: ({ distanceX, distanceY }) => {
+    move: ({ distanceX, distanceY, e }) => {
       if (!modalEl || !wrapEl || downOL == null || downOT == null || distanceX == null || distanceY == null) {
         return;
       }
+      e.preventDefault();
       let positionLeft = distanceX + downOL;
       let positionTop = distanceY + downOT;
       const limitL = wrapEl.clientWidth - modalEl.clientWidth - fixLeft;
@@ -114,7 +115,8 @@ function useModalMove(dialogRef, props, isFullscreen) {
       downOT = null;
       modalEl = null;
       wrapEl = null;
-    }
+    },
+    touchmoveOptions: { passive: false }
   });
   return {
     handleHeaderMousedown: handleMousedown,
@@ -138,10 +140,11 @@ function useModalResize(dialogRef, props, isFullscreen) {
       downW = modalEl.clientWidth;
       downH = modalEl.clientHeight;
     },
-    move: ({ distanceX, distanceY }) => {
+    move: ({ distanceX, distanceY, e }) => {
       if (!modalEl || !wrapEl || downW == null || downH == null || distanceX == null || distanceY == null) {
         return;
       }
+      e.preventDefault();
       if (props.resizable !== "vertical") {
         const w = distanceX + downW;
         const maxW = wrapEl.clientWidth - modalEl.offsetLeft - fixLeft;
@@ -167,7 +170,8 @@ function useModalResize(dialogRef, props, isFullscreen) {
       downH = null;
       modalEl = null;
       wrapEl = null;
-    }
+    },
+    touchmoveOptions: { passive: false }
   });
   return {
     handleResizeMousedown: handleMousedown,

package/lib/ele-modal/util.d.ts

@@ -12,7 +12,7 @@ export declare const closedClass = "ele-modal-closed";
  * @param appendTo 自定义插入的容器
  * @param modalsEl 限制在主体内部时的容器
  */
-export declare function getModalContainer(inner?: boolean, multiple?: boolean, appendTo?: string, modalsEl?: HTMLElement | null): HTMLElement | string;
+export declare function getModalContainer(inner?: boolean, multiple?: boolean, appendTo?: string | HTMLElement, modalsEl?: HTMLElement | null): HTMLElement | string;
 /**
  * 弹窗支持移动
  * @param dialogRef 弹窗实例