ele-admin-plus 1.5.1-beta.4 → 1.6.0-beta.2

package/es/ele-dropdown/props.d.ts

@@ -1,154 +1,11 @@
 import { PropType, ExtractPropTypes, EmitsToProps } from 'vue';
+import { dropdownProps as elDropdownProps } from 'element-plus';
 import { StyleValue } from '../ele-app/types';
 import { ElIconProps, ElButtonProps, ElDropdownInstance } from '../ele-app/el';
 import { default as ProDropdown } from './components/pro-dropdown';
 import { DropdownItem } from './types';
 
-type DropdownExclude = 'size' | 'maxHeight' | 'role' | 'type' | 'effect' | 'placement' | 'disabled' | 'popperOptions' | 'popperClass' | 'tabindex' | 'teleported' | 'trigger' | 'triggerKeys' | 'persistent' | 'id' | 'loop';
-declare const normalizeDropdownProps: Omit<{
-    readonly trigger: {
-        readonly type: PropType<import('element-plus').TooltipTriggerType | import('element-plus').TooltipTriggerType[]>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: "hover";
-    };
-    readonly triggerKeys: {
-        readonly type: PropType<string[]>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: () => string[];
-    };
-    readonly effect: {
-        readonly default: "light";
-        readonly type: PropType<import('element-plus').PopperEffect>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        readonly __epPropKey: true;
-    };
-    readonly type: {
-        readonly type: PropType<"" | "success" | "primary" | "warning" | "info" | "default" | "danger" | "text">;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
-    readonly placement: {
-        readonly type: PropType<import('element-plus').Placement>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: "bottom";
-    };
-    readonly popperOptions: {
-        readonly type: PropType<Partial<import('element-plus').Options>>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: () => {};
-    };
-    readonly id: StringConstructor;
-    readonly size: {
-        readonly type: PropType<string>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: "";
-    };
-    readonly splitButton: BooleanConstructor;
-    readonly hideOnClick: {
-        readonly type: PropType<boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: true;
-    };
-    readonly loop: {
-        readonly type: PropType<boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: true;
-    };
-    readonly showTimeout: {
-        readonly type: PropType<number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: 150;
-    };
-    readonly hideTimeout: {
-        readonly type: PropType<number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: 150;
-    };
-    readonly tabindex: {
-        readonly type: PropType<string | number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: 0;
-    };
-    readonly maxHeight: {
-        readonly type: PropType<string | number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: "";
-    };
-    readonly popperClass: {
-        readonly type: PropType<string>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: "";
-    };
-    readonly disabled: BooleanConstructor;
-    readonly role: {
-        readonly type: PropType<"dialog" | "menu" | "grid" | "listbox" | "tooltip" | "tree" | "group" | "navigation">;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: "menu";
-    };
-    readonly buttonProps: {
-        readonly type: PropType<Partial<import('element-plus').ButtonProps>>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
-    readonly teleported: {
-        readonly type: PropType<boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: true;
-    };
-    readonly persistent: {
-        readonly type: PropType<boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: true;
-    };
-}, DropdownExclude>;
+type DropdownExclude = 'size' | 'maxHeight' | 'role' | 'type' | 'effect' | 'placement' | 'disabled' | 'popperOptions' | 'popperClass' | 'popperStyle' | 'tabindex' | 'teleported' | 'trigger' | 'triggerKeys' | 'virtualRef' | 'virtualTriggering' | 'showArrow' | 'persistent' | 'id' | 'loop';
 /**
  * 属性
  */
@@ -181,31 +38,16 @@ export declare const dropdownProps: {
         type: BooleanConstructor;
         default: boolean;
     };
-    splitButton: BooleanConstructor;
-    hideOnClick: {
-        readonly type: PropType<boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: true;
-    };
-    showTimeout: {
-        readonly type: PropType<number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: 150;
-    };
-    hideTimeout: {
-        readonly type: PropType<number>;
+    appendTo: {
+        readonly type: PropType<import('element-plus/es/utils/vue/props/types').EpPropMergeType<(new (...args: any[]) => string | HTMLElement) | (() => string | HTMLElement) | (((new (...args: any[]) => string | HTMLElement) | (() => string | HTMLElement)) | null)[], unknown, unknown>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
-    } & {
-        readonly default: 150;
     };
+    splitButton: BooleanConstructor;
+    hideOnClick: import('element-plus/es/utils/vue/props/types').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
+    showTimeout: import('element-plus/es/utils/vue/props/types').EpPropFinalized<NumberConstructor, unknown, unknown, 150, boolean>;
+    hideTimeout: import('element-plus/es/utils/vue/props/types').EpPropFinalized<NumberConstructor, unknown, unknown, 150, boolean>;
     buttonProps: {
         readonly type: PropType<Partial<import('element-plus').ButtonProps>>;
         readonly required: false;
@@ -214,7 +56,7 @@ export declare const dropdownProps: {
     };
     size: PropType<ElButtonProps["size"]>;
     maxHeight: {
-        type: (NumberConstructor | StringConstructor)[];
+        type: (StringConstructor | NumberConstructor)[];
         default: string;
     };
     role: {
@@ -222,98 +64,29 @@ export declare const dropdownProps: {
         default: string;
     };
     type: PropType<ElButtonProps["type"]>;
-    effect: {
-        readonly type: PropType<import('element-plus').PopperEffect>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: "dark";
-    };
+    disabled: BooleanConstructor;
+    tabindex: import('element-plus/es/utils/vue/props/types').EpPropFinalized<(new (...args: any[]) => string | number) | (() => string | number) | (((new (...args: any[]) => string | number) | (() => string | number)) | null)[], unknown, unknown, 0, boolean>;
     ariaLabel: StringConstructor;
-    placement: {
-        readonly type: PropType<import('element-plus').Placement>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: "bottom";
-    };
+    effect: import('element-plus/es/utils/vue/props/types').EpPropFinalized<(new (...args: any[]) => string) | (() => import('element-plus').PopperEffect) | (((new (...args: any[]) => string) | (() => import('element-plus').PopperEffect)) | null)[], unknown, unknown, "dark", boolean>;
     popperClass: StringConstructor;
-    teleported: {
-        readonly type: PropType<boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: true;
-    };
-    appendTo: {
-        readonly type: PropType<string | HTMLElement>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
-    disabled: BooleanConstructor;
-    bg: StringConstructor;
-    fallbackPlacements: {
-        readonly type: PropType<import('element-plus').Placement[]>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: undefined;
-    };
-    persistent: BooleanConstructor;
-    zIndex: NumberConstructor;
-    trigger: {
-        readonly type: PropType<import('element-plus').TooltipTriggerType | import('element-plus').TooltipTriggerType[]>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: "hover";
-    };
-    triggerKeys: {
-        readonly type: PropType<string[]>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: () => string[];
-    };
-    popperOptions: {
-        readonly type: PropType<Partial<import('element-plus').Options>>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: () => {};
-    };
-    tabindex: {
-        readonly type: PropType<string | number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: 0;
-    };
-    showArrow: {
-        readonly type: PropType<boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: boolean;
-    };
     popperStyle: PropType<StyleValue>;
+    virtualTriggering: BooleanConstructor;
+    zIndex: NumberConstructor;
+    fallbackPlacements: import('element-plus/es/utils/vue/props/types').EpPropFinalized<(new (...args: any[]) => import('element-plus').Placement[]) | (() => import('element-plus').Placement[]) | (((new (...args: any[]) => import('element-plus').Placement[]) | (() => import('element-plus').Placement[])) | null)[], unknown, unknown, undefined, boolean>;
+    placement: import('element-plus/es/utils/vue/props/types').EpPropFinalized<StringConstructor, import('element-plus').Placement, unknown, "bottom", boolean>;
+    popperOptions: import('element-plus/es/utils/vue/props/types').EpPropFinalized<(new (...args: any[]) => Partial<import('element-plus').Options>) | (() => Partial<import('element-plus').Options>) | (((new (...args: any[]) => Partial<import('element-plus').Options>) | (() => Partial<import('element-plus').Options>)) | null)[], unknown, unknown, () => {}, boolean>;
+    showArrow: import('element-plus/es/utils/vue/props/types').EpPropFinalized<BooleanConstructor, unknown, unknown, boolean, boolean>;
+    persistent: BooleanConstructor;
+    teleported: import('element-plus/es/utils/vue/props/types').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
+    trigger: import('element-plus/es/utils/vue/props/types').EpPropFinalized<(new (...args: any[]) => "click" | "focus" | "hover" | "contextmenu" | import('element-plus').TooltipTriggerType[]) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>) | (((new (...args: any[]) => "click" | "focus" | "hover" | "contextmenu" | import('element-plus').TooltipTriggerType[]) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>)) | null)[], unknown, unknown, "hover", boolean>;
+    triggerKeys: import('element-plus/es/utils/vue/props/types').EpPropFinalized<(new (...args: any[]) => string[]) | (() => string[]) | (((new (...args: any[]) => string[]) | (() => string[])) | null)[], unknown, unknown, () => string[], boolean>;
     virtualRef: {
         readonly type: PropType<import('element-plus').Measurable>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    virtualTriggering: BooleanConstructor;
+    bg: StringConstructor;
     arrowBg: StringConstructor;
 };
 export type DropdownProps = ExtractPropTypes<typeof dropdownProps>;
@@ -331,18 +104,18 @@ export declare const dropdownEmits: {
     'update:modelValue': (_value: DropdownItem["command"]) => boolean;
     /** 选中改变的事件 */
     change: (_active: DropdownItem["command"]) => boolean;
-    "update:visible": (value: boolean) => boolean;
-    "before-enter": () => boolean;
-    "before-leave": () => boolean;
-    "after-enter": () => boolean;
-    "after-leave": () => boolean;
+    'update:visible': (value: boolean) => boolean;
+    'before-enter': () => boolean;
+    'before-leave': () => boolean;
+    'after-enter': () => boolean;
+    'after-leave': () => boolean;
 };
 export type DropdownEmitsProps = EmitsToProps<typeof dropdownEmits>;
 export type DropdownPropsAndEmits = DropdownProps & DropdownEmitsProps;
 /**
  * 属性名
  */
-export type ElDropdownPropKeys = Array<keyof typeof normalizeDropdownProps>;
+export type ElDropdownPropKeys = Array<Omit<keyof typeof elDropdownProps, DropdownExclude>>;
 export declare const elDropdownPropKeys: ElDropdownPropKeys;
 /**
  * 下拉菜单组件实例

package/es/ele-dropdown-provider/index.js

@@ -1,4 +1,4 @@
-import { defineComponent, createElementBlock, openBlock, Fragment, renderSlot, createVNode, mergeProps, unref } from "vue";
+import { defineComponent, openBlock, createElementBlock, Fragment, renderSlot, unref, createBlock, mergeProps, createCommentVNode } from "vue";
 import EleDropdown from "../ele-dropdown/index";
 import { useDropdownProvider } from "./util";
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -19,8 +19,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock(Fragment, null, [
         renderSlot(_ctx.$slots, "default"),
-        createVNode(EleDropdown, mergeProps({
-          triggerKeys: [],
+        unref(dropdownVirtualRef) ? (openBlock(), createBlock(EleDropdown, mergeProps({
+          key: 0,
           persistent: false
         }, unref(dropdownProps), {
           ref_key: "dropdownRef",
@@ -30,7 +30,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           virtualRef: unref(dropdownVirtualRef),
           disabled: !unref(dropdownItems).length,
           items: unref(dropdownItems)
-        }), null, 16, ["virtualRef", "disabled", "items"])
+        }), null, 16, ["virtualRef", "disabled", "items"])) : createCommentVNode("", true)
       ], 64);
     };
   }

package/es/ele-dropdown-provider/types.d.ts

@@ -1,13 +1,32 @@
-import type { EleDropdownPropsAndEmits } from '../ele-app/plus';
+import type { Ref } from 'vue';
+import type {
+  EleDropdownPropsAndEmits,
+  EleDropdownInstance
+} from '../ele-app/plus';
 import type { DropdownItem } from '../ele-dropdown/types';
 
 /**
- * 提供下拉菜单操作给子组件
+ * 下拉菜单操作
  */
 export interface DropdownProvider {
+  /**
+   * 打开下拉菜单
+   * @param triggerEl 触发元素
+   * @param items 下拉菜单项数据
+   * @param props 下拉菜单属性
+   */
   openDropdown: (
     triggerEl: any,
     items?: DropdownItem[],
     props?: EleDropdownPropsAndEmits
   ) => void;
+  /**
+   * 移除下拉菜单
+   * @param triggerEl 触发元素
+   */
+  removeDropdown: (triggerEl?: any) => void;
+  /**
+   * 下拉菜单组件实例
+   */
+  dropdownRef: Ref<EleDropdownInstance>;
 }

package/es/ele-dropdown-provider/util.d.ts

@@ -8,7 +8,7 @@ import { DropdownProvider } from './types';
  */
 export declare const DROPDOWN_KEY: InjectionKey<DropdownProvider>;
 /**
- * 提供下拉菜单操作给子组件
+ * 提供下拉菜单操作
  */
 export declare function useDropdownProvider(): {
     dropdownRef: import('vue').Ref<EleDropdownInstance, EleDropdownInstance>;
@@ -16,8 +16,20 @@ export declare function useDropdownProvider(): {
     dropdownItems: import('vue').ShallowRef<DropdownItem[], DropdownItem[]>;
     dropdownProps: import('vue').ShallowRef<EleDropdownPropsAndEmits, EleDropdownPropsAndEmits>;
     openDropdown: (triggerEl: any, items?: DropdownItem[], props?: EleDropdownPropsAndEmits) => void;
+    removeDropdown: (triggerEl?: any) => void;
 };
 /**
- * 下拉菜单操作
+ * 使用下拉菜单操作
  */
-export declare function useDropdown(): DropdownProvider;
+export declare function useDropdown(): DropdownProvider | null;
+/**
+ * 提供下拉菜单操作, 先调用 ele-app 的方法, 没有才调用自己的
+ */
+export declare function useDropdownProviderPro(): {
+    dropdownRef: import('vue').Ref<EleDropdownInstance, EleDropdownInstance>;
+    dropdownVirtualRef: import('vue').ShallowRef<any, any>;
+    dropdownItems: import('vue').ShallowRef<DropdownItem[], DropdownItem[]>;
+    dropdownProps: import('vue').ShallowRef<EleDropdownPropsAndEmits, EleDropdownPropsAndEmits>;
+    openDropdown: (triggerEl: any, items?: DropdownItem[], props?: EleDropdownPropsAndEmits) => void;
+    removeDropdown: (triggerEl?: any) => void;
+};

package/es/ele-dropdown-provider/util.js

@@ -1,5 +1,5 @@
 import { ref, shallowRef, provide, inject, nextTick } from "vue";
-const DROPDOWN_KEY = Symbol(
+const DROPDOWN_KEY = /* @__PURE__ */ Symbol(
   "dropdown"
 );
 function useDropdownProvider() {
@@ -11,24 +11,12 @@ function useDropdownProvider() {
     if (triggerEl == null) {
       return;
     }
-    if (dropdownVirtualRef.value === triggerEl) {
-      if (!items?.length) {
-        dropdownRef.value && dropdownRef.value.handleClose();
-        nextTick(() => {
-          dropdownProps.value = props || {};
-          dropdownItems.value = items || [];
-        });
-        return;
-      }
-      dropdownProps.value = props || {};
-      dropdownItems.value = items || [];
-      return;
-    }
     dropdownRef.value && dropdownRef.value.handleClose();
     nextTick(() => {
       dropdownProps.value = props || {};
       dropdownItems.value = items || [];
-      dropdownVirtualRef.value = triggerEl;
+      const rect = triggerEl.getBoundingClientRect();
+      dropdownVirtualRef.value = { getBoundingClientRect: () => rect };
       if (dropdownItems.value.length && !dropdownProps.value.disabled) {
         nextTick(() => {
           dropdownRef.value && dropdownRef.value.handleOpen();
@@ -36,22 +24,60 @@ function useDropdownProvider() {
       }
     });
   };
+  const removeDropdown = (triggerEl) => {
+    if (!triggerEl || dropdownVirtualRef.value === triggerEl) {
+      dropdownRef.value && dropdownRef.value.handleClose();
+      dropdownVirtualRef.value = void 0;
+      dropdownItems.value = [];
+    }
+  };
   provide(DROPDOWN_KEY, {
-    openDropdown
+    openDropdown,
+    removeDropdown,
+    dropdownRef
   });
   return {
     dropdownRef,
     dropdownVirtualRef,
     dropdownItems,
     dropdownProps,
-    openDropdown
+    openDropdown,
+    removeDropdown
   };
 }
 function useDropdown() {
-  return inject(DROPDOWN_KEY, {});
+  return inject(DROPDOWN_KEY, null);
+}
+function useDropdownProviderPro() {
+  const dropdownProvider = useDropdown();
+  const {
+    dropdownRef,
+    dropdownVirtualRef,
+    dropdownItems,
+    dropdownProps,
+    openDropdown,
+    removeDropdown
+  } = useDropdownProvider();
+  const openDropdownPro = (triggerEl, items, props) => {
+    const func = dropdownProvider?.openDropdown || openDropdown;
+    func(triggerEl, items, props);
+  };
+  const removeDropdownPro = (triggerEl) => {
+    const func = dropdownProvider?.removeDropdown || removeDropdown;
+    func(triggerEl);
+  };
+  return {
+    dropdownRef,
+    dropdownVirtualRef,
+    dropdownItems,
+    dropdownProps,
+    openDropdown: openDropdownPro,
+    removeDropdown: removeDropdownPro
+  };
 }
 export {
   DROPDOWN_KEY,
   useDropdown,
-  useDropdownProvider
+  useDropdownProvider,
+  useDropdownProviderPro
 };

package/es/ele-edit-tag/index.d.ts

@@ -25,8 +25,8 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     inputTagRef: import('vue').Ref<ElTagInstance, ElTagInstance>;
     inputRef: import('vue').Ref<ElInputInstance, ElInputInstance>;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-    "update:modelValue": (_value?: string[] | undefined) => void;
     change: (_value?: string[] | undefined) => void;
+    "update:modelValue": (_value?: string[] | undefined) => void;
     itemClick: (_index: number, _value: string) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     modelValue: import('vue').PropType<string[]>;
@@ -47,13 +47,13 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     readonly: BooleanConstructor;
     disabled: BooleanConstructor;
 }>> & Readonly<{
-    "onUpdate:modelValue"?: ((_value?: string[] | undefined) => any) | undefined;
     onChange?: ((_value?: string[] | undefined) => any) | undefined;
+    "onUpdate:modelValue"?: ((_value?: string[] | undefined) => any) | undefined;
     onItemClick?: ((_index: number, _value: string) => any) | undefined;
 }>, {
     disabled: boolean;
-    round: boolean;
     readonly: boolean;
+    round: boolean;
     hit: boolean;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;

package/es/ele-edit-tag/index.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, onDeactivated, onActivated, createElementBlock, openBlock, normalizeClass, createCommentVNode, withDirectives, createVNode, Fragment, renderList, createBlock, unref, normalizeStyle, withCtx, createTextVNode, toDisplayString, renderSlot, vShow, mergeProps, nextTick } from "vue";
+import { defineComponent, ref, onDeactivated, onActivated, openBlock, createElementBlock, normalizeClass, Fragment, renderList, createBlock, unref, normalizeStyle, withCtx, createTextVNode, toDisplayString, createCommentVNode, withDirectives, renderSlot, createVNode, vShow, mergeProps, nextTick } from "vue";
 import { ElTag, ElIcon, ElInput } from "element-plus";
 import EleTooltip from "../ele-tooltip/index";
 import { PlusOutlined, LoadingOutlined } from "../icons/index";

package/es/ele-ellipsis/index.d.ts

@@ -48,8 +48,8 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
 }>> & Readonly<{}>, {
     strong: boolean;
     tooltip: boolean | EllipsisTooltip;
-    underline: boolean;
     italic: boolean;
+    underline: boolean;
     deleted: boolean;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;

package/es/ele-ellipsis/index.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, computed, createBlock, openBlock, mergeProps, withCtx, renderSlot, createCommentVNode, normalizeProps } from "vue";
+import { defineComponent, ref, computed, openBlock, createBlock, mergeProps, withCtx, renderSlot, normalizeProps, createCommentVNode } from "vue";
 import { omit, pick, contentIsEllipsis } from "../utils/common";
 import EleTooltip from "../ele-tooltip/index";
 import EleText from "../ele-text/index";

package/es/ele-ellipsis/props.d.ts

@@ -8,7 +8,7 @@ export declare const ellipsisProps: {
     /** 最大行数 */
     maxLine: NumberConstructor;
     /** 行高 */
-    lineHeight: (NumberConstructor | StringConstructor)[];
+    lineHeight: (StringConstructor | NumberConstructor)[];
     /** 文字提示属性 */
     tooltip: {
         type: PropType<boolean | EllipsisTooltip>;

package/es/ele-file-list/components/file-grid-item.d.ts

@@ -3,7 +3,6 @@ import { IconItem, FileItem, SelectionType, ContextOpenOption } from '../types';
 
 declare function __VLS_template(): {
     icon?(_: {
-        icon: string | undefined;
         item: FileItem;
     }): any;
     title?(_: {

package/es/ele-file-list/components/file-grid-item.js

@@ -1,4 +1,5 @@
-import { defineComponent, ref, computed, createElementBlock, openBlock, withModifiers, normalizeClass, createElementVNode, createCommentVNode, renderSlot, toDisplayString } from "vue";
+import { defineComponent, ref, computed, openBlock, createElementBlock, withModifiers, normalizeClass, createElementVNode, renderSlot, createBlock, toDisplayString, createCommentVNode } from "vue";
+import FileIcon from "./file-icon";
 const _hoisted_1 = { class: "ele-file-list-item-icon" };
 const _hoisted_2 = ["src"];
 const _hoisted_3 = ["title"];
@@ -43,29 +44,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       return !!(props.current && props.current.key === props.item.key);
     });
-    const icon = computed(() => {
-      if (props.item.thumbnail) {
-        return props.item.thumbnail;
-      }
-      if (!props.icons) {
-        return;
-      }
-      if (props.item.isDirectory) {
-        return props.icons.find((d) => d.type === "dir")?.icon;
-      }
-      if (props.item.name) {
-        const icon2 = props.icons.find((d) => {
-          if (!d.suffixes) {
-            return false;
-          }
-          return !!d.suffixes.find((t) => !!props.item.name.endsWith(t));
-        })?.icon;
-        if (icon2) {
-          return icon2;
-        }
-      }
-      return props.icons.find((d) => d.type === "file")?.icon;
-    });
     const handleClick = () => {
       emit("click", props.item);
     };
@@ -94,14 +72,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           onContextmenu: handleContextmenu
         }, [
           createElementVNode("div", _hoisted_1, [
-            renderSlot(_ctx.$slots, "icon", {
-              icon: icon.value,
-              item: __props.item
-            }, () => [
-              createElementVNode("img", {
-                src: icon.value,
-                class: normalizeClass({ "ele-file-list-item-image": !!__props.item.thumbnail })
-              }, null, 10, _hoisted_2)
+            renderSlot(_ctx.$slots, "icon", { item: __props.item }, () => [
+              __props.item.thumbnail ? (openBlock(), createElementBlock("img", {
+                key: 0,
+                src: __props.item.thumbnail,
+                class: "ele-file-list-item-image"
+              }, null, 8, _hoisted_2)) : (openBlock(), createBlock(FileIcon, {
+                key: 1,
+                icons: __props.icons,
+                isDirectory: __props.item.isDirectory,
+                fileName: __props.item.name
+              }, null, 8, ["icons", "isDirectory", "fileName"]))
             ])
           ]),
           renderSlot(_ctx.$slots, "title", { item: __props.item }, () => [