ele-admin-plus 1.2.1-beta.2 → 1.2.1-beta.4

package/es/ele-pagination/index.js

@@ -23,7 +23,7 @@ const _sfc_main = defineComponent({
       if (props.isFixedPopper) {
         classes.push("is-fixed");
       }
-      if (props.popperClass) {
+      if (typeof props.popperClass === "string" && props.popperClass) {
         classes.push(props.popperClass);
       }
       return classes.join(" ");
@@ -54,6 +54,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_ElPagination = resolveComponent("ElPagination");
   return openBlock(), createBlock(_component_ElPagination, {
     small: _ctx.small,
+    size: _ctx.size,
     background: _ctx.type === "circle" ? false : _ctx.background,
     pageSize: _ctx.pageSize,
     defaultPageSize: _ctx.defaultPageSize,
@@ -88,7 +89,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         ])
       };
     })
-  ]), 1032, ["small", "background", "pageSize", "defaultPageSize", "total", "pageCount", "pagerCount", "currentPage", "defaultCurrentPage", "layout", "pageSizes", "popperClass", "prevText", "prevIcon", "nextText", "nextIcon", "disabled", "teleported", "hideOnSinglePage", "class", "onUpdate:currentPage", "onUpdate:pageSize"]);
+  ]), 1032, ["small", "size", "background", "pageSize", "defaultPageSize", "total", "pageCount", "pagerCount", "currentPage", "defaultCurrentPage", "layout", "pageSizes", "popperClass", "prevText", "prevIcon", "nextText", "nextIcon", "disabled", "teleported", "hideOnSinglePage", "class", "onUpdate:currentPage", "onUpdate:pageSize"]);
 }
 const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 export {

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

@@ -32,11 +32,17 @@ export declare const paginationProps: {
     pageSizes: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => number[]) | (() => number[]) | ((new (...args: any[]) => number[]) | (() => number[]))[], unknown, unknown, () => [10, 20, 30, 40, 50, 100], boolean>;
     popperClass: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
     prevText: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
-    prevIcon: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) | ((new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>))[], unknown, unknown, () => any, boolean>;
+    prevIcon: 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>;
     nextText: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
-    nextIcon: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) | ((new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>))[], unknown, unknown, () => any, boolean>;
+    nextIcon: 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>;
     teleported: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     small: BooleanConstructor;
+    size: {
+        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    };
     background: BooleanConstructor;
     disabled: BooleanConstructor;
     hideOnSinglePage: BooleanConstructor;

package/es/ele-pagination/style/index.scss

@@ -199,6 +199,76 @@
         font-size: eleVar('pagination', 'sm-font-size');
       }
     }
+
+    /* 大尺寸 */
+    &.el-pagination--large {
+      & > * {
+        margin: eleVar('pagination', 'lg-gap') !important;
+        margin-left: 0 !important;
+        margin-bottom: 0 !important;
+      }
+
+      & > .is-last {
+        margin-right: 0 !important;
+      }
+
+      .btn-prev,
+      .btn-next,
+      .el-pager li {
+        height: eleVar('pagination', 'lg-height');
+        line-height: eleVar('pagination', 'lg-height');
+        min-width: eleVar('pagination', 'lg-height');
+        padding: eleVar('pagination', 'lg-padding');
+        border-radius: eleVar('pagination', 'lg-radius');
+        font-size: eleVar('pagination', 'lg-font-size');
+      }
+
+      .el-pager {
+        margin-left: eleVar('pagination', 'lg-space') !important;
+        margin-right: eleVar('pagination', 'lg-space') !important;
+
+        li + li {
+          margin-left: eleVar('pagination', 'lg-space');
+        }
+      }
+
+      .btn-prev {
+        margin-right: 0 !important;
+      }
+
+      .btn-prev .el-icon,
+      .btn-next .el-icon {
+        transform: scale(1.16);
+      }
+
+      .el-pagination__editor.el-input {
+        width: 56px;
+      }
+
+      .el-pagination__sizes {
+        .el-input,
+        .el-select {
+          width: 104px;
+        }
+
+        .el-input .el-input__wrapper,
+        .el-select .el-select__wrapper {
+          padding-right: 8px;
+        }
+      }
+
+      .el-input__inner,
+      .el-select__selected-item > span {
+        font-size: eleVar('pagination', 'lg-font-size');
+      }
+
+      .el-pagination__total,
+      .el-pagination__goto,
+      .el-pagination__classifier {
+        line-height: eleVar('pagination', 'lg-height');
+        font-size: eleVar('pagination', 'lg-font-size');
+      }
+    }
   }
 
   /* 无限页数 */

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

@@ -3,20 +3,20 @@ import { EleTooltipInstance } from '../ele-app/plus';
 
 declare const _default: import('vue').DefineComponent<{
     trigger: {
-        type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => "focus" | "hover" | "click" | "contextmenu" | import('element-plus').TooltipTriggerType[]) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>) | ((new (...args: any[]) => "focus" | "hover" | "click" | "contextmenu" | import('element-plus').TooltipTriggerType[]) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>))[], unknown, unknown> | undefined>;
+        type: import('vue').PropType<import('../ele-app/plus').ElePopoverProps["trigger"]>;
         default: string;
     };
     confirmButtonText: StringConstructor;
     cancelButtonText: StringConstructor;
     confirmButtonType: {
-        type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "success" | "warning" | "info" | "default" | "primary" | "danger" | "text", unknown> | undefined>;
+        type: import('vue').PropType<import('../ele-app/el').ElPopconfirmProps["confirmButtonType"]>;
         default: string;
     };
     cancelButtonType: {
-        type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "success" | "warning" | "info" | "default" | "primary" | "danger" | "text", unknown> | undefined>;
+        type: import('vue').PropType<import('../ele-app/el').ElPopconfirmProps["cancelButtonType"]>;
         default: string;
     };
-    icon: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) | ((new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>))[], unknown, unknown> | undefined>;
+    icon: import('vue').PropType<import('../ele-app/el').ElPopconfirmProps["icon"]>;
     iconColor: {
         type: StringConstructor;
         default: string;
@@ -24,19 +24,19 @@ declare const _default: import('vue').DefineComponent<{
     hideIcon: BooleanConstructor;
     hideConfirmButton: BooleanConstructor;
     hideCancelButton: BooleanConstructor;
-    iconStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    iconStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     iconProps: import('vue').PropType<ElIconProps>;
     confirmButtonProps: import('vue').PropType<import('../ele-app/el').ElButtonProps>;
     cancelButtonProps: import('vue').PropType<import('../ele-app/el').ElButtonProps>;
-    footerStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    footerStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     transition: {
         type: StringConstructor;
         default: string;
     };
     bodyClass: StringConstructor;
-    bodyStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    titleStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    contentStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    bodyStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    titleStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    contentStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     title: StringConstructor;
     effect: {
         readonly default: "light";
@@ -45,14 +45,15 @@ declare const _default: import('vue').DefineComponent<{
         readonly validator: ((val: unknown) => boolean) | undefined;
         readonly __epPropKey: true;
     };
-    placement: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => "top" | "bottom" | "top-start" | "top-end" | "bottom-start" | "bottom-end" | "auto" | "auto-start" | "auto-end" | "right" | "left" | "right-start" | "right-end" | "left-start" | "left-end") | (() => import('element-plus').Placement) | ((new (...args: any[]) => "top" | "bottom" | "top-start" | "top-end" | "bottom-start" | "bottom-end" | "auto" | "auto-start" | "auto-end" | "right" | "left" | "right-start" | "right-end" | "left-start" | "left-end") | (() => import('element-plus').Placement))[], unknown, unknown, "bottom", boolean>;
+    placement: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement) | ((new (...args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement))[], unknown, unknown, "bottom", boolean>;
     teleported: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     disabled: BooleanConstructor;
     offset: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, undefined, boolean>;
-    popperOptions: import('element-plus/es/utils/index').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>))[], unknown, unknown, () => {}, boolean>;
+    persistent: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     width: import('element-plus/es/utils/index').EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, 150, boolean>;
-    visible: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => boolean) | (() => boolean | null) | ((new (...args: any[]) => boolean) | (() => boolean | null))[], unknown, unknown, null, boolean>;
-    tabindex: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string | number) | (() => string | number) | ((new (...args: any[]) => string | number) | (() => string | number))[], unknown, unknown, 0, boolean>;
+    visible: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => (boolean | null) & {}) | (() => boolean | null) | ((new (...args: any[]) => (boolean | null) & {}) | (() => boolean | null))[], unknown, unknown, null, boolean>;
+    popperOptions: import('element-plus/es/utils/index').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>))[], unknown, unknown, () => {}, boolean>;
+    tabindex: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => (string | number) & {}) | (() => string | number) | ((new (...args: any[]) => (string | number) & {}) | (() => string | number))[], unknown, unknown, 0, boolean>;
     content: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
     enterable: {
         readonly default: true;
@@ -65,20 +66,18 @@ declare const _default: import('vue').DefineComponent<{
     hideAfter: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 200, boolean>;
     autoClose: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     showArrow: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    persistent: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    popperStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    popperStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     popperClass: StringConstructor;
     ariaLabel: StringConstructor;
     bg: StringConstructor;
     appendTo: {
-        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => string | HTMLElement) | (() => string | HTMLElement) | ((new (...args: any[]) => string | HTMLElement) | (() => string | HTMLElement))[], unknown, unknown>>;
+        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | HTMLElement) & {}) | (() => string | HTMLElement) | ((new (...args: any[]) => (string | HTMLElement) & {}) | (() => string | HTMLElement))[], unknown, unknown>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
     zIndex: NumberConstructor;
     triggerKeys: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string[]) | (() => string[]) | ((new (...args: any[]) => string[]) | (() => string[]))[], unknown, unknown, () => string[], boolean>;
-    gpuAcceleration: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     arrowOffset: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 5, boolean>;
     virtualRef: {
         readonly type: import('vue').PropType<import('element-plus').Measurable>;
@@ -88,8 +87,8 @@ declare const _default: import('vue').DefineComponent<{
     };
     virtualTriggering: BooleanConstructor;
     className: StringConstructor;
+    gpuAcceleration: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     arrowBg: StringConstructor;
-    isPopover: BooleanConstructor;
 }, {
     tooltipRef: import('vue').Ref<EleTooltipInstance>;
     tooltipProps: import('vue').ComputedRef<Partial<import('../ele-tooltip/props').TooltipProps>>;
@@ -114,20 +113,20 @@ declare const _default: import('vue').DefineComponent<{
     'after-leave': () => boolean;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     trigger: {
-        type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => "focus" | "hover" | "click" | "contextmenu" | import('element-plus').TooltipTriggerType[]) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>) | ((new (...args: any[]) => "focus" | "hover" | "click" | "contextmenu" | import('element-plus').TooltipTriggerType[]) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>))[], unknown, unknown> | undefined>;
+        type: import('vue').PropType<import('../ele-app/plus').ElePopoverProps["trigger"]>;
         default: string;
     };
     confirmButtonText: StringConstructor;
     cancelButtonText: StringConstructor;
     confirmButtonType: {
-        type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "success" | "warning" | "info" | "default" | "primary" | "danger" | "text", unknown> | undefined>;
+        type: import('vue').PropType<import('../ele-app/el').ElPopconfirmProps["confirmButtonType"]>;
         default: string;
     };
     cancelButtonType: {
-        type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "success" | "warning" | "info" | "default" | "primary" | "danger" | "text", unknown> | undefined>;
+        type: import('vue').PropType<import('../ele-app/el').ElPopconfirmProps["cancelButtonType"]>;
         default: string;
     };
-    icon: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) | ((new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>))[], unknown, unknown> | undefined>;
+    icon: import('vue').PropType<import('../ele-app/el').ElPopconfirmProps["icon"]>;
     iconColor: {
         type: StringConstructor;
         default: string;
@@ -135,19 +134,19 @@ declare const _default: import('vue').DefineComponent<{
     hideIcon: BooleanConstructor;
     hideConfirmButton: BooleanConstructor;
     hideCancelButton: BooleanConstructor;
-    iconStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    iconStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     iconProps: import('vue').PropType<ElIconProps>;
     confirmButtonProps: import('vue').PropType<import('../ele-app/el').ElButtonProps>;
     cancelButtonProps: import('vue').PropType<import('../ele-app/el').ElButtonProps>;
-    footerStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    footerStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     transition: {
         type: StringConstructor;
         default: string;
     };
     bodyClass: StringConstructor;
-    bodyStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    titleStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    contentStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    bodyStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    titleStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    contentStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     title: StringConstructor;
     effect: {
         readonly default: "light";
@@ -156,14 +155,15 @@ declare const _default: import('vue').DefineComponent<{
         readonly validator: ((val: unknown) => boolean) | undefined;
         readonly __epPropKey: true;
     };
-    placement: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => "top" | "bottom" | "top-start" | "top-end" | "bottom-start" | "bottom-end" | "auto" | "auto-start" | "auto-end" | "right" | "left" | "right-start" | "right-end" | "left-start" | "left-end") | (() => import('element-plus').Placement) | ((new (...args: any[]) => "top" | "bottom" | "top-start" | "top-end" | "bottom-start" | "bottom-end" | "auto" | "auto-start" | "auto-end" | "right" | "left" | "right-start" | "right-end" | "left-start" | "left-end") | (() => import('element-plus').Placement))[], unknown, unknown, "bottom", boolean>;
+    placement: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement) | ((new (...args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement))[], unknown, unknown, "bottom", boolean>;
     teleported: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     disabled: BooleanConstructor;
     offset: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, undefined, boolean>;
-    popperOptions: import('element-plus/es/utils/index').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>))[], unknown, unknown, () => {}, boolean>;
+    persistent: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     width: import('element-plus/es/utils/index').EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, 150, boolean>;
-    visible: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => boolean) | (() => boolean | null) | ((new (...args: any[]) => boolean) | (() => boolean | null))[], unknown, unknown, null, boolean>;
-    tabindex: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string | number) | (() => string | number) | ((new (...args: any[]) => string | number) | (() => string | number))[], unknown, unknown, 0, boolean>;
+    visible: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => (boolean | null) & {}) | (() => boolean | null) | ((new (...args: any[]) => (boolean | null) & {}) | (() => boolean | null))[], unknown, unknown, null, boolean>;
+    popperOptions: import('element-plus/es/utils/index').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>))[], unknown, unknown, () => {}, boolean>;
+    tabindex: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => (string | number) & {}) | (() => string | number) | ((new (...args: any[]) => (string | number) & {}) | (() => string | number))[], unknown, unknown, 0, boolean>;
     content: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
     enterable: {
         readonly default: true;
@@ -176,20 +176,18 @@ declare const _default: import('vue').DefineComponent<{
     hideAfter: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 200, boolean>;
     autoClose: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     showArrow: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    persistent: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    popperStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    popperStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     popperClass: StringConstructor;
     ariaLabel: StringConstructor;
     bg: StringConstructor;
     appendTo: {
-        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => string | HTMLElement) | (() => string | HTMLElement) | ((new (...args: any[]) => string | HTMLElement) | (() => string | HTMLElement))[], unknown, unknown>>;
+        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | HTMLElement) & {}) | (() => string | HTMLElement) | ((new (...args: any[]) => (string | HTMLElement) & {}) | (() => string | HTMLElement))[], unknown, unknown>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
     zIndex: NumberConstructor;
     triggerKeys: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string[]) | (() => string[]) | ((new (...args: any[]) => string[]) | (() => string[]))[], unknown, unknown, () => string[], boolean>;
-    gpuAcceleration: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     arrowOffset: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 5, boolean>;
     virtualRef: {
         readonly type: import('vue').PropType<import('element-plus').Measurable>;
@@ -199,27 +197,28 @@ declare const _default: import('vue').DefineComponent<{
     };
     virtualTriggering: BooleanConstructor;
     className: StringConstructor;
+    gpuAcceleration: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     arrowBg: StringConstructor;
-    isPopover: BooleanConstructor;
 }>> & {
     "onUpdate:visible"?: ((value: boolean) => any) | undefined;
-    "onBefore-enter"?: (() => any) | undefined;
-    "onBefore-leave"?: (() => any) | undefined;
     "onAfter-enter"?: (() => any) | undefined;
     "onAfter-leave"?: (() => any) | undefined;
+    "onBefore-enter"?: (() => any) | undefined;
+    "onBefore-leave"?: (() => any) | undefined;
     onCancel?: ((_e: MouseEvent) => any) | undefined;
     onConfirm?: ((_e: MouseEvent) => any) | undefined;
 }, {
     effect: string;
-    placement: import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => "top" | "bottom" | "top-start" | "top-end" | "bottom-start" | "bottom-end" | "auto" | "auto-start" | "auto-end" | "right" | "left" | "right-start" | "right-end" | "left-start" | "left-end") | (() => import('element-plus').Placement) | ((new (...args: any[]) => "top" | "bottom" | "top-start" | "top-end" | "bottom-start" | "bottom-end" | "auto" | "auto-start" | "auto-end" | "right" | "left" | "right-start" | "right-end" | "left-start" | "left-end") | (() => import('element-plus').Placement))[], unknown, unknown>;
+    placement: import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement) | ((new (...args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement))[], unknown, unknown>;
     teleported: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
     disabled: boolean;
     offset: number;
-    popperOptions: Partial<import('element-plus').Options>;
+    persistent: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
     width: import('element-plus/es/utils/index').EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown>;
-    visible: import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => boolean) | (() => boolean | null) | ((new (...args: any[]) => boolean) | (() => boolean | null))[], unknown, unknown>;
-    trigger: import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => "focus" | "hover" | "click" | "contextmenu" | import('element-plus').TooltipTriggerType[]) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>) | ((new (...args: any[]) => "focus" | "hover" | "click" | "contextmenu" | import('element-plus').TooltipTriggerType[]) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>))[], unknown, unknown> | undefined;
-    tabindex: import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => string | number) | (() => string | number) | ((new (...args: any[]) => string | number) | (() => string | number))[], unknown, unknown>;
+    visible: import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (boolean | null) & {}) | (() => boolean | null) | ((new (...args: any[]) => (boolean | null) & {}) | (() => boolean | null))[], unknown, unknown>;
+    trigger: import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType> & {}) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>) | ((new (...args: any[]) => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType> & {}) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>))[], unknown, unknown> | undefined;
+    popperOptions: Partial<import('element-plus').Options>;
+    tabindex: import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | number) & {}) | (() => string | number) | ((new (...args: any[]) => (string | number) & {}) | (() => string | number))[], unknown, unknown>;
     triggerKeys: string[];
     transition: string;
     content: string;
@@ -228,15 +227,13 @@ declare const _default: import('vue').DefineComponent<{
     hideAfter: number;
     autoClose: number;
     showArrow: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
-    persistent: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
-    gpuAcceleration: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
     arrowOffset: number;
     virtualTriggering: boolean;
+    gpuAcceleration: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
     confirmButtonType: import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "success" | "warning" | "info" | "default" | "primary" | "danger" | "text", unknown> | undefined;
     cancelButtonType: import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "success" | "warning" | "info" | "default" | "primary" | "danger" | "text", unknown> | undefined;
     iconColor: string;
     hideIcon: boolean;
-    isPopover: boolean;
     hideConfirmButton: boolean;
     hideCancelButton: boolean;
 }, {}>;

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

@@ -1,12 +1,14 @@
 import { PropType, ExtractPropTypes } from 'vue';
-import { ElIconProps, ElButtonProps } from '../ele-app/el';
+import { StyleValue } from '../ele-app/types';
+import { ElPopconfirmProps, ElIconProps, ElButtonProps } from '../ele-app/el';
+import { ElePopoverProps } from '../ele-app/plus';
 
 /**
  * 属性
  */
 export declare const popconfirmProps: {
     trigger: {
-        type: PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => "focus" | "hover" | "click" | "contextmenu" | import('element-plus').TooltipTriggerType[]) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>) | ((new (...args: any[]) => "focus" | "hover" | "click" | "contextmenu" | import('element-plus').TooltipTriggerType[]) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>))[], unknown, unknown> | undefined>;
+        type: PropType<ElePopoverProps["trigger"]>;
         default: string;
     };
     /** 确认按钮文字 */
@@ -15,16 +17,16 @@ export declare const popconfirmProps: {
     cancelButtonText: StringConstructor;
     /** 确认按钮类型 */
     confirmButtonType: {
-        type: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "success" | "warning" | "info" | "default" | "primary" | "danger" | "text", unknown> | undefined>;
+        type: PropType<ElPopconfirmProps["confirmButtonType"]>;
         default: string;
     };
     /** 取消按钮类型 */
     cancelButtonType: {
-        type: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "success" | "warning" | "info" | "default" | "primary" | "danger" | "text", unknown> | undefined>;
+        type: PropType<ElPopconfirmProps["cancelButtonType"]>;
         default: string;
     };
     /** 自定义图标 */
-    icon: PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) | ((new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>))[], unknown, unknown> | undefined>;
+    icon: PropType<ElPopconfirmProps["icon"]>;
     /** 图标颜色 */
     iconColor: {
         type: StringConstructor;
@@ -37,7 +39,7 @@ export declare const popconfirmProps: {
     /** 是否隐藏取消按钮 */
     hideCancelButton: BooleanConstructor;
     /** 图标样式 */
-    iconStyle: PropType<Partial<import('vue').CSSProperties>>;
+    iconStyle: PropType<StyleValue>;
     /** 图标组件属性 */
     iconProps: PropType<ElIconProps>;
     /** 确认按钮组件属性 */
@@ -45,15 +47,15 @@ export declare const popconfirmProps: {
     /** 取消按钮组件属性 */
     cancelButtonProps: PropType<ElButtonProps>;
     /** 底栏样式 */
-    footerStyle: PropType<Partial<import('vue').CSSProperties>>;
+    footerStyle: PropType<StyleValue>;
     transition: {
         type: StringConstructor;
         default: string;
-    }; /** 取消按钮类型 */
+    };
     bodyClass: StringConstructor;
-    bodyStyle: PropType<Partial<import('vue').CSSProperties>>;
-    titleStyle: PropType<Partial<import('vue').CSSProperties>>;
-    contentStyle: PropType<Partial<import('vue').CSSProperties>>;
+    bodyStyle: PropType<StyleValue>;
+    titleStyle: PropType<StyleValue>;
+    contentStyle: PropType<StyleValue>;
     title: StringConstructor;
     effect: {
         readonly default: "light";
@@ -62,14 +64,15 @@ export declare const popconfirmProps: {
         readonly validator: ((val: unknown) => boolean) | undefined;
         readonly __epPropKey: true;
     };
-    placement: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => "top" | "bottom" | "top-start" | "top-end" | "bottom-start" | "bottom-end" | "auto" | "auto-start" | "auto-end" | "right" | "left" | "right-start" | "right-end" | "left-start" | "left-end") | (() => import('element-plus').Placement) | ((new (...args: any[]) => "top" | "bottom" | "top-start" | "top-end" | "bottom-start" | "bottom-end" | "auto" | "auto-start" | "auto-end" | "right" | "left" | "right-start" | "right-end" | "left-start" | "left-end") | (() => import('element-plus').Placement))[], unknown, unknown, "bottom", boolean>;
+    placement: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement) | ((new (...args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement))[], unknown, unknown, "bottom", boolean>;
     teleported: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     disabled: BooleanConstructor;
     offset: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, undefined, boolean>;
-    popperOptions: import('element-plus/es/utils/index').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>))[], unknown, unknown, () => {}, boolean>;
+    persistent: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     width: import('element-plus/es/utils/index').EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, 150, boolean>;
-    visible: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => boolean) | (() => boolean | null) | ((new (...args: any[]) => boolean) | (() => boolean | null))[], unknown, unknown, null, boolean>;
-    tabindex: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string | number) | (() => string | number) | ((new (...args: any[]) => string | number) | (() => string | number))[], unknown, unknown, 0, boolean>;
+    visible: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => (boolean | null) & {}) | (() => boolean | null) | ((new (...args: any[]) => (boolean | null) & {}) | (() => boolean | null))[], unknown, unknown, null, boolean>;
+    popperOptions: import('element-plus/es/utils/index').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>))[], unknown, unknown, () => {}, boolean>;
+    tabindex: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => (string | number) & {}) | (() => string | number) | ((new (...args: any[]) => (string | number) & {}) | (() => string | number))[], unknown, unknown, 0, boolean>;
     content: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
     enterable: {
         readonly default: true;
@@ -82,31 +85,29 @@ export declare const popconfirmProps: {
     hideAfter: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 200, boolean>;
     autoClose: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     showArrow: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    persistent: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    popperStyle: PropType<Partial<import('vue').CSSProperties>>;
+    popperStyle: PropType<StyleValue>;
     popperClass: StringConstructor;
     ariaLabel: StringConstructor;
     bg: StringConstructor;
     appendTo: {
-        readonly type: PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => string | HTMLElement) | (() => string | HTMLElement) | ((new (...args: any[]) => string | HTMLElement) | (() => string | HTMLElement))[], unknown, unknown>>;
+        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | HTMLElement) & {}) | (() => string | HTMLElement) | ((new (...args: any[]) => (string | HTMLElement) & {}) | (() => string | HTMLElement))[], unknown, unknown>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
     zIndex: NumberConstructor;
     triggerKeys: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string[]) | (() => string[]) | ((new (...args: any[]) => string[]) | (() => string[]))[], unknown, unknown, () => string[], boolean>;
-    gpuAcceleration: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     arrowOffset: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 5, boolean>;
     virtualRef: {
-        readonly type: PropType<import('element-plus').Measurable>;
+        readonly type: import('vue').PropType<import('element-plus').Measurable>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
     virtualTriggering: BooleanConstructor;
     className: StringConstructor;
+    gpuAcceleration: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     arrowBg: StringConstructor;
-    isPopover: BooleanConstructor;
 };
 export type PopconfirmProps = ExtractPropTypes<typeof popconfirmProps>;
 /**