ele-admin-plus 1.2.1-beta.1 → 1.2.1-beta.3

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

@@ -4,10 +4,10 @@ import { DropdownItem } from './types';
 
 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>>;
+    modelValue: import('vue').PropType<DropdownItem["command"]>;
+    menuStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     iconProps: import('vue').PropType<import('../ele-app/el').ElIconProps>;
-    trigger: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => "focus" | "hover" | "click" | "contextmenu" | import('element-plus').TooltipTriggerType[]) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>) | ((new (...args: any[]) => "focus" | "hover" | "click" | "contextmenu" | import('element-plus').TooltipTriggerType[]) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>))[], unknown, unknown, "hover", boolean>;
+    trigger: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType> & {}) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>) | ((new (...args: any[]) => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType> & {}) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>))[], unknown, unknown, "hover", boolean>;
     effect: {
         readonly default: "light";
         readonly type: import('vue').PropType<string>;
@@ -16,12 +16,12 @@ declare const _default: import('vue').DefineComponent<{
         readonly __epPropKey: true;
     };
     type: {
-        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => "" | "success" | "warning" | "info" | "default" | "primary" | "danger" | "text") | (() => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "success" | "warning" | "info" | "default" | "primary" | "danger" | "text", unknown>) | ((new (...args: any[]) => "" | "success" | "warning" | "info" | "default" | "primary" | "danger" | "text") | (() => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "success" | "warning" | "info" | "default" | "primary" | "danger" | "text", unknown>))[], unknown, unknown>>;
+        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "default" | "success" | "warning" | "info" | "text" | "primary" | "danger", unknown> & {}) | (() => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "default" | "success" | "warning" | "info" | "text" | "primary" | "danger", unknown>) | ((new (... /** SplitButton 点击事件 */args: any[]) => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "default" | "success" | "warning" | "info" | "text" | "primary" | "danger", unknown> & {}) | (() => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "default" | "success" | "warning" | "info" | "text" | "primary" | "danger", unknown>))[], unknown, unknown>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    placement: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => "top" | "bottom" | "top-start" | "top-end" | "bottom-start" | "bottom-end" | "auto" | "auto-start" | "auto-end" | "right" | "left" | "right-start" | "right-end" | "left-start" | "left-end") | (() => import('element-plus').Placement) | ((new (...args: any[]) => "top" | "bottom" | "top-start" | "top-end" | "bottom-start" | "bottom-end" | "auto" | "auto-start" | "auto-end" | "right" | "left" | "right-start" | "right-end" | "left-start" | "left-end") | (() => 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>;
     popperOptions: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => Partial<import('element-plus').Options>) | (() => Partial<import('element-plus').Options>) | ((new (...args: any[]) => Partial<import('element-plus').Options>) | (() => Partial<import('element-plus').Options>))[], unknown, unknown, () => {}, boolean>;
     id: StringConstructor;
     size: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
@@ -30,8 +30,8 @@ declare const _default: import('vue').DefineComponent<{
     loop: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     showTimeout: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 150, boolean>;
     hideTimeout: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 150, boolean>;
-    tabindex: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string | number) | (() => string | number) | ((new (...args: any[]) => string | number) | (() => string | number))[], unknown, unknown, 0, boolean>;
-    maxHeight: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string | number) | (() => string | number) | ((new (...args: any[]) => string | number) | (() => string | number))[], unknown, unknown, "", boolean>;
+    tabindex: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => (string | number) & {}) | (() => string | number) | ((new (...args: any[]) => (string | number) & {}) | (() => string | number))[], unknown, unknown, 0, boolean>;
+    maxHeight: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => (string | number) & {}) | (() => string | number) | ((new (...args: any[]) => (string | number) & {}) | (() => string | number))[], unknown, unknown, "", boolean>;
     popperClass: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
     disabled: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
     role: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "menu", boolean>;
@@ -47,23 +47,23 @@ declare const _default: import('vue').DefineComponent<{
     dropdownRef: import('vue').Ref<ElDropdownInstance | undefined>;
     rootProps: import('vue').ComputedRef<ElDropdownProps>;
     selected: import('vue').ComputedRef<DropdownItem | null | undefined>;
-    onMenuClick: (command: DropdownItem['command']) => void;
-    onBtnClick: () => void;
-    onPopVisibleChange: (visible: boolean) => void;
+    handleMenuClick: (command: DropdownItem["command"]) => void;
+    handleBtnClick: () => void;
+    handlePopVisibleChange: (visible: boolean) => void;
     handleOpen: () => void;
     handleClose: () => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     click: () => boolean;
-    command: (_command: import('element-plus/es/utils/index').EpPropMergeType<readonly [ObjectConstructor, StringConstructor, NumberConstructor], unknown, unknown> | undefined) => boolean;
+    command: (_command: DropdownItem["command"]) => boolean;
     visibleChange: (_visible: boolean) => boolean;
-    'update:modelValue': (_value: import('element-plus/es/utils/index').EpPropMergeType<readonly [ObjectConstructor, StringConstructor, NumberConstructor], unknown, unknown> | undefined) => boolean;
-    change: (_active: import('element-plus/es/utils/index').EpPropMergeType<readonly [ObjectConstructor, StringConstructor, NumberConstructor], unknown, unknown> | undefined) => boolean;
+    'update:modelValue': (_value: DropdownItem["command"]) => boolean;
+    change: (_active: DropdownItem["command"]) => boolean;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     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>>;
+    modelValue: import('vue').PropType<DropdownItem["command"]>;
+    menuStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     iconProps: import('vue').PropType<import('../ele-app/el').ElIconProps>;
-    trigger: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => "focus" | "hover" | "click" | "contextmenu" | import('element-plus').TooltipTriggerType[]) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>) | ((new (...args: any[]) => "focus" | "hover" | "click" | "contextmenu" | import('element-plus').TooltipTriggerType[]) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>))[], unknown, unknown, "hover", boolean>;
+    trigger: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType> & {}) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>) | ((new (...args: any[]) => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType> & {}) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>))[], unknown, unknown, "hover", boolean>;
     effect: {
         readonly default: "light";
         readonly type: import('vue').PropType<string>;
@@ -72,12 +72,12 @@ declare const _default: import('vue').DefineComponent<{
         readonly __epPropKey: true;
     };
     type: {
-        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => "" | "success" | "warning" | "info" | "default" | "primary" | "danger" | "text") | (() => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "success" | "warning" | "info" | "default" | "primary" | "danger" | "text", unknown>) | ((new (...args: any[]) => "" | "success" | "warning" | "info" | "default" | "primary" | "danger" | "text") | (() => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "success" | "warning" | "info" | "default" | "primary" | "danger" | "text", unknown>))[], unknown, unknown>>;
+        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "default" | "success" | "warning" | "info" | "text" | "primary" | "danger", unknown> & {}) | (() => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "default" | "success" | "warning" | "info" | "text" | "primary" | "danger", unknown>) | ((new (... /** SplitButton 点击事件 */args: any[]) => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "default" | "success" | "warning" | "info" | "text" | "primary" | "danger", unknown> & {}) | (() => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "default" | "success" | "warning" | "info" | "text" | "primary" | "danger", unknown>))[], unknown, unknown>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    placement: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => "top" | "bottom" | "top-start" | "top-end" | "bottom-start" | "bottom-end" | "auto" | "auto-start" | "auto-end" | "right" | "left" | "right-start" | "right-end" | "left-start" | "left-end") | (() => import('element-plus').Placement) | ((new (...args: any[]) => "top" | "bottom" | "top-start" | "top-end" | "bottom-start" | "bottom-end" | "auto" | "auto-start" | "auto-end" | "right" | "left" | "right-start" | "right-end" | "left-start" | "left-end") | (() => 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>;
     popperOptions: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => Partial<import('element-plus').Options>) | (() => Partial<import('element-plus').Options>) | ((new (...args: any[]) => Partial<import('element-plus').Options>) | (() => Partial<import('element-plus').Options>))[], unknown, unknown, () => {}, boolean>;
     id: StringConstructor;
     size: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
@@ -86,8 +86,8 @@ declare const _default: import('vue').DefineComponent<{
     loop: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     showTimeout: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 150, boolean>;
     hideTimeout: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 150, boolean>;
-    tabindex: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string | number) | (() => string | number) | ((new (...args: any[]) => string | number) | (() => string | number))[], unknown, unknown, 0, boolean>;
-    maxHeight: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string | number) | (() => string | number) | ((new (...args: any[]) => string | number) | (() => string | number))[], unknown, unknown, "", boolean>;
+    tabindex: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => (string | number) & {}) | (() => string | number) | ((new (...args: any[]) => (string | number) & {}) | (() => string | number))[], unknown, unknown, 0, boolean>;
+    maxHeight: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => (string | number) & {}) | (() => string | number) | ((new (...args: any[]) => (string | number) & {}) | (() => string | number))[], unknown, unknown, "", boolean>;
     popperClass: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
     disabled: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
     role: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "menu", boolean>;
@@ -106,20 +106,20 @@ declare const _default: import('vue').DefineComponent<{
     onCommand?: ((_command: import('element-plus/es/utils/index').EpPropMergeType<readonly [ObjectConstructor, StringConstructor, NumberConstructor], unknown, unknown> | undefined) => any) | undefined;
 }, {
     effect: string;
-    placement: import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => "top" | "bottom" | "top-start" | "top-end" | "bottom-start" | "bottom-end" | "auto" | "auto-start" | "auto-end" | "right" | "left" | "right-start" | "right-end" | "left-start" | "left-end") | (() => import('element-plus').Placement) | ((new (...args: any[]) => "top" | "bottom" | "top-start" | "top-end" | "bottom-start" | "bottom-end" | "auto" | "auto-start" | "auto-end" | "right" | "left" | "right-start" | "right-end" | "left-start" | "left-end") | (() => import('element-plus').Placement))[], unknown, unknown>;
+    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>;
     popperClass: string;
     teleported: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
     disabled: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
     size: string;
     popperOptions: Partial<import('element-plus').Options>;
-    trigger: import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => "focus" | "hover" | "click" | "contextmenu" | import('element-plus').TooltipTriggerType[]) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>) | ((new (...args: any[]) => "focus" | "hover" | "click" | "contextmenu" | import('element-plus').TooltipTriggerType[]) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>))[], unknown, unknown>;
+    trigger: import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType> & {}) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>) | ((new (...args: any[]) => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType> & {}) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>))[], unknown, unknown>;
     splitButton: boolean;
     hideOnClick: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
     loop: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
     showTimeout: number;
     hideTimeout: number;
-    tabindex: import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => string | number) | (() => string | number) | ((new (...args: any[]) => string | number) | (() => string | number))[], unknown, unknown>;
-    maxHeight: import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => string | number) | (() => string | number) | ((new (...args: any[]) => string | number) | (() => string | number))[], unknown, unknown>;
+    tabindex: import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | number) & {}) | (() => string | number) | ((new (...args: any[]) => (string | number) & {}) | (() => string | number))[], unknown, unknown>;
+    maxHeight: import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | number) & {}) | (() => string | number) | ((new (...args: any[]) => (string | number) & {}) | (() => string | number))[], unknown, unknown>;
     role: string;
 }, {}>;
 export default _default;

package/es/ele-dropdown/index.js

@@ -1,6 +1,7 @@
 import { defineComponent, ref, computed, resolveComponent, openBlock, createBlock, mergeProps, withCtx, renderSlot, normalizeStyle, createElementBlock, Fragment, renderList, resolveDynamicComponent, createCommentVNode, toDisplayString } from "vue";
 import { ElDropdown, ElDropdownMenu, ElDropdownItem, ElIcon } from "element-plus";
 import { omit } from "../utils/core";
+import { useFormValidate } from "../ele-basic-select/util";
 import { dropdownProps, dropdownEmits } from "./props";
 const _sfc_main = defineComponent({
   name: "EleDropdown",
@@ -8,6 +9,7 @@ const _sfc_main = defineComponent({
   props: dropdownProps,
   emits: dropdownEmits,
   setup(props, { emit }) {
+    const { validateChange } = useFormValidate();
     const dropdownRef = ref();
     const rootProps = computed(() => {
       const options = omit(props, [
@@ -35,17 +37,18 @@ const _sfc_main = defineComponent({
     const updateModelValue = (value) => {
       if (value !== props.modelValue) {
         emit("update:modelValue", value);
+        validateChange();
         emit("change", value);
       }
     };
-    const onMenuClick = (command) => {
+    const handleMenuClick = (command) => {
       updateModelValue(command);
       emit("command", command);
     };
-    const onBtnClick = () => {
+    const handleBtnClick = () => {
       emit("click");
     };
-    const onPopVisibleChange = (visible) => {
+    const handlePopVisibleChange = (visible) => {
       emit("visibleChange", visible);
     };
     const handleOpen = () => {
@@ -63,9 +66,9 @@ const _sfc_main = defineComponent({
       dropdownRef,
       rootProps,
       selected,
-      onMenuClick,
-      onBtnClick,
-      onPopVisibleChange,
+      handleMenuClick,
+      handleBtnClick,
+      handlePopVisibleChange,
       handleOpen,
       handleClose
     };
@@ -87,9 +90,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return openBlock(), createBlock(_component_ElDropdown, mergeProps(_ctx.rootProps, {
     ref: "dropdownRef",
     class: "ele-dropdown-trigger",
-    onClick: _ctx.onBtnClick,
-    onCommand: _ctx.onMenuClick,
-    onVisibleChange: _ctx.onPopVisibleChange
+    onClick: _ctx.handleBtnClick,
+    onCommand: _ctx.handleMenuClick,
+    onVisibleChange: _ctx.handlePopVisibleChange
   }), {
     dropdown: withCtx(() => [
       !_ctx.items && _ctx.$slots.dropdown ? renderSlot(_ctx.$slots, "dropdown", { key: 0 }) : (openBlock(), createBlock(_component_ElDropdownMenu, {
@@ -98,46 +101,49 @@ 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 }
-                ],
-                ref_for: true
-              },
-              _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, mergeProps({
+            return openBlock(), createElementBlock(Fragment, null, [
+              (item.vIf == null ? true : item.vIf) ? (openBlock(), createBlock(_component_ElDropdownItem, mergeProps(
+                {
+                  key: typeof item.command === "object" ? index2 : item.command,
+                  class: [
+                    { "is-active": _ctx.modelValue === item.command },
+                    { "is-danger": !!item.danger }
+                  ],
+                  ref_for: true
+                },
+                _ctx.omit(item, [
+                  "icon",
+                  "title",
+                  "iconProps",
+                  "iconStyle",
+                  "slot",
+                  "danger",
+                  "vIf"
+                ])
+              ), {
+                default: withCtx(() => [
+                  item.slot && item.slot !== "default" && _ctx.$slots[item.slot] ? renderSlot(_ctx.$slots, item.slot, {
                     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_1, toDisplayString(item.title), 1)) : createCommentVNode("", true)
-                ], 64))
-              ]),
-              _: 2
-            }, 1040, ["class"]);
-          }), 128)) : _ctx.$slots.dropdownMenu ? renderSlot(_ctx.$slots, "dropdownMenu", { key: 1 }) : createCommentVNode("", true)
+                    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_1, toDisplayString(item.title), 1)) : createCommentVNode("", true)
+                  ], 64))
+                ]),
+                _: 2
+              }, 1040, ["class"])) : createCommentVNode("", true)
+            ], 64);
+          }), 256)) : _ctx.$slots.dropdownMenu ? renderSlot(_ctx.$slots, "dropdownMenu", { key: 1 }) : createCommentVNode("", true)
         ]),
         _: 3
       }, 8, ["style"]))

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

@@ -1,4 +1,5 @@
 import { PropType, ExtractPropTypes } from 'vue';
+import { StyleValue } from '../ele-app/types';
 import { ElIconProps } from '../ele-app/el';
 import { DropdownItem } from './types';
 
@@ -9,26 +10,26 @@ export declare const dropdownProps: {
     /** 下拉菜单数据 */
     items: PropType<DropdownItem[]>;
     /** 选中的菜单 */
-    modelValue: PropType<import('element-plus/es/utils/index').EpPropMergeType<readonly [ObjectConstructor, StringConstructor, NumberConstructor], unknown, unknown> | undefined>;
+    modelValue: PropType<DropdownItem["command"]>;
     /** 自定义下拉菜单样式 */
-    menuStyle: PropType<Partial<import('vue').CSSProperties>>;
+    menuStyle: PropType<StyleValue>;
     /** 自定义图标属性 */
     iconProps: PropType<ElIconProps>;
-    trigger: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => "focus" | "hover" | "click" | "contextmenu" | import('element-plus').TooltipTriggerType[]) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>) | ((new (...args: any[]) => "focus" | "hover" | "click" | "contextmenu" | import('element-plus').TooltipTriggerType[]) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>))[], unknown, unknown, "hover", boolean>;
+    trigger: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType> & {}) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>) | ((new (...args: any[]) => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType> & {}) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>))[], unknown, unknown, "hover", boolean>;
     effect: {
         readonly default: "light";
-        readonly type: PropType<string>;
+        readonly type: import('vue').PropType<string>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         readonly __epPropKey: true;
     };
     type: {
-        readonly type: PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => "" | "success" | "warning" | "info" | "default" | "primary" | "danger" | "text") | (() => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "success" | "warning" | "info" | "default" | "primary" | "danger" | "text", unknown>) | ((new (...args: any[]) => "" | "success" | "warning" | "info" | "default" | "primary" | "danger" | "text") | (() => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "success" | "warning" | "info" | "default" | "primary" | "danger" | "text", unknown>))[], unknown, unknown>>;
+        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "default" | "success" | "warning" | "info" | "text" | "primary" | "danger", unknown> & {}) | (() => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "default" | "success" | "warning" | "info" | "text" | "primary" | "danger", unknown>) | ((new (...args: any[]) => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "default" | "success" | "warning" | "info" | "text" | "primary" | "danger", unknown> & {}) | (() => import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "default" | "success" | "warning" | "info" | "text" | "primary" | "danger", unknown>))[], unknown, unknown>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    placement: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => "top" | "bottom" | "top-start" | "top-end" | "bottom-start" | "bottom-end" | "auto" | "auto-start" | "auto-end" | "right" | "left" | "right-start" | "right-end" | "left-start" | "left-end") | (() => import('element-plus').Placement) | ((new (...args: any[]) => "top" | "bottom" | "top-start" | "top-end" | "bottom-start" | "bottom-end" | "auto" | "auto-start" | "auto-end" | "right" | "left" | "right-start" | "right-end" | "left-start" | "left-end") | (() => 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>;
     popperOptions: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => Partial<import('element-plus').Options>) | (() => Partial<import('element-plus').Options>) | ((new (...args: any[]) => Partial<import('element-plus').Options>) | (() => Partial<import('element-plus').Options>))[], unknown, unknown, () => {}, boolean>;
     id: StringConstructor;
     size: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
@@ -37,13 +38,13 @@ export declare const dropdownProps: {
     loop: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     showTimeout: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 150, boolean>;
     hideTimeout: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 150, boolean>;
-    tabindex: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string | number) | (() => string | number) | ((new (...args: any[]) => string | number) | (() => string | number))[], unknown, unknown, 0, boolean>;
-    maxHeight: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string | number) | (() => string | number) | ((new (...args: any[]) => string | number) | (() => string | number))[], unknown, unknown, "", boolean>;
+    tabindex: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => (string | number) & {}) | (() => string | number) | ((new (...args: any[]) => (string | number) & {}) | (() => string | number))[], unknown, unknown, 0, boolean>;
+    maxHeight: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => (string | number) & {}) | (() => string | number) | ((new (...args: any[]) => (string | number) & {}) | (() => string | number))[], unknown, unknown, "", boolean>;
     popperClass: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
     disabled: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
     role: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "menu", boolean>;
     buttonProps: {
-        readonly type: PropType<import('element-plus').ButtonProps>;
+        readonly type: import('vue').PropType<import('element-plus').ButtonProps>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
@@ -58,11 +59,11 @@ export declare const dropdownEmits: {
     /** SplitButton 点击事件 */
     click: () => boolean;
     /** 菜单项点击事件 */
-    command: (_command: DropdownItem['command']) => boolean;
+    command: (_command: DropdownItem["command"]) => boolean;
     /** 下拉框出现/隐藏事件 */
     visibleChange: (_visible: boolean) => boolean;
     /** 更新选中值 */
-    'update:modelValue': (_value: DropdownItem['command']) => boolean;
+    'update:modelValue': (_value: DropdownItem["command"]) => boolean;
     /** 选中改变的事件 */
-    change: (_active: DropdownItem['command']) => boolean;
+    change: (_active: DropdownItem["command"]) => boolean;
 };

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

@@ -17,4 +17,6 @@ export interface DropdownItem extends ElDropdownItemProps {
   slot?: Exclude<string, 'default'>;
   /** 是否为危险样式 */
   danger?: boolean;
+  /** 显示条件 */
+  vIf?: any;
 }

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

@@ -2,21 +2,21 @@ import { ElTagInstance, 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" | "primary" | "danger", unknown> | undefined>;
+    type: import('vue').PropType<import('../ele-app/el').ElTagProps["type"]>;
     hit: BooleanConstructor;
     color: StringConstructor;
-    size: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", unknown> | undefined>;
-    effect: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "light" | "dark" | "plain", unknown> | undefined>;
+    size: import('vue').PropType<import('../ele-app/el').ElTagProps["size"]>;
+    effect: import('vue').PropType<import('../ele-app/el').ElTagProps["effect"]>;
     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>>;
+    inputStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    inputTagStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    buttonStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    itemStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     validator: import('vue').PropType<import('./types').Validator>;
     beforeRemove: import('vue').PropType<import('./types').BeforeRemove>;
-    tooltipProps: import('vue').PropType<Partial<import('../ele-tooltip/props').TooltipProps>>;
-    readonly: BooleanConstructor; /** 页面是否失活 */
+    tooltipProps: import('vue').PropType<import('../ele-app/plus').EleTooltipProps>;
+    readonly: BooleanConstructor;
     disabled: BooleanConstructor;
 }, {
     inputTagRef: import('vue').Ref<ElTagInstance>;
@@ -33,26 +33,28 @@ declare const _default: import('vue').DefineComponent<{
     handleInputBlur: () => void;
     handleInputFocus: () => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-    'update:modelValue': (_value?: string[] | undefined) => boolean;
+    'update:modelValue': (_value?: string[]) => boolean;
+    change: (_value?: string[]) => 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" | "primary" | "danger", unknown> | undefined>;
+    type: import('vue').PropType<import('../ele-app/el').ElTagProps["type"]>;
     hit: BooleanConstructor;
     color: StringConstructor;
-    size: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", unknown> | undefined>;
-    effect: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "light" | "dark" | "plain", unknown> | undefined>;
+    size: import('vue').PropType<import('../ele-app/el').ElTagProps["size"]>;
+    effect: import('vue').PropType<import('../ele-app/el').ElTagProps["effect"]>;
     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>>;
+    inputStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    inputTagStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    buttonStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    itemStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     validator: import('vue').PropType<import('./types').Validator>;
     beforeRemove: import('vue').PropType<import('./types').BeforeRemove>;
-    tooltipProps: import('vue').PropType<Partial<import('../ele-tooltip/props').TooltipProps>>;
-    readonly: BooleanConstructor; /** 页面是否失活 */
+    tooltipProps: import('vue').PropType<import('../ele-app/plus').EleTooltipProps>;
+    readonly: BooleanConstructor;
     disabled: BooleanConstructor;
 }>> & {
+    onChange?: ((_value?: string[] | undefined) => any) | undefined;
     "onUpdate:modelValue"?: ((_value?: string[] | undefined) => any) | undefined;
 }, {
     disabled: boolean;

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

@@ -2,6 +2,7 @@ import { defineComponent, ref, onDeactivated, onActivated, nextTick, resolveComp
 import { ElTag, ElInput, ElIcon } from "element-plus";
 import EleTooltip from "../ele-tooltip/index";
 import { PlusOutlined, LoadingOutlined } from "../icons";
+import { useFormValidate } from "../ele-basic-select/util";
 import { editTagProps, editTagEmits } from "./props";
 const _sfc_main = defineComponent({
   name: "EleEditTag",
@@ -16,6 +17,7 @@ const _sfc_main = defineComponent({
   props: editTagProps,
   emits: editTagEmits,
   setup(props, { emit }) {
+    const { validateChange } = useFormValidate();
     const inputTagRef = ref(null);
     const inputRef = ref(null);
     const isEdit = ref(false);
@@ -24,6 +26,11 @@ const _sfc_main = defineComponent({
     const loading = ref(false);
     const tooltipVisible = ref(false);
     const isDeactivated = ref(false);
+    const updateModelValue = (modelValue) => {
+      emit("update:modelValue", modelValue);
+      validateChange();
+      emit("change", modelValue);
+    };
     const addTag = (value) => {
       tooltipVisible.value = false;
       isEdit.value = false;
@@ -33,7 +40,7 @@ const _sfc_main = defineComponent({
       if (value) {
         const temp = props.modelValue ? [...props.modelValue] : [];
         temp.push(value);
-        emit("update:modelValue", temp);
+        updateModelValue(temp);
       }
     };
     const removeTag = (index2) => {
@@ -42,7 +49,7 @@ const _sfc_main = defineComponent({
       }
       const temp = [...props.modelValue];
       temp.splice(index2, 1);
-      emit("update:modelValue", temp);
+      updateModelValue(temp);
     };
     const updateInputValue = (value) => {
       inputValue.value = value;
@@ -221,6 +228,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           disabled: _ctx.loading,
           modelValue: _ctx.inputValue,
           "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.inputValue = $event),
+          validateEvent: false,
           style: normalizeStyle(_ctx.inputStyle),
           onChange: _ctx.handleInputChange,
           onBlur: _ctx.handleInputBlur,

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

@@ -1,4 +1,7 @@
 import { PropType, ExtractPropTypes } from 'vue';
+import { StyleValue } from '../ele-app/types';
+import { ElTagProps } from '../ele-app/el';
+import { EleTooltipProps } from '../ele-app/plus';
 import { Validator, BeforeRemove } from './types';
 
 /**
@@ -8,33 +11,33 @@ export declare const editTagProps: {
     /** 标签数据 */
     modelValue: PropType<string[]>;
     /** 类型 */
-    type: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "success" | "warning" | "info" | "primary" | "danger", unknown> | undefined>;
+    type: PropType<ElTagProps["type"]>;
     /** 是否有边框描边 */
     hit: BooleanConstructor;
     /** 颜色 */
     color: StringConstructor;
     /** 尺寸 */
-    size: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", unknown> | undefined>;
+    size: PropType<ElTagProps["size"]>;
     /** 主题 */
-    effect: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "light" | "dark" | "plain", unknown> | undefined>;
+    effect: PropType<ElTagProps["effect"]>;
     /** 是否为圆形 */
     round: BooleanConstructor;
     /** 提示文本 */
     placeholder: StringConstructor;
     /** 输入框样式 */
-    inputStyle: PropType<Partial<import('vue').CSSProperties>>;
+    inputStyle: PropType<StyleValue>;
     /** 输入框外层标签样式 */
-    inputTagStyle: PropType<Partial<import('vue').CSSProperties>>;
+    inputTagStyle: PropType<StyleValue>;
     /** 添加按钮样式 */
-    buttonStyle: PropType<Partial<import('vue').CSSProperties>>;
+    buttonStyle: PropType<StyleValue>;
     /** 标签样式 */
-    itemStyle: PropType<Partial<import('vue').CSSProperties>>;
+    itemStyle: PropType<StyleValue>;
     /** 添加校验方法 */
     validator: PropType<Validator>;
     /** 移除校验方法 */
     beforeRemove: PropType<BeforeRemove>;
     /** 提示属性 */
-    tooltipProps: PropType<Partial<import('../ele-tooltip/props').TooltipProps>>;
+    tooltipProps: PropType<EleTooltipProps>;
     /** 是否只读 */
     readonly: BooleanConstructor;
     /** 是否禁用 */
@@ -47,4 +50,6 @@ export type EditTagProps = ExtractPropTypes<typeof editTagProps>;
 export declare const editTagEmits: {
     /** 更新数据 */
     'update:modelValue': (_value?: string[]) => boolean;
+    /** 数据改变事件 */
+    change: (_value?: string[]) => boolean;
 };

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

@@ -36,7 +36,9 @@ const editTagProps = {
 };
 const editTagEmits = {
   /** 更新数据 */
-  "update:modelValue": (_value) => true
+  "update:modelValue": (_value) => true,
+  /** 数据改变事件 */
+  change: (_value) => true
 };
 export {
   editTagEmits,