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

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

@@ -1,11 +1,18 @@
-import { PropType, ExtractPropTypes } from 'vue';
+import { PropType, ExtractPropTypes, EmitsToProps } from 'vue';
 import { drawerProps as elDrawerProps } from 'element-plus';
+import { EleLoadingProps } from '../ele-app/plus';
 import { StyleValue } from '../ele-app/types';
 
 /**
  * 属性
  */
 export declare const drawerProps: {
+    appendToBody: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    /** 是否限制在主体内部 */
+    inner: BooleanConstructor;
     /** 自定义标题样式 */
     headerStyle: PropType<StyleValue>;
     /** 标题样式 */
@@ -16,13 +23,27 @@ export declare const drawerProps: {
     footerStyle: PropType<StyleValue>;
     /** 自定义关闭按钮样式 */
     closeBtnStyle: PropType<StyleValue>;
-    /** 是否限制在主体内部 */
-    inner: BooleanConstructor;
+    /** 主体类名 */
+    drawerBodyClass: StringConstructor;
+    /** 是否是失活状态 */
+    isDeactivated: BooleanConstructor;
+    /** 异步内容组件时加载状态 */
+    compLoading: BooleanConstructor;
+    /** 加载状态 */
+    loading: BooleanConstructor;
+    /** 加载组件属性 */
+    loadingProps: PropType<EleLoadingProps>;
     /** 是否开启响应式 */
     responsive: {
         type: BooleanConstructor;
         default: null;
     };
+    /** 内部表格弹性布局 */
+    flexTable: PropType<boolean | "auto">;
+    /** 是否是在内容区添加自定义底栏 */
+    customFooter: BooleanConstructor;
+    /** 是否是表单抽屉 */
+    form: BooleanConstructor;
     direction: {
         readonly type: PropType<"ltr" | "rtl" | "ttb" | "btt">;
         readonly required: false;
@@ -31,6 +52,7 @@ export declare const drawerProps: {
     } & {
         readonly default: "rtl";
     };
+    resizable: BooleanConstructor;
     size: {
         readonly type: PropType<string | number>;
         readonly required: false;
@@ -63,7 +85,6 @@ export declare const drawerProps: {
     } & {
         readonly default: "2";
     };
-    appendToBody: BooleanConstructor;
     appendTo: {
         readonly type: PropType<string | HTMLElement>;
         readonly required: false;
@@ -111,6 +132,7 @@ export declare const drawerProps: {
     } & {
         readonly default: true;
     };
+    modalPenetrable: BooleanConstructor;
     openDelay: {
         readonly type: PropType<number>;
         readonly required: false;
@@ -151,16 +173,45 @@ export declare const drawerProps: {
         __epPropKey: true;
     };
     trapFocus: BooleanConstructor;
+    transition: {
+        readonly type: PropType<import('element-plus').DialogTransition>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: undefined;
+    };
     center: BooleanConstructor;
-    alignCenter: BooleanConstructor;
+    alignCenter: {
+        readonly type: PropType<boolean>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: undefined;
+    };
     closeIcon: {
         readonly type: PropType<string | import('vue').Component>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    draggable: BooleanConstructor;
-    overflow: BooleanConstructor;
+    draggable: {
+        readonly type: PropType<boolean>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: undefined;
+    };
+    overflow: {
+        readonly type: PropType<boolean>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    } & {
+        readonly default: undefined;
+    };
     fullscreen: BooleanConstructor;
     showClose: {
         readonly type: PropType<boolean>;
@@ -188,8 +239,22 @@ export declare const drawerProps: {
     };
 };
 export type DrawerProps = ExtractPropTypes<typeof drawerProps>;
-export type ElDrawerPropKeys = Array<keyof typeof elDrawerProps>;
+/**
+ * 事件
+ */
+export declare const drawerEmits: {
+    open: () => boolean;
+    opened: () => boolean;
+    close: () => boolean;
+    closed: () => boolean;
+    "update:modelValue": (value: boolean) => boolean;
+    openAutoFocus: () => boolean;
+    closeAutoFocus: () => boolean;
+};
+export type DrawerEmitsProps = EmitsToProps<typeof drawerEmits>;
+export type DrawerPropsAndEmits = DrawerProps & DrawerEmitsProps;
 /**
  * 抽屉组件属性名
  */
+export type ElDrawerPropKeys = Array<keyof typeof elDrawerProps>;
 export declare const elDrawerPropKeys: ElDrawerPropKeys;

package/es/ele-drawer/props.js

@@ -1,6 +1,12 @@
-import { drawerProps as drawerProps$1 } from "element-plus";
+import { drawerProps as drawerProps$1, drawerEmits as drawerEmits$1 } from "element-plus";
 const drawerProps = {
   ...drawerProps$1,
+  appendToBody: {
+    type: Boolean,
+    default: true
+  },
+  /** 是否限制在主体内部 */
+  inner: Boolean,
   /** 自定义标题样式 */
   headerStyle: Object,
   /** 标题样式 */
@@ -11,18 +17,36 @@ const drawerProps = {
   footerStyle: Object,
   /** 自定义关闭按钮样式 */
   closeBtnStyle: Object,
-  /** 是否限制在主体内部 */
-  inner: Boolean,
+  /** 主体类名 */
+  drawerBodyClass: String,
+  /** 是否是失活状态 */
+  isDeactivated: Boolean,
+  /** 异步内容组件时加载状态 */
+  compLoading: Boolean,
+  /** 加载状态 */
+  loading: Boolean,
+  /** 加载组件属性 */
+  loadingProps: Object,
   /** 是否开启响应式 */
   responsive: {
     type: Boolean,
     default: null
-  }
+  },
+  /** 内部表格弹性布局 */
+  flexTable: [Boolean, String],
+  /** 是否是在内容区添加自定义底栏 */
+  customFooter: Boolean,
+  /** 是否是表单抽屉 */
+  form: Boolean
+};
+const drawerEmits = {
+  ...drawerEmits$1
 };
 const elDrawerPropKeys = Object.keys(
   drawerProps$1
 );
 export {
+  drawerEmits,
   drawerProps,
   elDrawerPropKeys
 };

package/es/ele-drawer/style/index.js

@@ -1,3 +1,4 @@
 import "element-plus/es/components/drawer/style/index";
 import "element-plus/es/components/icon/style/index";
+import "../../ele-loading/style/index";
 import "./index.scss";

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

@@ -1,5 +1,6 @@
 @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-drawer-var($ele);
@@ -80,9 +81,14 @@
 .ele-drawer-body {
   padding: eleVar('drawer', 'body-padding');
   box-sizing: border-box;
+
+  &.is-form {
+    padding: eleVar('drawer', 'form-body-padding');
+  }
 }
 
 .ele-drawer-footer {
+  flex-shrink: 0;
   padding: eleVar('drawer', 'footer-padding');
   border-top: eleVar('drawer', 'footer-border');
   box-sizing: border-box;
@@ -109,3 +115,78 @@
     transition: (width $transition-base, left $transition-base);
   }
 }
+
+/* 内容异步组件加载状态 */
+.ele-drawer-comp-loading > .el-drawer > .el-drawer__body > .ele-loading {
+  background: none;
+  pointer-events: none;
+}
+
+/* 内部表格弹性布局 */
+.ele-drawer-flex-table > .el-drawer > .el-drawer__body {
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+
+  & > .ele-drawer-body {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    overflow: auto;
+
+    @include flex-pro-table();
+  }
+}
+
+.ele-drawer-flex-auto-table > .el-drawer > .el-drawer__body {
+  display: flex;
+  flex-direction: column;
+
+  & > .ele-drawer-body {
+    flex: auto;
+    display: flex;
+    flex-direction: column;
+
+    @include flex-auto-pro-table();
+  }
+}
+
+/* 在内容区添加自定义底栏 */
+.ele-drawer-custom-footer > .el-drawer > .el-drawer__body {
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+
+  & > .ele-drawer-body {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+    padding: 0;
+
+    & > .ele-drawer-custom-footer,
+    & > .ele-buttons.is-modal-footer {
+      flex-shrink: 0;
+      padding: eleVar('drawer', 'footer-padding');
+      border-top: eleVar('drawer', 'footer-border');
+      display: flex;
+      align-items: center;
+      justify-content: flex-end;
+    }
+
+    & > .ele-drawer-custom-body,
+    & > .el-form {
+      flex: 1;
+      box-sizing: border-box;
+      padding: eleVar('drawer', 'body-padding');
+      overflow: auto;
+    }
+
+    &.is-form {
+      & > .ele-drawer-custom-body,
+      & > .el-form {
+        padding: eleVar('drawer', 'form-body-padding');
+      }
+    }
+  }
+}

package/es/ele-dropdown/components/dropdown-menu-item.d.ts

@@ -18,7 +18,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     /** 自定义图标属性 */
     iconProps: PropType<ElIconProps>;
 }>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-    itemClick: (_item: DropdownItem) => void;
+    itemClick: (_item: DropdownItem, _e: MouseEvent) => void;
     wrapperContext: (_e: MouseEvent) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 菜单项数据 */
@@ -31,7 +31,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     /** 自定义图标属性 */
     iconProps: PropType<ElIconProps>;
 }>> & Readonly<{
-    onItemClick?: ((_item: DropdownItem) => any) | undefined;
+    onItemClick?: ((_item: DropdownItem, _e: MouseEvent) => any) | undefined;
     onWrapperContext?: ((_e: MouseEvent) => any) | undefined;
 }>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;

package/es/ele-dropdown/components/dropdown-menu-item.js

@@ -21,7 +21,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     iconProps: Object
   },
   emits: {
-    itemClick: (_item) => true,
+    itemClick: (_item, _e) => true,
     wrapperContext: (_e) => true
   },
   setup(__props, { emit: __emit }) {
@@ -30,11 +30,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const itemRef = ref(null);
     const subMenuRef = ref(null);
     const placement = ref();
-    const handleItemClick = () => {
+    const handleItemClick = (e) => {
       if (props.item.disabled) {
         return;
       }
-      emit("itemClick", props.item);
+      emit("itemClick", props.item, e);
     };
     const handleItemMouseenter = () => {
       const subMenuEl = subMenuRef.value;
@@ -63,12 +63,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         createElementVNode("div", {
           ref_key: "itemRef",
           ref: itemRef,
-          class: normalizeClass([
-            "ele-dropdown-menu-item",
+          class: normalizeClass(["ele-dropdown-menu-item", [
             { "is-disabled": !!__props.item.disabled },
-            { "is-active": __props.selected === __props.item.command },
+            { "is-active": __props.item.command != null && __props.selected === __props.item.command },
             { "is-danger": !!__props.item.danger }
-          ]),
+          ]]),
           onClick: withModifiers(handleItemClick, ["stop"]),
           onMouseenter: handleItemMouseenter
         }, [

package/es/ele-dropdown/components/dropdown-menus.d.ts

@@ -18,10 +18,12 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     menuStyle: PropType<StyleValue>;
     /** 自定义图标属性 */
     iconProps: PropType<ElIconProps>;
+    /** 图标尺寸 */
+    iconSize: PropType<"small" | "default">;
     /** 尺寸 */
     size: PropType<ElButtonProps["size"]>;
 }>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-    itemClick: (_item: DropdownItem) => void;
+    itemClick: (_item: DropdownItem, _e: MouseEvent) => void;
     wrapperContext: (_e: MouseEvent) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 下拉菜单数据 */
@@ -35,10 +37,12 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     menuStyle: PropType<StyleValue>;
     /** 自定义图标属性 */
     iconProps: PropType<ElIconProps>;
+    /** 图标尺寸 */
+    iconSize: PropType<"small" | "default">;
     /** 尺寸 */
     size: PropType<ElButtonProps["size"]>;
 }>> & Readonly<{
-    onItemClick?: ((_item: DropdownItem) => any) | undefined;
+    onItemClick?: ((_item: DropdownItem, _e: MouseEvent) => any) | undefined;
     onWrapperContext?: ((_e: MouseEvent) => any) | undefined;
 }>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;

package/es/ele-dropdown/components/dropdown-menus.js

@@ -15,20 +15,22 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     menuStyle: Object,
     /** 自定义图标属性 */
     iconProps: Object,
+    /** 图标尺寸 */
+    iconSize: String,
     /** 尺寸 */
     size: String
   },
   emits: {
-    itemClick: (_item) => true,
+    itemClick: (_item, _e) => true,
     wrapperContext: (_e) => true
   },
   setup(__props, { emit: __emit }) {
     const emit = __emit;
-    const handleItemClick = (item) => {
+    const handleItemClick = (item, e) => {
       if (item.disabled) {
         return;
       }
-      emit("itemClick", item);
+      emit("itemClick", item, e);
     };
     const handleWrapperContext = (e) => {
       emit("wrapperContext", e);
@@ -36,16 +38,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       const _component_DropdownMenus = resolveComponent("DropdownMenus", true);
       return openBlock(), createElementBlock("div", {
-        class: normalizeClass([
-          "ele-dropdown-menu",
+        class: normalizeClass(["ele-dropdown-menu", [
+          { "ele-dropdown-icon-small": __props.iconSize === "small" },
           { "is-small": __props.size === "small" },
           { "is-large": __props.size === "large" }
-        ]),
+        ]]),
         style: normalizeStyle(__props.menuStyle)
       }, [
         (openBlock(true), createElementBlock(Fragment, null, renderList(__props.items, (item) => {
           return openBlock(), createBlock(DropdownMenuItem, {
-            key: item.key == null ? JSON.stringify(item.command) : item.key,
+            key: JSON.stringify(item.key ?? item.command ?? item.title),
             item,
             selected: __props.selected,
             iconProps: __props.iconProps,