ele-admin-plus 1.2.1-beta.4 → 1.2.1-beta.5

package/es/ele-dropdown/components/pro-dropdown.d.ts

@@ -89,6 +89,7 @@ declare const _default: import('vue').DefineComponent<{
     ArrowDown: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
     tooltipRef: import('vue').Ref<EleTooltipInstance>;
     tooltipProps: import('vue').ComputedRef<Partial<import('../../ele-tooltip/props').TooltipProps>>;
+    hasSubMenu: import('vue').ComputedRef<boolean>;
     hidePopper: () => void;
     updatePopper: () => void;
     handleUpdateVisible: (visible: boolean) => void;
@@ -100,7 +101,7 @@ declare const _default: import('vue').DefineComponent<{
     handleBtnClick: (e: MouseEvent) => void;
     handleOpen: () => void;
     handleClose: () => void;
-    handleContextmenu: (e: MouseEvent) => void;
+    handleWrapperContext: (e: MouseEvent) => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     click: (_e: MouseEvent) => boolean;
     command: (_command: DropdownItem["command"]) => boolean;

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

@@ -1,13 +1,14 @@
-import { defineComponent, ref, computed, resolveComponent, openBlock, createBlock, mergeProps, withCtx, createVNode, createElementVNode, normalizeClass, normalizeStyle, createElementBlock, Fragment, renderList, createCommentVNode, renderSlot, resolveDynamicComponent, toDisplayString } from "vue";
-import { ElIcon, ElButtonGroup, ElButton, ElScrollbar } from "element-plus";
+import { defineComponent, ref, computed, resolveComponent, openBlock, createBlock, mergeProps, withCtx, createElementBlock, createSlots, renderList, renderSlot, normalizeProps, guardReactiveProps, createCommentVNode } from "vue";
+import { ElButton, ElScrollbar } from "element-plus";
 import { ArrowDown } from "../../icons";
 import { pick } from "../../utils/core";
 import EleTooltip from "../../ele-tooltip/index";
 import { tooltipPropKeys } from "../../ele-tooltip/props";
+import DropdownMenus from "./dropdown-menus";
 import { dropdownProps, dropdownEmits } from "../props";
 const _sfc_main = defineComponent({
   name: "ProDropdown",
-  components: { ElIcon, ElButtonGroup, ElButton, ElScrollbar, EleTooltip },
+  components: { ElButton, ElScrollbar, EleTooltip, DropdownMenus },
   props: {
     ...dropdownProps,
     /** 当前选中菜单项 */
@@ -32,6 +33,12 @@ const _sfc_main = defineComponent({
       options.isPopover = true;
       return options;
     });
+    const hasSubMenu = computed(
+      () => !!(props.items && props.items.some((d) => {
+        var _a;
+        return !!((_a = d.children) == null ? void 0 : _a.length);
+      }))
+    );
     const hidePopper = () => {
       tooltipRef.value && tooltipRef.value.hide();
     };
@@ -55,10 +62,8 @@ const _sfc_main = defineComponent({
       emit("after-leave");
     };
     const handleItemClick = (item) => {
-      if (item.disabled) {
-        return;
-      }
-      if (props.hideOnClick) {
+      var _a;
+      if (props.hideOnClick && !((_a = item.children) == null ? void 0 : _a.length)) {
         hidePopper();
       }
       emit("command", item.command);
@@ -75,7 +80,7 @@ const _sfc_main = defineComponent({
     const handleClose = () => {
       hidePopper();
     };
-    const handleContextmenu = (e) => {
+    const handleWrapperContext = (e) => {
       if (props.preventContextmenu) {
         e.preventDefault();
       }
@@ -84,6 +89,7 @@ const _sfc_main = defineComponent({
       ArrowDown,
       tooltipRef,
       tooltipProps,
+      hasSubMenu,
       hidePopper,
       updatePopper,
       handleUpdateVisible,
@@ -95,7 +101,7 @@ const _sfc_main = defineComponent({
       handleBtnClick,
       handleOpen,
       handleClose,
-      handleContextmenu
+      handleWrapperContext
     };
   }
 });
@@ -106,16 +112,9 @@ const _export_sfc = (sfc, props) => {
   }
   return target;
 };
-const _hoisted_1 = ["role"];
-const _hoisted_2 = {
-  key: 0,
-  class: "ele-dropdown-menu-divider"
-};
-const _hoisted_3 = ["onClick"];
-const _hoisted_4 = { key: 1 };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_ElButton = resolveComponent("ElButton");
-  const _component_ElIcon = resolveComponent("ElIcon");
+  const _component_DropdownMenus = resolveComponent("DropdownMenus");
   const _component_ElScrollbar = resolveComponent("ElScrollbar");
   const _component_EleTooltip = resolveComponent("EleTooltip");
   return openBlock(), createBlock(_component_EleTooltip, mergeProps({ tabindex: _ctx.tabindex }, _ctx.tooltipProps, {
@@ -127,59 +126,61 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     onHide: _ctx.handlePopAfterLeave
   }), {
     body: withCtx(() => [
-      createVNode(_component_ElScrollbar, {
+      _ctx.hasSubMenu ? (openBlock(), createElementBlock("div", {
+        key: 0,
+        class: "ele-dropdown-wrapper",
+        onContextmenu: _cache[0] || (_cache[0] = (...args) => _ctx.handleWrapperContext && _ctx.handleWrapperContext(...args))
+      }, [
+        _ctx.items && _ctx.items.length ? (openBlock(), createBlock(_component_DropdownMenus, {
+          key: 0,
+          role: _ctx.role,
+          items: _ctx.items,
+          selected: _ctx.modelValue,
+          menuStyle: _ctx.menuStyle,
+          iconProps: _ctx.iconProps,
+          size: _ctx.size,
+          onItemClick: _ctx.handleItemClick,
+          onWrapperContext: _ctx.handleWrapperContext
+        }, createSlots({ _: 2 }, [
+          renderList(Object.keys(_ctx.$slots).filter((k) => "default" !== k), (name) => {
+            return {
+              name,
+              fn: withCtx((slotProps) => [
+                renderSlot(_ctx.$slots, name, normalizeProps(guardReactiveProps(slotProps || {})))
+              ])
+            };
+          })
+        ]), 1032, ["role", "items", "selected", "menuStyle", "iconProps", "size", "onItemClick", "onWrapperContext"])) : createCommentVNode("", true)
+      ], 32)) : (openBlock(), createBlock(_component_ElScrollbar, {
+        key: 1,
         maxHeight: _ctx.maxHeight,
         class: "ele-dropdown-wrapper",
-        onContextmenu: _ctx.handleContextmenu
+        onContextmenu: _ctx.handleWrapperContext
       }, {
         default: withCtx(() => [
-          createElementVNode("div", {
+          _ctx.items && _ctx.items.length ? (openBlock(), createBlock(_component_DropdownMenus, {
+            key: 0,
             role: _ctx.role,
-            class: normalizeClass([
-              "ele-dropdown-menu",
-              { "is-small": _ctx.size === "small" },
-              { "is-large": _ctx.size === "large" }
-            ]),
-            style: normalizeStyle(_ctx.menuStyle)
-          }, [
-            (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.items, (item) => {
-              return openBlock(), createElementBlock(Fragment, {
-                key: item.key == null ? JSON.stringify(item.command) : item.key
-              }, [
-                item.divided ? (openBlock(), createElementBlock("div", _hoisted_2)) : createCommentVNode("", true),
-                createElementVNode("div", {
-                  class: normalizeClass([
-                    "ele-dropdown-menu-item",
-                    { "is-disabled": !!item.disabled },
-                    { "is-active": _ctx.modelValue === item.command },
-                    { "is-danger": !!item.danger }
-                  ]),
-                  onClick: ($event) => _ctx.handleItemClick(item)
-                }, [
-                  item.slot && item.slot !== "default" && _ctx.$slots[item.slot] ? renderSlot(_ctx.$slots, item.slot, {
-                    key: 0,
-                    item
-                  }) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
-                    item.icon ? (openBlock(), createBlock(_component_ElIcon, mergeProps({
-                      key: 0,
-                      ref_for: true
-                    }, { ..._ctx.iconProps || {}, ...item.iconProps || {} }), {
-                      default: withCtx(() => [
-                        (openBlock(), createBlock(resolveDynamicComponent(item.icon), {
-                          style: normalizeStyle(item.iconStyle)
-                        }, null, 8, ["style"]))
-                      ]),
-                      _: 2
-                    }, 1040)) : createCommentVNode("", true),
-                    item.title ? (openBlock(), createElementBlock("span", _hoisted_4, toDisplayString(item.title), 1)) : createCommentVNode("", true)
-                  ], 64))
-                ], 10, _hoisted_3)
-              ], 64);
-            }), 128))
-          ], 14, _hoisted_1)
+            items: _ctx.items,
+            selected: _ctx.modelValue,
+            menuStyle: _ctx.menuStyle,
+            iconProps: _ctx.iconProps,
+            size: _ctx.size,
+            onItemClick: _ctx.handleItemClick,
+            onWrapperContext: _ctx.handleWrapperContext
+          }, createSlots({ _: 2 }, [
+            renderList(Object.keys(_ctx.$slots).filter((k) => "default" !== k), (name) => {
+              return {
+                name,
+                fn: withCtx((slotProps) => [
+                  renderSlot(_ctx.$slots, name, normalizeProps(guardReactiveProps(slotProps || {})))
+                ])
+              };
+            })
+          ]), 1032, ["role", "items", "selected", "menuStyle", "iconProps", "size", "onItemClick", "onWrapperContext"])) : createCommentVNode("", true)
         ]),
         _: 3
-      }, 8, ["maxHeight", "onContextmenu"])
+      }, 8, ["maxHeight", "onContextmenu"]))
     ]),
     default: withCtx(() => [
       _ctx.splitButton ? (openBlock(), createBlock(_component_ElButton, mergeProps({

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

@@ -28,7 +28,7 @@ declare const _default: import('vue').DefineComponent<{
         readonly validator: ((val: unknown) => boolean) | undefined;
         readonly __epPropKey: true;
     };
-    placement: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement) | ((new (...args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement))[], unknown, unknown, "bottom", boolean>;
+    placement: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement) | ((new (... /** 更新气泡 */args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement))[], unknown, unknown, "bottom", boolean>;
     popperClass: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
     teleported: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     disabled: BooleanConstructor;
@@ -112,7 +112,7 @@ declare const _default: import('vue').DefineComponent<{
             readonly validator: ((val: unknown) => boolean) | undefined;
             readonly __epPropKey: true;
         };
-        placement: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement) | ((new (...args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement))[], unknown, unknown, "bottom", boolean>;
+        placement: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement) | ((new (... /** 更新气泡 */args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement))[], unknown, unknown, "bottom", boolean>;
         popperClass: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
         teleported: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
         disabled: BooleanConstructor;
@@ -182,6 +182,7 @@ declare const _default: import('vue').DefineComponent<{
         ArrowDown: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
         tooltipRef: import('vue').Ref<import('../ele-app/plus').EleTooltipInstance>;
         tooltipProps: import('vue').ComputedRef<Partial<import('../ele-tooltip/props').TooltipProps>>;
+        hasSubMenu: import('vue').ComputedRef<boolean>;
         hidePopper: () => void;
         updatePopper: () => void;
         handleUpdateVisible: (visible: boolean) => void;
@@ -193,7 +194,7 @@ declare const _default: import('vue').DefineComponent<{
         handleBtnClick: (e: MouseEvent) => void;
         handleOpen: () => void;
         handleClose: () => void;
-        handleContextmenu: (e: MouseEvent) => void;
+        handleWrapperContext: (e: MouseEvent) => void;
     }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
         click: (_e: MouseEvent) => boolean;
         command: (_command: DropdownItem["command"]) => boolean;
@@ -232,7 +233,7 @@ declare const _default: import('vue').DefineComponent<{
             readonly validator: ((val: unknown) => boolean) | undefined;
             readonly __epPropKey: true;
         };
-        placement: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement) | ((new (...args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement))[], unknown, unknown, "bottom", boolean>;
+        placement: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement) | ((new (... /** 更新气泡 */args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement))[], unknown, unknown, "bottom", boolean>;
         popperClass: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
         teleported: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
         disabled: BooleanConstructor;
@@ -359,7 +360,7 @@ declare const _default: import('vue').DefineComponent<{
             readonly validator: ((val: unknown) => boolean) | undefined;
             readonly __epPropKey: true;
         };
-        placement: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement) | ((new (...args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement))[], unknown, unknown, "bottom", boolean>;
+        placement: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement) | ((new (... /** 更新气泡 */args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement))[], unknown, unknown, "bottom", boolean>;
         popperClass: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
         teleported: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
         disabled: BooleanConstructor;
@@ -429,6 +430,7 @@ declare const _default: import('vue').DefineComponent<{
         ArrowDown: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
         tooltipRef: import('vue').Ref<import('../ele-app/plus').EleTooltipInstance>;
         tooltipProps: import('vue').ComputedRef<Partial<import('../ele-tooltip/props').TooltipProps>>;
+        hasSubMenu: import('vue').ComputedRef<boolean>;
         hidePopper: () => void;
         updatePopper: () => void;
         handleUpdateVisible: (visible: boolean) => void;
@@ -440,7 +442,7 @@ declare const _default: import('vue').DefineComponent<{
         handleBtnClick: (e: MouseEvent) => void;
         handleOpen: () => void;
         handleClose: () => void;
-        handleContextmenu: (e: MouseEvent) => void;
+        handleWrapperContext: (e: MouseEvent) => void;
     }, {}, {}, {}, {
         effect: string;
         placement: import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement) | ((new (...args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement))[], unknown, unknown>;
@@ -514,7 +516,7 @@ declare const _default: import('vue').DefineComponent<{
         readonly validator: ((val: unknown) => boolean) | undefined;
         readonly __epPropKey: true;
     };
-    placement: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement) | ((new (...args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement))[], unknown, unknown, "bottom", boolean>;
+    placement: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement) | ((new (... /** 更新气泡 */args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement))[], unknown, unknown, "bottom", boolean>;
     popperClass: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
     teleported: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     disabled: BooleanConstructor;

package/es/ele-dropdown/index.js

@@ -1,5 +1,5 @@
 import { defineComponent, ref, computed, resolveComponent, openBlock, createElementBlock, Fragment, createBlock, mergeProps, createSlots, renderList, withCtx, renderSlot, normalizeProps, guardReactiveProps, createVNode, normalizeStyle, resolveDynamicComponent, createCommentVNode, toDisplayString } from "vue";
-import { ElDropdown, ElDropdownMenu, ElDropdownItem, ElIcon } from "element-plus";
+import { ElDropdown, ElDropdownMenu, ElDropdownItem, ElButtonGroup, ElButton, ElIcon } from "element-plus";
 import { pick, omit } from "../utils/core";
 import { useFormValidate } from "../ele-basic-select/util";
 import ProDropdown from "./components/pro-dropdown";
@@ -10,6 +10,8 @@ const _sfc_main = defineComponent({
     ElDropdown,
     ElDropdownMenu,
     ElDropdownItem,
+    ElButtonGroup,
+    ElButton,
     ElIcon,
     ProDropdown
   },

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

@@ -14,7 +14,8 @@
     width: max-content;
   }
 
-  & > .el-scrollbar {
+  & > .el-scrollbar,
+  & > .ele-dropdown-wrapper {
     background: inherit;
     border-radius: inherit;
   }
@@ -36,6 +37,7 @@
   border-radius: eleVar('dropdown', 'item-radius');
   transition: (color $transition-base, background-color $transition-base);
   box-sizing: border-box;
+  position: relative;
   cursor: pointer;
 
   & + .ele-dropdown-menu-item {
@@ -47,6 +49,13 @@
     margin: eleVar('dropdown', 'icon-margin');
   }
 
+  & > .ele-dropdown-menu-item-arrow {
+    color: eleVar('dropdown', 'arrow-color');
+    font-size: eleVar('dropdown', 'arrow-size');
+    padding: eleVar('dropdown', 'arrow-padding');
+    margin: eleVar('dropdown', 'arrow-margin');
+  }
+
   &:hover,
   &:focus {
     color: eleVar('dropdown', 'item-hover-color');
@@ -141,6 +150,48 @@
   }
 }
 
+/* 子菜单 */
+.ele-dropdown-wrapper.is-sub-menu {
+  width: max-content;
+  background: eleVar('popper', 'bg');
+  border: eleVar('popper', 'border');
+  box-shadow: eleVar('popper', 'shadow');
+  border-radius: eleVar('popper', 'radius');
+  position: absolute;
+  left: 100%;
+  top: 0;
+  transform-origin: top left;
+  transition: all $transition-slow;
+
+  &.is-right-end {
+    top: auto;
+    bottom: 0;
+    transform-origin: bottom left;
+  }
+
+  &.is-left-start {
+    left: auto;
+    right: 100%;
+    transform-origin: top right;
+  }
+
+  &.is-left-end {
+    top: auto;
+    bottom: 0;
+    left: auto;
+    right: 100%;
+    transform-origin: bottom right;
+  }
+}
+
+.ele-dropdown-menu-item:not(:hover) > .ele-dropdown-wrapper,
+.ele-dropdown-menu-item.is-disabled > .ele-dropdown-wrapper {
+  opacity: 0;
+  transform: scale(0.6);
+  pointer-events: none;
+  visibility: hidden;
+}
+
 /* ElDropdown */
 .ele-dropdown-trigger.el-dropdown {
   color: inherit;

package/es/ele-dropdown/types.d.ts

@@ -17,4 +17,6 @@ export interface DropdownItem extends ElDropdownItemProps {
   slot?: Exclude<string, 'default'>;
   /** 是否为危险样式 */
   danger?: boolean;
+  /** 子菜单 */
+  children?: DropdownItem[];
 }

package/es/ele-popconfirm/index.js

@@ -162,34 +162,41 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           class: "ele-popconfirm-action",
           style: normalizeStyle(_ctx.footerStyle)
         }, [
-          renderSlot(_ctx.$slots, "action", {
+          renderSlot(_ctx.$slots, "actions", {
             cancel: _ctx.cancel,
             confirm: _ctx.confirm,
             cancelText: _ctx.cancelText,
             confirmText: _ctx.confirmText
-          }),
-          !_ctx.hideCancelButton ? (openBlock(), createBlock(_component_ElButton, mergeProps({
-            key: 0,
-            size: "small",
-            type: _ctx.cancelButtonType === "text" ? void 0 : _ctx.cancelButtonType,
-            text: _ctx.cancelButtonType === "text"
-          }, _ctx.cancelButtonProps || {}, { onClick: _ctx.cancel }), {
-            default: withCtx(() => [
-              createTextVNode(toDisplayString(_ctx.cancelText), 1)
-            ]),
-            _: 1
-          }, 16, ["type", "text", "onClick"])) : createCommentVNode("", true),
-          !_ctx.hideConfirmButton ? (openBlock(), createBlock(_component_ElButton, mergeProps({
-            key: 1,
-            size: "small",
-            type: _ctx.confirmButtonType === "text" ? void 0 : _ctx.confirmButtonType,
-            text: _ctx.confirmButtonType === "text"
-          }, _ctx.confirmButtonProps || {}, { onClick: _ctx.confirm }), {
-            default: withCtx(() => [
-              createTextVNode(toDisplayString(_ctx.confirmText), 1)
-            ]),
-            _: 1
-          }, 16, ["type", "text", "onClick"])) : createCommentVNode("", true)
+          }, () => [
+            renderSlot(_ctx.$slots, "action", {
+              cancel: _ctx.cancel,
+              confirm: _ctx.confirm,
+              cancelText: _ctx.cancelText,
+              confirmText: _ctx.confirmText
+            }),
+            !_ctx.hideCancelButton ? (openBlock(), createBlock(_component_ElButton, mergeProps({
+              key: 0,
+              size: "small",
+              type: _ctx.cancelButtonType === "text" ? void 0 : _ctx.cancelButtonType,
+              text: _ctx.cancelButtonType === "text"
+            }, _ctx.cancelButtonProps || {}, { onClick: _ctx.cancel }), {
+              default: withCtx(() => [
+                createTextVNode(toDisplayString(_ctx.cancelText), 1)
+              ]),
+              _: 1
+            }, 16, ["type", "text", "onClick"])) : createCommentVNode("", true),
+            !_ctx.hideConfirmButton ? (openBlock(), createBlock(_component_ElButton, mergeProps({
+              key: 1,
+              size: "small",
+              type: _ctx.confirmButtonType === "text" ? void 0 : _ctx.confirmButtonType,
+              text: _ctx.confirmButtonType === "text"
+            }, _ctx.confirmButtonProps || {}, { onClick: _ctx.confirm }), {
+              default: withCtx(() => [
+                createTextVNode(toDisplayString(_ctx.confirmText), 1)
+              ]),
+              _: 1
+            }, 16, ["type", "text", "onClick"])) : createCommentVNode("", true)
+          ])
         ], 4)
       ], 6)
     ]),

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, shallowRef, computed, watch, unref, shallowReactive, provide, nextTick, onMounted, resolveComponent, openBlock, createBlock, normalizeClass, createSlots, withCtx, createCommentVNode, renderSlot, renderList, normalizeProps, guardReactiveProps } from "vue";
+import { defineComponent, ref, shallowRef, computed, markRaw, watch, unref, shallowReactive, provide, nextTick, onMounted, resolveComponent, openBlock, createBlock, normalizeClass, createSlots, withCtx, createCommentVNode, renderSlot, renderList, normalizeProps, guardReactiveProps } from "vue";
 import { useRouter } from "vue-router";
 import { HomeOutlined } from "../icons";
 import { useTimer, useMediaQuery, useWindowListener } from "../utils/hook";
@@ -87,7 +87,12 @@ const _sfc_main = defineComponent({
       if (!isHome.value) {
         const to = homeMenuPath.value;
         const is = { transform: "scale(1.13)", transformOrigin: "8px -2px" };
-        data.push({ key: to, to, icon: HomeOutlined, iconStyle: is });
+        data.push({
+          key: to,
+          to,
+          icon: markRaw(HomeOutlined),
+          iconStyle: is
+        });
       }
       levelData.value.forEach((d) => {
         data.push({ key: d.path, title: d.title });

package/es/ele-pro-table/components/table-tools.d.ts

@@ -1,4 +1,5 @@
 import { PropType } from 'vue';
+import { DropdownItem } from '../../ele-dropdown/types';
 import { Columns, TableSize, DataItem, SpanMethod, SummaryMethod, CellStyle, CellClass, HeaderCellStyle, HeaderCellClass, TreeProps } from '../../ele-data-table/types';
 import { TableTool, TableLocale, FetchFunction, ExportConfig, PrintConfig, TableExportParams } from '../types';
 
@@ -62,9 +63,6 @@ declare const _default: import('vue').DefineComponent<{
     };
 }, {
     ownSlots: string[];
-    SizeSlackOutlined: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
-    SizeMiddleOutlined: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
-    SizeCompactOutlined: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
     lang: import('vue').ComputedRef<TableLocale>;
     toolExportRef: import('vue').Ref<import('vue').CreateComponentPublicInstance<Readonly<import('vue').ExtractPropTypes<{
         locale: {
@@ -445,6 +443,7 @@ declare const _default: import('vue').DefineComponent<{
         defaultShowTreeIndex: boolean;
     }> | null>;
     placement: import('vue').ComputedRef<"top" | "bottom">;
+    sizeDropdownItems: import('vue').ComputedRef<DropdownItem[]>;
     reload: () => void;
     updateSize: (size: string) => void;
     updateColumns: (columns: Columns, tableColumns: Columns, isReset: boolean) => void;

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, computed, resolveComponent, openBlock, createElementBlock, Fragment, createVNode, createSlots, renderList, withCtx, renderSlot, normalizeProps, guardReactiveProps, createBlock, createCommentVNode } from "vue";
+import { defineComponent, ref, computed, markRaw, resolveComponent, openBlock, createElementBlock, Fragment, createVNode, createSlots, renderList, withCtx, renderSlot, normalizeProps, guardReactiveProps, createBlock, createCommentVNode } from "vue";
 import { ElIcon } from "element-plus";
 import { ReloadOutlined, DownloadOutlined, PrinterOutlined, ColumnHeightOutlined, FullscreenOutlined, FullscreenExitOutlined, SizeSlackOutlined, SizeMiddleOutlined, SizeCompactOutlined } from "../../icons";
 import EleDropdown from "../../ele-dropdown/index";
@@ -95,6 +95,25 @@ const _sfc_main = defineComponent({
     const toolExportRef = ref(null);
     const toolPrintRef = ref(null);
     const placement = computed(() => props.maximized ? "bottom" : "top");
+    const sizeDropdownItems = computed(() => {
+      return [
+        {
+          title: lang.value.sizeLarge,
+          command: "large",
+          icon: markRaw(SizeSlackOutlined)
+        },
+        {
+          title: lang.value.sizeDefault,
+          command: "default",
+          icon: markRaw(SizeMiddleOutlined)
+        },
+        {
+          title: lang.value.sizeSmall,
+          command: "small",
+          icon: markRaw(SizeCompactOutlined)
+        }
+      ];
+    });
     const reload = () => {
       emit("reload");
     };
@@ -132,13 +151,11 @@ const _sfc_main = defineComponent({
     };
     return {
       ownSlots,
-      SizeSlackOutlined,
-      SizeMiddleOutlined,
-      SizeCompactOutlined,
       lang,
       toolExportRef,
       toolPrintRef,
       placement,
+      sizeDropdownItems,
       reload,
       updateSize,
       updateColumns,
@@ -291,15 +308,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               placement: "bottom",
               popperClass: "ele-tool-size-popper",
               modelValue: _ctx.size,
-              items: [
-                { title: _ctx.lang.sizeLarge, command: "large", icon: _ctx.SizeSlackOutlined },
-                {
-                  title: _ctx.lang.sizeDefault,
-                  command: "default",
-                  icon: _ctx.SizeMiddleOutlined
-                },
-                { title: _ctx.lang.sizeSmall, command: "small", icon: _ctx.SizeCompactOutlined }
-              ],
+              items: _ctx.sizeDropdownItems,
               popperOptions: {
                 modifiers: [{ name: "offset", options: { offset: [0, 10] } }]
               },

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

@@ -206,9 +206,6 @@ declare const _default: import('vue').DefineComponent<{
         "onUpdate:maximized"?: ((_maximized: boolean) => any) | undefined;
     }, {
         ownSlots: string[];
-        SizeSlackOutlined: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
-        SizeMiddleOutlined: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
-        SizeCompactOutlined: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
         lang: import('vue').ComputedRef<import('./types').TableLocale>;
         toolExportRef: Ref<import('vue').CreateComponentPublicInstance<Readonly<import('vue').ExtractPropTypes<{
             locale: {
@@ -589,6 +586,7 @@ declare const _default: import('vue').DefineComponent<{
             defaultShowTreeIndex: boolean;
         }> | null>;
         placement: import('vue').ComputedRef<"top" | "bottom">;
+        sizeDropdownItems: import('vue').ComputedRef<import('../ele-dropdown/types').DropdownItem[]>;
         reload: () => void;
         updateSize: (size: string) => void;
         updateColumns: (columns: Columns, tableColumns: Columns, isReset: boolean) => void;
@@ -695,9 +693,6 @@ declare const _default: import('vue').DefineComponent<{
         "onUpdate:maximized"?: ((_maximized: boolean) => any) | undefined;
     }, {
         ownSlots: string[];
-        SizeSlackOutlined: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
-        SizeMiddleOutlined: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
-        SizeCompactOutlined: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
         lang: import('vue').ComputedRef<import('./types').TableLocale>;
         toolExportRef: Ref<import('vue').CreateComponentPublicInstance<Readonly<import('vue').ExtractPropTypes<{
             locale: {
@@ -1078,6 +1073,7 @@ declare const _default: import('vue').DefineComponent<{
             defaultShowTreeIndex: boolean;
         }> | null>;
         placement: import('vue').ComputedRef<"top" | "bottom">;
+        sizeDropdownItems: import('vue').ComputedRef<import('../ele-dropdown/types').DropdownItem[]>;
         reload: () => void;
         updateSize: (size: string) => void;
         updateColumns: (columns: Columns, tableColumns: Columns, isReset: boolean) => void;

package/es/ele-tabs/index.js

@@ -64,7 +64,7 @@ const _sfc_main = defineComponent({
         return;
       }
       const el = e.target;
-      if (el && el.classList.contains("is-icon-close")) {
+      if (el && (el.classList.contains("is-icon-close") || el.classList.contains("el-tabs__nav") || el.classList.contains("el-tabs__item"))) {
         e.preventDefault();
       }
     };

package/es/style/themes/default.scss

@@ -16,8 +16,6 @@ $icon-validate-path: 'M512 43C768 43 981 256 981 512S768 981 512 981 43 768 43 5
 $icon-expand-path: 'M362 811 662 512 362 213' !default;
 // 树表格加载图标
 $icon-loading-path: 'M512 128V299M789 235 672 352M896 512H725M789 789 672 672M512 896V725M235 789 352 672M128 512H299M235 235 352 352' !default;
-// 表格筛选图标
-$icon-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;
 // 字体
 $logo-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
   'Helvetica Neue', Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji',
@@ -249,6 +247,10 @@ $ele: map.deep-merge(
       'item-disabled-bg': elVar('disabled', 'bg-color'),
       'icon-size': 16px,
       'icon-margin': 0 8px 0 -2px,
+      'arrow-size': 14px,
+      'arrow-color': elVar('text-color', 'placeholder'),
+      'arrow-padding': 0 0 0 6px,
+      'arrow-margin': 0 -8px 0 auto,
       'divider': 1px solid elVar('border-color', 'light'),
       'divider-margin': 6px 0,
       'sm-padding': 3px 0,