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

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-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";

package/es/ele-dropdown/index.js

@@ -101,19 +101,29 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       }, {
         default: withCtx(() => [
           _ctx.items ? (openBlock(true), createElementBlock(Fragment, { key: 0 }, renderList(_ctx.items, (item, index2) => {
-            return openBlock(), createBlock(_component_ElDropdownItem, 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 openBlock(), createBlock(_component_ElDropdownItem, 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: withCtx(() => [
                 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, normalizeProps(mergeProps({ key: 0 }, item.iconProps || {})), {
+                  item.icon ? (openBlock(), createBlock(_component_ElIcon, normalizeProps(mergeProps({ key: 0 }, { ..._ctx.iconProps || {}, ...item.iconProps || {} })), {
                     default: withCtx(() => [
                       (openBlock(), createBlock(resolveDynamicComponent(item.icon), {
                         style: normalizeStyle(item.iconStyle)

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

@@ -1,4 +1,5 @@
 import type { PropType, ExtractPropTypes } from 'vue';
+import type { ElIconProps } from '../ele-app/el';
 import type { DropdownItem } from './types';
 /**
  * 属性
@@ -10,6 +11,8 @@ export declare const dropdownProps: {
     modelValue: PropType<import("element-plus/es/utils/index").EpPropMergeType<readonly [ObjectConstructor, StringConstructor, NumberConstructor], unknown, unknown> | undefined>;
     /** 自定义下拉菜单样式 */
     menuStyle: PropType<Partial<import("vue").CSSProperties>>;
+    /** 自定义图标属性 */
+    iconProps: PropType<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";

package/es/ele-dropdown/props.js

@@ -6,7 +6,9 @@ const dropdownProps = {
   /** 选中的菜单 */
   modelValue: String,
   /** 自定义下拉菜单样式 */
-  menuStyle: Object
+  menuStyle: Object,
+  /** 自定义图标属性 */
+  iconProps: Object
 };
 const dropdownEmits = {
   /** SplitButton 点击事件 */

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

@@ -1,17 +1,19 @@
 import type { ElInputInstance } from '../ele-app/el';
 declare const _default: import("vue").DefineComponent<{
     modelValue: import("vue").PropType<string[]>;
-    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>;
     color: StringConstructor;
     size: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", unknown> | undefined>;
     effect: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "light" | "plain" | "dark", unknown> | undefined>;
     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>>; /** 提示信息 */
+    tooltipProps: import("vue").PropType<Partial<import("../ele-tooltip/props").TooltipProps>>;
 }, {
     inputRef: import("vue").Ref<ElInputInstance>;
     isEdit: import("vue").Ref<boolean>;
@@ -28,17 +30,19 @@ declare const _default: import("vue").DefineComponent<{
     'update:modelValue': (_value?: string[] | undefined) => boolean;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     modelValue: import("vue").PropType<string[]>;
-    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>;
     color: StringConstructor;
     size: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", unknown> | undefined>;
     effect: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<StringConstructor, "light" | "plain" | "dark", unknown> | undefined>;
     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>>; /** 提示信息 */
+    tooltipProps: import("vue").PropType<Partial<import("../ele-tooltip/props").TooltipProps>>;
 }>> & {
     "onUpdate:modelValue"?: ((_value?: string[] | undefined) => any) | undefined;
 }, {

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

@@ -1,18 +1,18 @@
-import { defineComponent, ref, onDeactivated, onActivated, nextTick, resolveComponent, openBlock, createElementBlock, normalizeClass, Fragment, renderList, createBlock, withCtx, createTextVNode, toDisplayString, createCommentVNode, withDirectives, createVNode, normalizeStyle, renderSlot, vShow, createSlots, mergeProps } from "vue";
-import { Plus, Loading } from "@element-plus/icons-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";
+import { PlusOutlined, LoadingOutlined } from "../icons";
 import { editTagProps, editTagEmits } from "./props";
 const _sfc_main = defineComponent({
   name: "EleEditTag",
   components: {
-    Plus,
-    Loading,
     ElTag,
     ElInput,
     ElIcon,
-    EleTooltip
+    EleTooltip,
+    PlusOutlined,
+    LoadingOutlined
   },
   props: editTagProps,
   emits: editTagEmits,
@@ -142,9 +142,9 @@ const _export_sfc = (sfc, props) => {
 const _hoisted_1 = { key: 0 };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_ElTag = resolveComponent("ElTag");
-  const _component_Plus = resolveComponent("Plus");
+  const _component_PlusOutlined = resolveComponent("PlusOutlined");
   const _component_ElIcon = resolveComponent("ElIcon");
-  const _component_Loading = resolveComponent("Loading");
+  const _component_LoadingOutlined = resolveComponent("LoadingOutlined");
   const _component_ElInput = resolveComponent("ElInput");
   const _component_EleTooltip = resolveComponent("EleTooltip");
   return openBlock(), createElementBlock("div", {
@@ -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",
@@ -188,7 +189,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             class: "ele-edit-tag-add-icon"
           }, {
             default: withCtx(() => [
-              createVNode(_component_Plus)
+              createVNode(_component_PlusOutlined)
             ]),
             _: 1
           }))
@@ -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, {
@@ -212,24 +214,25 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.inputValue = $event),
           style: normalizeStyle(_ctx.inputStyle),
           onChange: _ctx.onInputChange,
-          onBlur: _ctx.onInputBlur
-        }, createSlots({ _: 2 }, [
-          _ctx.loading ? {
-            name: "suffix",
-            fn: withCtx(() => [
-              createVNode(_component_ElIcon, { class: "is-loading" }, {
-                default: withCtx(() => [
-                  createVNode(_component_Loading)
-                ]),
-                _: 1
-              })
-            ]),
-            key: "0"
-          } : void 0
-        ]), 1032, ["disabled", "modelValue", "style", "onChange", "onBlur"])
+          onBlur: _ctx.onInputBlur,
+          onFocus: _ctx.onInputFocus
+        }, {
+          suffix: withCtx(() => [
+            _ctx.loading ? (openBlock(), createBlock(_component_ElIcon, {
+              key: 0,
+              class: "is-loading"
+            }, {
+              default: withCtx(() => [
+                createVNode(_component_LoadingOutlined)
+              ]),
+              _: 1
+            })) : createCommentVNode("", true)
+          ]),
+          _: 1
+        }, 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

@@ -7,7 +7,7 @@ export declare const editTagProps: {
     /** 标签数据 */
     modelValue: PropType<string[]>;
     /** 类型 */
-    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>;
     /** 颜色 */
     color: StringConstructor;
     /** 尺寸 */
@@ -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

@@ -1,101 +1,103 @@
 @use '../../style/themes/default.scss' as *;
 @use '../../style/util.scss' as *;
 
-.ele-edit-tag {
-  /* 标签 */
-  .el-tag {
-    margin: 0 8px 8px 0;
-    vertical-align: top;
-  }
+/* 标签 */
+.ele-edit-tag .el-tag {
+  margin: 0 8px 8px 0;
+  vertical-align: top;
+}
 
-  /* 添加按钮 */
-  .ele-edit-tag-add {
+/* 添加按钮 */
+.ele-edit-tag-add {
+  &.el-tag {
+    cursor: text;
     margin-right: 0;
+    border-style: dashed;
+    background: none;
+  }
 
-    &.el-tag {
-      cursor: text;
-      border-style: dashed;
-      background: none;
-    }
-
-    .ele-edit-tag-add-icon {
-      width: 1em;
-      height: 1em;
-      border-radius: 0;
-      font-size: inherit;
-      cursor: inherit;
-    }
-
-    .el-tag__content {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
+  & > .el-tag__content {
+    display: flex;
+    align-items: center;
+    justify-content: center;
   }
+}
 
-  /* 输入框 */
-  .ele-edit-tag-input {
-    margin-right: 0;
-    width: 80px;
+.ele-edit-tag .ele-edit-tag-add-icon {
+  width: 1em;
+  height: 1em;
+  border-radius: 0;
+  font-size: inherit;
+  cursor: inherit;
+  opacity: 0.6;
+}
 
-    &.el-tag {
-      padding: 0;
-      display: inline-block;
-      background: none;
-      border: none;
-    }
+/* 输入框 */
+.ele-edit-tag-input {
+  &.el-tag {
+    width: 80px;
+    margin-right: 0;
+    padding: 0;
+    display: inline-block;
+    background: none;
+    border: none;
+  }
 
-    & > .el-tag__content {
+  & > .el-tag__content {
+    width: 100%;
+    height: 100%;
+    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%;
-      display: block;
       font-size: inherit;
-      line-height: inherit;
       border-radius: inherit;
     }
+  }
 
-    .el-input {
-      width: 100%;
+  .el-input {
+    .el-input__wrapper {
       height: 100%;
-      font-size: inherit;
+      padding-left: 8px;
+      padding-right: 8px;
+      box-sizing: border-box;
       border-radius: inherit;
-
-      .el-input__wrapper {
-        height: 100%;
-        padding-left: 8px;
-        padding-right: 8px;
-        box-sizing: border-box;
-        border-radius: inherit;
-      }
-
-      .el-input__inner {
-        height: 100%;
-        line-height: inherit;
-      }
     }
 
-    &.is-error .el-input .el-input__wrapper {
-      box-shadow: 0 0 0 0.8px elVar('color-danger') inset;
+    .el-input__inner {
+      height: 100%;
+      line-height: inherit;
     }
   }
 
-  /* 小尺寸 */
-  &.is-small .ele-edit-tag-input {
-    width: 60px;
+  &.is-error .el-input .el-input__wrapper {
+    box-shadow: 0 0 0 0.8px elVar('color-danger') inset;
+  }
+}
 
-    .el-input .el-input__wrapper {
-      padding-left: 4px;
-      padding-right: 4px;
-    }
+/* 小尺寸 */
+.ele-edit-tag.is-small .ele-edit-tag-input {
+  width: 60px;
+
+  .el-input .el-input__wrapper {
+    padding-left: 4px;
+    padding-right: 4px;
   }
+}
 
-  /* 大尺寸 */
-  &.is-large .ele-edit-tag-input {
-    width: 100px;
+/* 大尺寸 */
+.ele-edit-tag.is-large .ele-edit-tag-input {
+  width: 100px;
 
-    .el-input .el-input__wrapper {
-      padding-left: 12px;
-      padding-right: 12px;
-    }
+  .el-input .el-input__wrapper {
+    padding-left: 12px;
+    padding-right: 12px;
   }
 }

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

@@ -57,7 +57,7 @@ declare const _default: import("vue").DefineComponent<{
     tooltip: boolean | EllipsisTooltip;
     underline: boolean;
     italic: boolean;
-    strong: boolean;
     deleted: boolean;
+    strong: boolean;
 }, {}>;
 export default _default;