ele-admin-plus 1.4.1 → 1.5.0-beta.1

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

@@ -0,0 +1,123 @@
+import type { UserComponent } from '../ele-app/types';
+import type { ElLinkProps, ElButtonProps } from '../ele-app/el';
+import type {
+  EleDropdownPropsAndEmits,
+  ElePopconfirmPropsAndEmits
+} from '../ele-app/plus';
+import type { DropdownItem } from '../ele-dropdown/types';
+
+/**
+ * 组件类型
+ */
+export type ButtonItemType = 'button' | 'link';
+
+/**
+ * 预设类型
+ */
+export type ButtonItemPreset =
+  | 'search'
+  | 'reset'
+  | 'searchExpand'
+  | 'searchFold'
+  | 'add'
+  | 'delBatch'
+  | 'edit'
+  | 'del'
+  | 'import'
+  | 'export'
+  | 'upload'
+  | 'download'
+  | 'expand'
+  | 'fold'
+  | 'detail'
+  | 'more'
+  | 'save'
+  | 'cancel'
+  | 'confirm';
+
+/**
+ * 权限控制字段
+ */
+export interface ButtonItemPermission {
+  /** 有某些权限才展示 */
+  permission?: string | string[];
+  /** 有任意权限才展示 */
+  anyPermission?: string | string[];
+  /** 有某些角色才展示 */
+  role?: string | string[];
+  /** 有任意角色才展示 */
+  anyRole?: string | string[];
+  /** 显示条件 */
+  vIf?: () => boolean;
+}
+
+/**
+ * 下拉菜单项
+ */
+export interface ButtonDropdownItem
+  extends Omit<DropdownItem, 'children'>,
+    ButtonItemPermission {
+  /** 预设类型 */
+  preset?: ButtonItemPreset;
+  /** 子级 */
+  children?: ButtonDropdownItem[];
+}
+
+/**
+ * 按钮类型项
+ */
+export interface ButtonItemBase<T extends ButtonItemType>
+  extends ButtonItemPermission {
+  /** 文本 */
+  title?: string;
+  /** 图标 */
+  icon?: UserComponent;
+  /** 组件类型 */
+  type?: T;
+  /** 组件属性 */
+  props?: T extends 'link' ? ElLinkProps : ElButtonProps;
+  /** 预设类型 */
+  preset?: ButtonItemPreset;
+  /** 点击事件 */
+  onClick?: (e: MouseEvent) => void;
+  /** 下拉菜单项 */
+  dropdownItems?: ButtonDropdownItem[];
+  /** 下拉菜单属性 */
+  dropdownProps?: EleDropdownPropsAndEmits;
+  /** 气泡确认框属性 */
+  popconfirmProps?: ElePopconfirmPropsAndEmits;
+  /** command */
+  command?: any;
+  /** key */
+  key?: string;
+}
+
+/**
+ * 按钮项
+ */
+export type ButtonItem = ButtonItemBase<'button'> | ButtonItemBase<'link'>;
+
+/**
+ * 国际化
+ */
+export interface ButtonsLocale {
+  search: string;
+  reset: string;
+  searchExpand: string;
+  searchFold: string;
+  add: string;
+  delBatch: string;
+  edit: string;
+  del: string;
+  import: string;
+  export: string;
+  upload: string;
+  download: string;
+  expand: string;
+  fold: string;
+  detail: string;
+  more: string;
+  save: string;
+  cancel: string;
+  confirm: string;
+}

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

@@ -22,7 +22,8 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     collapsable: import('vue').PropType<boolean | "header">;
     collapse: BooleanConstructor;
     collapseIconStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    flexTable: BooleanConstructor;
+    searchForm: BooleanConstructor;
+    flexTable: import('vue').PropType<boolean | "auto">;
 }>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     collapseChange: (_collapse: boolean) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
@@ -40,13 +41,14 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     collapsable: import('vue').PropType<boolean | "header">;
     collapse: BooleanConstructor;
     collapseIconStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    flexTable: BooleanConstructor;
+    searchForm: BooleanConstructor;
+    flexTable: import('vue').PropType<boolean | "auto">;
 }>> & Readonly<{
     onCollapseChange?: ((_collapse: boolean) => any) | undefined;
 }>, {
     collapse: boolean;
     bordered: boolean;
-    flexTable: boolean;
+    searchForm: boolean;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;
 export default _default;

package/es/ele-card/index.js

@@ -39,14 +39,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     );
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", {
-        class: normalizeClass([
-          "ele-card",
+        class: normalizeClass(["ele-card", [
           { "is-border": _ctx.bordered },
           { "is-shadow": _ctx.shadow === "always" },
           { "is-hover-shadow": _ctx.shadow === "hover" },
           { "is-collapse": isCollapse.value },
-          { "is-flex-table": _ctx.flexTable }
-        ])
+          { "is-flex-table": _ctx.flexTable && _ctx.flexTable !== "auto" },
+          { "is-flex-auto-table": _ctx.flexTable === "auto" },
+          { "is-search-form": _ctx.searchForm }
+        ]])
       }, [
         _ctx.header || _ctx.$slots.header || _ctx.$slots.extra ? (openBlock(), createElementBlock("div", {
           key: 0,

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

@@ -34,8 +34,10 @@ export declare const cardProps: {
     collapse: BooleanConstructor;
     /** 折叠按钮样式 */
     collapseIconStyle: PropType<StyleValue>;
+    /** 是否是搜索表单卡片 */
+    searchForm: BooleanConstructor;
     /** 内部表格是否弹性布局 */
-    flexTable: BooleanConstructor;
+    flexTable: PropType<boolean | "auto">;
 };
 export type CardProps = ExtractPropTypes<typeof cardProps>;
 /**

package/es/ele-card/props.js

@@ -27,8 +27,10 @@ const cardProps = {
   collapse: Boolean,
   /** 折叠按钮样式 */
   collapseIconStyle: Object,
+  /** 是否是搜索表单卡片 */
+  searchForm: Boolean,
   /** 内部表格是否弹性布局 */
-  flexTable: Boolean
+  flexTable: [Boolean, String]
 };
 const cardEmits = {
   /** 折叠展开事件 */

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

@@ -1,32 +1,10 @@
 @use '../../style/themes/default.scss' as *;
 @use '../../style/util.scss' as *;
+@use '../../ele-pro-table/style/css-var.scss' as *;
 @use './css-var.scss' as *;
 
 @include set-card-var($ele);
 
-.ele-card {
-  box-sizing: border-box;
-  background: eleVar('card', 'bg');
-  border-radius: eleVar('card', 'radius');
-  transition: (
-    border-color $transition-base,
-    background-color $transition-base,
-    box-shadow $transition-base
-  );
-
-  &.is-border {
-    border: eleVar('card', 'border');
-  }
-
-  &.is-shadow {
-    box-shadow: eleVar('card', 'shadow');
-  }
-
-  &.is-hover-shadow:hover {
-    box-shadow: eleVar('card', 'hover-shadow');
-  }
-}
-
 .ele-card-body {
   padding: eleVar('card', 'padding');
   transition: (
@@ -61,7 +39,6 @@
   box-sizing: border-box;
 }
 
-/* 折叠按钮 */
 .ele-card-collapse-icon {
   display: flex;
   align-items: center;
@@ -87,39 +64,75 @@
   }
 }
 
-/* 折叠状态 */
-.ele-card.is-collapse > .ele-card-header {
-  border-bottom: none;
+.ele-card {
+  box-sizing: border-box;
+  background: eleVar('card', 'bg');
+  border-radius: eleVar('card', 'radius');
+  transition: (
+    border-color $transition-base,
+    background-color $transition-base,
+    box-shadow $transition-base
+  );
 
-  & > .ele-card-collapse-icon svg.ele-arrow-up path {
-    #{'d'}: path('M10 17 24 31 38 17');
+  &.is-border {
+    border: eleVar('card', 'border');
   }
-}
 
-/* 内部表格高度铺满 */
-.ele-card.is-flex-table {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  overflow: auto;
+  &.is-shadow {
+    box-shadow: eleVar('card', 'shadow');
+  }
+
+  &.is-hover-shadow:hover {
+    box-shadow: eleVar('card', 'hover-shadow');
+  }
+
+  /* 折叠状态 */
+  &.is-collapse > .ele-card-header {
+    border-bottom: none;
+
+    & > .ele-card-collapse-icon svg.ele-arrow-up path {
+      #{'d'}: path('M10 17 24 31 38 17');
+    }
+  }
+
+  /* 搜索表单 */
+  &.is-search-form > .ele-card-body {
+    overflow: hidden;
+    padding: eleVar('card', 'search-form-padding');
+
+    .el-form-item {
+      margin-bottom: eleVar('card', 'search-form-space');
+    }
+  }
 
-  & > .ele-card-body {
+  /* 内部表格高度铺满 */
+  &.is-flex-table {
     flex: 1;
     display: flex;
     flex-direction: column;
-    overflow: auto;
+    overflow: hidden;
 
-    & > .ele-pro-table {
+    & > .ele-card-body {
       flex: 1;
       display: flex;
       flex-direction: column;
       overflow: auto;
 
-      & > .ele-pro-table-view {
-        flex: 1;
-        height: 100%;
-        overflow: hidden;
-      }
+      @include flex-pro-table();
+    }
+  }
+
+  &.is-flex-auto-table {
+    flex: auto;
+    display: flex;
+    flex-direction: column;
+
+    & > .ele-card-body {
+      flex: auto;
+      display: flex;
+      flex-direction: column;
+
+      @include flex-auto-pro-table();
     }
   }
 }

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

@@ -7,7 +7,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     multiple: BooleanConstructor;
     emptyValues: ArrayConstructor;
     valueOnClear: {
-        readonly type: import('vue').PropType<string | number | boolean | Function>;
+        readonly type: import('vue').PropType<string | number | boolean | Function | null>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
@@ -23,6 +23,12 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     placeholder: StringConstructor;
     disabled: BooleanConstructor;
     clearable: BooleanConstructor;
+    clearIcon: {
+        readonly type: import('vue').PropType<string | import('vue').Component>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    };
     filterable: BooleanConstructor;
     filterMethod: {
         readonly type: import('vue').PropType<(node: import('element-plus').CascaderNode, keyword: string) => boolean>;
@@ -97,12 +103,38 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         readonly default: string[];
     };
     popperClass: {
-        readonly type: import('vue').PropType<string>;
+        readonly type: import('vue').PropType<string | {
+            [x: string]: boolean;
+        } | (string | {
+            [x: string]: boolean;
+        } | (string | {
+            [x: string]: boolean;
+        } | (string | {
+            [x: string]: boolean;
+        } | (string | {
+            [x: string]: boolean;
+        } | (string | {
+            [x: string]: boolean;
+        } | (string | {
+            [x: string]: boolean;
+        } | (string | {
+            [x: string]: boolean;
+        } | (string | {
+            [x: string]: boolean;
+        } | (string | {
+            [x: string]: boolean;
+        } | (string | any[] | {
+            [x: string]: boolean;
+        })[])[])[])[])[])[])[])[])[])[]>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    };
+    popperStyle: {
+        readonly type: import('vue').PropType<import('vue').StyleValue>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
-    } & {
-        readonly default: string;
     };
     teleported: {
         readonly type: import('vue').PropType<boolean>;
@@ -112,6 +144,14 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     } & {
         readonly default: true;
     };
+    effect: {
+        readonly type: import('vue').PropType<import('element-plus').PopperEffect>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: string;
+    };
     tagType: {
         default: string;
         type: import('vue').PropType<"primary" | "success" | "warning" | "info" | "danger">;
@@ -142,8 +182,25 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     } & {
         readonly default: boolean;
     };
+    showCheckedStrategy: {
+        readonly type: import('vue').PropType<string>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: string;
+    };
+    checkOnClickNode: BooleanConstructor;
+    showPrefix: {
+        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 type: import('vue').PropType<import('element-plus').CascaderValue | null>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
@@ -163,17 +220,17 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     clear: () => void;
     focus: (evt: FocusEvent) => void;
     blur: (evt: FocusEvent) => void;
-    "update:modelValue": (value: import('element-plus').CascaderValue) => void;
-    change: (value: import('element-plus').CascaderValue) => void;
+    "update:modelValue": (value: import('element-plus').CascaderValue | null | undefined) => void;
+    change: (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;
+    removeTag: (val: import('element-plus').CascaderNodePathValue | import('element-plus').CascaderNodeValue) => 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 type: import('vue').PropType<string | number | boolean | Function | null>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
@@ -189,6 +246,12 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     placeholder: StringConstructor;
     disabled: BooleanConstructor;
     clearable: BooleanConstructor;
+    clearIcon: {
+        readonly type: import('vue').PropType<string | import('vue').Component>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    };
     filterable: BooleanConstructor;
     filterMethod: {
         readonly type: import('vue').PropType<(node: import('element-plus').CascaderNode, keyword: string) => boolean>;
@@ -263,12 +326,38 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         readonly default: string[];
     };
     popperClass: {
-        readonly type: import('vue').PropType<string>;
+        readonly type: import('vue').PropType<string | {
+            [x: string]: boolean;
+        } | (string | {
+            [x: string]: boolean;
+        } | (string | {
+            [x: string]: boolean;
+        } | (string | {
+            [x: string]: boolean;
+        } | (string | {
+            [x: string]: boolean;
+        } | (string | {
+            [x: string]: boolean;
+        } | (string | {
+            [x: string]: boolean;
+        } | (string | {
+            [x: string]: boolean;
+        } | (string | {
+            [x: string]: boolean;
+        } | (string | {
+            [x: string]: boolean;
+        } | (string | any[] | {
+            [x: string]: boolean;
+        })[])[])[])[])[])[])[])[])[])[]>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    };
+    popperStyle: {
+        readonly type: import('vue').PropType<import('vue').StyleValue>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
-    } & {
-        readonly default: string;
     };
     teleported: {
         readonly type: import('vue').PropType<boolean>;
@@ -278,6 +367,14 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     } & {
         readonly default: true;
     };
+    effect: {
+        readonly type: import('vue').PropType<import('element-plus').PopperEffect>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: string;
+    };
     tagType: {
         default: string;
         type: import('vue').PropType<"primary" | "success" | "warning" | "info" | "danger">;
@@ -308,8 +405,25 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     } & {
         readonly default: boolean;
     };
+    showCheckedStrategy: {
+        readonly type: import('vue').PropType<string>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: string;
+    };
+    checkOnClickNode: BooleanConstructor;
+    showPrefix: {
+        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 type: import('vue').PropType<import('element-plus').CascaderValue | null>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
@@ -326,21 +440,21 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     onClear?: (() => any) | undefined;
     onFocus?: ((evt: FocusEvent) => any) | undefined;
     onBlur?: ((evt: FocusEvent) => any) | undefined;
-    "onUpdate:modelValue"?: ((value: import('element-plus').CascaderValue) => any) | undefined;
-    onChange?: ((value: import('element-plus').CascaderValue) => any) | undefined;
+    "onUpdate:modelValue"?: ((value: import('element-plus').CascaderValue | null | undefined) => any) | undefined;
+    onChange?: ((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;
+    onRemoveTag?: ((val: import('element-plus').CascaderNodePathValue | import('element-plus').CascaderNodeValue) => any) | undefined;
 }>, {
+    effect: import('element-plus').PopperEffect;
     debounce: number;
     placement: import('element-plus').Placement;
-    popperClass: string;
     teleported: boolean;
     disabled: boolean;
     clearable: boolean;
     validateEvent: boolean;
     separator: string;
-    valueOnClear: string | number | boolean | Function;
+    valueOnClear: string | number | boolean | Function | null;
     filterable: boolean;
     filterMethod: (node: import('element-plus').CascaderNode, keyword: string) => boolean;
     showAllLevels: boolean;
@@ -352,6 +466,9 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     tagType: "primary" | "success" | "warning" | "info" | "danger";
     tagEffect: "dark" | "light" | "plain";
     persistent: boolean;
+    showCheckedStrategy: string;
+    checkOnClickNode: boolean;
+    showPrefix: boolean;
     props: import('element-plus').CascaderProps;
     multiple: boolean;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;

package/es/ele-cascader/index.js

@@ -9,7 +9,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   props: cascaderProps,
   emits: cascaderEmits,
   setup(__props, { expose: __expose, emit: __emit }) {
-    var _a;
     const props = __props;
     const emit = __emit;
     const { emitMethods } = useComponentEvents(cascaderEmits, emit);
@@ -17,7 +16,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const cascaderRef = ref(null);
     const cascaderPropsOption = reactive({
       ...props.props || {},
-      multiple: !!(props.multiple || ((_a = props.props) == null ? void 0 : _a.multiple))
+      multiple: !!(props.multiple || props.props?.multiple)
     });
     watch(
       [() => props.multiple, () => props.props],