ele-admin-plus 1.1.4 → 1.1.5-beta.2

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

@@ -1,5 +1,5 @@
 import type { Ref } from 'vue';
-import type { ElePopoverProps } from '../ele-avatar-group/types';
+import type { EleTooltipInstance } from '../ele-app/types/components';
 import type { TourStep, TourLocale } from './types';
 declare const _default: import("vue").DefineComponent<{
     modelValue: NumberConstructor;
@@ -19,16 +19,14 @@ declare const _default: import("vue").DefineComponent<{
     locale: import("vue").PropType<Partial<TourLocale>>;
 }, {
     lang: import("vue").ComputedRef<TourLocale>;
-    rootRef: Ref<HTMLDivElement | null>;
-    triggerRef: Ref<HTMLDivElement | null>;
-    popoverRef: any;
+    triggerRef: any;
+    tooltipRef: Ref<EleTooltipInstance>;
+    tooltipProps: import("vue").ShallowRef<Partial<import("../ele-tooltip/props").TooltipProps>>;
     visible: Ref<boolean>;
     step: import("vue").ShallowRef<TourStep | null>;
     isLast: Ref<boolean>;
     boxStyle: Ref<Partial<import("vue").CSSProperties>>;
     showMask: Ref<boolean>;
-    popProps: import("vue").ShallowRef<ElePopoverProps>;
-    rootStyle: import("vue").ComputedRef<Partial<import("vue").CSSProperties>>;
     onPrev: () => void;
     onNext: () => void;
     onFinish: () => void;

package/es/ele-tour/index.js

@@ -1,29 +1,25 @@
-import { defineComponent, ref, shallowRef, computed, onMounted, watch, nextTick, unref, resolveComponent, openBlock, createBlock, Teleport, createElementVNode, normalizeClass, normalizeStyle, createVNode, mergeProps, withCtx, createElementBlock, Fragment, renderSlot, createTextVNode, toDisplayString, createCommentVNode } from "vue";
+import { defineComponent, ref, shallowRef, onMounted, watch, nextTick, resolveComponent, openBlock, createBlock, Teleport, createElementVNode, normalizeClass, normalizeStyle, createVNode, mergeProps, withCtx, createElementBlock, renderSlot, createTextVNode, toDisplayString, createCommentVNode } from "vue";
 import { ElButton } from "element-plus";
-import ElePopover from "../ele-popover/index";
+import EleTooltip from "../ele-tooltip/index";
 import { useLicense, useLocale } from "../ele-config-provider/receiver";
-import { getOffset, getPopProps } from "./util";
+import { getOffset, getPopperProps } from "./util";
 import { tourProps, tourEmits } from "./props";
 const _sfc_main = defineComponent({
   name: "EleTour",
-  components: { ElButton, ElePopover },
+  components: { ElButton, EleTooltip },
   props: tourProps,
   emits: tourEmits,
   setup(props, { emit }) {
     const { authenticated } = useLicense();
     const { lang } = useLocale("tour", props);
-    const rootRef = ref(null);
     const triggerRef = ref(null);
-    const popoverRef = ref(null);
+    const tooltipRef = ref(null);
+    const tooltipProps = shallowRef({});
     const visible = ref(false);
     const step = shallowRef(null);
     const isLast = ref(false);
     const boxStyle = ref({});
     const showMask = ref(false);
-    const popProps = shallowRef({});
-    const rootStyle = computed(() => {
-      return { zIndex: props.zIndex };
-    });
     const start = () => {
       if (!authenticated.value || !props.steps || props.modelValue == null || props.modelValue < 0 || props.modelValue >= props.steps.length) {
         close();
@@ -57,7 +53,7 @@ const _sfc_main = defineComponent({
         };
       }
       visible.value = true;
-      popProps.value = getPopProps(true, !el, popoverProps);
+      tooltipProps.value = getPopperProps(true, !el, popoverProps);
       nextTick(() => {
         updatePopper();
       });
@@ -67,7 +63,7 @@ const _sfc_main = defineComponent({
       boxStyle.value = {};
       step.value = null;
       showMask.value = false;
-      popProps.value = getPopProps();
+      tooltipProps.value = getPopperProps();
     };
     const updateModelValue = (value) => {
       emit("update:modelValue", value);
@@ -86,12 +82,7 @@ const _sfc_main = defineComponent({
       updateModelValue(null);
     };
     const updatePopper = () => {
-      var _a;
-      const popper = unref((_a = popoverRef.value) == null ? void 0 : _a.popperRef);
-      const ins = unref(popper == null ? void 0 : popper.popperInstanceRef);
-      if (ins && typeof ins.update === "function") {
-        ins.update();
-      }
+      tooltipRef.value && tooltipRef.value.updatePopper();
     };
     onMounted(() => {
       start();
@@ -104,16 +95,14 @@ const _sfc_main = defineComponent({
     );
     return {
       lang,
-      rootRef,
       triggerRef,
-      popoverRef,
+      tooltipRef,
+      tooltipProps,
       visible,
       step,
       isLast,
       boxStyle,
       showMask,
-      popProps,
-      rootStyle,
       onPrev,
       onNext,
       onFinish
@@ -128,21 +117,24 @@ const _export_sfc = (sfc, props) => {
   return target;
 };
 const _hoisted_1 = {
+  key: 0,
+  class: "ele-popover-body"
+};
+const _hoisted_2 = {
   key: 0,
   class: "ele-tour-title"
 };
-const _hoisted_2 = { class: "ele-tour-text" };
-const _hoisted_3 = { class: "ele-tour-footer" };
-const _hoisted_4 = { class: "ele-tour-counter" };
-const _hoisted_5 = { class: "ele-tour-action" };
+const _hoisted_3 = { class: "ele-tour-text" };
+const _hoisted_4 = { class: "ele-tour-footer" };
+const _hoisted_5 = { class: "ele-tour-counter" };
+const _hoisted_6 = { class: "ele-tour-action" };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_ElButton = resolveComponent("ElButton");
-  const _component_ElePopover = resolveComponent("ElePopover");
+  const _component_EleTooltip = resolveComponent("EleTooltip");
   return openBlock(), createBlock(Teleport, { to: "body" }, [
     createElementVNode("div", {
-      ref: "rootRef",
       class: normalizeClass(["ele-tour", { "show-mask": _ctx.showMask }, { "is-open": _ctx.visible }]),
-      style: normalizeStyle(_ctx.rootStyle)
+      style: normalizeStyle({ zIndex: _ctx.zIndex })
     }, [
       createElementVNode("div", {
         class: "ele-tour-box",
@@ -153,16 +145,16 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         class: "ele-tour-reference",
         style: normalizeStyle(_ctx.boxStyle)
       }, null, 4),
-      createVNode(_component_ElePopover, mergeProps(_ctx.popProps, {
-        ref: "popoverRef",
+      createVNode(_component_EleTooltip, mergeProps(_ctx.tooltipProps, {
+        ref: "tooltipRef",
         virtualRef: _ctx.triggerRef,
         virtualTriggering: true,
         disabled: !_ctx.visible,
         hideAfter: 0
       }), {
-        default: withCtx(() => [
-          _ctx.steps && _ctx.step ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
-            _ctx.step.title ? (openBlock(), createElementBlock("div", _hoisted_1, [
+        body: withCtx(() => [
+          _ctx.steps && _ctx.step ? (openBlock(), createElementBlock("div", _hoisted_1, [
+            _ctx.step.title ? (openBlock(), createElementBlock("div", _hoisted_2, [
               renderSlot(_ctx.$slots, "title", {
                 step: _ctx.step,
                 current: _ctx.modelValue
@@ -170,7 +162,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                 createTextVNode(toDisplayString(_ctx.step.title), 1)
               ])
             ])) : createCommentVNode("", true),
-            createElementVNode("div", _hoisted_2, [
+            createElementVNode("div", _hoisted_3, [
               renderSlot(_ctx.$slots, "text", {
                 step: _ctx.step,
                 current: _ctx.modelValue
@@ -182,9 +174,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               step: _ctx.step,
               current: _ctx.modelValue
             }, () => [
-              createElementVNode("div", _hoisted_3, [
-                createElementVNode("div", _hoisted_4, toDisplayString((_ctx.modelValue || 0) + 1) + "/" + toDisplayString(_ctx.steps.length), 1),
-                createElementVNode("div", _hoisted_5, [
+              createElementVNode("div", _hoisted_4, [
+                createElementVNode("div", _hoisted_5, toDisplayString((_ctx.modelValue || 0) + 1) + "/" + toDisplayString(_ctx.steps.length), 1),
+                createElementVNode("div", _hoisted_6, [
                   !_ctx.isLast ? (openBlock(), createBlock(_component_ElButton, {
                     key: 0,
                     size: "small",
@@ -230,7 +222,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                 ])
               ])
             ])
-          ], 64)) : createCommentVNode("", true)
+          ])) : createCommentVNode("", true)
         ]),
         _: 3
       }, 16, ["virtualRef", "disabled"])

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

@@ -4,20 +4,26 @@ import type { TourStep, TourLocale } from './types';
  * 属性
  */
 export declare const tourProps: {
+    /** 当前处于第几步 */
     modelValue: NumberConstructor;
+    /** 步骤 */
     steps: {
         type: PropType<TourStep[]>;
         required: boolean;
     };
+    /** 是否开启遮罩层 */
     mask: {
         type: BooleanConstructor;
         default: boolean;
     };
+    /** 高亮区内间距 */
     padding: {
         type: NumberConstructor;
         default: number;
     };
+    /** 层级 */
     zIndex: NumberConstructor;
+    /** 国际化 */
     locale: PropType<Partial<TourLocale>>;
 };
 export type TourProps = ExtractPropTypes<typeof tourProps>;

package/es/ele-tour/props.js

@@ -1,24 +1,24 @@
 const tourProps = {
-  // 当前处于第几步
+  /** 当前处于第几步 */
   modelValue: Number,
-  // 步骤
+  /** 步骤 */
   steps: {
     type: Array,
     required: true
   },
-  // 是否开启遮罩层
+  /** 是否开启遮罩层 */
   mask: {
     type: Boolean,
     default: true
   },
-  // 高亮区内间距
+  /** 高亮区内间距 */
   padding: {
     type: Number,
     default: 6
   },
-  // 层级
+  /** 层级 */
   zIndex: Number,
-  // 国际化
+  /** 国际化 */
   locale: Object
 };
 const tourEmits = {

package/es/ele-tour/style/index.js

@@ -1,3 +1,3 @@
 import 'element-plus/es/components/button/style/index';
-import '../../ele-popover/style/index';
+import '../../ele-tooltip/style/index';
 import './index.scss';

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

@@ -79,6 +79,10 @@
   }
 }
 
+.ele-tour-popover > .ele-popover-body {
+  padding: 12px 16px;
+}
+
 /* 气泡弹窗效果 */
 .ele-tour-popover.ele-tour-modal {
   margin: 0 auto;
@@ -86,10 +90,10 @@
   top: 50% !important;
   right: 0 !important;
   bottom: auto !important;
-  transform: translateY(-50.1%);
+  transform: translateY(-50.1%) !important;
   transform-origin: center !important;
-  box-sizing: border-box;
   max-width: calc(100% - 32px);
+  box-sizing: border-box;
 
   & > .el-popper__arrow {
     display: none;

package/es/ele-tour/types/index.d.ts

@@ -1,4 +1,4 @@
-import type { ElePopoverProps } from '../../ele-avatar-group/types';
+import type { ElePopoverProps } from '../../ele-app/types/components';
 /**
  * 引导步骤指向元素
  */
@@ -13,6 +13,7 @@ export interface TourStep {
     title?: string;
     /** 描述 */
     description?: string;
+    /** 内间距 */
     padding?: number;
     /** 是否开启遮罩层 */
     mask?: boolean;

package/es/ele-tour/util.d.ts

@@ -1,4 +1,4 @@
-import type { ElePopoverProps } from '../ele-avatar-group/types';
+import type { EleTooltipProps } from '../ele-app/types/components';
 import type { Offset } from './types';
 /**
  * 获取元素距浏览器窗口的距离
@@ -11,4 +11,4 @@ export declare function getOffset(el: HTMLElement): Offset;
  * @param model 是否是弹窗
  * @param props 自定义属性
  */
-export declare function getPopProps(visible?: boolean, modal?: boolean, props?: ElePopoverProps): ElePopoverProps;
+export declare function getPopperProps(visible?: boolean, modal?: boolean, props?: EleTooltipProps): EleTooltipProps;

package/es/ele-tour/util.js

@@ -6,7 +6,7 @@ function getOffset(el) {
     left: left + (scrollX ?? 0)
   };
 }
-function getPopProps(visible, modal, props) {
+function getPopperProps(visible, modal, props) {
   const classes = ["ele-tour-popover"];
   if (modal) {
     classes.push("ele-tour-modal");
@@ -20,6 +20,10 @@ function getPopProps(visible, modal, props) {
     teleported: false,
     width: modal ? 440 : 290,
     transition: "ele-tour-fast",
+    persistent: false,
+    effect: "light",
+    isPopover: true,
+    gpuAcceleration: true,
     ...props,
     visible: visible ?? false,
     popperClass: classes.join(" ")
@@ -27,5 +31,5 @@ function getPopProps(visible, modal, props) {
 }
 export {
   getOffset,
-  getPopProps
+  getPopperProps
 };

package/es/ele-upload-list/components/list-item.d.ts

@@ -2,13 +2,18 @@ import type { PropType } from 'vue';
 import type { ElProgressProps } from '../../ele-app/types';
 import type { UploadItem, UploadLocale } from '../types';
 declare const _default: import("vue").DefineComponent<{
+    /** 数据 */
     item: {
         type: PropType<UploadItem>;
         required: true;
     };
+    /** 是否只读 */
     readonly: BooleanConstructor;
+    /** 是否禁用 */
     disabled: BooleanConstructor;
+    /** 进度条属性 */
     progressProps: PropType<ElProgressProps>;
+    /** 国际化 */
     locale: {
         type: PropType<Partial<UploadLocale>>;
         required: true;
@@ -22,21 +27,26 @@ declare const _default: import("vue").DefineComponent<{
     remove: (_item: UploadItem) => true;
     retry: (_item: UploadItem) => true;
 }, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    /** 数据 */
     item: {
         type: PropType<UploadItem>;
         required: true;
     };
+    /** 是否只读 */
     readonly: BooleanConstructor;
+    /** 是否禁用 */
     disabled: BooleanConstructor;
+    /** 进度条属性 */
     progressProps: PropType<ElProgressProps>;
+    /** 国际化 */
     locale: {
         type: PropType<Partial<UploadLocale>>;
         required: true;
     };
 }>> & {
-    onRetry?: ((_item: UploadItem) => any) | undefined;
     onItemClick?: ((_item: UploadItem) => any) | undefined;
     onRemove?: ((_item: UploadItem) => any) | undefined;
+    onRetry?: ((_item: UploadItem) => any) | undefined;
 }, {
     disabled: boolean;
     readonly: boolean;

package/es/ele-upload-list/components/list-item.js

@@ -14,18 +14,18 @@ const _sfc_main = defineComponent({
     EleTooltip
   },
   props: {
-    // 数据
+    /** 数据 */
     item: {
       type: Object,
       required: true
     },
-    // 是否只读
+    /** 是否只读 */
     readonly: Boolean,
-    // 是否禁用
+    /** 是否禁用 */
     disabled: Boolean,
-    // 进度条属性
+    /** 进度条属性 */
     progressProps: Object,
-    // 国际化
+    /** 国际化 */
     locale: {
       type: Object,
       required: true

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

@@ -76,9 +76,9 @@ declare const _default: import("vue").DefineComponent<{
     locale: import("vue").PropType<Partial<UploadLocale>>;
 }>> & {
     "onUpdate:modelValue"?: ((_value: UploadItem[]) => any) | undefined;
-    onRetry?: ((_item: UploadItem) => any) | undefined;
     onItemClick?: ((_item: UploadItem) => any) | undefined;
     onRemove?: ((_item: UploadItem) => any) | undefined;
+    onRetry?: ((_item: UploadItem) => any) | undefined;
     onUpload?: ((_item: UploadItem) => any) | undefined;
 }, {
     disabled: boolean;

package/es/ele-upload-list/index.js

@@ -23,13 +23,13 @@ const _sfc_main = defineComponent({
     const { lang } = useLocale("upload", props);
     const previewRef = ref(null);
     const previewOption = reactive({
-      // 是否打开
+      /** 是否打开 */
       visible: false,
-      // 当前图片地址
+      /** 当前图片地址 */
       current: "",
-      // 当前为第几个图片
+      /** 当前为第几个图片 */
       currentIndex: 0,
-      // 图片列表
+      /** 图片列表 */
       images: []
     });
     const uploadEnable = computed(() => {

package/es/ele-upload-list/props.d.ts

@@ -5,30 +5,43 @@ import type { UploadItem, UploadLocale } from './types';
  * 属性
  */
 export declare const uploadListProps: {
+    /** 已上传列表 */
     modelValue: {
         type: PropType<UploadItem[]>;
         required: boolean;
     };
+    /** 是否只读 */
     readonly: BooleanConstructor;
+    /** 是否禁用 */
     disabled: BooleanConstructor;
+    /** 是否支持点击预览 */
     preview: {
         type: BooleanConstructor;
         default: boolean;
     };
+    /** 最大上传数量 */
     limit: NumberConstructor;
+    /** 是否支持多选文件 */
     multiple: BooleanConstructor;
+    /** 是否启用拖拽上传 */
     drag: BooleanConstructor;
+    /** 接受上传的文件类型 */
     accept: {
         type: StringConstructor;
         default: string;
     };
+    /** 自定义条目样式 */
     itemStyle: PropType<Partial<import("vue").CSSProperties>>;
+    /** 自定义上传按钮样式 */
     buttonStyle: PropType<Partial<import("vue").CSSProperties>>;
+    /** 是否开启拖拽排序 */
     sortable: {
         type: PropType<boolean | Record<string | number | symbol, any>>;
         default: boolean;
     };
+    /** 进度条属性 */
     progressProps: PropType<ElProgressProps>;
+    /** 国际化 */
     locale: PropType<Partial<UploadLocale>>;
 };
 export type UploadListProps = ExtractPropTypes<typeof uploadListProps>;
@@ -36,9 +49,14 @@ export type UploadListProps = ExtractPropTypes<typeof uploadListProps>;
  * 事件
  */
 export declare const uploadListEmits: {
+    /** 更新绑定值 */
     'update:modelValue': (_value: UploadItem[]) => boolean;
+    /** item 点击事件 */
     itemClick: (_item: UploadItem) => boolean;
+    /** 上传事件 */
     upload: (_item: UploadItem) => boolean;
+    /** item 移除事件 */
     remove: (_item: UploadItem) => boolean;
+    /** item 上传失败重试事件 */
     retry: (_item: UploadItem) => boolean;
 };

package/es/ele-upload-list/props.js

@@ -1,53 +1,53 @@
 const uploadListProps = {
-  // 已上传列表
+  /** 已上传列表 */
   modelValue: {
     type: Array,
     required: true
   },
-  // 是否只读
+  /** 是否只读 */
   readonly: Boolean,
-  // 是否禁用
+  /** 是否禁用 */
   disabled: Boolean,
-  // 是否支持点击预览
+  /** 是否支持点击预览 */
   preview: {
     type: Boolean,
     default: true
   },
-  // 最大上传数量
+  /** 最大上传数量 */
   limit: Number,
-  // 是否支持多选文件
+  /** 是否支持多选文件 */
   multiple: Boolean,
-  // 是否启用拖拽上传
+  /** 是否启用拖拽上传 */
   drag: Boolean,
-  // 接受上传的文件类型
+  /** 接受上传的文件类型 */
   accept: {
     type: String,
     default: "image/png,image/jpeg"
   },
-  // 自定义条目样式
+  /** 自定义条目样式 */
   itemStyle: Object,
-  // 自定义上传按钮样式
+  /** 自定义上传按钮样式 */
   buttonStyle: Object,
-  // 是否开启拖拽排序
+  /** 是否开启拖拽排序 */
   sortable: {
     type: [Boolean, Object],
     default: true
   },
-  // 进度条属性
+  /** 进度条属性 */
   progressProps: Object,
-  // 国际化
+  /** 国际化 */
   locale: Object
 };
 const uploadListEmits = {
-  // 更新绑定值
+  /** 更新绑定值 */
   "update:modelValue": (_value) => true,
-  // item 点击事件
+  /** item 点击事件 */
   itemClick: (_item) => true,
-  // 上传事件
+  /** 上传事件 */
   upload: (_item) => true,
-  // item 移除事件
+  /** item 移除事件 */
   remove: (_item) => true,
-  // item 上传失败重试事件
+  /** item 上传失败重试事件 */
   retry: (_item) => true
 };
 export {