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

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

@@ -55,166 +55,48 @@ export declare const popconfirmProps: {
     bodyClass: StringConstructor;
     titleStyle: PropType<StyleValue>;
     contentStyle: PropType<StyleValue>;
+    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>;
     title: StringConstructor;
-    tabindex: {
-        readonly type: PropType<string | number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: 0;
-    };
-    showAfter: {
-        readonly type: PropType<number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: 0;
-    };
-    hideAfter: {
-        readonly type: PropType<number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: 200;
-    };
-    autoClose: {
-        readonly type: PropType<number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: 0;
-    };
-    effect: {
-        readonly type: PropType<import('element-plus').PopperEffect>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: "dark";
-    };
+    disabled: BooleanConstructor;
     ariaLabel: StringConstructor;
-    placement: {
-        readonly type: PropType<import('element-plus').Placement>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: "bottom";
-    };
+    visible: import('element-plus/es/utils/vue/props/types').EpPropFinalized<(new (...args: any[]) => boolean) | (() => boolean | null) | (((new (...args: any[]) => boolean) | (() => boolean | null)) | null)[], unknown, unknown, null, boolean>;
+    className: StringConstructor;
+    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>;
+    enterable: import('element-plus/es/utils/vue/props/types').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     popperClass: StringConstructor;
-    teleported: {
-        readonly type: PropType<boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: true;
-    };
+    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>;
+    gpuAcceleration: import('element-plus/es/utils/vue/props/types').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
+    offset: import('element-plus/es/utils/vue/props/types').EpPropFinalized<NumberConstructor, unknown, unknown, 12, 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>;
+    arrowOffset: import('element-plus/es/utils/vue/props/types').EpPropFinalized<NumberConstructor, unknown, unknown, 5, boolean>;
+    showArrow: import('element-plus/es/utils/vue/props/types').EpPropFinalized<BooleanConstructor, unknown, unknown, boolean, boolean>;
     appendTo: {
-        readonly type: PropType<string | HTMLElement>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
-    disabled: BooleanConstructor;
-    offset: {
-        readonly type: PropType<number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: 12;
-    };
-    bg: StringConstructor;
-    bodyStyle: PropType<StyleValue>;
-    fallbackPlacements: {
-        readonly type: PropType<import('element-plus').Placement[]>;
+        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: undefined;
     };
+    content: import('element-plus/es/utils/vue/props/types').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
     persistent: BooleanConstructor;
-    width: (NumberConstructor | StringConstructor)[];
-    zIndex: NumberConstructor;
-    visible: {
-        readonly type: PropType<boolean | null>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: null;
-    };
-    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: () => {};
-    };
-    showArrow: {
-        readonly type: PropType<boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: boolean;
-    };
-    content: {
-        readonly type: PropType<string>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: "";
-    };
-    popperStyle: PropType<StyleValue>;
-    enterable: {
-        readonly type: PropType<boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: true;
-    };
-    arrowOffset: {
-        readonly type: PropType<number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: 5;
-    };
+    teleported: import('element-plus/es/utils/vue/props/types').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
+    showAfter: import('element-plus/es/utils/vue/props/types').EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
+    hideAfter: import('element-plus/es/utils/vue/props/types').EpPropFinalized<NumberConstructor, unknown, unknown, 200, boolean>;
+    autoClose: import('element-plus/es/utils/vue/props/types').EpPropFinalized<NumberConstructor, unknown, unknown, 0, 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>;
+    focusOnTarget: BooleanConstructor;
     virtualRef: {
         readonly type: PropType<import('element-plus').Measurable>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    virtualTriggering: BooleanConstructor;
-    className: StringConstructor;
-    gpuAcceleration: {
-        readonly type: PropType<boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: true;
-    };
+    width: (StringConstructor | NumberConstructor)[];
+    bg: StringConstructor;
+    bodyStyle: PropType<StyleValue>;
     arrowBg: StringConstructor;
 };
 export type PopconfirmProps = ExtractPropTypes<typeof popconfirmProps>;
@@ -224,11 +106,11 @@ export type PopconfirmProps = ExtractPropTypes<typeof popconfirmProps>;
 export declare const popconfirmEmits: {
     confirm: (_e: MouseEvent) => boolean;
     cancel: (_e: MouseEvent) => 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 PopconfirmEmitsProps = EmitsToProps<typeof popconfirmEmits>;
 export type PopconfirmPropsAndEmits = PopconfirmProps & PopconfirmEmitsProps;

package/lib/ele-popconfirm/style/index.scss

@@ -12,7 +12,7 @@
   display: flex;
 }
 
-.ele-popconfirm-icon {
+.ele-popconfirm-icon.el-icon {
   flex-shrink: 0;
   font-size: eleVar('popconfirm', 'icon-font-size');
   margin: eleVar('popconfirm', 'icon-margin');

package/lib/ele-popconfirm-provider/index.cjs

@@ -19,9 +19,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createElementBlock(vue.Fragment, null, [
         vue.renderSlot(_ctx.$slots, "default"),
-        vue.createVNode(ElePopconfirm, vue.mergeProps({
+        vue.unref(popconfirmVirtualRef) ? (vue.openBlock(), vue.createBlock(ElePopconfirm, vue.mergeProps({
+          key: 0,
           width: 200,
-          triggerKeys: [],
           persistent: false,
           placement: "top-end"
         }, vue.unref(popconfirmProps), {
@@ -29,7 +29,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           ref: popconfirmRef,
           virtualTriggering: true,
           virtualRef: vue.unref(popconfirmVirtualRef)
-        }), null, 16, ["virtualRef"])
+        }), null, 16, ["virtualRef"])) : vue.createCommentVNode("", true)
       ], 64);
     };
   }

package/lib/ele-popconfirm-provider/types.d.ts

@@ -1,8 +1,26 @@
-import type { ElePopconfirmPropsAndEmits } from '../ele-app/plus';
+import type { Ref } from 'vue';
+import type {
+  ElePopconfirmPropsAndEmits,
+  ElePopconfirmInstance
+} from '../ele-app/plus';
 
 /**
  * 提供气泡确认框操作给子组件
  */
 export interface PopconfirmProvider {
+  /**
+   * 打开气泡确认框
+   * @param triggerEl 触发元素
+   * @param props 气泡确认框属性
+   */
   openPopconfirm: (triggerEl: any, props?: ElePopconfirmPropsAndEmits) => void;
+  /**
+   * 移除气泡确认框
+   * @param triggerEl 触发元素
+   */
+  removePopconfirm: (triggerEl?: any) => void;
+  /**
+   * 气泡确认框组件实例
+   */
+  popconfirmRef: Ref<ElePopconfirmInstance>;
 }

package/lib/ele-popconfirm-provider/util.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const vue = require("vue");
-const POPCONFIRM_KEY = Symbol(
+const POPCONFIRM_KEY = /* @__PURE__ */ Symbol(
   "popconfirm"
 );
 function usePopconfirmProvider() {
@@ -29,18 +29,27 @@ function usePopconfirmProvider() {
       }
     });
   };
+  const removePopconfirm = (triggerEl) => {
+    if (!triggerEl || popconfirmVirtualRef.value === triggerEl) {
+      popconfirmRef.value && popconfirmRef.value.hidePopper();
+      popconfirmVirtualRef.value = void 0;
+    }
+  };
   vue.provide(POPCONFIRM_KEY, {
-    openPopconfirm
+    openPopconfirm,
+    removePopconfirm,
+    popconfirmRef
   });
   return {
     popconfirmRef,
     popconfirmVirtualRef,
     popconfirmProps,
-    openPopconfirm
+    openPopconfirm,
+    removePopconfirm
   };
 }
 function usePopconfirm() {
-  return vue.inject(POPCONFIRM_KEY, {});
+  return vue.inject(POPCONFIRM_KEY, null);
 }
 exports.POPCONFIRM_KEY = POPCONFIRM_KEY;
 exports.usePopconfirm = usePopconfirm;

package/lib/ele-popconfirm-provider/util.d.ts

@@ -7,15 +7,16 @@ import { PopconfirmProvider } from './types';
  */
 export declare const POPCONFIRM_KEY: InjectionKey<PopconfirmProvider>;
 /**
- * 提供气泡确认框操作给子组件
+ * 提供气泡确认框操作
  */
 export declare function usePopconfirmProvider(): {
     popconfirmRef: import('vue').Ref<ElePopconfirmInstance, ElePopconfirmInstance>;
     popconfirmVirtualRef: import('vue').ShallowRef<any, any>;
     popconfirmProps: import('vue').ShallowRef<Partial<import('../ele-popconfirm/props').PopconfirmPropsAndEmits>, Partial<import('../ele-popconfirm/props').PopconfirmPropsAndEmits>>;
     openPopconfirm: (triggerEl: any, props?: ElePopconfirmPropsAndEmits) => void;
+    removePopconfirm: (triggerEl?: any) => void;
 };
 /**
- * 气泡确认框操作
+ * 使用气泡确认框操作
  */
-export declare function usePopconfirm(): PopconfirmProvider;
+export declare function usePopconfirm(): PopconfirmProvider | null;