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

package/es/ele-admin-layout/index.d.ts

@@ -18,7 +18,7 @@ declare function __VLS_template(): Partial<Record<string, (_: any) => any>> & Pa
 };
 declare const __VLS_component: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
     height: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: (NumberConstructor | StringConstructor)[];
         default: string;
     };
     headerMenus: import('vue').PropType<MenuItem[]>;
@@ -155,7 +155,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     contentMounted: (_contentEl: HTMLElement, _modalsEl: HTMLElement) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     height: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: (NumberConstructor | StringConstructor)[];
         default: string;
     };
     headerMenus: import('vue').PropType<MenuItem[]>;

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

@@ -2,11 +2,11 @@ declare function __VLS_template(): {
     default?(_: {}): any;
 };
 declare const __VLS_component: import('vue').DefineComponent<{}, {
-    openModal: (option: import('../ele-modal-render/types').ModalItem) => import('../ele-modal-render/types').ModalItemId;
+    openModal: <T extends import('../ele-modal-render/types').ModalItemType, P extends Record<string, any>>(option: import('../ele-modal-render/types').ModalItem<T, P>) => import('../ele-modal-render/types').ModalItemId;
     closeModal: (modalId?: import('../ele-modal-render/types').ModalItemId) => void;
     closeAllModal: () => void;
     removeModal: (modalId?: import('../ele-modal-render/types').ModalItemId) => void;
-    updateModalProps: (modalId?: import('../ele-modal-render/types').ModalItemId, option?: Record<string, any>) => void;
+    updateModalProps: <T extends import('../ele-modal-render/types').ModalItemType>(modalId?: import('../ele-modal-render/types').ModalItemId, option?: import('../ele-modal-render/types').ModalItemProps<T>) => void;
     dropdownRef: import('vue').Ref<import('./plus').EleDropdownInstance, import('./plus').EleDropdownInstance>;
     openDropdown: (triggerEl: any, items?: import('../ele-dropdown/types').DropdownItem[], props?: import('./plus').EleDropdownPropsAndEmits) => void;
     popconfirmRef: import('vue').Ref<import('./plus').ElePopconfirmInstance, import('./plus').ElePopconfirmInstance>;

package/es/ele-app/types.d.ts

@@ -54,7 +54,7 @@ export type ComponentProps<T> = MutablePartial<T> & {
 /**
  * 组件名或组件
  */
-export type UserComponent = string | Component;
+export type UserComponent<P = any> = string | Component<P>;
 
 /**
  * 组件事件触发器

package/es/ele-basic-select/index.d.ts

@@ -67,8 +67,8 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     updateVisible: (visible: boolean) => void;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     clear: () => void;
-    focus: (_e: FocusEvent) => void;
     blur: (_e: FocusEvent) => void;
+    focus: (_e: FocusEvent) => void;
     "update:visible": (_visible: boolean) => void;
     filterChange: (_value: string) => void;
     removeTag: (_item: SelectedItem) => void;
@@ -127,8 +127,8 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     };
 }>> & Readonly<{
     onClear?: (() => any) | undefined;
-    onFocus?: ((_e: FocusEvent) => any) | undefined;
     onBlur?: ((_e: FocusEvent) => any) | undefined;
+    onFocus?: ((_e: FocusEvent) => any) | undefined;
     "onUpdate:visible"?: ((_visible: boolean) => any) | undefined;
     onFilterChange?: ((_value: string) => any) | undefined;
     onRemoveTag?: ((_item: SelectedItem) => any) | undefined;
@@ -140,7 +140,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     disabled: boolean;
     value: import('./types').SelectValue;
     filterable: boolean;
-    tagType: ("primary" | "success" | "warning" | "info" | "danger") | undefined;
+    tagType: ("success" | "primary" | "warning" | "info" | "danger") | undefined;
     persistent: boolean;
     visible: boolean;
     automaticDropdown: boolean;

package/es/ele-buttons/components/item-render.js

@@ -4,6 +4,8 @@ import { ArrowDown, EyeOutlined, ArrowUp, VerticalAlignMiddleOutlined, ColumnHei
 import { mapTree } from "../../utils/common";
 import { useDropdown } from "../../ele-dropdown-provider/util";
 import { usePopconfirm } from "../../ele-popconfirm-provider/util";
+const dropdownDefaultTrigger = "hover";
+const popconfirmDefaultTrigger = "click";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{ name: "ItemRender" },
   __name: "item-render",
@@ -116,7 +118,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       triggerItemClick(command);
     };
     const handleOpenDropdown = (e, item) => {
-      if (!item.dropdownItems || !item.dropdownItems.length || !dropdown || !dropdown.openDropdown) {
+      if (!item.dropdownItems?.length || !dropdown || !dropdown.openDropdown) {
         return;
       }
       dropdown.openDropdown(
@@ -133,8 +135,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           iconSize: "small",
           onCommand: handleDropdownCommand,
           popperOptions: { strategy: "fixed" },
-          ...item.dropdownProps || {},
-          trigger: "hover"
+          trigger: dropdownDefaultTrigger,
+          ...item.dropdownProps || {}
         }
       );
     };
@@ -149,17 +151,47 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       popconfirm.openPopconfirm(e.currentTarget, {
         popperOptions: { strategy: "fixed" },
-        ...item.popconfirmProps || {},
-        trigger: "click"
+        trigger: popconfirmDefaultTrigger,
+        ...item.popconfirmProps || {}
       });
     };
     const handleItemClick = (e, item) => {
-      if (item.popconfirmProps) {
+      if (item.disabled) {
+        return;
+      }
+      if ((item.dropdownProps?.trigger || dropdownDefaultTrigger) === "click") {
+        handleOpenDropdown(e, item);
+      }
+      if (item.popconfirmProps && (item.popconfirmProps.trigger ?? popconfirmDefaultTrigger) === "click") {
         handleOpenPopconfirm(e, item);
       }
       item.onClick && item.onClick(e);
       triggerItemClick(item.command, e);
     };
+    const handleItemMouseenter = (e, item) => {
+      if (item.disabled) {
+        return;
+      }
+      if ((item.dropdownProps?.trigger ?? dropdownDefaultTrigger) === "hover") {
+        handleOpenDropdown(e, item);
+      }
+      if (item.popconfirmProps && (item.popconfirmProps.trigger ?? popconfirmDefaultTrigger) === "hover") {
+        handleOpenPopconfirm(e, item);
+      }
+    };
+    const handleItemContextmenu = (e, item) => {
+      if (item.disabled) {
+        return;
+      }
+      if ((item.dropdownProps?.trigger ?? dropdownDefaultTrigger) === "contextmenu") {
+        e.preventDefault();
+        handleOpenDropdown(e, item);
+      }
+      if (item.popconfirmProps && (item.popconfirmProps.trigger ?? popconfirmDefaultTrigger) === "contextmenu") {
+        e.preventDefault();
+        handleOpenPopconfirm(e, item);
+      }
+    };
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock(Fragment, null, [
         __props.divider ? (openBlock(), createBlock(unref(ElDivider), mergeProps({
@@ -172,13 +204,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           underline: "never",
           type: linkType.value,
           icon: icon.value,
+          disabled: __props.item.disabled,
           class: ["ele-buttons-item ele-buttons-link", {
             "ele-buttons-icon-link": !!icon.value,
             "ele-buttons-wrap": __props.wrapClass
           }]
         }, __props.item.props || {}, {
           onClick: _cache[0] || (_cache[0] = (e) => handleItemClick(e, __props.item)),
-          onMouseenter: _cache[1] || (_cache[1] = (e) => handleOpenDropdown(e, __props.item))
+          onMouseenter: _cache[1] || (_cache[1] = (e) => handleItemMouseenter(e, __props.item)),
+          onContextmenu: _cache[2] || (_cache[2] = (e) => handleItemContextmenu(e, __props.item))
         }), {
           default: withCtx(() => [
             createElementVNode("span", null, toDisplayString(title.value), 1),
@@ -193,17 +227,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             })) : createCommentVNode("", true)
           ]),
           _: 1
-        }, 16, ["type", "icon", "class"])) : (openBlock(), createBlock(unref(ElButton), mergeProps({
+        }, 16, ["type", "icon", "disabled", "class"])) : (openBlock(), createBlock(unref(ElButton), mergeProps({
           key: 2,
           type: btnType.value,
           icon: icon.value,
+          disabled: __props.item.disabled,
           class: ["ele-buttons-item ele-buttons-btn", {
             "ele-buttons-icon-btn": !!icon.value,
             "ele-buttons-wrap": __props.wrapClass
           }]
         }, __props.item.props || {}, {
-          onClick: _cache[2] || (_cache[2] = (e) => handleItemClick(e, __props.item)),
-          onMouseenter: _cache[3] || (_cache[3] = (e) => handleOpenDropdown(e, __props.item))
+          onClick: _cache[3] || (_cache[3] = (e) => handleItemClick(e, __props.item)),
+          onMouseenter: _cache[4] || (_cache[4] = (e) => handleItemMouseenter(e, __props.item)),
+          onContextmenu: _cache[5] || (_cache[5] = (e) => handleItemContextmenu(e, __props.item))
         }), {
           default: withCtx(() => [
             createElementVNode("span", null, toDisplayString(title.value), 1),
@@ -218,7 +254,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             })) : createCommentVNode("", true)
           ]),
           _: 1
-        }, 16, ["type", "icon", "class"]))
+        }, 16, ["type", "icon", "disabled", "class"]))
       ], 64);
     };
   }

package/es/ele-buttons/types.d.ts

@@ -72,6 +72,8 @@ export interface ButtonItemBase<T extends ButtonItemType>
   title?: string;
   /** 图标 */
   icon?: UserComponent;
+  /** 是否禁用 */
+  disabled?: boolean;
   /** 组件类型 */
   type?: T;
   /** 组件属性 */

package/es/ele-check-card/index.d.ts

@@ -31,8 +31,8 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
 }>, {
     reloadOptions: (params?: any) => void;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-    "update:modelValue": (_value: CheckedValue) => void;
     change: (_value: CheckedValue) => void;
+    "update:modelValue": (_value: CheckedValue) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     modelValue: {
         type: import('vue').PropType<CheckedValue>;
@@ -55,8 +55,8 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     row: import('vue').PropType<boolean | import('../ele-app/el').ElRowProps>;
     allowUncheck: BooleanConstructor;
 }>> & Readonly<{
-    "onUpdate:modelValue"?: ((_value: CheckedValue) => any) | undefined;
     onChange?: ((_value: CheckedValue) => any) | undefined;
+    "onUpdate:modelValue"?: ((_value: CheckedValue) => any) | undefined;
 }>, {
     modelValue: CheckedValue;
     disabled: boolean;

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

@@ -80,8 +80,8 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     onDone?: ((_result?: string | Blob | null | undefined) => any) | undefined;
 }>, {
     tooltip: boolean;
-    responsive: boolean;
     tools: string;
+    responsive: boolean;
     preview: boolean;
     accept: string;
     imageType: string;

package/es/ele-dropdown/components/pro-dropdown.d.ts

@@ -169,12 +169,12 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     handleOpen: () => void;
     handleClose: () => void;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
+    change: (_active: (string | number | Record<string, any>) | undefined) => void;
     click: (_e: MouseEvent) => void;
     command: (_command: (string | number | Record<string, any>) | undefined) => void;
     "update:modelValue": (_value: (string | number | Record<string, any>) | undefined) => void;
-    change: (_active: (string | number | Record<string, any>) | undefined) => void;
-    visibleChange: (_visible: boolean) => void;
     "update:visible": (value: boolean) => void;
+    visibleChange: (_visible: boolean) => void;
     "before-enter": () => void;
     "before-leave": () => void;
     "after-enter": () => void;
@@ -334,12 +334,12 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     virtualTriggering: BooleanConstructor;
     arrowBg: StringConstructor;
 }>> & Readonly<{
+    onChange?: ((_active: (string | number | Record<string, any>) | undefined) => any) | undefined;
     onClick?: ((_e: MouseEvent) => any) | undefined;
     onCommand?: ((_command: (string | number | Record<string, any>) | undefined) => any) | undefined;
     "onUpdate:modelValue"?: ((_value: (string | number | Record<string, any>) | undefined) => any) | undefined;
-    onChange?: ((_active: (string | number | Record<string, any>) | undefined) => any) | undefined;
-    onVisibleChange?: ((_visible: boolean) => any) | undefined;
     "onUpdate:visible"?: ((value: boolean) => any) | undefined;
+    onVisibleChange?: ((_visible: boolean) => any) | undefined;
     "onBefore-enter"?: (() => any) | undefined;
     "onBefore-leave"?: (() => any) | undefined;
     "onAfter-enter"?: (() => any) | undefined;

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

@@ -174,8 +174,8 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     command: (_command: (string | number | Record<string, any>) | undefined) => void;
     "update:modelValue": (_value: (string | number | Record<string, any>) | undefined) => void;
     change: (_active: (string | number | Record<string, any>) | undefined) => void;
-    visibleChange: (_visible: boolean) => void;
     "update:visible": (value: boolean) => void;
+    visibleChange: (_visible: boolean) => void;
     "before-enter": () => void;
     "before-leave": () => void;
     "after-enter": () => void;
@@ -337,8 +337,8 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     onCommand?: ((_command: (string | number | Record<string, any>) | undefined) => any) | undefined;
     "onUpdate:modelValue"?: ((_value: (string | number | Record<string, any>) | undefined) => any) | undefined;
     onChange?: ((_active: (string | number | Record<string, any>) | undefined) => any) | undefined;
-    onVisibleChange?: ((_visible: boolean) => any) | undefined;
     "onUpdate:visible"?: ((value: boolean) => any) | undefined;
+    onVisibleChange?: ((_visible: boolean) => any) | undefined;
     "onBefore-enter"?: (() => any) | undefined;
     "onBefore-leave"?: (() => any) | undefined;
     "onAfter-enter"?: (() => any) | undefined;

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

@@ -8,7 +8,20 @@ function useDropdownProvider() {
   const dropdownItems = shallowRef([]);
   const dropdownProps = shallowRef({});
   const openDropdown = (triggerEl, items, props) => {
-    if (triggerEl == null || dropdownVirtualRef.value === triggerEl) {
+    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();
@@ -16,7 +29,7 @@ function useDropdownProvider() {
       dropdownProps.value = props || {};
       dropdownItems.value = items || [];
       dropdownVirtualRef.value = triggerEl;
-      if (dropdownItems.value.length) {
+      if (dropdownItems.value.length && !dropdownProps.value.disabled) {
         nextTick(() => {
           dropdownRef.value && dropdownRef.value.handleOpen();
         });

package/es/ele-file-list/index.d.ts

@@ -31,8 +31,8 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     contextMenuProps: import('vue').PropType<import('../ele-app/plus').EleDropdownProps>;
     locale: import('vue').PropType<Partial<import('./types').FileListLocale>>;
 }>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-    sortChange: (_sorter: SortValue) => void;
     itemClick: (_item: FileItem) => void;
+    sortChange: (_sorter: SortValue) => void;
     "update:selections": (_selection?: FileItem[] | undefined) => void;
     "update:current": (_current?: FileItem | null | undefined) => void;
     itemContextOpen: (_dropdownRef: EleDropdownInstance, _item: FileItem) => void;
@@ -63,8 +63,8 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     contextMenuProps: import('vue').PropType<import('../ele-app/plus').EleDropdownProps>;
     locale: import('vue').PropType<Partial<import('./types').FileListLocale>>;
 }>> & Readonly<{
-    onSortChange?: ((_sorter: SortValue) => any) | undefined;
     onItemClick?: ((_item: FileItem) => any) | undefined;
+    onSortChange?: ((_sorter: SortValue) => any) | undefined;
     "onUpdate:selections"?: ((_selection?: FileItem[] | undefined) => any) | undefined;
     "onUpdate:current"?: ((_current?: FileItem | null | undefined) => any) | undefined;
     onItemContextOpen?: ((_dropdownRef: EleDropdownInstance, _item: FileItem) => any) | undefined;

package/es/ele-icon-select/index.d.ts

@@ -77,10 +77,10 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     updatePopover: () => void;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     clear: () => void;
-    focus: (_e: FocusEvent) => void;
     blur: (_e: FocusEvent) => void;
-    "update:modelValue": (_value?: string | null | undefined) => void;
     change: (_value?: string | null | undefined) => void;
+    focus: (_e: FocusEvent) => void;
+    "update:modelValue": (_value?: string | null | undefined) => void;
     visibleChange: (_visible: boolean) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     modelValue: StringConstructor;
@@ -147,10 +147,10 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     };
 }>> & Readonly<{
     onClear?: (() => any) | undefined;
-    onFocus?: ((_e: FocusEvent) => any) | undefined;
     onBlur?: ((_e: FocusEvent) => any) | undefined;
-    "onUpdate:modelValue"?: ((_value?: string | null | undefined) => any) | undefined;
     onChange?: ((_value?: string | null | undefined) => any) | undefined;
+    onFocus?: ((_e: FocusEvent) => any) | undefined;
+    "onUpdate:modelValue"?: ((_value?: string | null | undefined) => any) | undefined;
     onVisibleChange?: ((_visible: boolean) => any) | undefined;
 }>, {
     transition: string;

package/es/ele-loading/components/main-content.js

@@ -1,5 +1,5 @@
 import { defineComponent, computed, createElementBlock, openBlock, normalizeClass, normalizeStyle, renderSlot, createBlock, createCommentVNode, normalizeProps, guardReactiveProps, unref, Teleport, createVNode, mergeProps } from "vue";
-import { useContentSlot } from "../../utils/hook";
+import { useContentSlot } from "../../ele-viewer/util";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{ name: "MainContent" },
   __name: "main-content",

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

@@ -33,9 +33,9 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     spinner: StringConstructor;
     svgViewBox: StringConstructor;
 }>> & Readonly<{}>, {
+    blur: boolean;
     type: import('./types').LoadingType;
     loading: boolean;
-    blur: boolean;
     plain: boolean;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;

package/es/ele-menus/components/menu-items.d.ts

@@ -67,8 +67,8 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     onParentMouseleave?: ((_item: MenuItem, _e: MouseEvent) => any) | undefined;
 }>, {
     horizontal: boolean;
-    colorful: boolean;
     first: boolean;
+    colorful: boolean;
     tipDisabled: boolean;
     parentIsGroup: boolean;
     webkit: boolean;

package/es/ele-modal-render/components/item-render.d.ts

@@ -1,25 +1,25 @@
 import { PropType } from 'vue';
-import { ModalItem, ModalItemId } from '../types';
+import { ModalItem, ModalItemId, ModalItemType, ModalItemProps } from '../types';
 
 declare function __VLS_template(): Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>>;
 declare const __VLS_component: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
     item: {
-        type: PropType<ModalItem>;
+        type: PropType<ModalItem<ModalItemType, Record<string, any>>>;
         required: true;
     };
 }>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     removeItem: (_modalId?: ModalItemId | undefined) => void;
     updateItemVisible: (_modalId?: ModalItemId | undefined, _visible?: boolean | undefined) => void;
-    updateItemProps: (_modalId?: ModalItemId | undefined, _opt?: Record<string, any> | undefined) => void;
+    updateItemProps: (_modalId?: ModalItemId | undefined, _opt?: ModalItemProps<ModalItemType> | undefined) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     item: {
-        type: PropType<ModalItem>;
+        type: PropType<ModalItem<ModalItemType, Record<string, any>>>;
         required: true;
     };
 }>> & Readonly<{
     onRemoveItem?: ((_modalId?: ModalItemId | undefined) => any) | undefined;
     onUpdateItemVisible?: ((_modalId?: ModalItemId | undefined, _visible?: boolean | undefined) => any) | undefined;
-    onUpdateItemProps?: ((_modalId?: ModalItemId | undefined, _opt?: Record<string, any> | undefined) => any) | undefined;
+    onUpdateItemProps?: ((_modalId?: ModalItemId | undefined, _opt?: ModalItemProps<ModalItemType> | undefined) => any) | undefined;
 }>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;
 export default _default;

package/es/ele-modal-render/components/item-render.js

@@ -31,18 +31,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const closeModal = () => {
       handleUpdateItemVisible(false);
     };
-    const modalProps = computed(
-      () => {
-        return {
-          ...props.item.props || {},
-          isDeactivated: props.item.isDeactivated,
-          compLoading: props.item.compLoading,
-          modelValue: props.item.visible,
-          "onUpdate:modelValue": handleUpdateItemVisible,
-          onClosed: removeModal
-        };
-      }
-    );
+    const modalProps = computed(() => {
+      return {
+        ...props.item.props || {},
+        isDeactivated: props.item.isDeactivated,
+        compLoading: props.item.compLoading,
+        modelValue: props.item.visible,
+        "onUpdate:modelValue": handleUpdateItemVisible,
+        onClosed: removeModal
+      };
+    });
     const provideData = {
       modalProps,
       closeModal,

package/es/ele-modal-render/index.d.ts

@@ -1,17 +1,17 @@
 import { PropType } from 'vue';
-import { ModalItem, ModalItemId } from './types';
+import { ModalItem, ModalItemId, ModalItemType, ModalItemProps } from './types';
 
 declare const _default: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
-    modals: PropType<ModalItem[]>;
+    modals: PropType<ModalItem<ModalItemType, Record<string, any>>[]>;
 }>, () => any[], {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     removeItem: (_modalId?: ModalItemId) => true;
     updateItemVisible: (_modalId?: ModalItemId, _visible?: boolean) => true;
-    updateItemProps: (_modalId?: ModalItemId, _opt?: Record<string, any>) => true;
+    updateItemProps: (_modalId?: ModalItemId, _opt?: ModalItemProps<ModalItemType>) => true;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
-    modals: PropType<ModalItem[]>;
+    modals: PropType<ModalItem<ModalItemType, Record<string, any>>[]>;
 }>> & Readonly<{
     onRemoveItem?: ((_modalId?: ModalItemId | undefined) => any) | undefined;
     onUpdateItemVisible?: ((_modalId?: ModalItemId | undefined, _visible?: boolean | undefined) => any) | undefined;
-    onUpdateItemProps?: ((_modalId?: ModalItemId | undefined, _opt?: Record<string, any> | undefined) => any) | undefined;
+    onUpdateItemProps?: ((_modalId?: ModalItemId | undefined, _opt?: ModalItemProps<ModalItemType> | undefined) => any) | undefined;
 }>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 export default _default;