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

package/es/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>;
@@ -13,7 +14,7 @@ declare const _default: import("vue").DefineComponent<{
     appendToBody: BooleanConstructor;
     appendTo: import("element-plus/es/utils/index").EpPropFinalized<(new (...args: any[]) => string & {}) | (() => string) | ((new (...args: any[]) => string & {}) | (() => string))[], unknown, unknown, "body", boolean>;
     beforeClose: {
-        readonly type: import("vue").PropType<import("element-plus").DialogBeforeCloseFn>; /** 关闭事件 */
+        readonly type: import("vue").PropType<import("element-plus").DialogBeforeCloseFn>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
@@ -62,6 +63,7 @@ declare const _default: import("vue").DefineComponent<{
     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>;
@@ -90,7 +93,7 @@ declare const _default: import("vue").DefineComponent<{
     appendToBody: BooleanConstructor;
     appendTo: import("element-plus/es/utils/index").EpPropFinalized<(new (...args: any[]) => string & {}) | (() => string) | ((new (...args: any[]) => string & {}) | (() => string))[], unknown, unknown, "body", boolean>;
     beforeClose: {
-        readonly type: import("vue").PropType<import("element-plus").DialogBeforeCloseFn>; /** 关闭事件 */
+        readonly type: import("vue").PropType<import("element-plus").DialogBeforeCloseFn>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
@@ -170,5 +173,6 @@ declare const _default: import("vue").DefineComponent<{
     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/es/ele-drawer/index.js

@@ -1,6 +1,7 @@
-import { defineComponent, ref, resolveComponent, openBlock, createBlock, createSlots, withCtx, createElementVNode, normalizeStyle, renderSlot, createTextVNode, toDisplayString, createElementBlock, createVNode, createCommentVNode } from "vue";
+import { defineComponent, ref, computed, unref, onActivated, onDeactivated, resolveComponent, openBlock, createBlock, createSlots, withCtx, createElementVNode, normalizeStyle, renderSlot, createTextVNode, toDisplayString, createElementBlock, createVNode, createCommentVNode } from "vue";
 import { ElDrawer, ElIcon, drawerEmits } from "element-plus";
-import { useLicense } from "../ele-config-provider/receiver";
+import { useLicense, useLayoutState } from "../ele-config-provider/receiver";
+import { collapseClass, compactClass, maximizedClass, hasTabClass, mixSidebarClass, singleSidebarClass, topLayoutClass, expandedClass, mobileClass } from "../ele-modal/util";
 import { CloseOutlined } from "../icons";
 import { drawerProps } from "./props";
 const _sfc_main = defineComponent({
@@ -8,9 +9,57 @@ const _sfc_main = defineComponent({
   components: { ElDrawer, ElIcon, CloseOutlined },
   props: drawerProps,
   emits: drawerEmits,
-  setup(_props, { emit }) {
+  setup(props, { emit }) {
     const { authenticated } = useLicense();
+    const layoutProvide = useLayoutState();
     const drawerRef = ref(null);
+    const isActivated = ref(true);
+    const drawerClass = computed(() => {
+      const layoutState = unref(layoutProvide);
+      const classes = ["ele-drawer"];
+      if (!props.modelValue) {
+        classes.push("ele-drawer-closed");
+      }
+      if (!isActivated.value && props.modelValue) {
+        classes.push("ele-drawer-hide");
+      }
+      if (props.inner) {
+        classes.push("ele-drawer-inner");
+        if (layoutState && layoutState.sidebar != null) {
+          if (layoutState.collapse && !layoutState.topLayout) {
+            classes.push(collapseClass);
+          }
+          if (layoutState.compact && layoutState.mixSidebar && !layoutState.topLayout) {
+            classes.push(compactClass);
+          }
+          if (layoutState.maximized) {
+            classes.push(maximizedClass);
+          }
+          if (layoutState.tabBar) {
+            classes.push(hasTabClass);
+          }
+          if (layoutState.mixSidebar && !layoutState.topLayout) {
+            classes.push(mixSidebarClass);
+            if (!layoutState.sidebar) {
+              classes.push(singleSidebarClass);
+            }
+          }
+          if (layoutState.topLayout) {
+            classes.push(topLayoutClass);
+          }
+          if (layoutState.maximized && layoutState.expanded) {
+            classes.push(expandedClass);
+          }
+          if (layoutState.mobile) {
+            classes.push(mobileClass);
+          }
+        }
+      }
+      if (props.modalClass) {
+        classes.push(props.modalClass);
+      }
+      return classes.join(" ");
+    });
     const handleClose = () => {
       if (drawerRef.value && drawerRef.value.handleClose) {
         drawerRef.value.handleClose();
@@ -33,8 +82,15 @@ const _sfc_main = defineComponent({
     const onClosed = () => {
       emit("closed");
     };
+    onActivated(() => {
+      isActivated.value = true;
+    });
+    onDeactivated(() => {
+      isActivated.value = false;
+    });
     return {
       drawerRef,
+      drawerClass,
       handleClose,
       updateModelValue,
       onOpen,
@@ -73,9 +129,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,
@@ -135,7 +191,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]]);
 export {

package/es/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>;

package/es/ele-drawer/props.js

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

package/es/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/es/ele-edit-tag/index.d.ts

@@ -8,7 +8,9 @@ declare const _default: import("vue").DefineComponent<{
     round: BooleanConstructor;
     placeholder: StringConstructor;
     inputStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    inputTagStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     buttonStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    itemStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     validator: import("vue").PropType<import("./types").Validator>;
     beforeRemove: import("vue").PropType<import("./types").BeforeRemove>;
     tooltipProps: import("vue").PropType<Partial<import("../ele-tooltip/props").TooltipProps>>;
@@ -35,7 +37,9 @@ declare const _default: import("vue").DefineComponent<{
     round: BooleanConstructor;
     placeholder: StringConstructor;
     inputStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    inputTagStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     buttonStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    itemStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     validator: import("vue").PropType<import("./types").Validator>;
     beforeRemove: import("vue").PropType<import("./types").BeforeRemove>;
     tooltipProps: import("vue").PropType<Partial<import("../ele-tooltip/props").TooltipProps>>;

package/es/ele-edit-tag/index.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, onDeactivated, onActivated, nextTick, resolveComponent, openBlock, createElementBlock, normalizeClass, Fragment, renderList, createBlock, withCtx, createTextVNode, toDisplayString, createCommentVNode, withDirectives, createVNode, normalizeStyle, renderSlot, vShow, mergeProps } from "vue";
+import { defineComponent, ref, onDeactivated, onActivated, nextTick, resolveComponent, openBlock, createElementBlock, normalizeClass, Fragment, renderList, createBlock, normalizeStyle, withCtx, createTextVNode, toDisplayString, createCommentVNode, withDirectives, createVNode, renderSlot, vShow, mergeProps } from "vue";
 import { ElTag, ElInput, ElIcon } from "element-plus";
 import EleTooltip from "../ele-tooltip/index";
 import { useLicense } from "../ele-config-provider/receiver";
@@ -164,13 +164,14 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         round: _ctx.round,
         closable: true,
         disableTransitions: true,
+        style: normalizeStyle(_ctx.itemStyle),
         onClose: ($event) => _ctx.onTagClose(index2)
       }, {
         default: withCtx(() => [
           createTextVNode(toDisplayString(item), 1)
         ]),
         _: 2
-      }, 1032, ["type", "color", "size", "effect", "round", "onClose"]);
+      }, 1032, ["type", "color", "size", "effect", "round", "style", "onClose"]);
     }), 128)) : createCommentVNode("", true),
     withDirectives(createVNode(_component_ElTag, {
       type: "info",
@@ -202,7 +203,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       size: _ctx.size,
       round: _ctx.round,
       disableTransitions: true,
-      class: normalizeClass(["ele-edit-tag-input", { "is-error": !!_ctx.errorMessage }])
+      class: normalizeClass(["ele-edit-tag-input", { "is-error": !!_ctx.errorMessage }]),
+      style: normalizeStyle(_ctx.inputTagStyle)
     }, {
       default: withCtx(() => [
         createVNode(_component_ElInput, {
@@ -230,7 +232,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         }, 8, ["disabled", "modelValue", "style", "onChange", "onBlur", "onFocus"])
       ]),
       _: 1
-    }, 8, ["size", "round", "class"]), [
+    }, 8, ["size", "round", "class", "style"]), [
       [vShow, _ctx.isEdit]
     ]),
     createVNode(_component_EleTooltip, mergeProps({

package/es/ele-edit-tag/props.d.ts

@@ -20,8 +20,12 @@ export declare const editTagProps: {
     placeholder: StringConstructor;
     /** 输入框样式 */
     inputStyle: PropType<Partial<import("vue").CSSProperties>>;
+    /** 输入框外层标签样式 */
+    inputTagStyle: PropType<Partial<import("vue").CSSProperties>>;
     /** 添加按钮样式 */
     buttonStyle: PropType<Partial<import("vue").CSSProperties>>;
+    /** 标签样式 */
+    itemStyle: PropType<Partial<import("vue").CSSProperties>>;
     /** 添加校验方法 */
     validator: PropType<Validator>;
     /** 移除校验方法 */

package/es/ele-edit-tag/props.js

@@ -15,8 +15,12 @@ const editTagProps = {
   placeholder: String,
   /** 输入框样式 */
   inputStyle: Object,
+  /** 输入框外层标签样式 */
+  inputTagStyle: Object,
   /** 添加按钮样式 */
   buttonStyle: Object,
+  /** 标签样式 */
+  itemStyle: Object,
   /** 添加校验方法 */
   validator: Function,
   /** 移除校验方法 */

package/es/ele-edit-tag/style/index.scss

@@ -46,18 +46,23 @@
   & > .el-tag__content {
     width: 100%;
     height: 100%;
-    display: block;
+    display: flex;
+    align-items: center;
+    justify-content: center;
     font-size: inherit;
     line-height: inherit;
     border-radius: inherit;
+
+    & > .el-input {
+      flex: 1;
+      width: 100%;
+      height: 100%;
+      font-size: inherit;
+      border-radius: inherit;
+    }
   }
 
   .el-input {
-    width: 100%;
-    height: 100%;
-    font-size: inherit;
-    border-radius: inherit;
-
     .el-input__wrapper {
       height: 100%;
       padding-left: 8px;

package/es/ele-icon-select/components/icon-grid.js

@@ -1,9 +1,9 @@
-import { defineComponent, ref, watch, resolveComponent, openBlock, createElementBlock, createElementVNode, normalizeStyle, Fragment, renderList, normalizeClass, renderSlot, createVNode, mergeProps, createCommentVNode } from "vue";
-import { ElEmpty } from "element-plus";
+import { defineComponent, ref, watch, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, normalizeStyle, createElementBlock, Fragment, renderList, normalizeClass, renderSlot, createVNode, mergeProps, createCommentVNode } from "vue";
+import { ElEmpty, ElScrollbar } from "element-plus";
 import EleTooltip from "../../ele-tooltip/index";
 const _sfc_main = defineComponent({
   name: "IconGrid",
-  components: { ElEmpty, EleTooltip },
+  components: { ElEmpty, ElScrollbar, EleTooltip },
   props: {
     /** 选中的图标 */
     icon: String,
@@ -74,48 +74,51 @@ const _export_sfc = (sfc, props) => {
   }
   return target;
 };
-const _hoisted_1 = { class: "ele-icon-select-body" };
-const _hoisted_2 = ["title", "onClick", "onMouseover"];
-const _hoisted_3 = {
+const _hoisted_1 = ["title", "onClick", "onMouseover"];
+const _hoisted_2 = {
   key: 0,
   class: "ele-icon-select-empty"
 };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_ElEmpty = resolveComponent("ElEmpty");
   const _component_EleTooltip = resolveComponent("EleTooltip");
-  return openBlock(), createElementBlock("div", _hoisted_1, [
-    createElementVNode("div", {
-      class: "ele-icon-select-grid",
-      style: normalizeStyle(_ctx.gridStyle)
-    }, [
-      (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.data, (d, i) => {
-        return openBlock(), createElementBlock("div", {
-          key: i + "-" + d,
-          class: normalizeClass(["ele-icon-select-item", { "is-active": _ctx.icon && d === _ctx.icon }]),
-          title: _ctx.tooltip ? void 0 : d,
-          style: normalizeStyle(_ctx.itemStyle),
-          onClick: ($event) => _ctx.onItemClick(d),
-          onMouseover: (e) => _ctx.onItemHover(d, e)
-        }, [
-          renderSlot(_ctx.$slots, "icon", { icon: d })
-        ], 46, _hoisted_2);
-      }), 128))
-    ], 4),
-    !_ctx.data || !_ctx.data.length ? (openBlock(), createElementBlock("div", _hoisted_3, [
-      createVNode(_component_ElEmpty, mergeProps({ imageSize: 60 }, _ctx.emptyProps), null, 16)
-    ])) : createCommentVNode("", true),
-    createVNode(_component_EleTooltip, mergeProps({
-      placement: "top",
-      offset: 6,
-      teleported: false
-    }, _ctx.tooltipProps || {}, {
-      visible: _ctx.tooltipVisible,
-      content: _ctx.tooltipContent,
-      virtualRef: _ctx.virtualRef,
-      virtualTriggering: true,
-      "onUpdate:visible": _ctx.updateTooltipVisible
-    }), null, 16, ["visible", "content", "virtualRef", "onUpdate:visible"])
-  ]);
+  const _component_ElScrollbar = resolveComponent("ElScrollbar");
+  return openBlock(), createBlock(_component_ElScrollbar, { class: "ele-icon-select-body" }, {
+    default: withCtx(() => [
+      createElementVNode("div", {
+        class: "ele-icon-select-grid",
+        style: normalizeStyle(_ctx.gridStyle)
+      }, [
+        (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.data, (d, i) => {
+          return openBlock(), createElementBlock("div", {
+            key: i + "-" + d,
+            class: normalizeClass(["ele-icon-select-item", { "is-active": _ctx.icon && d === _ctx.icon }]),
+            title: _ctx.tooltip ? void 0 : d,
+            style: normalizeStyle(_ctx.itemStyle),
+            onClick: ($event) => _ctx.onItemClick(d),
+            onMouseover: (e) => _ctx.onItemHover(d, e)
+          }, [
+            renderSlot(_ctx.$slots, "icon", { icon: d })
+          ], 46, _hoisted_1);
+        }), 128))
+      ], 4),
+      !_ctx.data || !_ctx.data.length ? (openBlock(), createElementBlock("div", _hoisted_2, [
+        createVNode(_component_ElEmpty, mergeProps({ imageSize: 60 }, _ctx.emptyProps), null, 16)
+      ])) : createCommentVNode("", true),
+      createVNode(_component_EleTooltip, mergeProps({
+        placement: "top",
+        offset: 6,
+        teleported: false
+      }, _ctx.tooltipProps || {}, {
+        visible: _ctx.tooltipVisible,
+        content: _ctx.tooltipContent,
+        virtualRef: _ctx.virtualRef,
+        virtualTriggering: true,
+        "onUpdate:visible": _ctx.updateTooltipVisible
+      }), null, 16, ["visible", "content", "virtualRef", "onUpdate:visible"])
+    ]),
+    _: 3
+  });
 }
 const iconGrid = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 export {

package/es/ele-icon-select/style/index.js

@@ -1,4 +1,5 @@
 import 'element-plus/es/components/empty/style/index';
+import 'element-plus/es/components/scrollbar/style/index';
 import '../../ele-tooltip/style/index';
 import '../../ele-basic-select/style/index';
 import './index.scss';

package/es/ele-icon-select/style/index.scss

@@ -173,10 +173,12 @@
 .ele-icon-select-body {
   flex: 1;
   height: 100%;
-  padding: eleVar('icon', 'body-padding');
   box-sizing: border-box;
-  overflow: auto;
-  overflow: overlay;
+  overflow: hidden;
+
+  & > .el-scrollbar__wrap > .el-scrollbar__view {
+    padding: eleVar('icon', 'body-padding');
+  }
 }
 
 .ele-icon-select-grid {

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

@@ -33,7 +33,7 @@ declare const _default: import("vue").DefineComponent<{
     closeBtnStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     fullscreenBtnStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     responsive: {
-        type: BooleanConstructor;
+        type: BooleanConstructor; /** 布局状态 */
         default: null;
     };
     form: BooleanConstructor;
@@ -52,7 +52,7 @@ declare const _default: import("vue").DefineComponent<{
     openDelay: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     closeDelay: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     top: {
-        readonly type: import("vue").PropType<string>; /** 弹窗插入位置 */
+        readonly type: import("vue").PropType<string>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
@@ -144,7 +144,7 @@ declare const _default: import("vue").DefineComponent<{
     closeBtnStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     fullscreenBtnStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     responsive: {
-        type: BooleanConstructor;
+        type: BooleanConstructor; /** 布局状态 */
         default: null;
     };
     form: BooleanConstructor;
@@ -163,7 +163,7 @@ declare const _default: import("vue").DefineComponent<{
     openDelay: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     closeDelay: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     top: {
-        readonly type: import("vue").PropType<string>; /** 弹窗插入位置 */
+        readonly type: import("vue").PropType<string>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
@@ -230,8 +230,8 @@ declare const _default: import("vue").DefineComponent<{
     ariaLevel: string;
     minWidth: number;
     minHeight: number;
-    responsive: boolean;
     multiple: boolean;
+    responsive: boolean;
     resetOnClose: boolean;
     maxable: boolean;
     inner: boolean;