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

package/lib/ele-dropdown/props.cjs

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

package/lib/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/lib/ele-edit-tag/index.cjs

@@ -1,19 +1,19 @@
 "use strict";
 const vue = require("vue");
-const iconsVue = require("@element-plus/icons-vue");
 const elementPlus = require("element-plus");
 const EleTooltip = require("../ele-tooltip/index");
 const receiver = require("../ele-config-provider/receiver");
+const icons = require("../icons");
 const props = require("./props");
 const _sfc_main = vue.defineComponent({
   name: "EleEditTag",
   components: {
-    Plus: iconsVue.Plus,
-    Loading: iconsVue.Loading,
     ElTag: elementPlus.ElTag,
     ElInput: elementPlus.ElInput,
     ElIcon: elementPlus.ElIcon,
-    EleTooltip
+    EleTooltip,
+    PlusOutlined: icons.PlusOutlined,
+    LoadingOutlined: icons.LoadingOutlined
   },
   props: props.editTagProps,
   emits: props.editTagEmits,
@@ -143,9 +143,9 @@ const _export_sfc = (sfc, props2) => {
 const _hoisted_1 = { key: 0 };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_ElTag = vue.resolveComponent("ElTag");
-  const _component_Plus = vue.resolveComponent("Plus");
+  const _component_PlusOutlined = vue.resolveComponent("PlusOutlined");
   const _component_ElIcon = vue.resolveComponent("ElIcon");
-  const _component_Loading = vue.resolveComponent("Loading");
+  const _component_LoadingOutlined = vue.resolveComponent("LoadingOutlined");
   const _component_ElInput = vue.resolveComponent("ElInput");
   const _component_EleTooltip = vue.resolveComponent("EleTooltip");
   return vue.openBlock(), vue.createElementBlock("div", {
@@ -165,13 +165,14 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         round: _ctx.round,
         closable: true,
         disableTransitions: true,
+        style: vue.normalizeStyle(_ctx.itemStyle),
         onClose: ($event) => _ctx.onTagClose(index2)
       }, {
         default: vue.withCtx(() => [
           vue.createTextVNode(vue.toDisplayString(item), 1)
         ]),
         _: 2
-      }, 1032, ["type", "color", "size", "effect", "round", "onClose"]);
+      }, 1032, ["type", "color", "size", "effect", "round", "style", "onClose"]);
     }), 128)) : vue.createCommentVNode("", true),
     vue.withDirectives(vue.createVNode(_component_ElTag, {
       type: "info",
@@ -189,7 +190,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             class: "ele-edit-tag-add-icon"
           }, {
             default: vue.withCtx(() => [
-              vue.createVNode(_component_Plus)
+              vue.createVNode(_component_PlusOutlined)
             ]),
             _: 1
           }))
@@ -203,7 +204,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       size: _ctx.size,
       round: _ctx.round,
       disableTransitions: true,
-      class: vue.normalizeClass(["ele-edit-tag-input", { "is-error": !!_ctx.errorMessage }])
+      class: vue.normalizeClass(["ele-edit-tag-input", { "is-error": !!_ctx.errorMessage }]),
+      style: vue.normalizeStyle(_ctx.inputTagStyle)
     }, {
       default: vue.withCtx(() => [
         vue.createVNode(_component_ElInput, {
@@ -213,24 +215,25 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.inputValue = $event),
           style: vue.normalizeStyle(_ctx.inputStyle),
           onChange: _ctx.onInputChange,
-          onBlur: _ctx.onInputBlur
-        }, vue.createSlots({ _: 2 }, [
-          _ctx.loading ? {
-            name: "suffix",
-            fn: vue.withCtx(() => [
-              vue.createVNode(_component_ElIcon, { class: "is-loading" }, {
-                default: vue.withCtx(() => [
-                  vue.createVNode(_component_Loading)
-                ]),
-                _: 1
-              })
-            ]),
-            key: "0"
-          } : void 0
-        ]), 1032, ["disabled", "modelValue", "style", "onChange", "onBlur"])
+          onBlur: _ctx.onInputBlur,
+          onFocus: _ctx.onInputFocus
+        }, {
+          suffix: vue.withCtx(() => [
+            _ctx.loading ? (vue.openBlock(), vue.createBlock(_component_ElIcon, {
+              key: 0,
+              class: "is-loading"
+            }, {
+              default: vue.withCtx(() => [
+                vue.createVNode(_component_LoadingOutlined)
+              ]),
+              _: 1
+            })) : vue.createCommentVNode("", true)
+          ]),
+          _: 1
+        }, 8, ["disabled", "modelValue", "style", "onChange", "onBlur", "onFocus"])
       ]),
       _: 1
-    }, 8, ["size", "round", "class"]), [
+    }, 8, ["size", "round", "class", "style"]), [
       [vue.vShow, _ctx.isEdit]
     ]),
     vue.createVNode(_component_EleTooltip, vue.mergeProps({

package/lib/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/lib/ele-edit-tag/props.cjs

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

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

package/lib/ele-icon-select/components/icon-grid.cjs

@@ -4,7 +4,7 @@ const elementPlus = require("element-plus");
 const EleTooltip = require("../../ele-tooltip/index");
 const _sfc_main = vue.defineComponent({
   name: "IconGrid",
-  components: { ElEmpty: elementPlus.ElEmpty, EleTooltip },
+  components: { ElEmpty: elementPlus.ElEmpty, ElScrollbar: elementPlus.ElScrollbar, EleTooltip },
   props: {
     /** 选中的图标 */
     icon: String,
@@ -75,48 +75,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 = vue.resolveComponent("ElEmpty");
   const _component_EleTooltip = vue.resolveComponent("EleTooltip");
-  return vue.openBlock(), vue.createElementBlock("div", _hoisted_1, [
-    vue.createElementVNode("div", {
-      class: "ele-icon-select-grid",
-      style: vue.normalizeStyle(_ctx.gridStyle)
-    }, [
-      (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.data, (d, i) => {
-        return vue.openBlock(), vue.createElementBlock("div", {
-          key: i + "-" + d,
-          class: vue.normalizeClass(["ele-icon-select-item", { "is-active": _ctx.icon && d === _ctx.icon }]),
-          title: _ctx.tooltip ? void 0 : d,
-          style: vue.normalizeStyle(_ctx.itemStyle),
-          onClick: ($event) => _ctx.onItemClick(d),
-          onMouseover: (e) => _ctx.onItemHover(d, e)
-        }, [
-          vue.renderSlot(_ctx.$slots, "icon", { icon: d })
-        ], 46, _hoisted_2);
-      }), 128))
-    ], 4),
-    !_ctx.data || !_ctx.data.length ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_3, [
-      vue.createVNode(_component_ElEmpty, vue.mergeProps({ imageSize: 60 }, _ctx.emptyProps), null, 16)
-    ])) : vue.createCommentVNode("", true),
-    vue.createVNode(_component_EleTooltip, vue.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 = vue.resolveComponent("ElScrollbar");
+  return vue.openBlock(), vue.createBlock(_component_ElScrollbar, { class: "ele-icon-select-body" }, {
+    default: vue.withCtx(() => [
+      vue.createElementVNode("div", {
+        class: "ele-icon-select-grid",
+        style: vue.normalizeStyle(_ctx.gridStyle)
+      }, [
+        (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.data, (d, i) => {
+          return vue.openBlock(), vue.createElementBlock("div", {
+            key: i + "-" + d,
+            class: vue.normalizeClass(["ele-icon-select-item", { "is-active": _ctx.icon && d === _ctx.icon }]),
+            title: _ctx.tooltip ? void 0 : d,
+            style: vue.normalizeStyle(_ctx.itemStyle),
+            onClick: ($event) => _ctx.onItemClick(d),
+            onMouseover: (e) => _ctx.onItemHover(d, e)
+          }, [
+            vue.renderSlot(_ctx.$slots, "icon", { icon: d })
+          ], 46, _hoisted_1);
+        }), 128))
+      ], 4),
+      !_ctx.data || !_ctx.data.length ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_2, [
+        vue.createVNode(_component_ElEmpty, vue.mergeProps({ imageSize: 60 }, _ctx.emptyProps), null, 16)
+      ])) : vue.createCommentVNode("", true),
+      vue.createVNode(_component_EleTooltip, vue.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]]);
 module.exports = iconGrid;

package/lib/ele-icon-select/style/index.cjs

@@ -1,5 +1,6 @@
 "use strict";
 require("element-plus/lib/components/empty/style/index");
+require("element-plus/lib/components/scrollbar/style/index");
 require("../../ele-tooltip/style/index");
 require("../../ele-basic-select/style/index");
 require("./index.scss");

package/lib/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 {