ele-admin-plus 1.0.0-beta.2 → 1.0.0-beta.3

package/lib/ele-tour/index.js

@@ -1,8 +1,7 @@
 "use strict";
 const vue = require("vue");
 const elementPlus = require("element-plus");
-const useReceiver = require("../ele-config-provider/use-receiver");
-const licenseUtil = require("../utils/license-util");
+const receiver = require("../ele-config-provider/receiver");
 const util = require("./util");
 const props = require("./props");
 const _sfc_main = vue.defineComponent({
@@ -11,8 +10,8 @@ const _sfc_main = vue.defineComponent({
   props: props.tourProps,
   emits: props.tourEmits,
   setup(props2, { emit }) {
-    const { authenticated } = licenseUtil.useLicense();
-    const { lang } = useReceiver.useLocale("tour", props2);
+    const { authenticated } = receiver.useLicense();
+    const { lang } = receiver.useLocale("tour", props2);
     const rootRef = vue.ref(null);
     const triggerRef = vue.ref(null);
     const popoverRef = vue.ref(null);
@@ -22,6 +21,9 @@ const _sfc_main = vue.defineComponent({
     const boxStyle = vue.ref({});
     const showMask = vue.ref(false);
     const popProps = vue.shallowRef({});
+    const rootStyle = vue.computed(() => {
+      return { zIndex: props2.zIndex };
+    });
     const start = () => {
       if (!authenticated.value || !props2.steps || props2.modelValue == null || props2.modelValue < 0 || props2.modelValue >= props2.steps.length) {
         close();
@@ -111,6 +113,7 @@ const _sfc_main = vue.defineComponent({
       boxStyle,
       showMask,
       popProps,
+      rootStyle,
       onPrev,
       onNext,
       onFinish
@@ -138,12 +141,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return vue.openBlock(), vue.createBlock(vue.Teleport, { to: "body" }, [
     vue.createElementVNode("div", {
       ref: "rootRef",
-      class: vue.normalizeClass([
-        "ele-tour",
-        { "ele-tour-mask": _ctx.showMask },
-        { "ele-tour-open": _ctx.visible }
-      ]),
-      style: vue.normalizeStyle({ zIndex: _ctx.zIndex })
+      class: vue.normalizeClass(["ele-tour", { "show-mask": _ctx.showMask }, { "is-open": _ctx.visible }]),
+      style: vue.normalizeStyle(_ctx.rootStyle)
     }, [
       vue.createElementVNode("div", {
         class: "ele-tour-box",

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

@@ -8,10 +8,10 @@
   bottom: 0;
   z-index: elVar('index', 'popper');
   display: none;
-}
 
-.ele-tour-open {
-  display: block;
+  &.is-open {
+    display: block;
+  }
 }
 
 /* 带高亮的遮罩 */
@@ -22,7 +22,7 @@
   transition: left 0.3s, top 0.3s, width 0.3s, height 0.3s;
 }
 
-.ele-tour-mask .ele-tour-box {
+.ele-tour.show-mask .ele-tour-box {
   border: none;
   box-shadow: 0 0 0 1000vw elVar('overlay-color', 'lighter');
 }

package/lib/ele-tour/util.js

@@ -19,6 +19,7 @@ function getPopProps(visible, modal, props) {
   return {
     trigger: "click",
     placement: "top",
+    teleported: false,
     width: modal ? 440 : 290,
     transition: "ele-tour-fast",
     ...props,

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

@@ -6,6 +6,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
         required: true;
     };
     readonly: BooleanConstructor;
+    disabled: BooleanConstructor;
     locale: {
         type: PropType<UploadLocale>;
         required: true;
@@ -15,24 +16,26 @@ declare const _sfc_main: import("vue").DefineComponent<{
     onItemClick: () => void;
     onRetry: () => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    remove: () => true;
-    itemClick: () => true;
-    retry: () => true;
+    itemClick: (_item: UploadItem) => true;
+    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;
     locale: {
         type: PropType<UploadLocale>;
         required: true;
     };
 }>> & {
-    onRemove?: (() => any) | undefined;
-    onItemClick?: (() => any) | undefined;
-    onRetry?: (() => any) | undefined;
+    onItemClick?: ((_item: UploadItem) => any) | undefined;
+    onRemove?: ((_item: UploadItem) => any) | undefined;
+    onRetry?: ((_item: UploadItem) => any) | undefined;
 }, {
     readonly: boolean;
+    disabled: boolean;
 }, {}>;
 export default _sfc_main;

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

@@ -21,6 +21,8 @@ const _sfc_main = vue.defineComponent({
     },
     // 是否只读
     readonly: Boolean,
+    // 是否禁用
+    disabled: Boolean,
     // 国际化
     locale: {
       type: Object,
@@ -28,25 +30,21 @@ const _sfc_main = vue.defineComponent({
     }
   },
   emits: {
-    remove: () => true,
-    itemClick: () => true,
-    retry: () => true
+    itemClick: (_item) => true,
+    remove: (_item) => true,
+    retry: (_item) => true
   },
-  setup(_props, { emit }) {
+  setup(props, { emit }) {
     const onRemove = () => {
-      emit("remove");
+      emit("remove", props.item);
     };
     const onItemClick = () => {
-      emit("itemClick");
+      emit("itemClick", props.item);
     };
     const onRetry = () => {
-      emit("retry");
-    };
-    return {
-      onRemove,
-      onItemClick,
-      onRetry
+      emit("retry", props.item);
     };
+    return { onRemove, onItemClick, onRetry };
   }
 });
 const _export_sfc = (sfc, props) => {
@@ -66,10 +64,9 @@ const _hoisted_3 = {
   class: "ele-upload-progress"
 };
 const _hoisted_4 = { class: "ele-upload-text" };
-const _hoisted_5 = { class: "ele-upload-tools" };
-const _hoisted_6 = {
-  key: 2,
-  class: "ele-upload-mask"
+const _hoisted_5 = {
+  key: 0,
+  class: "ele-upload-tools"
 };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_ElImage = vue.resolveComponent("ElImage");
@@ -81,7 +78,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_ElTooltip = vue.resolveComponent("ElTooltip");
   return vue.openBlock(), vue.createElementBlock("div", {
     title: _ctx.item.name,
-    class: vue.normalizeClass(["ele-upload-item", { "ele-draggable": !_ctx.readonly }]),
+    class: "ele-upload-item",
     onClick: _cache[2] || (_cache[2] = (...args) => _ctx.onItemClick && _ctx.onItemClick(...args))
   }, [
     vue.renderSlot(_ctx.$slots, "thumbnail", { item: _ctx.item }, () => [
@@ -98,7 +95,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         })
       ]))
     ]),
-    !_ctx.readonly ? (vue.openBlock(), vue.createElementBlock("div", {
+    !_ctx.readonly && !_ctx.disabled ? (vue.openBlock(), vue.createElementBlock("div", {
       key: 0,
       class: "ele-upload-remove",
       onClick: _cache[0] || (_cache[0] = vue.withModifiers((...args) => _ctx.onRemove && _ctx.onRemove(...args), ["stop"]))
@@ -118,9 +115,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         vue.createVNode(_component_ElProgress, {
           showText: false,
           percentage: _ctx.item.progress,
-          status: _ctx.item.status == "exception" ? "exception" : void 0
+          status: _ctx.item.status === "exception" ? "exception" : void 0
         }, null, 8, ["percentage", "status"]),
-        vue.createElementVNode("div", _hoisted_5, [
+        !_ctx.disabled ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_5, [
           _ctx.item.status === "exception" ? (vue.openBlock(), vue.createElementBlock("div", {
             key: 0,
             class: "ele-upload-retry",
@@ -141,10 +138,10 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               _: 1
             }, 8, ["content"])
           ])) : vue.createCommentVNode("", true)
-        ])
+        ])) : vue.createCommentVNode("", true)
       ])
-    ])) : (vue.openBlock(), vue.createElementBlock("div", _hoisted_6))
-  ], 10, _hoisted_1);
+    ])) : vue.createCommentVNode("", true)
+  ], 8, _hoisted_1);
 }
 const listItem = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 module.exports = listItem;