ele-admin-plus 1.1.8-beta.4 → 1.1.8-beta.6

package/lib/ele-basic-select/props.d.ts

@@ -28,7 +28,7 @@ export declare const basicSelectProps: {
     /** 多选标签最大显示文本长度 */
     maxTagTextLength: NumberConstructor;
     /** 多选标签类型 */
-    tagType: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "" | "success" | "warning" | "info" | "danger", unknown> | undefined>;
+    tagType: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "success" | "warning" | "info" | "primary" | "danger", unknown> | undefined>;
     /** 是否在输入框获得焦点后自动弹出选项菜单 */
     automaticDropdown: BooleanConstructor;
     /** 是否可以筛选 */

package/lib/ele-basic-select/style/index.scss

@@ -64,14 +64,11 @@
   }
 
   & > .el-input .el-input__icon.ele-select-clear {
-    color: elVar('bg-color', 'overlay');
-    font-size: eleVar('input', 'clear-size');
-    background: eleVar('input', 'clear-color');
-    border-radius: 50%;
+    color: eleVar('input', 'clear-color');
     cursor: pointer;
 
     &:hover {
-      background: eleVar('input', 'clear-hover-color');
+      color: eleVar('input', 'clear-hover-color');
     }
   }
 
@@ -93,10 +90,6 @@
     #{'d'}: path('M10 31 24 17 38 31');
   }
 
-  .ele-select-arrow > svg > path {
-    stroke-width: 4;
-  }
-
   /* 多选 */
   &.is-multiple {
     min-height: elVar('component-size');

package/lib/ele-copyable/index.cjs

@@ -1,13 +1,13 @@
 "use strict";
 const vue = require("vue");
 const elementPlus = require("element-plus");
-const iconsVue = require("@element-plus/icons-vue");
+const icons = require("../icons");
 const receiver = require("../ele-config-provider/receiver");
 const EleTooltip = require("../ele-tooltip/index");
 const props = require("./props");
 const _sfc_main = vue.defineComponent({
   name: "EleCopyable",
-  components: { ElIcon: elementPlus.ElIcon, DocumentCopy: iconsVue.DocumentCopy, Check: iconsVue.Check, EleTooltip },
+  components: { ElIcon: elementPlus.ElIcon, CopyOutlined: icons.CopyOutlined, CheckOutlined: icons.CheckOutlined, EleTooltip },
   props: props.copyableProps,
   emits: props.copyableEmits,
   setup(props2, { emit }) {
@@ -105,9 +105,9 @@ const _export_sfc = (sfc, props2) => {
   return target;
 };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  const _component_Check = vue.resolveComponent("Check");
+  const _component_CheckOutlined = vue.resolveComponent("CheckOutlined");
   const _component_ElIcon = vue.resolveComponent("ElIcon");
-  const _component_DocumentCopy = vue.resolveComponent("DocumentCopy");
+  const _component_CopyOutlined = vue.resolveComponent("CopyOutlined");
   const _component_EleTooltip = vue.resolveComponent("EleTooltip");
   return vue.openBlock(), vue.createElementBlock("div", {
     class: vue.normalizeClass(["ele-copyable", { "ele-copyable-done": _ctx.copied }])
@@ -130,7 +130,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           _ctx.copiedIcon ? (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(_ctx.copiedIcon), {
             key: 0,
             style: vue.normalizeStyle(_ctx.copiedIconStyle)
-          }, null, 8, ["style"])) : (vue.openBlock(), vue.createBlock(_component_Check, {
+          }, null, 8, ["style"])) : (vue.openBlock(), vue.createBlock(_component_CheckOutlined, {
             key: 1,
             style: vue.normalizeStyle(_ctx.copiedIconStyle)
           }, null, 8, ["style"]))
@@ -141,7 +141,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           _ctx.icon ? (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(_ctx.icon), {
             key: 0,
             style: vue.normalizeStyle(_ctx.iconStyle)
-          }, null, 8, ["style"])) : (vue.openBlock(), vue.createBlock(_component_DocumentCopy, {
+          }, null, 8, ["style"])) : (vue.openBlock(), vue.createBlock(_component_CopyOutlined, {
             key: 1,
             style: vue.normalizeStyle(_ctx.iconStyle)
           }, null, 8, ["style"]))

package/lib/ele-copyable/index.d.ts

@@ -12,10 +12,11 @@ declare const _default: import("vue").DefineComponent<{
     copiedIconStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     tooltip: {
         type: import("vue").PropType<boolean | Partial<import("../ele-tooltip/props").TooltipProps>>;
-        default: boolean;
+        default: boolean; /** 提示单例目标 */
     };
     resetAfter: {
         type: NumberConstructor;
+        /** 是否拷贝完成 */
         default: number;
     };
     locale: import("vue").PropType<Partial<CopyableLocale>>;
@@ -41,10 +42,11 @@ declare const _default: import("vue").DefineComponent<{
     copiedIconStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     tooltip: {
         type: import("vue").PropType<boolean | Partial<import("../ele-tooltip/props").TooltipProps>>;
-        default: boolean;
+        default: boolean; /** 提示单例目标 */
     };
     resetAfter: {
         type: NumberConstructor;
+        /** 是否拷贝完成 */
         default: number;
     };
     locale: import("vue").PropType<Partial<CopyableLocale>>;

package/lib/ele-cropper/components/cropper-tools.cjs

@@ -1,23 +1,23 @@
 "use strict";
 const vue = require("vue");
-const iconsVue = require("@element-plus/icons-vue");
 const elementPlus = require("element-plus");
+const icons = require("../../icons");
 const EleTooltip = require("../../ele-tooltip/index");
 const receiver = require("../../ele-config-provider/receiver");
 const TOOL_ICONS = {
-  zoomIn: iconsVue.ZoomIn,
-  zoomOut: iconsVue.ZoomOut,
-  moveLeft: iconsVue.Back,
-  moveRight: iconsVue.Right,
-  moveUp: iconsVue.Top,
-  moveDown: iconsVue.Bottom,
-  rotateLeft: iconsVue.RefreshLeft,
-  rotateRight: iconsVue.RefreshRight,
-  flipX: iconsVue.Switch,
-  flipY: iconsVue.Sort,
-  reset: iconsVue.Refresh,
-  upload: iconsVue.Upload,
-  ok: iconsVue.Check
+  zoomIn: icons.ZoomInOutlined,
+  zoomOut: icons.ZoomOutOutlined,
+  moveLeft: icons.ArrowLeftOutlined,
+  moveRight: icons.ArrowRightOutlined,
+  moveUp: icons.ArrowUpOutlined,
+  moveDown: icons.ArrowDownOutlined,
+  rotateLeft: icons.UndoOutlined,
+  rotateRight: icons.ReloadOutlined,
+  flipX: icons.SwapOutlined,
+  flipY: icons.SortOutlined,
+  reset: icons.SyncOutlined,
+  upload: icons.UploadOutlined,
+  ok: icons.CheckOutlined
 };
 const _sfc_main = vue.defineComponent({
   name: "CropperTools",

package/lib/ele-cropper/props.cjs

@@ -28,7 +28,7 @@ const cropperProps = {
   /** 预览组件宽度 */
   previewWidth: {
     type: Number,
-    default: 120
+    default: 98
   },
   /** 是否返回blob数据 */
   toBlob: Boolean,

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

@@ -8,7 +8,7 @@
 
   .ele-cropper-image {
     flex: 1;
-    height: 320px;
+    height: 300px;
     position: relative;
     box-sizing: border-box;
 
@@ -82,8 +82,8 @@
     display: none;
   }
 
-  & > .el-icon {
-    font-size: 16px;
+  &.ele-cropper-ok > .el-icon + span {
+    margin-left: 4px;
   }
 }
 

package/lib/ele-cropper-modal/index.cjs

@@ -31,7 +31,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_EleCropper = vue.resolveComponent("EleCropper");
   const _component_EleModal = vue.resolveComponent("EleModal");
   return vue.openBlock(), vue.createBlock(_component_EleModal, vue.mergeProps({
-    width: "660px",
+    width: "620px",
     title: _ctx.lang.title
   }, _ctx.modalProps, {
     modelValue: _ctx.modelValue,

package/lib/ele-data-table/style/index.scss

@@ -1,8 +1,9 @@
 @use '../../style/themes/default.scss' as *;
 @use '../../style/util.scss' as *;
 @use './css-var.scss' as *;
-$ele-filter-path: 'M349 838c0 17 14 32 31 32h262c17 0 31-14 31-32V642H349v196ZM880 154H143c-24 0-39 26-27 48l221 376h348l221-376c12-21-3-48-27-48' !default;
 $ele-expand-path: 'M362 811 662 512 362 213' !default;
+$ele-loading-path: 'M512 128V299M789 235 672 352M896 512H725M789 789 672 672M512 896V725M235 789 352 672M128 512H299M235 235 352 352' !default;
+$ele-filter-path: 'M349 838c0 17 14 32 31 32h262c17 0 31-14 31-32V642H349v196ZM880 154H143c-24 0-39 26-27 48l221 376h348l221-376c12-21-3-48-27-48' !default;
 
 @include set-data-table-var($ele);
 @include table-var-style('body .ele-data-table.el-table');
@@ -216,21 +217,31 @@ $ele-expand-path: 'M362 811 662 512 362 213' !default;
       transition: (color $ele-transition, background-color $ele-transition);
       transform: none;
 
+      &:hover {
+        background: eleVar('table', 'icon-hover-bg');
+      }
+
       & > .el-icon {
         transition: all $ele-transition;
         font-size: inherit;
 
-        &:not(.is-loading) > svg > path {
+        & > svg > path {
           fill: none;
           stroke: currentColor;
-          stroke-width: 100;
           stroke-linecap: round;
+          stroke-linejoin: round;
+          stroke-width: 98;
           #{'d'}: path($ele-expand-path);
         }
       }
 
-      &:hover {
-        background: eleVar('table', 'icon-hover-bg');
+      & > .is-loading > svg > path {
+        stroke-width: 85;
+        #{'d'}: path($ele-loading-path);
+      }
+
+      & > .el-icon:not(.is-loading) > svg {
+        transform: translateX(0.4px);
       }
     }
 
@@ -239,7 +250,7 @@ $ele-expand-path: 'M362 811 662 512 362 213' !default;
     & > .el-table__placeholder {
       height: 16px;
       display: inline-flex;
-      vertical-align: -3px;
+      vertical-align: -2px;
     }
 
     & > .el-table__expand-icon,

package/lib/ele-drawer/index.cjs

@@ -1,17 +1,66 @@
 "use strict";
 const vue = require("vue");
-const iconsVue = require("@element-plus/icons-vue");
 const elementPlus = require("element-plus");
 const receiver = require("../ele-config-provider/receiver");
+const util = require("../ele-modal/util");
+const icons = require("../icons");
 const props = require("./props");
 const _sfc_main = vue.defineComponent({
   name: "EleDrawer",
-  components: { ElDrawer: elementPlus.ElDrawer, ElIcon: elementPlus.ElIcon, Close: iconsVue.Close },
+  components: { ElDrawer: elementPlus.ElDrawer, ElIcon: elementPlus.ElIcon, CloseOutlined: icons.CloseOutlined },
   props: props.drawerProps,
   emits: elementPlus.drawerEmits,
-  setup(_props, { emit }) {
+  setup(props2, { emit }) {
     const { authenticated } = receiver.useLicense();
+    const layoutProvide = receiver.useLayoutState();
     const drawerRef = vue.ref(null);
+    const isActivated = vue.ref(true);
+    const drawerClass = vue.computed(() => {
+      const layoutState = vue.unref(layoutProvide);
+      const classes = ["ele-drawer"];
+      if (!props2.modelValue) {
+        classes.push("ele-drawer-closed");
+      }
+      if (!isActivated.value && props2.modelValue) {
+        classes.push("ele-drawer-hide");
+      }
+      if (props2.inner) {
+        classes.push("ele-drawer-inner");
+        if (layoutState && layoutState.sidebar != null) {
+          if (layoutState.collapse && !layoutState.topLayout) {
+            classes.push(util.collapseClass);
+          }
+          if (layoutState.compact && layoutState.mixSidebar && !layoutState.topLayout) {
+            classes.push(util.compactClass);
+          }
+          if (layoutState.maximized) {
+            classes.push(util.maximizedClass);
+          }
+          if (layoutState.tabBar) {
+            classes.push(util.hasTabClass);
+          }
+          if (layoutState.mixSidebar && !layoutState.topLayout) {
+            classes.push(util.mixSidebarClass);
+            if (!layoutState.sidebar) {
+              classes.push(util.singleSidebarClass);
+            }
+          }
+          if (layoutState.topLayout) {
+            classes.push(util.topLayoutClass);
+          }
+          if (layoutState.maximized && layoutState.expanded) {
+            classes.push(util.expandedClass);
+          }
+          if (layoutState.mobile) {
+            classes.push(util.mobileClass);
+          }
+        }
+      }
+      if (props2.modalClass) {
+        classes.push(props2.modalClass);
+      }
+      return classes.join(" ");
+    });
     const handleClose = () => {
       if (drawerRef.value && drawerRef.value.handleClose) {
         drawerRef.value.handleClose();
@@ -34,8 +83,15 @@ const _sfc_main = vue.defineComponent({
     const onClosed = () => {
       emit("closed");
     };
+    vue.onActivated(() => {
+      isActivated.value = true;
+    });
+    vue.onDeactivated(() => {
+      isActivated.value = false;
+    });
     return {
       drawerRef,
+      drawerClass,
       handleClose,
       updateModelValue,
       onOpen,
@@ -54,7 +110,7 @@ const _export_sfc = (sfc, props2) => {
 };
 const _hoisted_1 = ["onClick"];
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  const _component_Close = vue.resolveComponent("Close");
+  const _component_CloseOutlined = vue.resolveComponent("CloseOutlined");
   const _component_ElIcon = vue.resolveComponent("ElIcon");
   const _component_ElDrawer = vue.resolveComponent("ElDrawer");
   return vue.openBlock(), vue.createBlock(_component_ElDrawer, {
@@ -74,9 +130,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     size: _ctx.size,
     title: _ctx.title,
     withHeader: _ctx.withHeader,
-    modalClass: _ctx.modalClass,
+    modalClass: _ctx.drawerClass,
     zIndex: _ctx.zIndex,
-    class: "ele-drawer",
+    headerAriaLevel: _ctx.headerAriaLevel,
     onOpen: _ctx.onOpen,
     onOpened: _ctx.onOpened,
     onClose: _ctx.onClose,
@@ -106,7 +162,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           vue.renderSlot(_ctx.$slots, "closeBtn", {}, () => [
             vue.createVNode(_component_ElIcon, null, {
               default: vue.withCtx(() => [
-                vue.createVNode(_component_Close)
+                vue.createVNode(_component_CloseOutlined)
               ]),
               _: 1
             })
@@ -136,7 +192,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       ]),
       key: "0"
     } : void 0
-  ]), 1032, ["modelValue", "appendToBody", "lockScroll", "beforeClose", "closeOnClickModal", "closeOnPressEscape", "openDelay", "closeDelay", "destroyOnClose", "modal", "direction", "size", "title", "withHeader", "modalClass", "zIndex", "onOpen", "onOpened", "onClose", "onClosed", "onUpdate:modelValue"]);
+  ]), 1032, ["modelValue", "appendToBody", "lockScroll", "beforeClose", "closeOnClickModal", "closeOnPressEscape", "openDelay", "closeDelay", "destroyOnClose", "modal", "direction", "size", "title", "withHeader", "modalClass", "zIndex", "headerAriaLevel", "onOpen", "onOpened", "onClose", "onClosed", "onUpdate:modelValue"]);
 }
 const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 module.exports = index;

package/lib/ele-drawer/index.d.ts

@@ -5,6 +5,7 @@ declare const _default: import("vue").DefineComponent<{
     bodyStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     footerStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     closeBtnStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    inner: BooleanConstructor;
     direction: import("element-plus/es/utils/index").EpPropFinalized<StringConstructor, "ltr" | "rtl" | "ttb" | "btt", unknown, "rtl", boolean>;
     size: import("element-plus/es/utils/index").EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, "30%", boolean>;
     withHeader: import("element-plus/es/utils/index").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
@@ -54,14 +55,15 @@ declare const _default: import("vue").DefineComponent<{
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    customClass: import("element-plus/es/utils/index").EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
     draggable: BooleanConstructor;
+    overflow: BooleanConstructor;
     fullscreen: BooleanConstructor;
     showClose: import("element-plus/es/utils/index").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     title: import("element-plus/es/utils/index").EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
     ariaLevel: import("element-plus/es/utils/index").EpPropFinalized<StringConstructor, unknown, unknown, "2", boolean>;
 }, {
     drawerRef: import("vue").Ref<ElDrawerInstance>;
+    drawerClass: import("vue").ComputedRef<string>;
     handleClose: () => void;
     updateModelValue: (value: boolean) => void;
     onOpen: () => void;
@@ -82,6 +84,7 @@ declare const _default: import("vue").DefineComponent<{
     bodyStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     footerStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     closeBtnStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    inner: BooleanConstructor;
     direction: import("element-plus/es/utils/index").EpPropFinalized<StringConstructor, "ltr" | "rtl" | "ttb" | "btt", unknown, "rtl", boolean>;
     size: import("element-plus/es/utils/index").EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, "30%", boolean>;
     withHeader: import("element-plus/es/utils/index").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
@@ -131,8 +134,8 @@ declare const _default: import("vue").DefineComponent<{
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    customClass: import("element-plus/es/utils/index").EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
     draggable: BooleanConstructor;
+    overflow: BooleanConstructor;
     fullscreen: BooleanConstructor;
     showClose: import("element-plus/es/utils/index").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     title: import("element-plus/es/utils/index").EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
@@ -140,11 +143,11 @@ declare const _default: import("vue").DefineComponent<{
 }>> & {
     onOpen?: (() => any) | undefined;
     onClose?: (() => any) | undefined;
+    onOpenAutoFocus?: (() => any) | undefined;
+    onCloseAutoFocus?: (() => any) | undefined;
     "onUpdate:modelValue"?: ((value: boolean) => any) | undefined;
     onOpened?: (() => any) | undefined;
     onClosed?: (() => any) | undefined;
-    onOpenAutoFocus?: (() => any) | undefined;
-    onCloseAutoFocus?: (() => any) | undefined;
 }, {
     size: import("element-plus/es/utils/index").EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown>;
     center: boolean;
@@ -162,13 +165,14 @@ declare const _default: import("vue").DefineComponent<{
     trapFocus: import("element-plus/es/utils/index").EpPropMergeType<BooleanConstructor, unknown, unknown>;
     headerAriaLevel: string;
     alignCenter: boolean;
-    customClass: string;
     draggable: boolean;
+    overflow: boolean;
     fullscreen: boolean;
     showClose: import("element-plus/es/utils/index").EpPropMergeType<BooleanConstructor, unknown, unknown>;
     ariaLevel: string;
     direction: import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "ltr" | "rtl" | "ttb" | "btt", unknown>;
     withHeader: import("element-plus/es/utils/index").EpPropMergeType<BooleanConstructor, unknown, unknown>;
     modalFade: import("element-plus/es/utils/index").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+    inner: boolean;
 }, {}>;
 export default _default;

package/lib/ele-drawer/props.cjs

@@ -12,6 +12,8 @@ const drawerProps = {
   /** 自定义底部样式 */
   footerStyle: Object,
   /** 自定义关闭按钮样式 */
-  closeBtnStyle: Object
+  closeBtnStyle: Object,
+  /** 是否限制在主体内部 */
+  inner: Boolean
 };
 exports.drawerProps = drawerProps;

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

@@ -13,6 +13,8 @@ export declare const drawerProps: {
     footerStyle: PropType<Partial<import("vue").CSSProperties>>;
     /** 自定义关闭按钮样式 */
     closeBtnStyle: PropType<Partial<import("vue").CSSProperties>>;
+    /** 是否限制在主体内部 */
+    inner: BooleanConstructor;
     direction: import("element-plus/es/utils/index").EpPropFinalized<StringConstructor, "ltr" | "rtl" | "ttb" | "btt", unknown, "rtl", boolean>;
     size: import("element-plus/es/utils/index").EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, "30%", boolean>;
     withHeader: import("element-plus/es/utils/index").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
@@ -62,8 +64,8 @@ export declare const drawerProps: {
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    customClass: import("element-plus/es/utils/index").EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
     draggable: BooleanConstructor;
+    overflow: BooleanConstructor;
     fullscreen: BooleanConstructor;
     showClose: import("element-plus/es/utils/index").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     title: import("element-plus/es/utils/index").EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;

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

@@ -6,27 +6,27 @@
 
 /* 抽屉 */
 .ele-drawer {
-  &.el-drawer {
+  & > .el-drawer {
     background: eleVar('drawer', 'bg');
-  }
 
-  & > .el-drawer__header {
-    margin: 0;
-    padding: 0;
-    color: inherit;
-    display: block;
-    flex-shrink: 0;
-    border: none;
-  }
+    & > .el-drawer__header {
+      margin: 0;
+      padding: 0;
+      color: inherit;
+      display: block;
+      flex-shrink: 0;
+      border: none;
+    }
 
-  & > .el-drawer__body {
-    padding: 0;
-  }
+    & > .el-drawer__body {
+      padding: 0;
+    }
 
-  & > .el-drawer__footer {
-    padding: 0;
-    flex-shrink: 0;
-    border: none;
+    & > .el-drawer__footer {
+      padding: 0;
+      flex-shrink: 0;
+      border: none;
+    }
   }
 
   .ele-drawer-header {
@@ -78,3 +78,76 @@
     box-sizing: border-box;
   }
 }
+
+/* 失活状态 */
+.ele-drawer-hide {
+  display: none !important;
+}
+
+/* 限制在内部并适配布局状态 */
+.ele-drawer-inner {
+  & > .el-drawer {
+    box-shadow: eleVar('drawer', 'inner-shadow');
+  }
+
+  &.ele-drawer {
+    top: eleVar('header', 'height', 0);
+    left: eleVar('sidebar', 'width', 0);
+    height: auto;
+  }
+
+  &:not(.el-drawer-fade-leave-active, .el-drawer-fade-enter-active) {
+    transition: (width $ele-transition, left $ele-transition);
+  }
+
+  &.ele-state-has-tab {
+    top: calc(#{eleVar('header', 'height')} + #{eleVar('tab', 'height')});
+  }
+
+  &.ele-state-collapse {
+    left: eleVar('sidebar', 'collapse-width');
+  }
+
+  &.ele-state-mix-sidebar {
+    $box-width: eleVar('sidebox', 'width');
+    left: calc(#{$box-width} + #{eleVar('sidebar', 'mix-width')});
+
+    &.ele-state-collapse {
+      left: $box-width;
+    }
+
+    &.ele-state-single-sidebar {
+      left: $box-width;
+    }
+  }
+
+  &.ele-state-compact {
+    $collapse-width: eleVar('sidebar', 'collapse-width');
+    left: calc(#{$collapse-width} + #{eleVar('sidebar', 'mix-width')});
+
+    &.ele-state-single-sidebar {
+      left: $collapse-width;
+    }
+
+    &.ele-state-collapse {
+      left: $collapse-width;
+    }
+  }
+
+  &.ele-state-top-layout {
+    left: 0;
+  }
+
+  &.ele-state-maximized {
+    top: eleVar('tab', 'height');
+    left: 0 !important;
+  }
+
+  &.ele-state-expanded {
+    top: 0 !important;
+  }
+
+  &.ele-state-mobile {
+    left: 0 !important;
+  }
+}

package/lib/ele-dropdown/index.cjs

@@ -102,19 +102,29 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       }, {
         default: vue.withCtx(() => [
           _ctx.items ? (vue.openBlock(true), vue.createElementBlock(vue.Fragment, { key: 0 }, vue.renderList(_ctx.items, (item, index2) => {
-            return vue.openBlock(), vue.createBlock(_component_ElDropdownItem, vue.mergeProps({
-              key: typeof item.command === "object" ? index2 : item.command,
-              class: [
-                { "is-active": _ctx.modelValue === item.command },
-                { "is-danger": !!item.danger }
-              ]
-            }, _ctx.omit(item, ["icon"])), {
+            return vue.openBlock(), vue.createBlock(_component_ElDropdownItem, vue.mergeProps(
+              {
+                key: typeof item.command === "object" ? index2 : item.command,
+                class: [
+                  { "is-active": _ctx.modelValue === item.command },
+                  { "is-danger": !!item.danger }
+                ]
+              },
+              _ctx.omit(item, [
+                "icon",
+                "title",
+                "iconProps",
+                "iconStyle",
+                "slot",
+                "danger"
+              ])
+            ), {
               default: vue.withCtx(() => [
                 item.slot && item.slot !== "default" && _ctx.$slots[item.slot] ? vue.renderSlot(_ctx.$slots, item.slot, {
                   key: 0,
                   item
                 }) : (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 1 }, [
-                  item.icon ? (vue.openBlock(), vue.createBlock(_component_ElIcon, vue.normalizeProps(vue.mergeProps({ key: 0 }, item.iconProps || {})), {
+                  item.icon ? (vue.openBlock(), vue.createBlock(_component_ElIcon, vue.normalizeProps(vue.mergeProps({ key: 0 }, { ..._ctx.iconProps || {}, ...item.iconProps || {} })), {
                     default: vue.withCtx(() => [
                       (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(item.icon), {
                         style: vue.normalizeStyle(item.iconStyle)

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

@@ -5,6 +5,7 @@ declare const _default: import("vue").DefineComponent<{
     items: import("vue").PropType<DropdownItem[]>;
     modelValue: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<readonly [ObjectConstructor, StringConstructor, NumberConstructor], unknown, unknown> | undefined>;
     menuStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    iconProps: import("vue").PropType<import("../ele-app/el").ElIconProps>;
     trigger: import("element-plus/es/utils/index").EpPropFinalized<(new (...args: any[]) => "hover" | "focus" | "click" | "contextmenu" | import("element-plus").TooltipTriggerType[]) | (() => import("element-plus/es/utils/typescript").Arrayable<import("element-plus").TooltipTriggerType>) | ((new (...args: any[]) => "hover" | "focus" | "click" | "contextmenu" | import("element-plus").TooltipTriggerType[]) | (() => import("element-plus/es/utils/typescript").Arrayable<import("element-plus").TooltipTriggerType>))[], unknown, unknown, "hover", boolean>;
     effect: {
         readonly default: "light";
@@ -60,6 +61,7 @@ declare const _default: import("vue").DefineComponent<{
     items: import("vue").PropType<DropdownItem[]>;
     modelValue: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<readonly [ObjectConstructor, StringConstructor, NumberConstructor], unknown, unknown> | undefined>;
     menuStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    iconProps: import("vue").PropType<import("../ele-app/el").ElIconProps>;
     trigger: import("element-plus/es/utils/index").EpPropFinalized<(new (...args: any[]) => "hover" | "focus" | "click" | "contextmenu" | import("element-plus").TooltipTriggerType[]) | (() => import("element-plus/es/utils/typescript").Arrayable<import("element-plus").TooltipTriggerType>) | ((new (...args: any[]) => "hover" | "focus" | "click" | "contextmenu" | import("element-plus").TooltipTriggerType[]) | (() => import("element-plus/es/utils/typescript").Arrayable<import("element-plus").TooltipTriggerType>))[], unknown, unknown, "hover", boolean>;
     effect: {
         readonly default: "light";