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

package/lib/ele-cropper-modal/props.d.ts

@@ -17,9 +17,6 @@ export declare const cropperModalProps: {
     };
     accept: {
         type: StringConstructor;
-        /**
-         * 事件
-         */
         default: string;
     };
     tools: {
@@ -41,7 +38,7 @@ export declare const cropperModalProps: {
         type: BooleanConstructor;
         default: boolean;
     };
-    tooltipProps: PropType<Partial<import('../ele-tooltip/props').TooltipProps>>;
+    tooltipProps: PropType<import('../ele-app/plus').EleTooltipProps>;
     responsive: {
         type: BooleanConstructor;
         default: null;

package/lib/ele-data-table/index.d.ts

@@ -11,7 +11,7 @@ declare const _default: import('vue').DefineComponent<{
         default: null;
     };
     rowKey: {
-        type: import('vue').PropType<string | ((row: DataItem) => string) | undefined>;
+        type: import('vue').PropType<import('./types').RowKey>;
         required: boolean;
     };
     columns: {
@@ -51,14 +51,14 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    width: (StringConstructor | NumberConstructor)[];
-    maxHeight: (StringConstructor | NumberConstructor)[];
+    width: (NumberConstructor | StringConstructor)[];
+    maxHeight: (NumberConstructor | StringConstructor)[];
     lazy: BooleanConstructor;
     className: {
         type: StringConstructor;
         default: string;
     };
-    height: (StringConstructor | NumberConstructor)[];
+    height: (NumberConstructor | StringConstructor)[];
     data: {
         type: import('vue').PropType<any[]>;
         default: () => never[];
@@ -79,13 +79,13 @@ declare const _default: import('vue').DefineComponent<{
     headerCellClassName: import('vue').PropType<import('element-plus').CellCls<any> | undefined>;
     headerCellStyle: import('vue').PropType<import('element-plus').CellStyle<any> | undefined>;
     highlightCurrentRow: BooleanConstructor;
-    currentRowKey: (StringConstructor | NumberConstructor)[];
+    currentRowKey: (NumberConstructor | StringConstructor)[];
     emptyText: StringConstructor;
     expandRowKeys: import('vue').PropType<any[] | undefined>;
     defaultExpandAll: BooleanConstructor;
     defaultSort: import('vue').PropType<import('element-plus').Sort | undefined>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import('vue').PropType<Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    tooltipOptions: import('vue').PropType<Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "effect" | "placement" | "popperClass" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "appendTo" | "transition" | "showArrow">> | undefined>;
     spanMethod: import('vue').PropType<((data: {
         row: any;
         rowIndex: number;
@@ -120,7 +120,7 @@ declare const _default: import('vue').DefineComponent<{
     };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: import('vue').PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    showOverflowTooltip: import('vue').PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "effect" | "placement" | "popperClass" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "appendTo" | "transition" | "showArrow">> | undefined>;
 }, {
     clearSort: () => void;
     clearSelection: () => void;
@@ -135,13 +135,13 @@ declare const _default: import('vue').DefineComponent<{
     tableRef: import('vue').Ref<ElTableInstance>;
     getSelectionRows: () => DataItem[] | undefined;
     toggleAllSelection: () => void;
-    toggleRowExpansion: (row: DataItem, expanded?: boolean | undefined) => void;
-    clearFilter: (columnKeys?: string[] | undefined) => void;
+    toggleRowExpansion: (row: DataItem, expanded?: boolean) => void;
+    clearFilter: (columnKeys?: string[]) => void;
     doLayout: () => void;
     sort: (prop: string, order: string) => void;
-    scrollTo: (options: number | ScrollToOptions, yCoord?: number | undefined) => void;
-    setScrollTop: (top?: number | undefined) => void;
-    setScrollLeft: (left?: number | undefined) => void;
+    scrollTo: (options: number | ScrollToOptions, yCoord?: number) => void;
+    setScrollTop: (top?: number) => void;
+    setScrollLeft: (left?: number) => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     select: (_selection: DataItem[], _row: DataItem) => boolean;
     selectAll: (_selection: DataItem[]) => boolean;
@@ -158,11 +158,11 @@ declare const _default: import('vue').DefineComponent<{
     headerContextmenu: (_column: Column, _e: MouseEvent) => boolean;
     sortChange: (_sorter: Sorter) => boolean;
     filterChange: (_filter: Filter) => boolean;
-    currentChange: (_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => boolean; /** 获取单选选中行 */
+    currentChange: (_current?: DataItem | null, _old?: DataItem | null) => boolean;
     headerDragend: (_width: number, _old: number, _column: Column, _e: MouseEvent) => boolean;
     expandChange: (_row: DataItem, _expanded: boolean) => boolean;
-    'update:currentRowKey': (_currentRowKey?: DataKey | undefined) => boolean;
-    'update:selectedRowKeys': (_selectedRowKeys?: DataKey[] | undefined) => boolean;
+    'update:currentRowKey': (_currentRowKey?: DataKey) => boolean;
+    'update:selectedRowKeys': (_selectedRowKeys?: DataKey[]) => boolean;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     stripe: {
         type: BooleanConstructor;
@@ -173,7 +173,7 @@ declare const _default: import('vue').DefineComponent<{
         default: null;
     };
     rowKey: {
-        type: import('vue').PropType<string | ((row: DataItem) => string) | undefined>;
+        type: import('vue').PropType<import('./types').RowKey>;
         required: boolean;
     };
     columns: {
@@ -213,14 +213,14 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    width: (StringConstructor | NumberConstructor)[];
-    maxHeight: (StringConstructor | NumberConstructor)[];
+    width: (NumberConstructor | StringConstructor)[];
+    maxHeight: (NumberConstructor | StringConstructor)[];
     lazy: BooleanConstructor;
     className: {
         type: StringConstructor;
         default: string;
     };
-    height: (StringConstructor | NumberConstructor)[];
+    height: (NumberConstructor | StringConstructor)[];
     data: {
         type: import('vue').PropType<any[]>;
         default: () => never[];
@@ -241,13 +241,13 @@ declare const _default: import('vue').DefineComponent<{
     headerCellClassName: import('vue').PropType<import('element-plus').CellCls<any> | undefined>;
     headerCellStyle: import('vue').PropType<import('element-plus').CellStyle<any> | undefined>;
     highlightCurrentRow: BooleanConstructor;
-    currentRowKey: (StringConstructor | NumberConstructor)[];
+    currentRowKey: (NumberConstructor | StringConstructor)[];
     emptyText: StringConstructor;
     expandRowKeys: import('vue').PropType<any[] | undefined>;
     defaultExpandAll: BooleanConstructor;
     defaultSort: import('vue').PropType<import('element-plus').Sort | undefined>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import('vue').PropType<Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    tooltipOptions: import('vue').PropType<Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "effect" | "placement" | "popperClass" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "appendTo" | "transition" | "showArrow">> | undefined>;
     spanMethod: import('vue').PropType<((data: {
         row: any;
         rowIndex: number;
@@ -282,7 +282,7 @@ declare const _default: import('vue').DefineComponent<{
     };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: import('vue').PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    showOverflowTooltip: import('vue').PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "effect" | "placement" | "popperClass" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "appendTo" | "transition" | "showArrow">> | undefined>;
 }>> & {
     onSelect?: ((_selection: DataItem[], _row: DataItem) => any) | undefined;
     onExpandChange?: ((_row: DataItem, _expanded: boolean) => any) | undefined;

package/lib/ele-data-table/props.d.ts

@@ -1,5 +1,5 @@
 import { PropType, ExtractPropTypes } from 'vue';
-import { DataKey, DataItem, Column, Columns, Sorter, Filter, TableEmptyProps, RowClickChecked } from './types';
+import { DataKey, DataItem, Column, Columns, Sorter, Filter, TableEmptyProps, RowClickChecked, RowKey } from './types';
 
 declare const normalizeProps: Omit<{
     data: {
@@ -7,14 +7,14 @@ declare const normalizeProps: Omit<{
         default: () => never[];
     };
     size: {
-        readonly type: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
+        readonly type: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
-    width: (StringConstructor | NumberConstructor)[];
-    height: (StringConstructor | NumberConstructor)[];
-    maxHeight: (StringConstructor | NumberConstructor)[];
+    width: (NumberConstructor | StringConstructor)[];
+    height: (NumberConstructor | StringConstructor)[];
+    maxHeight: (NumberConstructor | StringConstructor)[];
     fit: {
         type: BooleanConstructor;
         default: boolean;
@@ -38,13 +38,13 @@ declare const normalizeProps: Omit<{
     headerCellClassName: PropType<import('element-plus/es/components/table/src/table/defaults').CellCls<any> | undefined>;
     headerCellStyle: PropType<import('element-plus/es/components/table/src/table/defaults').CellStyle<any> | undefined>;
     highlightCurrentRow: BooleanConstructor;
-    currentRowKey: (StringConstructor | NumberConstructor)[];
+    currentRowKey: (NumberConstructor | StringConstructor)[];
     emptyText: StringConstructor;
     expandRowKeys: PropType<any[] | undefined>;
     defaultExpandAll: BooleanConstructor;
     defaultSort: PropType<import('element-plus/es/components/table/src/table/defaults').Sort | undefined>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: PropType<Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    tooltipOptions: PropType<Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "effect" | "placement" | "popperClass" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "appendTo" | "transition" | "showArrow">> | undefined>;
     spanMethod: PropType<((data: {
         row: any;
         rowIndex: number;
@@ -88,7 +88,7 @@ declare const normalizeProps: Omit<{
     };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    showOverflowTooltip: PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "effect" | "placement" | "popperClass" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "appendTo" | "transition" | "showArrow">> | undefined>;
 }, "style">;
 /**
  * 属性
@@ -103,7 +103,7 @@ export declare const dataTableProps: {
         default: null;
     };
     rowKey: {
-        type: PropType<string | ((row: DataItem) => string) | undefined>;
+        type: PropType<RowKey>;
         required: boolean;
     };
     /** 列配置 */
@@ -145,14 +145,14 @@ export declare const dataTableProps: {
     selectedRowKeys: PropType<DataKey[]>;
     /** 缓存数据 */
     cacheData: PropType<DataItem[]>;
-    width: (StringConstructor | NumberConstructor)[];
-    height: (StringConstructor | NumberConstructor)[];
+    width: (NumberConstructor | StringConstructor)[];
+    height: (NumberConstructor | StringConstructor)[];
     data: {
         type: PropType<any[]>;
         default: () => never[];
     };
     size: {
-        readonly type: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "small" | "default" | "large", never>>;
+        readonly type: PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
@@ -161,7 +161,7 @@ export declare const dataTableProps: {
         type: BooleanConstructor;
         default: boolean;
     };
-    maxHeight: (StringConstructor | NumberConstructor)[];
+    maxHeight: (NumberConstructor | StringConstructor)[];
     lazy: BooleanConstructor;
     className: {
         type: StringConstructor;
@@ -183,13 +183,13 @@ export declare const dataTableProps: {
     headerCellClassName: PropType<import('element-plus/es/components/table/src/table/defaults').CellCls<any> | undefined>;
     headerCellStyle: PropType<import('element-plus/es/components/table/src/table/defaults').CellStyle<any> | undefined>;
     highlightCurrentRow: BooleanConstructor;
-    currentRowKey: (StringConstructor | NumberConstructor)[];
+    currentRowKey: (NumberConstructor | StringConstructor)[];
     emptyText: StringConstructor;
     expandRowKeys: PropType<any[] | undefined>;
     defaultExpandAll: BooleanConstructor;
     defaultSort: PropType<import('element-plus/es/components/table/src/table/defaults').Sort | undefined>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: PropType<Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    tooltipOptions: PropType<Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "effect" | "placement" | "popperClass" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "appendTo" | "transition" | "showArrow">> | undefined>;
     spanMethod: PropType<((data: {
         row: any;
         rowIndex: number;
@@ -224,7 +224,7 @@ export declare const dataTableProps: {
     };
     scrollbarAlwaysOn: BooleanConstructor;
     flexible: BooleanConstructor;
-    showOverflowTooltip: PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "effect" | "placement" | "popperClass" | "offset" | "popperOptions" | "appendTo" | "transition" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    showOverflowTooltip: PropType<boolean | Partial<Pick<import('element-plus').ElTooltipProps, "offset" | "effect" | "placement" | "popperClass" | "showAfter" | "hideAfter" | "popperOptions" | "enterable" | "appendTo" | "transition" | "showArrow">> | undefined>;
 };
 export type DataTableProps = ExtractPropTypes<typeof dataTableProps>;
 /**

package/lib/ele-data-table/style/index.scss

@@ -306,7 +306,7 @@
     > .el-table__body
     > .el-table__body-footer {
     border-top: 1px solid eleVar('table', 'border-color');
-    margin-top: -1px;
+    margin-top: calc(-1px - eleVar('table', 'fix-height'));
     z-index: 3;
 
     td.el-table__cell {

package/lib/ele-data-table/types.d.ts

@@ -48,6 +48,8 @@ export interface Column extends Omit<TableColumn, 'filterPlacement'> {
   printSlot?: string;
   /** 子级 */
   children?: Columns;
+  /** 显示条件 */
+  vIf?: any;
 }
 
 /**

package/lib/ele-data-table/util.cjs

@@ -22,7 +22,11 @@ function getCols(cols, pageIndex, slots, slotNormalize, globalTooltip) {
               "headerSlot",
               "hideInTable",
               "hideInSetting",
-              "children"
+              "hideInExport",
+              "hideInPrint",
+              "printSlot",
+              "children",
+              "vIf"
             ]),
             showOverflowTooltip: getTooltipProps(
               col.showOverflowTooltip,

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

@@ -1,11 +1,11 @@
 import { ElDrawerInstance } from '../ele-app/el';
 
 declare const _default: import('vue').DefineComponent<{
-    headerStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    titleStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    bodyStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    footerStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    closeBtnStyle: 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>;
+    bodyStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    footerStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    closeBtnStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     inner: BooleanConstructor;
     direction: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, "ltr" | "rtl" | "ttb" | "btt", unknown, "rtl", boolean>;
     size: import('element-plus/es/utils/index').EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, "30%", boolean>;
@@ -29,7 +29,7 @@ declare const _default: import('vue').DefineComponent<{
     closeDelay: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     top: {
         readonly type: import('vue').PropType<string>;
-        readonly required: false; /** 关闭事件 */
+        readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
@@ -51,7 +51,7 @@ declare const _default: import('vue').DefineComponent<{
     center: BooleanConstructor;
     alignCenter: BooleanConstructor;
     closeIcon: {
-        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;
@@ -83,11 +83,11 @@ declare const _default: import('vue').DefineComponent<{
     openAutoFocus: () => boolean;
     closeAutoFocus: () => boolean;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
-    headerStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    titleStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    bodyStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    footerStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
-    closeBtnStyle: 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>;
+    bodyStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    footerStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
+    closeBtnStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     inner: BooleanConstructor;
     direction: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, "ltr" | "rtl" | "ttb" | "btt", unknown, "rtl", boolean>;
     size: import('element-plus/es/utils/index').EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, "30%", boolean>;
@@ -111,7 +111,7 @@ declare const _default: import('vue').DefineComponent<{
     closeDelay: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     top: {
         readonly type: import('vue').PropType<string>;
-        readonly required: false; /** 关闭事件 */
+        readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
@@ -133,7 +133,7 @@ declare const _default: import('vue').DefineComponent<{
     center: BooleanConstructor;
     alignCenter: BooleanConstructor;
     closeIcon: {
-        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-drawer/props.d.ts

@@ -1,19 +1,20 @@
 import { PropType, ExtractPropTypes } from 'vue';
+import { StyleValue } from '../ele-app/types';
 
 /**
  * 属性
  */
 export declare const drawerProps: {
     /** 自定义标题样式 */
-    headerStyle: PropType<Partial<import('vue').CSSProperties>>;
+    headerStyle: PropType<StyleValue>;
     /** 标题样式 */
-    titleStyle: PropType<Partial<import('vue').CSSProperties>>;
+    titleStyle: PropType<StyleValue>;
     /** 自定义主体样式 */
-    bodyStyle: PropType<Partial<import('vue').CSSProperties>>;
+    bodyStyle: PropType<StyleValue>;
     /** 自定义底部样式 */
-    footerStyle: PropType<Partial<import('vue').CSSProperties>>;
+    footerStyle: PropType<StyleValue>;
     /** 自定义关闭按钮样式 */
-    closeBtnStyle: PropType<Partial<import('vue').CSSProperties>>;
+    closeBtnStyle: PropType<StyleValue>;
     /** 是否限制在主体内部 */
     inner: BooleanConstructor;
     direction: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, "ltr" | "rtl" | "ttb" | "btt", unknown, "rtl", boolean>;
@@ -24,7 +25,7 @@ export declare const drawerProps: {
     appendToBody: BooleanConstructor;
     appendTo: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string & {}) | (() => string) | ((new (...args: any[]) => string & {}) | (() => string))[], unknown, unknown, "body", boolean>;
     beforeClose: {
-        readonly type: PropType<import('element-plus').DialogBeforeCloseFn>;
+        readonly type: import('vue').PropType<import('element-plus').DialogBeforeCloseFn>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
@@ -37,7 +38,7 @@ export declare const drawerProps: {
     openDelay: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     closeDelay: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     top: {
-        readonly type: PropType<string>;
+        readonly type: import('vue').PropType<string>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
@@ -45,13 +46,13 @@ export declare const drawerProps: {
     modelValue: BooleanConstructor;
     modalClass: StringConstructor;
     width: {
-        readonly type: PropType<import('element-plus/es/utils/index').EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown>>;
+        readonly type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
     zIndex: {
-        readonly type: PropType<number>;
+        readonly type: import('vue').PropType<number>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
@@ -60,7 +61,7 @@ export declare const drawerProps: {
     center: BooleanConstructor;
     alignCenter: BooleanConstructor;
     closeIcon: {
-        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-dropdown/index.cjs

@@ -2,6 +2,7 @@
 const vue = require("vue");
 const elementPlus = require("element-plus");
 const core = require("../utils/core");
+const util = require("../ele-basic-select/util");
 const props = require("./props");
 const _sfc_main = vue.defineComponent({
   name: "EleDropdown",
@@ -9,6 +10,7 @@ const _sfc_main = vue.defineComponent({
   props: props.dropdownProps,
   emits: props.dropdownEmits,
   setup(props2, { emit }) {
+    const { validateChange } = util.useFormValidate();
     const dropdownRef = vue.ref();
     const rootProps = vue.computed(() => {
       const options = core.omit(props2, [
@@ -36,6 +38,7 @@ const _sfc_main = vue.defineComponent({
     const updateModelValue = (value) => {
       if (value !== props2.modelValue) {
         emit("update:modelValue", value);
+        validateChange();
         emit("change", value);
       }
     };
@@ -99,46 +102,49 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       }, {
         default: vue.withCtx(() => [
           _ctx.items ? (vue.openBlock(true), vue.createElementBlock(vue.Fragment, { key: 0 }, vue.renderList(_ctx.items, (item, index2) => {
-            return vue.openBlock(), vue.createBlock(_component_ElDropdownItem, vue.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: vue.withCtx(() => [
-                item.slot && item.slot !== "default" && _ctx.$slots[item.slot] ? vue.renderSlot(_ctx.$slots, item.slot, {
-                  key: 0,
-                  item
-                }) : (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 1 }, [
-                  item.icon ? (vue.openBlock(), vue.createBlock(_component_ElIcon, vue.mergeProps({
+            return vue.openBlock(), vue.createElementBlock(vue.Fragment, null, [
+              (item.vIf == null ? true : item.vIf) ? (vue.openBlock(), vue.createBlock(_component_ElDropdownItem, vue.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: vue.withCtx(() => [
+                  item.slot && item.slot !== "default" && _ctx.$slots[item.slot] ? vue.renderSlot(_ctx.$slots, item.slot, {
                     key: 0,
-                    ref_for: true
-                  }, { ..._ctx.iconProps || {}, ...item.iconProps || {} }), {
-                    default: vue.withCtx(() => [
-                      (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(item.icon), {
-                        style: vue.normalizeStyle(item.iconStyle)
-                      }, null, 8, ["style"]))
-                    ]),
-                    _: 2
-                  }, 1040)) : vue.createCommentVNode("", true),
-                  item.title ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_1, vue.toDisplayString(item.title), 1)) : vue.createCommentVNode("", true)
-                ], 64))
-              ]),
-              _: 2
-            }, 1040, ["class"]);
-          }), 128)) : _ctx.$slots.dropdownMenu ? vue.renderSlot(_ctx.$slots, "dropdownMenu", { key: 1 }) : vue.createCommentVNode("", true)
+                    item
+                  }) : (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 1 }, [
+                    item.icon ? (vue.openBlock(), vue.createBlock(_component_ElIcon, vue.mergeProps({
+                      key: 0,
+                      ref_for: true
+                    }, { ..._ctx.iconProps || {}, ...item.iconProps || {} }), {
+                      default: vue.withCtx(() => [
+                        (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(item.icon), {
+                          style: vue.normalizeStyle(item.iconStyle)
+                        }, null, 8, ["style"]))
+                      ]),
+                      _: 2
+                    }, 1040)) : vue.createCommentVNode("", true),
+                    item.title ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_1, vue.toDisplayString(item.title), 1)) : vue.createCommentVNode("", true)
+                  ], 64))
+                ]),
+                _: 2
+              }, 1040, ["class"])) : vue.createCommentVNode("", true)
+            ], 64);
+          }), 256)) : _ctx.$slots.dropdownMenu ? vue.renderSlot(_ctx.$slots, "dropdownMenu", { key: 1 }) : vue.createCommentVNode("", true)
         ]),
         _: 3
       }, 8, ["style"]))