ele-admin-plus 1.5.1-beta.4 → 1.6.0-beta.2

package/lib/ele-buttons/types.d.ts

@@ -1,16 +1,12 @@
-import type { UserComponent } from '../ele-app/types';
-import type { ElLinkProps, ElButtonProps } from '../ele-app/el';
+import type { UserComponent, UserComponentSlots } from '../ele-app/types';
+import type { ElLinkProps, ElButtonProps, ElIconProps } from '../ele-app/el';
 import type {
   EleDropdownPropsAndEmits,
-  ElePopconfirmPropsAndEmits
+  ElePopconfirmPropsAndEmits,
+  EleTooltipPropsAndEmits
 } from '../ele-app/plus';
 import type { DropdownItem } from '../ele-dropdown/types';
 
-/**
- * 组件类型
- */
-export type ButtonItemType = 'button' | 'link';
-
 /**
  * 预设类型
  */
@@ -35,6 +31,11 @@ export type ButtonItemPreset =
   | 'cancel'
   | 'confirm';
 
+/**
+ * 权限过滤方式
+ */
+export type ButtonItemPermissionFilter = '' | 'disabled';
+
 /**
  * 权限控制字段
  */
@@ -47,6 +48,8 @@ export interface ButtonItemPermission {
   role?: string | string[];
   /** 有任意角色才展示 */
   anyRole?: string | string[];
+  /** 权限过滤方式 */
+  permissionFilter?: ButtonItemPermissionFilter;
   /** 显示条件 */
   vIf?: () => boolean;
 }
@@ -55,8 +58,7 @@ export interface ButtonItemPermission {
  * 下拉菜单项
  */
 export interface ButtonDropdownItem
-  extends Omit<DropdownItem, 'children'>,
-    ButtonItemPermission {
+  extends Omit<DropdownItem, 'children'>, ButtonItemPermission {
   /** 预设类型 */
   preset?: ButtonItemPreset;
   /** 子级 */
@@ -64,10 +66,12 @@ export interface ButtonDropdownItem
 }
 
 /**
- * 按钮类型项
+ * 按钮项
  */
-export interface ButtonItemBase<T extends ButtonItemType>
-  extends ButtonItemPermission {
+export interface ButtonItem<
+  T extends UserComponent = UserComponent<any>,
+  P extends Record<string, any> = Record<string, any>
+> extends ButtonItemPermission {
   /** 文本 */
   title?: string;
   /** 图标 */
@@ -75,9 +79,15 @@ export interface ButtonItemBase<T extends ButtonItemType>
   /** 是否禁用 */
   disabled?: boolean;
   /** 组件类型 */
-  type?: T;
+  type?: T | UserComponent<P>;
   /** 组件属性 */
-  props?: T extends 'link' ? ElLinkProps : ElButtonProps;
+  props?: T extends 'link'
+    ? ElLinkProps
+    : T extends 'button'
+      ? ElButtonProps
+      : Record<string, any> & Partial<P>;
+  /** 组件插槽 */
+  slots?: UserComponentSlots;
   /** 预设类型 */
   preset?: ButtonItemPreset;
   /** 点击事件 */
@@ -86,8 +96,12 @@ export interface ButtonItemBase<T extends ButtonItemType>
   dropdownItems?: ButtonDropdownItem[];
   /** 下拉菜单属性 */
   dropdownProps?: EleDropdownPropsAndEmits;
+  /** 下拉右侧箭头图标属性 */
+  dropdownArrowProps?: ElIconProps | boolean;
   /** 气泡确认框属性 */
   popconfirmProps?: ElePopconfirmPropsAndEmits;
+  /** 文本提示属性 */
+  tooltipProps?: EleTooltipPropsAndEmits;
   /** command */
   command?: any;
   /** key */
@@ -95,9 +109,15 @@ export interface ButtonItemBase<T extends ButtonItemType>
 }
 
 /**
- * 按钮项
+ * 按钮数据类型推导辅助函数
+ * @param item 按钮数据
  */
-export type ButtonItem = ButtonItemBase<'button'> | ButtonItemBase<'link'>;
+export type CreateItemHelper = <
+  T extends UserComponent,
+  P extends Record<string, any>
+>(
+  item: ButtonItem<T, P>
+) => ButtonItem<T, P>;
 
 /**
  * 国际化

package/lib/ele-card/style/index.scss

@@ -67,6 +67,8 @@
 .ele-card {
   box-sizing: border-box;
   background: eleVar('card', 'bg');
+  border: eleVar('card', 'none-border');
+  box-shadow: eleVar('card', 'none-shadow');
   border-radius: eleVar('card', 'radius');
   transition: (
     border-color $transition-base,

package/lib/ele-cascader/index.cjs

@@ -7,7 +7,46 @@ const props = require("./props");
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   ...{ name: "EleCascader" },
   __name: "index",
-  props: props.cascaderProps,
+  props: {
+    options: { type: [Array, Function] },
+    multiple: { type: Boolean },
+    size: {},
+    placeholder: {},
+    disabled: { type: Boolean },
+    clearable: { type: Boolean },
+    clearIcon: {},
+    filterable: { type: Boolean },
+    filterMethod: { type: Function },
+    separator: {},
+    showAllLevels: { type: Boolean },
+    collapseTags: { type: Boolean },
+    maxCollapseTags: {},
+    collapseTagsTooltip: { type: Boolean },
+    maxCollapseTagsTooltipHeight: {},
+    debounce: {},
+    beforeFilter: { type: Function },
+    placement: {},
+    fallbackPlacements: {},
+    popperClass: {},
+    popperStyle: { type: [Boolean, null, String, Object, Array] },
+    teleported: { type: Boolean },
+    effect: {},
+    tagType: {},
+    tagEffect: {},
+    validateEvent: { type: Boolean },
+    persistent: { type: Boolean },
+    showCheckedStrategy: {},
+    checkOnClickNode: { type: Boolean },
+    showPrefix: { type: Boolean },
+    fitInputWidth: { type: [Boolean, Number] },
+    modelValue: {},
+    props: {},
+    virtualScroll: { type: Boolean },
+    itemSize: {},
+    height: {},
+    emptyValues: {},
+    valueOnClear: { type: [String, Number, Boolean, Function, null] }
+  },
   emits: props.cascaderEmits,
   setup(__props, { expose: __expose, emit: __emit }) {
     const props$1 = __props;

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

@@ -1,376 +1,40 @@
 import { ElCascaderInstance } from '../ele-app/el';
-import { CascaderOption } from './types';
+import { CascaderProps } from './props';
 
 declare function __VLS_template(): Partial<Record<string, (_: any) => any>>;
-declare const __VLS_component: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
-    options: import('vue').PropType<CascaderOption[] | import('./types').CascaderOptionFunction>;
-    multiple: BooleanConstructor;
-    emptyValues: ArrayConstructor;
-    valueOnClear: {
-        readonly type: import('vue').PropType<string | number | boolean | Function>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: undefined;
-    };
-    size: {
-        readonly type: import('vue').PropType<"" | "small" | "default" | "large">;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
-    placeholder: StringConstructor;
-    disabled: BooleanConstructor;
-    clearable: BooleanConstructor;
-    filterable: BooleanConstructor;
-    filterMethod: {
-        readonly type: import('vue').PropType<(node: import('element-plus').CascaderNode, keyword: string) => boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: (node: import('element-plus').CascaderNode, keyword: string) => boolean;
-    };
-    separator: {
-        readonly type: import('vue').PropType<string>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: string;
-    };
-    showAllLevels: {
-        readonly type: import('vue').PropType<boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: boolean;
-    };
-    collapseTags: BooleanConstructor;
-    maxCollapseTags: {
-        readonly type: import('vue').PropType<number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: number;
-    };
-    collapseTagsTooltip: {
-        readonly type: import('vue').PropType<boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: boolean;
-    };
-    maxCollapseTagsTooltipHeight: {
-        readonly type: import('vue').PropType<string | number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
-    debounce: {
-        readonly type: import('vue').PropType<number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: number;
-    };
-    beforeFilter: {
-        readonly type: import('vue').PropType<(value: string) => boolean | Promise<any>>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: () => true;
-    };
-    placement: {
-        readonly type: import('vue').PropType<import('element-plus').Placement>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: string;
-    };
-    fallbackPlacements: {
-        readonly type: import('vue').PropType<import('element-plus').Placement[]>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: string[];
-    };
-    popperClass: {
-        readonly type: import('vue').PropType<string>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: string;
-    };
-    teleported: {
-        readonly type: import('vue').PropType<boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: true;
-    };
-    tagType: {
-        default: string;
-        type: import('vue').PropType<"success" | "primary" | "warning" | "info" | "danger">;
-        required: false;
-        validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
-    tagEffect: {
-        default: string;
-        type: import('vue').PropType<"dark" | "light" | "plain">;
-        required: false;
-        validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
-    validateEvent: {
-        readonly type: import('vue').PropType<boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: boolean;
-    };
-    persistent: {
-        readonly type: import('vue').PropType<boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: boolean;
-    };
-    modelValue: {
-        readonly type: import('vue').PropType<(string | number)[] | (string | number) | ((string | number)[] | (string | number))[]>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
-    props: {
-        readonly type: import('vue').PropType<import('element-plus').CascaderProps>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: () => import('element-plus').CascaderProps;
-    };
-}>, {
+declare const __VLS_component: import('vue').DefineComponent<import('vue').ExtractPropTypes<__VLS_TypePropsToRuntimeProps<CascaderProps>>, {
     reloadOptions: (params?: any) => void;
     cascaderRef: import('vue').Ref<ElCascaderInstance, ElCascaderInstance>;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     focus: (evt: FocusEvent) => void;
     blur: (evt: FocusEvent) => void;
     clear: () => void;
-    "update:modelValue": (_: import('element-plus').CascaderValue) => void;
-    change: (_: import('element-plus').CascaderValue) => void;
+    change: (value: import('element-plus').CascaderValue | null | undefined) => void;
+    "update:modelValue": (value: import('element-plus').CascaderValue | null | undefined) => void;
     visibleChange: (val: boolean) => void;
     expandChange: (val: import('element-plus').CascaderValue) => void;
-    removeTag: (val: (string | number)[] | (string | number)) => void;
-}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
-    options: import('vue').PropType<CascaderOption[] | import('./types').CascaderOptionFunction>;
-    multiple: BooleanConstructor;
-    emptyValues: ArrayConstructor;
-    valueOnClear: {
-        readonly type: import('vue').PropType<string | number | boolean | Function>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: undefined;
-    };
-    size: {
-        readonly type: import('vue').PropType<"" | "small" | "default" | "large">;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
-    placeholder: StringConstructor;
-    disabled: BooleanConstructor;
-    clearable: BooleanConstructor;
-    filterable: BooleanConstructor;
-    filterMethod: {
-        readonly type: import('vue').PropType<(node: import('element-plus').CascaderNode, keyword: string) => boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: (node: import('element-plus').CascaderNode, keyword: string) => boolean;
-    };
-    separator: {
-        readonly type: import('vue').PropType<string>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: string;
-    };
-    showAllLevels: {
-        readonly type: import('vue').PropType<boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: boolean;
-    };
-    collapseTags: BooleanConstructor;
-    maxCollapseTags: {
-        readonly type: import('vue').PropType<number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: number;
-    };
-    collapseTagsTooltip: {
-        readonly type: import('vue').PropType<boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: boolean;
-    };
-    maxCollapseTagsTooltipHeight: {
-        readonly type: import('vue').PropType<string | number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
-    debounce: {
-        readonly type: import('vue').PropType<number>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: number;
-    };
-    beforeFilter: {
-        readonly type: import('vue').PropType<(value: string) => boolean | Promise<any>>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: () => true;
-    };
-    placement: {
-        readonly type: import('vue').PropType<import('element-plus').Placement>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: string;
-    };
-    fallbackPlacements: {
-        readonly type: import('vue').PropType<import('element-plus').Placement[]>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: string[];
-    };
-    popperClass: {
-        readonly type: import('vue').PropType<string>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: string;
-    };
-    teleported: {
-        readonly type: import('vue').PropType<boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: true;
-    };
-    tagType: {
-        default: string;
-        type: import('vue').PropType<"success" | "primary" | "warning" | "info" | "danger">;
-        required: false;
-        validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
-    tagEffect: {
-        default: string;
-        type: import('vue').PropType<"dark" | "light" | "plain">;
-        required: false;
-        validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
-    validateEvent: {
-        readonly type: import('vue').PropType<boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: boolean;
-    };
-    persistent: {
-        readonly type: import('vue').PropType<boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: boolean;
-    };
-    modelValue: {
-        readonly type: import('vue').PropType<(string | number)[] | (string | number) | ((string | number)[] | (string | number))[]>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
-    props: {
-        readonly type: import('vue').PropType<import('element-plus').CascaderProps>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: () => import('element-plus').CascaderProps;
-    };
-}>> & Readonly<{
+    removeTag: (val: import('element-plus').CascaderNodeValue | import('element-plus').CascaderNodePathValue) => void;
+}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<__VLS_TypePropsToRuntimeProps<CascaderProps>>> & Readonly<{
     onFocus?: ((evt: FocusEvent) => any) | undefined;
     onBlur?: ((evt: FocusEvent) => any) | undefined;
     onClear?: (() => any) | undefined;
-    "onUpdate:modelValue"?: ((_: import('element-plus').CascaderValue) => any) | undefined;
-    onChange?: ((_: import('element-plus').CascaderValue) => any) | undefined;
+    onChange?: ((value: import('element-plus').CascaderValue | null | undefined) => any) | undefined;
+    "onUpdate:modelValue"?: ((value: import('element-plus').CascaderValue | null | undefined) => any) | undefined;
     onVisibleChange?: ((val: boolean) => any) | undefined;
     onExpandChange?: ((val: import('element-plus').CascaderValue) => any) | undefined;
-    onRemoveTag?: ((val: (string | number)[] | (string | number)) => any) | undefined;
-}>, {
-    debounce: number;
-    placement: import('element-plus').Placement;
-    popperClass: string;
-    teleported: boolean;
-    clearable: boolean;
-    disabled: boolean;
-    separator: string;
-    valueOnClear: string | number | boolean | Function;
-    filterable: boolean;
-    filterMethod: (node: import('element-plus').CascaderNode, keyword: string) => boolean;
-    showAllLevels: boolean;
-    collapseTags: boolean;
-    maxCollapseTags: number;
-    collapseTagsTooltip: boolean;
-    beforeFilter: (value: string) => boolean | Promise<any>;
-    fallbackPlacements: import('element-plus').Placement[];
-    tagType: "success" | "primary" | "warning" | "info" | "danger";
-    tagEffect: "dark" | "light" | "plain";
-    validateEvent: boolean;
-    persistent: boolean;
-    props: import('element-plus').CascaderProps;
-    multiple: boolean;
-}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
+    onRemoveTag?: ((val: import('element-plus').CascaderNodeValue | import('element-plus').CascaderNodePathValue) => any) | undefined;
+}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;
 export default _default;
+type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
+type __VLS_TypePropsToRuntimeProps<T> = {
+    [K in keyof T]-?: {} extends Pick<T, K> ? {
+        type: import('vue').PropType<__VLS_NonUndefinedable<T[K]>>;
+    } : {
+        type: import('vue').PropType<T[K]>;
+        required: true;
+    };
+};
 type __VLS_WithTemplateSlots<T, S> = T & {
     new (): {
         $slots: S;

package/lib/ele-cascader/props.cjs

@@ -1,15 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const elementPlus = require("element-plus");
-const cascaderProps = {
-  ...elementPlus.cascaderProps,
-  /** 选项数据 */
-  options: [Array, Function],
-  /** 是否多选 */
-  multiple: Boolean
-};
 Object.defineProperty(exports, "cascaderEmits", {
   enumerable: true,
   get: () => elementPlus.cascaderEmits
 });
-exports.cascaderProps = cascaderProps;