ele-admin-plus 1.5.1-beta.1 → 1.5.1-beta.3

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

@@ -24,31 +24,102 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     tooltipDisabled: BooleanConstructor;
     ellipsisProps: import('vue').PropType<import('./types').EllipsisProps>;
     textEllipsisTooltip: import('vue').PropType<import('./types').TextEllipsisTooltip>;
-    defaultActive: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
-    defaultOpeneds: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string[]) | (() => string[]) | ((new (...args: any[]) => string[]) | (() => string[]))[], unknown, unknown, () => [], boolean>;
+    defaultActive: {
+        readonly type: import('vue').PropType<string>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: "";
+    };
+    defaultOpeneds: {
+        readonly type: import('vue').PropType<string[]>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: () => [];
+    };
     uniqueOpened: BooleanConstructor;
     router: BooleanConstructor;
-    menuTrigger: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, "click" | "hover", unknown, "hover", boolean>;
+    menuTrigger: {
+        readonly type: import('vue').PropType<"hover" | "click">;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: "hover";
+    };
     collapse: BooleanConstructor;
     backgroundColor: StringConstructor;
     textColor: StringConstructor;
     activeTextColor: StringConstructor;
     closeOnClickOutside: BooleanConstructor;
-    collapseTransition: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    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) & {}) | (() => string | import('vue').Component) | ((new (...args: any[]) => (string | import('vue').Component) & {}) | (() => string | import('vue').Component))[], unknown, unknown, () => any, boolean>;
-    popperEffect: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string) | (() => import('element-plus').PopperEffect) | ((new (...args: any[]) => string) | (() => import('element-plus').PopperEffect))[], unknown, unknown, "dark", boolean>;
+    collapseTransition: {
+        readonly type: import('vue').PropType<boolean>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: true;
+    };
+    ellipsis: {
+        readonly type: import('vue').PropType<boolean>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: true;
+    };
+    popperOffset: {
+        readonly type: import('vue').PropType<number>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: 6;
+    };
+    ellipsisIcon: {
+        readonly type: import('vue').PropType<string | import('vue').Component>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: () => any;
+    };
+    popperEffect: {
+        readonly type: import('vue').PropType<import('element-plus').PopperEffect>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: "dark";
+    };
     popperClass: StringConstructor;
-    popperStyle: {
-        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => string | import('vue').CSSProperties) | (() => string | import('vue').CSSProperties) | ((new (...args: any[]) => string | import('vue').CSSProperties) | (() => string | import('vue').CSSProperties))[], unknown, unknown>>;
+    showTimeout: {
+        readonly type: import('vue').PropType<number>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: 300;
+    };
+    hideTimeout: {
+        readonly type: import('vue').PropType<number>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: 300;
+    };
+    persistent: {
+        readonly type: import('vue').PropType<boolean>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
+    } & {
+        readonly default: true;
     };
-    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>;
-    persistent: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
 }>, {
     menuRef: import('vue').Ref<ElMenuInstance, ElMenuInstance>;
     ellipsisRef: import('vue').Ref<ElSubMenuInstance, ElSubMenuInstance>;
@@ -85,31 +156,102 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     tooltipDisabled: BooleanConstructor;
     ellipsisProps: import('vue').PropType<import('./types').EllipsisProps>;
     textEllipsisTooltip: import('vue').PropType<import('./types').TextEllipsisTooltip>;
-    defaultActive: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
-    defaultOpeneds: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string[]) | (() => string[]) | ((new (...args: any[]) => string[]) | (() => string[]))[], unknown, unknown, () => [], boolean>;
+    defaultActive: {
+        readonly type: import('vue').PropType<string>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: "";
+    };
+    defaultOpeneds: {
+        readonly type: import('vue').PropType<string[]>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: () => [];
+    };
     uniqueOpened: BooleanConstructor;
     router: BooleanConstructor;
-    menuTrigger: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, "click" | "hover", unknown, "hover", boolean>;
+    menuTrigger: {
+        readonly type: import('vue').PropType<"hover" | "click">;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: "hover";
+    };
     collapse: BooleanConstructor;
     backgroundColor: StringConstructor;
     textColor: StringConstructor;
     activeTextColor: StringConstructor;
     closeOnClickOutside: BooleanConstructor;
-    collapseTransition: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    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) & {}) | (() => string | import('vue').Component) | ((new (...args: any[]) => (string | import('vue').Component) & {}) | (() => string | import('vue').Component))[], unknown, unknown, () => any, boolean>;
-    popperEffect: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string) | (() => import('element-plus').PopperEffect) | ((new (...args: any[]) => string) | (() => import('element-plus').PopperEffect))[], unknown, unknown, "dark", boolean>;
+    collapseTransition: {
+        readonly type: import('vue').PropType<boolean>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: true;
+    };
+    ellipsis: {
+        readonly type: import('vue').PropType<boolean>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: true;
+    };
+    popperOffset: {
+        readonly type: import('vue').PropType<number>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: 6;
+    };
+    ellipsisIcon: {
+        readonly type: import('vue').PropType<string | import('vue').Component>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: () => any;
+    };
+    popperEffect: {
+        readonly type: import('vue').PropType<import('element-plus').PopperEffect>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: "dark";
+    };
     popperClass: StringConstructor;
-    popperStyle: {
-        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => string | import('vue').CSSProperties) | (() => string | import('vue').CSSProperties) | ((new (...args: any[]) => string | import('vue').CSSProperties) | (() => string | import('vue').CSSProperties))[], unknown, unknown>>;
+    showTimeout: {
+        readonly type: import('vue').PropType<number>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: 300;
+    };
+    hideTimeout: {
+        readonly type: import('vue').PropType<number>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: 300;
+    };
+    persistent: {
+        readonly type: import('vue').PropType<boolean>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
+    } & {
+        readonly default: true;
     };
-    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>;
-    persistent: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
 }>> & Readonly<{
     onSelect?: ((index: string, indexPath: string[], item: MenuItemClicked, routerResult?: Promise<void | NavigationFailure> | undefined) => any) | undefined;
     onClose?: ((index: string, indexPath: string[]) => any) | undefined;
@@ -120,21 +262,21 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     onParentMouseenter?: ((_item: MenuItem, _e: MouseEvent) => any) | undefined;
     onParentMouseleave?: ((_item: MenuItem, _e: MouseEvent) => any) | undefined;
 }>, {
-    persistent: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
+    persistent: boolean;
     showTimeout: number;
     hideTimeout: number;
     defaultActive: string;
     defaultOpeneds: string[];
     uniqueOpened: boolean;
     router: boolean;
-    menuTrigger: import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "hover" | "click", unknown>;
+    menuTrigger: "hover" | "click";
     collapse: boolean;
     closeOnClickOutside: boolean;
-    collapseTransition: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
-    ellipsis: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
+    collapseTransition: boolean;
+    ellipsis: boolean;
     popperOffset: number;
-    ellipsisIcon: import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | import('vue').Component) & {}) | (() => string | import('vue').Component) | ((new (...args: any[]) => (string | import('vue').Component) & {}) | (() => string | import('vue').Component))[], unknown, unknown>;
-    popperEffect: import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => string) | (() => import('element-plus').PopperEffect) | ((new (...args: any[]) => string) | (() => import('element-plus').PopperEffect))[], unknown, unknown>;
+    ellipsisIcon: string | import('vue').Component;
+    popperEffect: import('element-plus').PopperEffect;
     popupTheme: import('./types').PopupMenuTheme;
     colorful: boolean;
     popupColorful: import('./types').PopupColorful;

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

@@ -34,31 +34,102 @@ export declare const menusProps: {
     ellipsisProps: PropType<EllipsisProps>;
     /** 是否开启菜单文本溢出提示 */
     textEllipsisTooltip: PropType<TextEllipsisTooltip>;
-    defaultActive: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
-    defaultOpeneds: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string[]) | (() => string[]) | ((new (...args: any[]) => string[]) | (() => string[]))[], unknown, unknown, () => [], boolean>;
+    defaultActive: {
+        readonly type: PropType<string>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: "";
+    };
+    defaultOpeneds: {
+        readonly type: PropType<string[]>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: () => [];
+    };
     uniqueOpened: BooleanConstructor;
     router: BooleanConstructor;
-    menuTrigger: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, "click" | "hover", unknown, "hover", boolean>;
+    menuTrigger: {
+        readonly type: PropType<"hover" | "click">;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: "hover";
+    };
     collapse: BooleanConstructor;
     backgroundColor: StringConstructor;
     textColor: StringConstructor;
     activeTextColor: StringConstructor;
     closeOnClickOutside: BooleanConstructor;
-    collapseTransition: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    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) & {}) | (() => string | import('vue').Component) | ((new (...args: any[]) => (string | import('vue').Component) & {}) | (() => string | import('vue').Component))[], unknown, unknown, () => any, boolean>;
-    popperEffect: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string) | (() => import('element-plus').PopperEffect) | ((new (...args: any[]) => string) | (() => import('element-plus').PopperEffect))[], unknown, unknown, "dark", boolean>;
+    collapseTransition: {
+        readonly type: PropType<boolean>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: true;
+    };
+    ellipsis: {
+        readonly type: PropType<boolean>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: true;
+    };
+    popperOffset: {
+        readonly type: PropType<number>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: 6;
+    };
+    ellipsisIcon: {
+        readonly type: PropType<string | import('vue').Component>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: () => any;
+    };
+    popperEffect: {
+        readonly type: PropType<import('element-plus').PopperEffect>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: "dark";
+    };
     popperClass: StringConstructor;
-    popperStyle: {
-        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => string | import('vue').CSSProperties) | (() => string | import('vue').CSSProperties) | ((new (...args: any[]) => string | import('vue').CSSProperties) | (() => string | import('vue').CSSProperties))[], unknown, unknown>>;
+    showTimeout: {
+        readonly type: PropType<number>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: 300;
+    };
+    hideTimeout: {
+        readonly type: PropType<number>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: 300;
+    };
+    persistent: {
+        readonly type: PropType<boolean>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
+    } & {
+        readonly default: true;
     };
-    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>;
-    persistent: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
 };
 export type MenusProps = ExtractPropTypes<typeof menusProps>;
 export type MenuPropKeys = Array<keyof typeof menuProps>;

package/lib/ele-menus/util.cjs

@@ -25,14 +25,11 @@ function getMenuItems(menus, index, horizontal) {
   if (!horizontal || !menus || !menus.length) {
     return { items: menus };
   }
-  const data = menus.map((d) => {
-    return { ...d, group: false };
-  });
-  if (index == null || index < 0 || index >= data.length) {
-    return { items: data, activeIndex: `/${index}item` };
+  if (index == null || index < 0 || index >= menus.length) {
+    return { items: menus, activeIndex: `/${index}item` };
   }
-  const items = index === 0 ? [] : data.slice(0, index);
-  const moreItems = index === 0 ? data : data.slice(index);
+  const items = index === 0 ? [] : menus.slice(0, index);
+  const moreItems = index === 0 ? menus : menus.slice(index);
   moreItems.forEach((d) => {
     items.push({
       ...d,