ele-admin-plus 1.1.5-beta.2 → 1.1.6-beta.1

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

@@ -55,14 +55,12 @@ declare const _default: import("vue").DefineComponent<{
     rowHeight: NumberConstructor;
     locale: import("vue").PropType<Partial<import("./types").TableLocale>>;
     size: {
-        /** 表格组件属性 */
         readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
     maxHeight: (StringConstructor | NumberConstructor)[];
-    width: (StringConstructor | NumberConstructor)[];
     fit: {
         type: BooleanConstructor;
         default: boolean;
@@ -71,6 +69,7 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
+    width: (StringConstructor | NumberConstructor)[];
     lazy: BooleanConstructor;
     rowKey: import("vue").PropType<string | ((row: any) => string) | undefined>;
     columns: {
@@ -86,7 +85,7 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     stripe: {
         type: BooleanConstructor;
         default: null;
@@ -117,7 +116,7 @@ declare const _default: import("vue").DefineComponent<{
     defaultExpandAll: BooleanConstructor;
     defaultSort: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").Sort | undefined>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import("vue").PropType<Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    tooltipOptions: import("vue").PropType<Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     spanMethod: import("vue").PropType<((data: {
         row: any;
         rowIndex: number;
@@ -213,9 +212,11 @@ declare const _default: import("vue").DefineComponent<{
     'update:selections': (_selections: DataItem[]) => boolean;
     'update:current': (_current?: DataItem | null | undefined) => boolean;
     columnsChange: (_columns: Columns) => boolean;
+    /** 每页显示数量 */
     sizeChange: (_size: "" | "default" | "small" | "large" | undefined) => boolean;
     maximizedChange: (_maximized: boolean) => boolean;
-    refresh: () => boolean; /** 数据总数量 */
+    /** 数据总数量 */
+    refresh: () => boolean;
     select: (_selection: DataItem[], _row: DataItem) => boolean;
     selectAll: (_selection: DataItem[]) => boolean;
     selectionChange: (_selection: DataItem[]) => boolean;
@@ -284,14 +285,12 @@ declare const _default: import("vue").DefineComponent<{
     rowHeight: NumberConstructor;
     locale: import("vue").PropType<Partial<import("./types").TableLocale>>;
     size: {
-        /** 表格组件属性 */
         readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "" | "default" | "small" | "large", never>>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
     maxHeight: (StringConstructor | NumberConstructor)[];
-    width: (StringConstructor | NumberConstructor)[];
     fit: {
         type: BooleanConstructor;
         default: boolean;
@@ -300,6 +299,7 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
+    width: (StringConstructor | NumberConstructor)[];
     lazy: BooleanConstructor;
     rowKey: import("vue").PropType<string | ((row: any) => string) | undefined>;
     columns: {
@@ -315,7 +315,7 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     stripe: {
         type: BooleanConstructor;
         default: null;
@@ -346,7 +346,7 @@ declare const _default: import("vue").DefineComponent<{
     defaultExpandAll: BooleanConstructor;
     defaultSort: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").Sort | undefined>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import("vue").PropType<Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    tooltipOptions: import("vue").PropType<Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     spanMethod: import("vue").PropType<((data: {
         row: any;
         rowIndex: number;

package/lib/ele-pro-table/index.js

@@ -391,10 +391,6 @@ const _sfc_main = vue.defineComponent({
         reload();
       }
     });
-    vue.onBeforeUnmount(() => {
-      updateSelections([]);
-      updateCurrent(null);
-    });
     return {
       ...methods,
       tableViewRef,

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

@@ -85,7 +85,6 @@ export declare const proTableProps: {
         __epPropKey: true;
     };
     maxHeight: (StringConstructor | NumberConstructor)[];
-    width: (StringConstructor | NumberConstructor)[];
     fit: {
         type: BooleanConstructor;
         default: boolean;
@@ -94,6 +93,7 @@ export declare const proTableProps: {
         type: StringConstructor;
         default: string;
     };
+    width: (StringConstructor | NumberConstructor)[];
     lazy: BooleanConstructor;
     rowKey: PropType<string | ((row: any) => string) | undefined>;
     columns: {
@@ -109,7 +109,7 @@ export declare const proTableProps: {
         type: BooleanConstructor;
         default: boolean;
     };
-    showOverflowTooltip: PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    showOverflowTooltip: PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     stripe: {
         type: BooleanConstructor;
         default: null;
@@ -140,7 +140,7 @@ export declare const proTableProps: {
     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, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    tooltipOptions: PropType<Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     spanMethod: PropType<((data: {
         row: any;
         rowIndex: number;

package/lib/ele-pro-table/util.js

@@ -243,6 +243,7 @@ function getCheckedColumns(columns, cols, sortable) {
     core.eachTree(cols, (t) => {
       if (t.uid === colId) {
         temp = t;
+        return false;
       }
     });
     if (temp && !temp.checked) {
@@ -275,32 +276,29 @@ function getCheckedColumns(columns, cols, sortable) {
       if (c.uid === bColId) {
         bi = i;
       }
-      if (ai != null && bi != null) {
-        return false;
-      }
       i++;
     });
     if (ai == null && a.hideInSetting && a.fixed === "right") {
-      ai = cols.length;
+      ai = i;
     }
     if (ai == null) {
       ai = -1;
     }
     if (a.fixed === true || a.fixed === "left") {
-      ai -= cols.length;
+      ai -= i;
     } else if (a.fixed === "right" || a.hideInSetting && !a.fixed) {
-      ai += cols.length;
+      ai += i;
     }
     if (bi == null && b.hideInSetting && b.fixed === "right") {
-      bi = cols.length;
+      bi = i;
     }
     if (bi == null) {
       bi = -1;
     }
     if (b.fixed === true || b.fixed === "left") {
-      bi -= cols.length;
+      bi -= i;
     } else if (b.fixed === "right" || b.hideInSetting && !b.fixed) {
-      bi += cols.length;
+      bi += i;
     }
     return ai - bi;
   });

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

@@ -865,7 +865,7 @@
         margin-left: $space;
       }
 
-      &:hover {
+      &:not(.is-tab):hover {
         box-shadow: eleVar('tab-button', 'active-shadow');
       }
 

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

@@ -1,4 +1,4 @@
-import type { ElTooltipProps, ElTooltipInstance, ElPopperInstance } from '../ele-app/types';
+import type { ElTooltipInstance, ElPopperInstance } from '../ele-app/types';
 declare const _default: import("vue").DefineComponent<{
     bodyStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
     bg: StringConstructor;
@@ -15,21 +15,7 @@ declare const _default: import("vue").DefineComponent<{
     role: import("element-plus/es/utils").EpPropFinalized<StringConstructor, "menu" | "group" | "listbox" | "grid" | "tooltip" | "dialog" | "navigation" | "tree", unknown, "tooltip", boolean>;
     teleported: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     strategy: import("element-plus/es/utils").EpPropFinalized<StringConstructor, "fixed" | "absolute", unknown, "absolute", boolean>;
-    visible: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => boolean) | (() => boolean | null) | ((new (...args: any[]) => boolean) | (() => boolean | null))[], unknown, unknown, null, boolean>;
-    transition: StringConstructor;
-    content: import("element-plus/es/utils").EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
-    popperStyle: {
-        readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => string | import("vue").CSSProperties | import("vue").StyleValue[]) | (() => import("vue").StyleValue) | ((new (...args: any[]) => string | import("vue").CSSProperties | import("vue").StyleValue[]) | (() => import("vue").StyleValue))[], unknown, unknown>>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
-    enterable: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    showAfter: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
-    hideAfter: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 200, boolean>;
-    autoClose: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     showArrow: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, boolean, boolean>;
-    persistent: BooleanConstructor;
     arrowOffset: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 5, boolean>;
     triggerKeys: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => string[]) | (() => string[]) | ((new (...args: any[]) => string[]) | (() => string[]))[], unknown, unknown, () => string[], boolean>;
     virtualRef: {
@@ -46,11 +32,22 @@ declare const _default: import("vue").DefineComponent<{
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
+    content: import("element-plus/es/utils").EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
     rawContent: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
+    persistent: BooleanConstructor;
     ariaLabel: StringConstructor;
+    visible: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => boolean) | (() => boolean | null) | ((new (...args: any[]) => boolean) | (() => boolean | null))[], unknown, unknown, null, boolean>;
+    transition: StringConstructor;
+    enterable: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     pure: BooleanConstructor;
     focusOnShow: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
     trapping: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
+    popperStyle: {
+        readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => string | import("vue").CSSProperties | import("vue").StyleValue[]) | (() => import("vue").StyleValue) | ((new (...args: any[]) => string | import("vue").CSSProperties | import("vue").StyleValue[]) | (() => import("vue").StyleValue))[], unknown, unknown>>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    };
     referenceEl: {
         readonly type: import("vue").PropType<HTMLElement>;
         readonly required: false;
@@ -68,11 +65,14 @@ declare const _default: import("vue").DefineComponent<{
     boundariesPadding: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     fallbackPlacements: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => import("element-plus").Placement[]) | (() => import("element-plus").Placement[]) | ((new (...args: any[]) => import("element-plus").Placement[]) | (() => import("element-plus").Placement[]))[], unknown, unknown, undefined, boolean>;
     gpuAcceleration: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
+    showAfter: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
+    hideAfter: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 200, boolean>;
+    autoClose: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     popperClass: StringConstructor;
     className: StringConstructor;
 }, {
     tooltipRef: import("vue").Ref<ElTooltipInstance | undefined>;
-    rootProps: import("vue").ComputedRef<ElTooltipProps>;
+    rootProps: import("vue").ComputedRef<Partial<import("element-plus").ElTooltipProps>>;
     popperRef: import("vue").ComputedRef<ElPopperInstance>;
     contentRef: import("vue").ComputedRef<any>;
     isFocusInsideContent: () => void;
@@ -103,21 +103,7 @@ declare const _default: import("vue").DefineComponent<{
     role: import("element-plus/es/utils").EpPropFinalized<StringConstructor, "menu" | "group" | "listbox" | "grid" | "tooltip" | "dialog" | "navigation" | "tree", unknown, "tooltip", boolean>;
     teleported: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     strategy: import("element-plus/es/utils").EpPropFinalized<StringConstructor, "fixed" | "absolute", unknown, "absolute", boolean>;
-    visible: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => boolean) | (() => boolean | null) | ((new (...args: any[]) => boolean) | (() => boolean | null))[], unknown, unknown, null, boolean>;
-    transition: StringConstructor;
-    content: import("element-plus/es/utils").EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
-    popperStyle: {
-        readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => string | import("vue").CSSProperties | import("vue").StyleValue[]) | (() => import("vue").StyleValue) | ((new (...args: any[]) => string | import("vue").CSSProperties | import("vue").StyleValue[]) | (() => import("vue").StyleValue))[], unknown, unknown>>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
-    enterable: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    showAfter: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
-    hideAfter: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 200, boolean>;
-    autoClose: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     showArrow: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, boolean, boolean>;
-    persistent: BooleanConstructor;
     arrowOffset: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 5, boolean>;
     triggerKeys: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => string[]) | (() => string[]) | ((new (...args: any[]) => string[]) | (() => string[]))[], unknown, unknown, () => string[], boolean>;
     virtualRef: {
@@ -134,11 +120,22 @@ declare const _default: import("vue").DefineComponent<{
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
+    content: import("element-plus/es/utils").EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
     rawContent: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
+    persistent: BooleanConstructor;
     ariaLabel: StringConstructor;
+    visible: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => boolean) | (() => boolean | null) | ((new (...args: any[]) => boolean) | (() => boolean | null))[], unknown, unknown, null, boolean>;
+    transition: StringConstructor;
+    enterable: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     pure: BooleanConstructor;
     focusOnShow: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
     trapping: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
+    popperStyle: {
+        readonly type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => string | import("vue").CSSProperties | import("vue").StyleValue[]) | (() => import("vue").StyleValue) | ((new (...args: any[]) => string | import("vue").CSSProperties | import("vue").StyleValue[]) | (() => import("vue").StyleValue))[], unknown, unknown>>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    };
     referenceEl: {
         readonly type: import("vue").PropType<HTMLElement>;
         readonly required: false;
@@ -156,6 +153,9 @@ declare const _default: import("vue").DefineComponent<{
     boundariesPadding: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     fallbackPlacements: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => import("element-plus").Placement[]) | (() => import("element-plus").Placement[]) | ((new (...args: any[]) => import("element-plus").Placement[]) | (() => import("element-plus").Placement[]))[], unknown, unknown, undefined, boolean>;
     gpuAcceleration: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
+    showAfter: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
+    hideAfter: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 200, boolean>;
+    autoClose: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     popperClass: StringConstructor;
     className: StringConstructor;
 }>> & {
@@ -176,19 +176,16 @@ declare const _default: import("vue").DefineComponent<{
     role: import("element-plus/es/utils").EpPropMergeType<StringConstructor, "menu" | "group" | "listbox" | "grid" | "tooltip" | "dialog" | "navigation" | "tree", unknown>;
     teleported: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
     strategy: import("element-plus/es/utils").EpPropMergeType<StringConstructor, "fixed" | "absolute", unknown>;
-    visible: import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => boolean) | (() => boolean | null) | ((new (...args: any[]) => boolean) | (() => boolean | null))[], unknown, unknown>;
-    content: string;
-    enterable: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
-    showAfter: number;
-    hideAfter: number;
-    autoClose: number;
     showArrow: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
-    persistent: boolean;
     arrowOffset: number;
     triggerKeys: string[];
     virtualTriggering: boolean;
     open: boolean;
+    content: string;
     rawContent: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+    persistent: boolean;
+    visible: import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => boolean) | (() => boolean | null) | ((new (...args: any[]) => boolean) | (() => boolean | null))[], unknown, unknown>;
+    enterable: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
     pure: boolean;
     focusOnShow: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
     trapping: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
@@ -196,6 +193,9 @@ declare const _default: import("vue").DefineComponent<{
     boundariesPadding: number;
     fallbackPlacements: import("element-plus").Placement[];
     gpuAcceleration: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>;
+    showAfter: number;
+    hideAfter: number;
+    autoClose: number;
     isPopover: boolean;
 }, {}>;
 export default _default;

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

@@ -23,21 +23,7 @@ export declare const tooltipProps: {
     role: import("element-plus/es/utils").EpPropFinalized<StringConstructor, "menu" | "group" | "listbox" | "grid" | "tooltip" | "dialog" | "navigation" | "tree", unknown, "tooltip", boolean>;
     teleported: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     strategy: import("element-plus/es/utils").EpPropFinalized<StringConstructor, "fixed" | "absolute", unknown, "absolute", boolean>;
-    visible: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => boolean) | (() => boolean | null) | ((new (...args: any[]) => boolean) | (() => boolean | null))[], unknown, unknown, null, boolean>;
-    transition: StringConstructor;
-    content: import("element-plus/es/utils").EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
-    popperStyle: {
-        readonly type: PropType<import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => string | import("vue").CSSProperties | import("vue").StyleValue[]) | (() => import("vue").StyleValue) | ((new (...args: any[]) => string | import("vue").CSSProperties | import("vue").StyleValue[]) | (() => import("vue").StyleValue))[], unknown, unknown>>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
-    enterable: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    showAfter: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
-    hideAfter: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 200, boolean>;
-    autoClose: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     showArrow: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, boolean, boolean>;
-    persistent: BooleanConstructor;
     arrowOffset: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 5, boolean>;
     triggerKeys: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => string[]) | (() => string[]) | ((new (...args: any[]) => string[]) | (() => string[]))[], unknown, unknown, () => string[], boolean>;
     virtualRef: {
@@ -54,11 +40,22 @@ export declare const tooltipProps: {
         readonly validator: ((val: unknown) => boolean) | undefined;
         __epPropKey: true;
     };
+    content: import("element-plus/es/utils").EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
     rawContent: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
+    persistent: BooleanConstructor;
     ariaLabel: StringConstructor;
+    visible: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => boolean) | (() => boolean | null) | ((new (...args: any[]) => boolean) | (() => boolean | null))[], unknown, unknown, null, boolean>;
+    transition: StringConstructor;
+    enterable: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     pure: BooleanConstructor;
     focusOnShow: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
     trapping: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, false, boolean>;
+    popperStyle: {
+        readonly type: PropType<import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => string | import("vue").CSSProperties | import("vue").StyleValue[]) | (() => import("vue").StyleValue) | ((new (...args: any[]) => string | import("vue").CSSProperties | import("vue").StyleValue[]) | (() => import("vue").StyleValue))[], unknown, unknown>>;
+        readonly required: false;
+        readonly validator: ((val: unknown) => boolean) | undefined;
+        __epPropKey: true;
+    };
     referenceEl: {
         readonly type: PropType<HTMLElement>;
         readonly required: false;
@@ -76,6 +73,9 @@ export declare const tooltipProps: {
     boundariesPadding: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     fallbackPlacements: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => import("element-plus").Placement[]) | (() => import("element-plus").Placement[]) | ((new (...args: any[]) => import("element-plus").Placement[]) | (() => import("element-plus").Placement[]))[], unknown, unknown, undefined, boolean>;
     gpuAcceleration: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
+    showAfter: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
+    hideAfter: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 200, boolean>;
+    autoClose: import("element-plus/es/utils").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     popperClass: StringConstructor;
     className: StringConstructor;
 };

package/lib/ele-virtual-table/components/body-cell.d.ts

@@ -30,7 +30,7 @@ declare const _default: import("vue").DefineComponent<{
         colspan: number;
     } | undefined) | undefined>;
     /** 溢出提示组件全局属性 */
-    tableTooltipProps: PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    tableTooltipProps: PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     /** 序号列起始编号 */
     pageIndex: NumberConstructor;
     /** 表格行高 */
@@ -110,7 +110,7 @@ declare const _default: import("vue").DefineComponent<{
         colspan: number;
     } | undefined) | undefined>;
     /** 溢出提示组件全局属性 */
-    tableTooltipProps: PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    tableTooltipProps: PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     /** 序号列起始编号 */
     pageIndex: NumberConstructor;
     /** 表格行高 */

package/lib/ele-virtual-table/components/body-row.d.ts

@@ -29,7 +29,7 @@ declare const _default: import("vue").DefineComponent<{
         colspan: number;
     } | undefined) | undefined>;
     /** 溢出提示组件全局属性 */
-    tableTooltipProps: PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    tableTooltipProps: PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     /** 序号列起始编号 */
     pageIndex: NumberConstructor;
     /** 表格行高 */
@@ -109,7 +109,7 @@ declare const _default: import("vue").DefineComponent<{
         colspan: number;
     } | undefined) | undefined>;
     /** 溢出提示组件全局属性 */
-    tableTooltipProps: PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    tableTooltipProps: PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     /** 序号列起始编号 */
     pageIndex: NumberConstructor;
     /** 表格行高 */

package/lib/ele-virtual-table/components/cell-filter.js

@@ -9,6 +9,8 @@ const _sfc_main = vue.defineComponent({
     ElIcon: elementPlus.ElIcon,
     ElButton: elementPlus.ElButton,
     ElScrollbar: elementPlus.ElScrollbar,
+    ElCheckboxGroup: elementPlus.ElCheckboxGroup,
+    ElCheckbox: elementPlus.ElCheckbox,
     EleTooltip,
     FilterFilled: icons.FilterFilled
   },

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

@@ -44,7 +44,6 @@ export declare const virtualTableProps: {
         __epPropKey: true;
     };
     maxHeight: (StringConstructor | NumberConstructor)[];
-    width: (StringConstructor | NumberConstructor)[];
     fit: {
         type: BooleanConstructor;
         default: boolean;
@@ -53,6 +52,7 @@ export declare const virtualTableProps: {
         type: StringConstructor;
         default: string;
     };
+    width: (StringConstructor | NumberConstructor)[];
     lazy: BooleanConstructor;
     rowKey: import("vue").PropType<string | ((row: any) => string) | undefined>;
     data: {
@@ -64,7 +64,7 @@ export declare const virtualTableProps: {
         type: BooleanConstructor;
         default: boolean;
     };
-    showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    showOverflowTooltip: import("vue").PropType<boolean | Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     showHeader: {
         type: BooleanConstructor;
         default: boolean;
@@ -87,7 +87,7 @@ export declare const virtualTableProps: {
     defaultExpandAll: BooleanConstructor;
     defaultSort: import("vue").PropType<import("element-plus/es/components/table/src/table/defaults").Sort | undefined>;
     tooltipEffect: StringConstructor;
-    tooltipOptions: import("vue").PropType<Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "enterable" | "showAfter" | "hideAfter" | "showArrow">> | undefined>;
+    tooltipOptions: import("vue").PropType<Partial<Pick<import("element-plus").ElTooltipProps, "offset" | "effect" | "placement" | "popperOptions" | "popperClass" | "showArrow" | "enterable" | "showAfter" | "hideAfter">> | undefined>;
     spanMethod: import("vue").PropType<((data: {
         row: any;
         rowIndex: number;

package/lib/ele-virtual-table/util.js

@@ -101,7 +101,11 @@ function analyseColumns(columns) {
   if (!columns || !columns.length) {
     return { cols, rows };
   }
-  generateRowCols(columns, cols, rows, 0);
+  const sortedCols = [...columns];
+  sortedCols.sort((a, b) => {
+    return util.getColFixedNumber(a.fixed) - util.getColFixedNumber(b.fixed);
+  });
+  generateRowCols(sortedCols, cols, rows, 0);
   computeFixedCols(cols);
   rows.forEach((row, i) => {
     row.forEach((col) => {
@@ -109,7 +113,6 @@ function analyseColumns(columns) {
         col.rowspan = rows.length - i;
       }
     });
-    computeFixedCols(row);
   });
   for (let i = 0; i < rows.length; i++) {
     for (let j = 0; j < rows[i].length; j++) {
@@ -121,11 +124,18 @@ function analyseColumns(columns) {
       }
       if (row.rowspan != null && row.rowspan > 1) {
         for (let n = 1; n < row.rowspan; n++) {
-          rows[i + n].splice(j, 0, { colspan: 1, rowspan: 0 });
+          rows[i + n].splice(j, 0, {
+            colspan: 1,
+            rowspan: 0,
+            originalCol: row.originalCol
+          });
         }
       }
     }
   }
+  rows.forEach((row) => {
+    computeFixedCols(row);
+  });
   return { cols, rows };
 }
 function getColWidth(col, tableWidth, colsWidth, colsMinWidth) {

package/lib/ele-watermark/index.js

@@ -49,6 +49,7 @@ const _sfc_main = vue.defineComponent({
         transform: "none !important",
         filter: "none !important",
         visibility: "visible !important",
+        transition: "none !important",
         maxWidth: "none !important",
         maxHeight: "none !important",
         zoom: "1 !important",

package/lib/style/themes/default.scss

@@ -327,13 +327,13 @@ $ele: map.deep-merge(
       'arrow-margin': 0 -4px 0 6px,
       'bg': elVar('bg-color'),
       'border-color': elVar('border-color', 'light'),
-      'padding': 2px 0,
+      'padding': 4px 0,
       'base-level': 16px,
       'child-bg': rgba(0, 0, 0, 0.02),
       'collapse-width': 58px,
       'collapse-icon-size': 18px,
       'item-height': 40px,
-      'item-margin': 8px,
+      'item-margin': 6px,
       'item-padding': 0,
       'item-radius': 0,
       'item-color': elVar('text-color', 'primary'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ele-admin-plus",
-  "version": "1.1.5-beta.2",
+  "version": "1.1.6-beta.1",
   "description": "EleAdminPlus Library",
   "main": "lib/index.js",
   "module": "es/index.js",