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

package/lib/ele-breadcrumb/index.d.ts

@@ -10,7 +10,7 @@ declare const _default: import('vue').DefineComponent<{
         required: boolean;
     };
     separatorIcon: {
-        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) | ((new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>))[], unknown, unknown>>;
+        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>) | ((new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>))[], unknown, unknown>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
@@ -18,7 +18,7 @@ declare const _default: import('vue').DefineComponent<{
 }, {
     breadcrumbRef: import('vue').Ref<ElBreadcrumbInstance>;
     breadcrumbSeparator: import('vue').ComputedRef<string | undefined>;
-    breadcrumbSeparatorIcon: import('vue').ComputedRef<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) | ((new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>))[], unknown, unknown> | undefined>;
+    breadcrumbSeparatorIcon: import('vue').ComputedRef<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>) | ((new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>))[], unknown, unknown> | undefined>;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     separator: {
         type: import('vue').PropType<import('./types').BreadcrumbSeparator>;
@@ -29,7 +29,7 @@ declare const _default: import('vue').DefineComponent<{
         required: boolean;
     };
     separatorIcon: {
-        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) | ((new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>))[], unknown, unknown>>;
+        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>) | ((new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>))[], unknown, unknown>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;

package/lib/ele-breadcrumb/props.d.ts

@@ -15,7 +15,7 @@ export declare const breadcrumbProps: {
         required: boolean;
     };
     separatorIcon: {
-        readonly type: PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) | ((new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions, {}, any>))[], unknown, unknown>>;
+        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>) | ((new (...args: any[]) => (string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>) & {}) | (() => string | import('vue').Component<any, any, any, import('vue').ComputedOptions, import('vue').MethodOptions>))[], unknown, unknown>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;

package/lib/ele-card/index.d.ts

@@ -1,17 +1,17 @@
 declare const _default: import('vue').DefineComponent<{
     header: StringConstructor;
     footer: StringConstructor;
-    bodyStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    bodyStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     bodyClass: StringConstructor;
-    shadow: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "always" | "never" | "hover", unknown> | undefined>;
+    shadow: import('vue').PropType<import('../ele-app/el').ElCardProps["shadow"]>;
     bordered: BooleanConstructor;
-    headerStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    titleStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    footerStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    headerStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    titleStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    footerStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     collapsable: import('vue').PropType<boolean | "header">;
     collapse: BooleanConstructor;
-    collapseIconStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    flexTable: BooleanConstructor; /** 顶栏点击 */
+    collapseIconStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    flexTable: BooleanConstructor;
 }, {
     isCollapse: import('vue').Ref<boolean>;
     handleBeforeLeave: (el: HTMLElement) => void;
@@ -27,17 +27,17 @@ declare const _default: import('vue').DefineComponent<{
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     header: StringConstructor;
     footer: StringConstructor;
-    bodyStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    bodyStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     bodyClass: StringConstructor;
-    shadow: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "always" | "never" | "hover", unknown> | undefined>;
+    shadow: import('vue').PropType<import('../ele-app/el').ElCardProps["shadow"]>;
     bordered: BooleanConstructor;
-    headerStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    titleStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    footerStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    headerStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    titleStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    footerStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     collapsable: import('vue').PropType<boolean | "header">;
     collapse: BooleanConstructor;
-    collapseIconStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    flexTable: BooleanConstructor; /** 顶栏点击 */
+    collapseIconStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    flexTable: BooleanConstructor;
 }>> & {
     onCollapseChange?: ((_collapse: boolean) => any) | undefined;
 }, {

package/lib/ele-card/props.d.ts

@@ -1,4 +1,6 @@
 import { ExtractPropTypes, PropType } from 'vue';
+import { StyleValue } from '../ele-app/types';
+import { ElCardProps } from '../ele-app/el';
 
 /**
  * 属性
@@ -9,25 +11,25 @@ export declare const cardProps: {
     /** 页脚 */
     footer: StringConstructor;
     /** 主体样式 */
-    bodyStyle: PropType<Partial<import('vue').CSSProperties>>;
+    bodyStyle: PropType<StyleValue>;
     /** 主体类名 */
     bodyClass: StringConstructor;
     /** 阴影 */
-    shadow: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "always" | "never" | "hover", unknown> | undefined>;
+    shadow: PropType<ElCardProps["shadow"]>;
     /** 边框 */
     bordered: BooleanConstructor;
     /** 标题栏样式 */
-    headerStyle: PropType<Partial<import('vue').CSSProperties>>;
+    headerStyle: PropType<StyleValue>;
     /** 标题样式 */
-    titleStyle: PropType<Partial<import('vue').CSSProperties>>;
+    titleStyle: PropType<StyleValue>;
     /** 页脚样式 */
-    footerStyle: PropType<Partial<import('vue').CSSProperties>>;
+    footerStyle: PropType<StyleValue>;
     /** 是否可折叠 */
     collapsable: PropType<boolean | "header">;
     /** 是否折叠 */
     collapse: BooleanConstructor;
     /** 折叠按钮样式 */
-    collapseIconStyle: PropType<Partial<import('vue').CSSProperties>>;
+    collapseIconStyle: PropType<StyleValue>;
     /** 内部表格是否弹性布局 */
     flexTable: BooleanConstructor;
 };

package/lib/ele-check-card/components/card-item.d.ts

@@ -1,4 +1,5 @@
 import { PropType } from 'vue';
+import { StyleValue } from '../../ele-app/types';
 import { CheckCardItem } from '../types';
 
 declare const _default: import('vue').DefineComponent<{
@@ -13,7 +14,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 是否需要选中箭头 */
     arrow: BooleanConstructor;
     /** 选中箭头样式 */
-    arrowStyle: PropType<Partial<import('vue').CSSProperties>>;
+    arrowStyle: PropType<StyleValue>;
 }, unknown, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 数据 */
     item: PropType<CheckCardItem>;
@@ -26,7 +27,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 是否需要选中箭头 */
     arrow: BooleanConstructor;
     /** 选中箭头样式 */
-    arrowStyle: PropType<Partial<import('vue').CSSProperties>>;
+    arrowStyle: PropType<StyleValue>;
 }>>, {
     disabled: boolean;
     bordered: boolean;

package/lib/ele-check-card/index.cjs

@@ -1,6 +1,7 @@
 "use strict";
 const vue = require("vue");
 const elementPlus = require("element-plus");
+const util = require("../ele-basic-select/util");
 const CardItem = require("./components/card-item");
 const props = require("./props");
 const _sfc_main = vue.defineComponent({
@@ -9,6 +10,7 @@ const _sfc_main = vue.defineComponent({
   props: props.checkCardProps,
   emits: props.checkCardEmits,
   setup(props2, { emit }) {
+    const { validateChange } = util.useFormValidate();
     const isChecked = (item) => {
       if (props2.modelValue == null || item.value == null) {
         return false;
@@ -21,9 +23,12 @@ const _sfc_main = vue.defineComponent({
       }
       return props2.modelValue.includes(item.value);
     };
-    const updateModelValue = (value) => {
-      emit("update:modelValue", value);
-      emit("change", value);
+    const updateModelValue = (modelValue) => {
+      if (util.valueIsChanged(modelValue, props2.modelValue, props2.multiple)) {
+        emit("update:modelValue", modelValue);
+        validateChange();
+        emit("change", modelValue);
+      }
     };
     const handleItemClick = (item) => {
       if (props2.disabled || item.disabled) {

package/lib/ele-check-card/index.d.ts

@@ -16,9 +16,9 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    arrowStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    arrowStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     itemClass: StringConstructor;
-    itemStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    itemStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     row: import('vue').PropType<boolean | import('../ele-app/el').ElRowProps>;
 }, {
     isChecked: (item: CheckCardItem) => boolean;
@@ -42,18 +42,18 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    arrowStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    arrowStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     itemClass: StringConstructor;
-    itemStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    itemStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     row: import('vue').PropType<boolean | import('../ele-app/el').ElRowProps>;
 }>> & {
-    onChange?: ((_value: CheckedValue) => any) | undefined;
     "onUpdate:modelValue"?: ((_value: CheckedValue) => any) | undefined;
+    onChange?: ((_value: CheckedValue) => any) | undefined;
 }, {
     modelValue: CheckedValue;
     disabled: boolean;
-    multiple: boolean;
     bordered: boolean;
     arrow: boolean;
+    multiple: boolean;
 }, {}>;
 export default _default;

package/lib/ele-check-card/props.d.ts

@@ -1,4 +1,5 @@
 import { ExtractPropTypes, PropType } from 'vue';
+import { StyleValue } from '../ele-app/types';
 import { ElRowProps } from '../ele-app/el';
 import { CheckCardItem, CheckedValue } from './types';
 
@@ -28,11 +29,11 @@ export declare const checkCardProps: {
         default: boolean;
     };
     /** 选中箭头样式 */
-    arrowStyle: PropType<Partial<import('vue').CSSProperties>>;
+    arrowStyle: PropType<StyleValue>;
     /** 自定义卡片类名 */
     itemClass: StringConstructor;
     /** 自定义卡片样式 */
-    itemStyle: PropType<Partial<import('vue').CSSProperties>>;
+    itemStyle: PropType<StyleValue>;
     /** 是否使用栅格布局 */
     row: PropType<boolean | ElRowProps>;
 };

package/lib/ele-config-provider/index.d.ts

@@ -1,7 +1,7 @@
 declare const _default: import('vue').DefineComponent<{
     locale: import('vue').PropType<import('./types').EleLocale>;
-    table: import('vue').PropType<Partial<Pick<import('../ele-app/plus').EleProTableProps, "size" | "stripe" | "border" | "tools" | "emptyProps" | "exportConfig" | "printConfig" | "request" | "response" | "parseData" | "maximizedIndex" | "pagination">>>;
-    message: import('vue').PropType<Partial<Pick<import('../utils/message').MessageOptions, "center" | "offset" | "plain" | "appendTo" | "showClose" | "duration" | "grouping" | "mask" | "inner" | "original" | "centered">>>;
+    table: import('vue').PropType<import('./types').TableGlobalConfig>;
+    message: import('vue').PropType<import('./types').MessageGlobalConfig>;
     messageBox: import('vue').PropType<Partial<import('../utils/message-box').MessageBoxOptions>>;
     license: StringConstructor;
     mapKey: StringConstructor;
@@ -9,8 +9,8 @@ declare const _default: import('vue').DefineComponent<{
     [key: string]: any;
 }>[] | undefined, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     locale: import('vue').PropType<import('./types').EleLocale>;
-    table: import('vue').PropType<Partial<Pick<import('../ele-app/plus').EleProTableProps, "size" | "stripe" | "border" | "tools" | "emptyProps" | "exportConfig" | "printConfig" | "request" | "response" | "parseData" | "maximizedIndex" | "pagination">>>;
-    message: import('vue').PropType<Partial<Pick<import('../utils/message').MessageOptions, "center" | "offset" | "plain" | "appendTo" | "showClose" | "duration" | "grouping" | "mask" | "inner" | "original" | "centered">>>;
+    table: import('vue').PropType<import('./types').TableGlobalConfig>;
+    message: import('vue').PropType<import('./types').MessageGlobalConfig>;
     messageBox: import('vue').PropType<Partial<import('../utils/message-box').MessageBoxOptions>>;
     license: StringConstructor;
     mapKey: StringConstructor;

package/lib/ele-config-provider/props.d.ts

@@ -1,6 +1,6 @@
 import { PropType, ExtractPropTypes, InjectionKey } from 'vue';
 import { MessageBoxOptions } from '../utils/message-box';
-import { EleLocale } from './types';
+import { TableGlobalConfig, MessageGlobalConfig, EleLocale } from './types';
 
 /**
  * 属性
@@ -9,9 +9,9 @@ export declare const configProviderProps: {
     /** 国际化 */
     locale: PropType<EleLocale>;
     /** 表格全局配置 */
-    table: PropType<Partial<Pick<import('../ele-app/plus').EleProTableProps, "size" | "stripe" | "border" | "tools" | "emptyProps" | "exportConfig" | "printConfig" | "request" | "response" | "parseData" | "maximizedIndex" | "pagination">>>;
+    table: PropType<TableGlobalConfig>;
     /** 消息提示全局配置 */
-    message: PropType<Partial<Pick<import('../utils/message').MessageOptions, "center" | "offset" | "plain" | "appendTo" | "showClose" | "duration" | "grouping" | "mask" | "inner" | "original" | "centered">>>;
+    message: PropType<MessageGlobalConfig>;
     /** 消息弹窗全局配置 */
     messageBox: PropType<Partial<MessageBoxOptions>>;
     /** license */

package/lib/ele-config-provider/types.d.ts

@@ -39,6 +39,7 @@ export type TableGlobalConfig = Partial<
     | 'maximizedIndex'
     | 'pagination'
     | 'emptyProps'
+    | 'toolbar'
     | 'exportConfig'
     | 'printConfig'
   >

package/lib/ele-copyable/index.d.ts

@@ -3,16 +3,16 @@ import { CopyableLocale } from './types';
 
 declare const _default: import('vue').DefineComponent<{
     text: StringConstructor;
-    innerStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    customStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    innerStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    customStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     icon: import('vue').PropType<import('./types').CopyableIcon>;
     iconProps: import('vue').PropType<import('../ele-app/el').ElIconProps>;
-    iconStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    iconStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     copiedIcon: import('vue').PropType<import('./types').CopyableIcon>;
     copiedIconProps: import('vue').PropType<import('../ele-app/el').ElIconProps>;
-    copiedIconStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    copiedIconStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     tooltip: {
-        type: import('vue').PropType<boolean | Partial<import('../ele-tooltip/props').TooltipProps>>; /** 提示单例目标 */
+        type: import('vue').PropType<boolean | import('../ele-app/plus').EleTooltipProps>;
         default: boolean;
     };
     resetAfter: {
@@ -32,16 +32,16 @@ declare const _default: import('vue').DefineComponent<{
     copy: (_error?: any) => boolean;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     text: StringConstructor;
-    innerStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    customStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    innerStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    customStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     icon: import('vue').PropType<import('./types').CopyableIcon>;
     iconProps: import('vue').PropType<import('../ele-app/el').ElIconProps>;
-    iconStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    iconStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     copiedIcon: import('vue').PropType<import('./types').CopyableIcon>;
     copiedIconProps: import('vue').PropType<import('../ele-app/el').ElIconProps>;
-    copiedIconStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
+    copiedIconStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     tooltip: {
-        type: import('vue').PropType<boolean | Partial<import('../ele-tooltip/props').TooltipProps>>; /** 提示单例目标 */
+        type: import('vue').PropType<boolean | import('../ele-app/plus').EleTooltipProps>;
         default: boolean;
     };
     resetAfter: {

package/lib/ele-copyable/props.d.ts

@@ -1,5 +1,7 @@
 import { PropType, ExtractPropTypes } from 'vue';
+import { StyleValue } from '../ele-app/types';
 import { ElIconProps } from '../ele-app/el';
+import { EleTooltipProps } from '../ele-app/plus';
 import { CopyableIcon, CopyableLocale } from './types';
 
 /**
@@ -9,24 +11,24 @@ export declare const copyableProps: {
     /** 重新定义拷贝到剪切板里的文本 */
     text: StringConstructor;
     /** 自定义内容样式 */
-    innerStyle: PropType<Partial<import('vue').CSSProperties>>;
+    innerStyle: PropType<StyleValue>;
     /** 自定义拷贝按钮样式 */
-    customStyle: PropType<Partial<import('vue').CSSProperties>>;
+    customStyle: PropType<StyleValue>;
     /** 自定义拷贝图标 */
     icon: PropType<CopyableIcon>;
     /** 自定义拷贝图标属性 */
     iconProps: PropType<ElIconProps>;
     /** 自定义拷贝图标样式 */
-    iconStyle: PropType<Partial<import('vue').CSSProperties>>;
+    iconStyle: PropType<StyleValue>;
     /** 自定义拷贝后图标 */
     copiedIcon: PropType<CopyableIcon>;
     /** 自定义拷贝后图标属性 */
     copiedIconProps: PropType<ElIconProps>;
     /** 自定义拷贝后图标样式 */
-    copiedIconStyle: PropType<Partial<import('vue').CSSProperties>>;
+    copiedIconStyle: PropType<StyleValue>;
     /** 文字提示属性 */
     tooltip: {
-        type: PropType<boolean | Partial<import('../ele-tooltip/props').TooltipProps>>;
+        type: PropType<boolean | EleTooltipProps>;
         default: boolean;
     };
     /** 拷贝成功状态重置时间 */

package/lib/ele-count-up/index.d.ts

@@ -18,7 +18,7 @@ declare const _default: import('vue').DefineComponent<{
     reset: () => void;
     update: (newEndVal?: string | number) => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-    ready: (_instance?: CountUp | null | undefined) => boolean;
+    ready: (_instance?: CountUp | null) => boolean;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     delay: {
         type: NumberConstructor;

package/lib/ele-cropper/components/cropper-tools.cjs

@@ -2,8 +2,9 @@
 const vue = require("vue");
 const elementPlus = require("element-plus");
 const icons = require("../../icons");
-const EleTooltip = require("../../ele-tooltip/index");
+const hook = require("../../utils/hook");
 const receiver = require("../../ele-config-provider/receiver");
+const EleTooltip = require("../../ele-tooltip/index");
 const TOOL_ICONS = {
   zoomIn: icons.ZoomInOutlined,
   zoomOut: icons.ZoomOutOutlined,
@@ -31,6 +32,8 @@ const _sfc_main = vue.defineComponent({
     tooltip: Boolean,
     /** 提示组件属性 */
     tooltipProps: Object,
+    /** 上传按钮点击前的钩子 */
+    beforeUploadClick: Function,
     /** 国际化 */
     locale: Object
   },
@@ -51,31 +54,52 @@ const _sfc_main = vue.defineComponent({
   },
   setup(props, { emit }) {
     const { lang } = receiver.useLocale("cropper", props);
+    const [startHideTipTimer, stopHideTipTimer] = hook.useTimer(200);
+    const tooltipRef = vue.ref(null);
     const groups = vue.shallowRef([]);
     const tooltipContent = vue.ref("");
     const virtualRef = vue.ref();
+    const emitUpload = (data, type) => {
+      emit("upload", { data, type });
+    };
     const handleUpload = (file) => {
       const reader = new FileReader();
       reader.onload = (e) => {
         var _a;
-        emit("upload", {
-          data: (_a = e.target) == null ? void 0 : _a.result,
-          type: file.type
-        });
+        const url = (_a = e.target) == null ? void 0 : _a.result;
+        if (url != null) {
+          emitUpload(url, file.type);
+        }
       };
       reader.readAsDataURL(file);
       return false;
     };
-    const handleClick = (name) => {
-      emit(name);
+    const hideTooltip = () => {
+      tooltipRef.value && tooltipRef.value.hide();
     };
     const handleItemHover = (item, e) => {
       const title = lang.value[item.name];
       if (props.tooltip && item.name !== "ok" && title) {
+        stopHideTipTimer();
         virtualRef.value = e.currentTarget;
         tooltipContent.value = title;
       }
     };
+    const handleClick = (name) => {
+      startHideTipTimer(() => {
+        hideTooltip();
+      });
+      emit(name);
+    };
+    const handleUploadButtonClick = (e) => {
+      startHideTipTimer(() => {
+        hideTooltip();
+      });
+      if (props.beforeUploadClick && props.beforeUploadClick(e, emitUpload) === false) {
+        e.stopPropagation();
+        e.preventDefault();
+      }
+    };
     vue.watch(
       () => props.tools,
       (tools) => {
@@ -104,12 +128,14 @@ const _sfc_main = vue.defineComponent({
     );
     return {
       lang,
+      tooltipRef,
       groups,
       tooltipContent,
       virtualRef,
       handleUpload,
       handleClick,
-      handleItemHover
+      handleItemHover,
+      handleUploadButtonClick
     };
   }
 });
@@ -141,7 +167,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                 key: 0,
                 action: "",
                 accept: _ctx.accept,
-                showUploadList: false,
+                showFileList: false,
                 beforeUpload: _ctx.handleUpload,
                 style: { "display": "inline-block", "line-height": "0" }
               }, {
@@ -150,8 +176,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                     type: "primary",
                     icon: item.icon,
                     class: vue.normalizeClass(["ele-cropper-tool", item.className]),
-                    onMouseover: (e) => _ctx.handleItemHover(item, e)
-                  }, null, 8, ["icon", "class", "onMouseover"])
+                    onMouseover: (e) => _ctx.handleItemHover(item, e),
+                    onClick: _ctx.handleUploadButtonClick
+                  }, null, 8, ["icon", "class", "onMouseover", "onClick"])
                 ]),
                 _: 2
               }, 1032, ["accept", "beforeUpload"])) : (vue.openBlock(), vue.createBlock(_component_ElButton, {
@@ -181,7 +208,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     }, _ctx.tooltipProps || {}, {
       content: _ctx.tooltipContent,
       virtualRef: _ctx.virtualRef,
-      virtualTriggering: true
+      virtualTriggering: true,
+      ref: "tooltipRef"
     }), null, 16, ["content", "virtualRef"])
   ]);
 }

package/lib/ele-cropper/components/cropper-tools.d.ts

@@ -1,5 +1,6 @@
 import { PropType } from 'vue';
-import { UploadOption, ToolName, ToolGroup, ToolItem, CropperLocale } from '../types';
+import { EleTooltipProps, EleTooltipInstance } from '../../ele-app/plus';
+import { UploadOption, ToolName, ToolGroup, ToolItem, BeforeUploadClick, CropperLocale } from '../types';
 
 declare const _default: import('vue').DefineComponent<{
     /** 操作按钮布局 */
@@ -9,17 +10,21 @@ declare const _default: import('vue').DefineComponent<{
     /** 是否需要提示组件 */
     tooltip: BooleanConstructor;
     /** 提示组件属性 */
-    tooltipProps: PropType<Partial<import('../../ele-tooltip/props').TooltipProps>>;
+    tooltipProps: PropType<EleTooltipProps>;
+    /** 上传按钮点击前的钩子 */
+    beforeUploadClick: PropType<BeforeUploadClick>;
     /** 国际化 */
     locale: PropType<Partial<CropperLocale>>;
 }, {
     lang: import('vue').ComputedRef<CropperLocale>;
+    tooltipRef: import('vue').Ref<EleTooltipInstance>;
     groups: import('vue').ShallowRef<ToolGroup[]>;
     tooltipContent: import('vue').Ref<string>;
     virtualRef: import('vue').Ref<any>;
     handleUpload: (file: File) => boolean;
-    handleClick: (name: Omit<ToolName, 'upload'>) => void;
+    handleClick: (name: Omit<ToolName, "upload">) => void;
     handleItemHover: (item: ToolItem, e: MouseEvent) => void;
+    handleUploadButtonClick: (e: MouseEvent) => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     zoomIn: () => true;
     zoomOut: () => true;
@@ -42,11 +47,14 @@ declare const _default: import('vue').DefineComponent<{
     /** 是否需要提示组件 */
     tooltip: BooleanConstructor;
     /** 提示组件属性 */
-    tooltipProps: PropType<Partial<import('../../ele-tooltip/props').TooltipProps>>;
+    tooltipProps: PropType<EleTooltipProps>;
+    /** 上传按钮点击前的钩子 */
+    beforeUploadClick: PropType<BeforeUploadClick>;
     /** 国际化 */
     locale: PropType<Partial<CropperLocale>>;
 }>> & {
     onReset?: (() => any) | undefined;
+    onUpload?: ((_option?: UploadOption | undefined) => any) | undefined;
     onZoomIn?: (() => any) | undefined;
     onZoomOut?: (() => any) | undefined;
     onMoveLeft?: (() => any) | undefined;
@@ -57,7 +65,6 @@ declare const _default: import('vue').DefineComponent<{
     onRotateRight?: (() => any) | undefined;
     onFlipX?: (() => any) | undefined;
     onFlipY?: (() => any) | undefined;
-    onUpload?: ((_option?: UploadOption | undefined) => any) | undefined;
     onOk?: (() => any) | undefined;
 }, {
     tooltip: boolean;

package/lib/ele-cropper/index.cjs

@@ -190,6 +190,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       locale: _ctx.locale,
       tooltip: _ctx.tooltip,
       tooltipProps: _ctx.tooltipProps,
+      beforeUploadClick: _ctx.beforeUploadClick,
       onZoomIn: _ctx.handleZoomIn,
       onZoomOut: _ctx.handleZoomOut,
       onMoveLeft: _ctx.handleMoveLeft,
@@ -203,7 +204,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       onReset: _ctx.handleReset,
       onUpload: _ctx.handleUpload,
       onOk: _ctx.handleOk
-    }, null, 8, ["tools", "accept", "locale", "tooltip", "tooltipProps", "onZoomIn", "onZoomOut", "onMoveLeft", "onMoveRight", "onMoveUp", "onMoveDown", "onRotateLeft", "onRotateRight", "onFlipX", "onFlipY", "onReset", "onUpload", "onOk"])
+    }, null, 8, ["tools", "accept", "locale", "tooltip", "tooltipProps", "beforeUploadClick", "onZoomIn", "onZoomOut", "onMoveLeft", "onMoveRight", "onMoveUp", "onMoveDown", "onRotateLeft", "onRotateRight", "onFlipX", "onFlipY", "onReset", "onUpload", "onOk"])
   ], 2);
 }
 const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);