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

package/es/ele-modal/index.js

@@ -1,14 +1,19 @@
 import { defineComponent, ref, computed, unref, watch, onActivated, onDeactivated, nextTick, resolveComponent, openBlock, createBlock, Teleport, createVNode, mergeProps, createSlots, withCtx, createElementVNode, normalizeStyle, createElementBlock, renderSlot, createTextVNode, toDisplayString, createCommentVNode } from "vue";
 import { ElDialog, ElIcon } from "element-plus";
-import { Close } from "@element-plus/icons-vue";
-import { CompressOutlined, ExpandOutlined } from "../icons";
+import { CloseOutlined, CompressOutlined, ExpandOutlined } from "../icons";
 import { pick } from "../utils/core";
 import { useLicense, useLayoutState } from "../ele-config-provider/receiver";
 import { getModalContainer, resizableClass, multipleClass, fullscreenClass, closedClass, hideClass, innerClass, collapseClass, compactClass, maximizedClass, hasTabClass, mixSidebarClass, singleSidebarClass, topLayoutClass, expandedClass, mobileClass, setInitPosition, wrapperClass, responsiveClass, movableClass, setModalTop, resetModalStyle, handleMovable, handleResizable } from "./util";
 import { modalProps, modalEmits, dialogPropKeys } from "./props";
 const _sfc_main = defineComponent({
   name: "EleModal",
-  components: { ElDialog, ElIcon, Close, CompressOutlined, ExpandOutlined },
+  components: {
+    ElDialog,
+    ElIcon,
+    CloseOutlined,
+    CompressOutlined,
+    ExpandOutlined
+  },
   inheritAttrs: false,
   props: modalProps,
   emits: modalEmits,
@@ -27,7 +32,7 @@ const _sfc_main = defineComponent({
     const dialogClass = computed(() => {
       const layoutState = unref(layoutProvide);
       const classes = [wrapperClass];
-      if (props.responsive ?? layoutState.responsive ?? true) {
+      if (props.responsive ?? (layoutState == null ? void 0 : layoutState.responsive) ?? true) {
         classes.push(responsiveClass);
       }
       if (props.form) {
@@ -56,32 +61,34 @@ const _sfc_main = defineComponent({
       }
       if (props.inner) {
         classes.push(innerClass);
-        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 && 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 (layoutState.topLayout) {
-          classes.push(topLayoutClass);
-        }
-        if (layoutState.maximized && layoutState.expanded) {
-          classes.push(expandedClass);
-        }
-        if (layoutState.mobile) {
-          classes.push(mobileClass);
         }
       }
       if (props.modalClass) {
@@ -262,7 +269,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_CompressOutlined = resolveComponent("CompressOutlined");
   const _component_ExpandOutlined = resolveComponent("ExpandOutlined");
   const _component_ElIcon = resolveComponent("ElIcon");
-  const _component_Close = resolveComponent("Close");
+  const _component_CloseOutlined = resolveComponent("CloseOutlined");
   const _component_ElDialog = resolveComponent("ElDialog");
   return openBlock(), createBlock(Teleport, {
     to: _ctx.teleportTo,
@@ -303,7 +310,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             onClick: _cache[0] || (_cache[0] = ($event) => _ctx.toggleFullscreen())
           }, [
             renderSlot(_ctx.$slots, "maxIcon", { fullscreen: _ctx.isFullscreen }, () => [
-              createVNode(_component_ElIcon, { style: { "transform": "scale(0.72)" } }, {
+              createVNode(_component_ElIcon, null, {
                 default: withCtx(() => [
                   _ctx.isFullscreen ? (openBlock(), createBlock(_component_CompressOutlined, { key: 0 })) : (openBlock(), createBlock(_component_ExpandOutlined, { key: 1 }))
                 ]),
@@ -320,7 +327,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             renderSlot(_ctx.$slots, "closeIcon", {}, () => [
               createVNode(_component_ElIcon, null, {
                 default: withCtx(() => [
-                  createVNode(_component_Close)
+                  createVNode(_component_CloseOutlined)
                 ]),
                 _: 1
               })

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

@@ -103,7 +103,7 @@ export declare const modalProps: {
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    customClass: import("element-plus/es/utils/index").EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
+    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/es/ele-modal/style/css-var.scss

@@ -5,11 +5,4 @@
   .ele-modal {
     @include set-ele-var('modal', $var);
   }
-
-  .ele-modal-inner {
-    @include set-ele-var('header', $var);
-    @include set-ele-var('sidebar', $var);
-    @include set-ele-var('sidebox', $var);
-    @include set-ele-var('tab', $var);
-  }
 }

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

@@ -15,6 +15,7 @@
     & > .el-dialog {
       background: eleVar('modal', 'bg');
       border-radius: eleVar('modal', 'radius');
+      padding: 0;
 
       & > .el-dialog__footer {
         border: none;
@@ -176,7 +177,7 @@
   right: 0;
   bottom: 0;
   pointer-events: none;
-  z-index: eleVar('modal', 'index');
+  z-index: elVar('index', 'popper');
 }
 
 .ele-modal-multiple {
@@ -206,9 +207,14 @@
 
 /* 限制在内部并适配布局状态 */
 .ele-modal-inner {
-  top: eleVar('header', 'height');
-  left: eleVar('sidebar', 'width');
-  transition: (width $ele-transition, left $ele-transition);
+  &.ele-modal {
+    top: eleVar('header', 'height', 0);
+    left: eleVar('sidebar', 'width', 0);
+  }
+
+  &:not(.dialog-fade-leave-active, .dialog-fade-enter-active) {
+    transition: (width $ele-transition, left $ele-transition);
+  }
 
   &.ele-state-has-tab {
     top: calc(#{eleVar('header', 'height')} + #{eleVar('tab', 'height')});

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

@@ -34,7 +34,7 @@ declare const _default: import("vue").DefineComponent<{
     };
     bodyClass: StringConstructor;
     bodyStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
-    titleStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>; /** 文字提示实例 */
+    titleStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     contentStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     offset: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, undefined, boolean>;
     effect: {
@@ -150,7 +150,7 @@ declare const _default: import("vue").DefineComponent<{
     };
     bodyClass: StringConstructor;
     bodyStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
-    titleStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>; /** 文字提示实例 */
+    titleStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     contentStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     offset: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, undefined, boolean>;
     effect: {

package/es/ele-popconfirm/index.js

@@ -1,12 +1,12 @@
 import { defineComponent, ref, computed, resolveComponent, openBlock, createBlock, mergeProps, withCtx, createElementVNode, normalizeClass, normalizeStyle, normalizeProps, resolveDynamicComponent, createCommentVNode, createElementBlock, renderSlot, createTextVNode, toDisplayString } from "vue";
 import { ElIcon, ElButton, useLocale } from "element-plus";
-import { QuestionFilled } from "@element-plus/icons-vue";
 import { omit } from "../utils/core";
 import EleTooltip from "../ele-tooltip/index";
+import { QuestionCircleFilled } from "../icons";
 import { popconfirmProps, popconfirmEmits } from "./props";
 const _sfc_main = defineComponent({
   name: "ElePopconfirm",
-  components: { QuestionFilled, ElIcon, ElButton, EleTooltip },
+  components: { ElIcon, ElButton, EleTooltip, QuestionCircleFilled },
   props: popconfirmProps,
   emits: popconfirmEmits,
   setup(props, { emit }) {
@@ -129,7 +129,7 @@ const _export_sfc = (sfc, props) => {
 const _hoisted_1 = { class: "ele-popconfirm-main" };
 const _hoisted_2 = { class: "ele-popconfirm-body" };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  const _component_QuestionFilled = resolveComponent("QuestionFilled");
+  const _component_QuestionCircleFilled = resolveComponent("QuestionCircleFilled");
   const _component_ElIcon = resolveComponent("ElIcon");
   const _component_ElButton = resolveComponent("ElButton");
   const _component_EleTooltip = resolveComponent("EleTooltip");
@@ -153,7 +153,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               _ctx.icon ? (openBlock(), createBlock(resolveDynamicComponent(_ctx.icon), {
                 key: 0,
                 style: normalizeStyle(_ctx.iconStyle)
-              }, null, 8, ["style"])) : (openBlock(), createBlock(_component_QuestionFilled, {
+              }, null, 8, ["style"])) : (openBlock(), createBlock(_component_QuestionCircleFilled, {
                 key: 1,
                 style: normalizeStyle(_ctx.iconStyle)
               }, null, 8, ["style"]))

package/es/ele-pro-layout/components/pro-header.js

@@ -84,8 +84,8 @@ const _sfc_main = defineComponent({
             to: props.homePath,
             icon: HomeOutlined,
             iconStyle: {
-              transform: "scale(1.14)",
-              transformOrigin: "8px 2px"
+              transform: "scale(1.13)",
+              transformOrigin: "8px -2px"
             }
           });
         }

package/es/ele-pro-layout/components/pro-tabs.js

@@ -158,7 +158,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             label: withCtx(() => [
               renderSlot(_ctx.$slots, "tabHome", {}, () => [
                 createVNode(_component_ElIcon, {
-                  size: 16,
+                  class: "ele-tab-icon",
                   style: { "vertical-align": "-3px" }
                 }, {
                   default: withCtx(() => [

package/es/ele-pro-layout/components/tab-dropdown.js

@@ -1,6 +1,6 @@
 import { defineComponent, ref, onBeforeUnmount, resolveComponent, openBlock, createBlock, withCtx, createVNode, mergeProps, createSlots, createElementVNode, renderSlot } from "vue";
 import { ElIcon } from "element-plus";
-import { ArrowDown } from "@element-plus/icons-vue";
+import { ArrowDown } from "../../icons";
 import EleDropdown from "../../ele-dropdown/index";
 import EleTabTool from "../../ele-tab-tool/index";
 const _sfc_main = defineComponent({
@@ -73,8 +73,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           createElementVNode("div", _hoisted_1, [
             renderSlot(_ctx.$slots, "icon", {}, () => [
               createVNode(_component_ElIcon, {
-                size: 16,
-                style: { "vertical-align": "-3.5px" }
+                class: "ele-tab-icon",
+                style: { "vertical-align": "-3px" }
               }, {
                 default: withCtx(() => [
                   createVNode(_component_ArrowDown)

package/es/ele-pro-layout/style/css-var.scss

@@ -9,7 +9,9 @@
   .ele-admin-header,
   .ele-admin-sidebar,
   .ele-admin-sidebox,
-  .ele-admin-tabs {
+  .ele-admin-tabs,
+  .ele-modal-inner,
+  .ele-drawer-inner {
     @include set-ele-var('header', $var);
   }
 
@@ -30,14 +32,18 @@
   .ele-admin-sidebar,
   .ele-admin-sidebox,
   .ele-admin-body,
-  .ele-admin-mask {
+  .ele-admin-mask,
+  .ele-modal-inner,
+  .ele-drawer-inner {
     @include set-ele-var('sidebar', $var);
   }
 
   .ele-admin-header,
   .ele-admin-sidebox,
   .ele-admin-sidebox-popup,
-  .ele-admin-body {
+  .ele-admin-body,
+  .ele-modal-inner,
+  .ele-drawer-inner {
     @include set-ele-var('sidebox', $var);
   }
 }

package/es/ele-pro-table/components/table-tools.js

@@ -1,7 +1,6 @@
 import { defineComponent, computed, resolveComponent, openBlock, createElementBlock, Fragment, renderList, createBlock, withCtx, createVNode, renderSlot, createCommentVNode } from "vue";
 import { ElIcon } from "element-plus";
-import { RefreshRight } from "@element-plus/icons-vue";
-import { ColumnHeightOutlined, FullscreenOutlined, FullscreenExitOutlined } from "../../icons";
+import { ReloadOutlined, ColumnHeightOutlined, FullscreenOutlined, FullscreenExitOutlined } from "../../icons";
 import { useLocale } from "../../ele-config-provider/receiver";
 import EleDropdown from "../../ele-dropdown/index";
 import { getSizeCacheKey } from "../util";
@@ -11,7 +10,7 @@ const _sfc_main = defineComponent({
   name: "TableTools",
   components: {
     ElIcon,
-    RefreshRight,
+    ReloadOutlined,
     ColumnHeightOutlined,
     FullscreenOutlined,
     FullscreenExitOutlined,
@@ -81,7 +80,7 @@ const _export_sfc = (sfc, props) => {
   return target;
 };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  const _component_RefreshRight = resolveComponent("RefreshRight");
+  const _component_ReloadOutlined = resolveComponent("ReloadOutlined");
   const _component_ElIcon = resolveComponent("ElIcon");
   const _component_EleTool = resolveComponent("EleTool");
   const _component_ColumnHeightOutlined = resolveComponent("ColumnHeightOutlined");
@@ -100,7 +99,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         default: withCtx(() => [
           createVNode(_component_ElIcon, null, {
             default: withCtx(() => [
-              createVNode(_component_RefreshRight, { style: { "transform": "scale(1.2)" } })
+              createVNode(_component_ReloadOutlined)
             ]),
             _: 1
           })

package/es/ele-pro-table/components/tool-column.js

@@ -1,6 +1,6 @@
 import { defineComponent, ref, watch, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, normalizeClass, createTextVNode, toDisplayString, createCommentVNode } from "vue";
-import { Setting } from "@element-plus/icons-vue";
 import { ElCheckbox, ElIcon } from "element-plus";
+import { SettingOutlined } from "../../icons";
 import { eachTree } from "../../utils/core";
 import EleTooltip from "../../ele-tooltip/index";
 import EleTool from "../../ele-tool/index";
@@ -12,7 +12,7 @@ const _sfc_main = defineComponent({
     ElCheckbox,
     ElIcon,
     EleTooltip,
-    Setting,
+    SettingOutlined,
     EleTool,
     ToolColumnList
   },
@@ -207,7 +207,7 @@ const _export_sfc = (sfc, props) => {
 const _hoisted_1 = { class: "ele-tool-column-header" };
 const _hoisted_2 = { class: "ele-tool-column-label" };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  const _component_Setting = resolveComponent("Setting");
+  const _component_SettingOutlined = resolveComponent("SettingOutlined");
   const _component_ElIcon = resolveComponent("ElIcon");
   const _component_ElCheckbox = resolveComponent("ElCheckbox");
   const _component_ToolColumnList = resolveComponent("ToolColumnList");
@@ -278,7 +278,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         default: withCtx(() => [
           createVNode(_component_ElIcon, null, {
             default: withCtx(() => [
-              createVNode(_component_Setting, { style: { "transform": "scale(1.08)" } })
+              createVNode(_component_SettingOutlined)
             ]),
             _: 1
           })

package/es/ele-pro-table/index.d.ts

@@ -173,7 +173,7 @@ declare const _default: import("vue").DefineComponent<{
     tableIndex: import("vue").ComputedRef<number>;
     paginationProps: import("vue").ComputedRef<ElePaginationProps | null>;
     tableProps: import("vue").ComputedRef<EleDataTableProps>;
-    tableTools: import("vue").ComputedRef<string[]>;
+    toolNames: import("vue").ComputedRef<string[]>;
     rootProps: import("vue").ComputedRef<EleLoadingProps>;
     onRefresh: () => void;
     onSizeChange: (size: TableSize) => void;

package/es/ele-pro-table/index.js

@@ -100,7 +100,7 @@ const _sfc_main = defineComponent({
         onCurrentChange
       };
     });
-    const tableTools = computed(() => {
+    const toolNames = computed(() => {
       const tools = props.tools ?? globalProps.value.tools ?? true;
       if (tools === true) {
         return ["reload", "size", "columns", "maximized"];
@@ -430,7 +430,7 @@ const _sfc_main = defineComponent({
       tableIndex,
       paginationProps,
       tableProps,
-      tableTools,
+      toolNames,
       rootProps,
       onRefresh,
       onSizeChange,
@@ -467,11 +467,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       _ctx.toolbar ? (openBlock(), createBlock(_component_EleToolbar, normalizeProps(mergeProps$1({ key: 0 }, _ctx.toolbar === true ? {} : _ctx.toolbar)), {
         tools: withCtx(() => [
           renderSlot(_ctx.$slots, "tools"),
-          _ctx.tableTools && _ctx.tableTools.length ? (openBlock(), createBlock(_component_TableTools, {
+          _ctx.toolNames && _ctx.toolNames.length ? (openBlock(), createBlock(_component_TableTools, {
             key: 0,
             size: _ctx.tableSize,
             columns: _ctx.columns,
-            tools: _ctx.tableTools,
+            tools: _ctx.toolNames,
             columnSortable: _ctx.columnSortable,
             columnFixed: _ctx.columnFixed,
             maximized: _ctx.tableMaximized,

package/es/ele-pro-table/style/index.scss

@@ -199,7 +199,7 @@
 
 .ele-tool-column-handle {
   display: flex;
-  font-size: 14px;
+  font-size: 12px;
   color: elVar('text-color', 'placeholder');
   margin-right: 4px;
   cursor: move;
@@ -238,6 +238,6 @@
   }
 
   .ele-tool-column-header .ele-tool-column-label {
-    padding-left: calc(24px - #{eleVar('tool-column', 'item-padding')});
+    padding-left: calc(22px - #{eleVar('tool-column', 'item-padding')});
   }
 }

package/es/ele-split-panel/index.js

@@ -178,7 +178,13 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       renderSlot(_ctx.$slots, "collapse", { collapse: _ctx.isCollapse }, () => [
         createVNode(_component_ElIcon, { class: "ele-split-collapse-icon" }, {
           default: withCtx(() => [
-            _ctx.vertical ? (openBlock(), createBlock(_component_ArrowUp, { key: 0 })) : (openBlock(), createBlock(_component_ArrowLeft, { key: 1 }))
+            _ctx.vertical ? (openBlock(), createBlock(_component_ArrowUp, {
+              key: 0,
+              style: { "margin-top": "-1.25px" }
+            })) : (openBlock(), createBlock(_component_ArrowLeft, {
+              key: 1,
+              style: { "margin-left": "-1.25px" }
+            }))
           ]),
           _: 1
         })

package/es/ele-split-panel/style/index.scss

@@ -86,10 +86,14 @@
     z-index: 5;
 
     .ele-split-collapse-icon {
-      font-size: 18px;
+      font-size: 14px;
       color: elVar('text-color', 'secondary');
       transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
       transform: scaleX(1);
+
+      & > svg {
+        stroke-width: 5;
+      }
     }
 
     &:hover .ele-split-collapse-icon {

package/es/ele-table-select/index.d.ts

@@ -29,7 +29,7 @@ declare const _default: import("vue").DefineComponent<{
     maxTagCount: NumberConstructor; /** 下拉框是否显示 */
     maxTagTextLength: NumberConstructor;
     tagType: {
-        type: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "" | "success" | "warning" | "info" | "danger", unknown> | undefined>;
+        type: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "success" | "warning" | "info" | "primary" | "danger", unknown> | undefined>;
         default: string;
     };
     automaticDropdown: BooleanConstructor;
@@ -125,7 +125,7 @@ declare const _default: import("vue").DefineComponent<{
     maxTagCount: NumberConstructor; /** 下拉框是否显示 */
     maxTagTextLength: NumberConstructor;
     tagType: {
-        type: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "" | "success" | "warning" | "info" | "danger", unknown> | undefined>;
+        type: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "success" | "warning" | "info" | "primary" | "danger", unknown> | undefined>;
         default: string;
     };
     automaticDropdown: BooleanConstructor;
@@ -175,7 +175,7 @@ declare const _default: import("vue").DefineComponent<{
     transition: string;
     multiple: boolean;
     responsive: boolean;
-    tagType: import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "" | "success" | "warning" | "info" | "danger", unknown> | undefined;
+    tagType: import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "success" | "warning" | "info" | "primary" | "danger", unknown> | undefined;
     automaticDropdown: boolean;
     filterable: boolean;
     valueKey: string;

package/es/ele-table-select/props.d.ts

@@ -46,7 +46,7 @@ export declare const tableSelectProps: {
     maxTagTextLength: NumberConstructor;
     /** 多选标签类型 */
     tagType: {
-        type: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "" | "success" | "warning" | "info" | "danger", unknown> | undefined>;
+        type: PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "success" | "warning" | "info" | "primary" | "danger", unknown> | undefined>;
         default: string;
     };
     /** 是否在输入框获得焦点后自动弹出选项菜单 */

package/es/ele-tabs/index.js

@@ -113,24 +113,28 @@ const _sfc_main = defineComponent({
         e.preventDefault();
       }
     };
+    const getBtnEl = (el, e, firefox) => {
+      const wheelDelta = e.wheelDelta || e.detail;
+      const delta = firefox ? -wheelDelta : wheelDelta;
+      if (delta > 0) {
+        return el.querySelector(".el-tabs__nav-prev");
+      } else if (delta < 0) {
+        return el.querySelector(".el-tabs__nav-next");
+      }
+    };
     const onMousewheel = (e, isFirefox) => {
-      e.preventDefault();
-      e.stopPropagation();
-      const el = e.currentTarget;
-      if (el && !current.isScroll) {
-        current.isScroll = true;
-        const wheelDelta = e.wheelDelta || e.detail;
-        const delta = isFirefox ? -wheelDelta : wheelDelta;
-        if (delta > 0) {
-          const prevEl = el.querySelector(".el-tabs__nav-prev");
-          prevEl && prevEl.click();
-        } else if (delta < 0) {
-          const nextEl = el.querySelector(".el-tabs__nav-next");
-          nextEl && nextEl.click();
+      const tabEl = e.currentTarget;
+      if (tabEl && !current.isScroll) {
+        const el = getBtnEl(tabEl, e, isFirefox);
+        if (el && !el.classList.contains("is-disabled")) {
+          current.isScroll = true;
+          e.preventDefault();
+          e.stopPropagation();
+          el.click();
+          setTimeout(() => {
+            current.isScroll = false;
+          }, 300);
         }
-        setTimeout(() => {
-          current.isScroll = false;
-        }, 300);
       }
     };
     const onFMousewheel = (e) => {
@@ -278,12 +282,19 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     ]),
     _: 2
   }, [
+    _ctx.$slots["add-icon"] ? {
+      name: "add-icon",
+      fn: withCtx(() => [
+        renderSlot(_ctx.$slots, "add-icon")
+      ]),
+      key: "0"
+    } : void 0,
     _ctx.$slots.addIcon ? {
       name: "addIcon",
       fn: withCtx(() => [
         renderSlot(_ctx.$slots, "addIcon")
       ]),
-      key: "0"
+      key: "1"
     } : void 0
   ]), 1040, ["type", "class", "onUpdate:modelValue", "onTabClick", "onTabChange", "onTabRemove", "onTabAdd", "onEdit", "onContextmenu"]);
 }

package/es/ele-tabs/style/css-var.scss

@@ -3,7 +3,9 @@
 /* 标签页主题变量 */
 @mixin set-tab-var($var) {
   .ele-tabs,
-  .ele-tab-tool {
+  .ele-tab-tool,
+  .ele-modal-inner,
+  .ele-drawer-inner {
     @include set-ele-var('tab', $var);
   }
 

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

@@ -82,6 +82,11 @@
     padding-right: calc(#{$padding} + #{$size} / 2 + #{$padding} / 4);
   }
 
+  .ele-tab-icon {
+    font-size: eleVar('tab', 'icon-font-size');
+    vertical-align: -2.8px;
+  }
+
   /* 关闭图标 */
   .el-tabs__nav-wrap .el-tabs__nav .el-tabs__item .is-icon-close {
     margin: 0;
@@ -190,6 +195,10 @@
     padding-right: calc(#{$padding} + #{$size} / 2 + #{$padding} / 4);
   }
 
+  .ele-tab-icon {
+    font-size: eleVar('tab-sm', 'icon-font-size');
+  }
+
   .el-tabs__nav-wrap .el-tabs__nav .el-tabs__item .is-icon-close {
     width: eleVar('tab-sm', 'close-size');
     height: eleVar('tab-sm', 'close-size');
@@ -223,6 +232,10 @@
     padding-right: calc(#{$padding} + #{$size} / 2 + #{$padding} / 4);
   }
 
+  .ele-tab-icon {
+    font-size: eleVar('tab-lg', 'icon-font-size');
+  }
+
   .el-tabs__nav-wrap .el-tabs__nav .el-tabs__item .is-icon-close {
     width: eleVar('tab-lg', 'close-size');
     height: eleVar('tab-lg', 'close-size');
@@ -666,6 +679,11 @@
     outline: none;
   }
 
+  .ele-tab-icon {
+    font-size: eleVar('tab', 'icon-font-size');
+    vertical-align: -2.8px;
+  }
+
   /* 下拉菜单 */
   & > .el-dropdown {
     color: inherit;
@@ -713,6 +731,10 @@
     &.is-tab {
       font-size: eleVar('tab-sm', 'font-size');
     }
+
+    .ele-tab-icon {
+      font-size: eleVar('tab-sm', 'icon-font-size');
+    }
   }
 
   /* 大型尺寸 */
@@ -725,6 +747,10 @@
     &.is-tab {
       font-size: eleVar('tab-lg', 'font-size');
     }
+
+    .ele-tab-icon {
+      font-size: eleVar('tab-lg', 'icon-font-size');
+    }
   }
 
   /* 简约风格和指示器风格 */