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

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

@@ -29,14 +29,10 @@ export declare const popoverProps: {
     tabindex: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => string | number) | (() => string | number) | ((new (...args: any[]) => string | number) | (() => string | number))[], unknown, unknown, 0, boolean>;
     disabled: BooleanConstructor;
     teleported: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    visible: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => boolean) | (() => boolean | null) | ((new (...args: any[]) => boolean) | (() => boolean | null))[], unknown, unknown, null, boolean>;
+    showArrow: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     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;
-    };
+    persistent: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
+    visible: import("element-plus/es/utils").EpPropFinalized<(new (...args: any[]) => boolean) | (() => boolean | null) | ((new (...args: any[]) => boolean) | (() => boolean | null))[], unknown, unknown, null, boolean>;
     enterable: {
         readonly default: true;
         readonly type: PropType<import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown>>;
@@ -44,13 +40,17 @@ export declare const popoverProps: {
         readonly validator: ((val: unknown) => boolean) | undefined;
         readonly __epPropKey: true;
     };
-    title: StringConstructor;
-    width: import("element-plus/es/utils").EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, 150, 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;
+    };
     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, true, boolean>;
-    persistent: import("element-plus/es/utils").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
+    title: StringConstructor;
+    width: import("element-plus/es/utils").EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, 150, boolean>;
     popperClass: StringConstructor;
     bg: StringConstructor;
     arrowBg: StringConstructor;
@@ -67,48 +67,6 @@ export declare const popoverProps: {
         __epPropKey: true;
     };
     virtualTriggering: BooleanConstructor;
-    onMouseenter: {
-        readonly type: PropType<(e: Event) => void>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
-    onMouseleave: {
-        readonly type: PropType<(e: Event) => void>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
-    onClick: {
-        readonly type: PropType<(e: Event) => void>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
-    onKeydown: {
-        readonly type: PropType<(e: Event) => void>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
-    onFocus: {
-        readonly type: PropType<(e: Event) => void>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
-    onBlur: {
-        readonly type: PropType<(e: Event) => void>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
-    onContextmenu: {
-        readonly type: PropType<(e: Event) => void>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
     open: BooleanConstructor;
     appendTo: {
         readonly type: PropType<import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => string | HTMLElement) | (() => string | HTMLElement) | ((new (...args: any[]) => string | HTMLElement) | (() => string | HTMLElement))[], unknown, unknown>>;

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/index.d.ts

@@ -2,6 +2,7 @@ import type { Ref } from 'vue';
 import type { TabPaneName, TabsPaneContext } from 'element-plus';
 import { omit } from '../utils/core';
 import type { ElTabsProps, ElTabsInstance } from '../ele-app/types';
+import type { EleDropdownInstance } from '../ele-app/types/components';
 import type { DropdownItem } from '../ele-dropdown/types';
 import type { TabPaneItem, TabEventOption } from './types';
 import type { TabTitleInstance } from './props';
@@ -58,14 +59,14 @@ declare const _default: import("vue").DefineComponent<{
     onEdit: (name: TabPaneName | undefined, action: 'remove' | 'add') => void;
     onItemClick: (option: TabEventOption) => void;
     onItemContextMenu: (option: TabEventOption) => void;
-    onItemContextOpen: (ref: DropdownInstance) => void;
+    onItemContextOpen: (ref: EleDropdownInstance) => void;
     onContextmenu: (e: MouseEvent) => void;
     hideAllDropdown: () => void;
     updateActiveBar: () => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     tabItemClick: (_opt: TabEventOption) => boolean;
     tabContextMenu: (_opt: TabEventOption) => boolean;
-    tabContextOpen: (_ref: import("../ele-app/types/components").EleDropdownInstance) => boolean;
+    tabContextOpen: (_ref: EleDropdownInstance) => boolean;
     tabSortChange: (_data: TabPaneItem[]) => boolean;
     "update:modelValue": (name: TabPaneName) => boolean;
     tabClick: (pane: {
@@ -85,7 +86,7 @@ declare const _default: import("vue").DefineComponent<{
         index: string | undefined;
         isClosable: boolean;
     }, ev: Event) => boolean;
-    tabChange: (name: TabPaneName) => boolean;
+    tabChange: (name: TabPaneName) => boolean; /** 页签移除或新增事件 */
     edit: (paneName: TabPaneName | undefined, action: "add" | "remove") => boolean;
     tabRemove: (name: TabPaneName) => boolean;
     tabAdd: () => boolean;
@@ -132,7 +133,7 @@ declare const _default: import("vue").DefineComponent<{
     "onUpdate:modelValue"?: ((name: TabPaneName) => any) | undefined;
     onTabItemClick?: ((_opt: TabEventOption) => any) | undefined;
     onTabContextMenu?: ((_opt: TabEventOption) => any) | undefined;
-    onTabContextOpen?: ((_ref: import("../ele-app/types/components").EleDropdownInstance) => any) | undefined;
+    onTabContextOpen?: ((_ref: EleDropdownInstance) => any) | undefined;
     onTabSortChange?: ((_data: TabPaneItem[]) => any) | undefined;
     onTabClick?: ((pane: {
         uid: number;

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

@@ -126,7 +126,7 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    position: static;
+    position: relative;
     right: auto;
     left: auto;
 
@@ -137,6 +137,34 @@
     &.is-disabled {
       cursor: not-allowed;
     }
+
+    &::before,
+    &::before {
+      content: '';
+      width: 10px;
+      position: absolute;
+      top: 0;
+      bottom: -1px;
+      transition: box-shadow $ele-transition;
+      pointer-events: none;
+      z-index: calc(#{eleVar('tab', 'active-index')} + 1);
+    }
+  }
+
+  .el-tabs__nav-prev::before {
+    right: -10px;
+  }
+
+  .el-tabs__nav-next::before {
+    left: -10px;
+  }
+
+  .el-tabs__nav-prev:not(.is-disabled)::before {
+    box-shadow: eleVar('tab', 'scroll-left-shadow');
+  }
+
+  .el-tabs__nav-next:not(.is-disabled)::before {
+    box-shadow: eleVar('tab', 'scroll-right-shadow');
   }
 
   .el-tabs__nav-next {
@@ -440,9 +468,13 @@
     }
   }
 
-  .el-tabs__nav-prev:not(.is-disabled):hover,
-  .el-tabs__nav-next:not(.is-disabled):hover {
-    background: eleVar('tab-simple', 'hover-bg');
+  .el-tabs__nav-prev:not(.is-disabled),
+  .el-tabs__nav-next:not(.is-disabled) {
+    border-radius: eleVar('tab-simple', 'radius');
+
+    &:hover {
+      background: eleVar('tab-simple', 'tool-hover-bg');
+    }
   }
 
   .el-tabs__active-bar,
@@ -551,6 +583,10 @@
       height: $height;
       line-height: $height;
       margin-top: $space;
+
+      &::before {
+        display: none;
+      }
     }
 
     .el-tabs__active-bar,
@@ -694,13 +730,13 @@
   /* 简约风格和指示器风格 */
   &.is-simple .ele-tab-tool,
   &.is-indicator .ele-tab-tool {
+    border-radius: eleVar('tab-simple', 'radius');
+
     &:hover {
-      background: eleVar('tab-simple', 'hover-bg');
+      background: eleVar('tab-simple', 'tool-hover-bg');
     }
 
     &.is-tab {
-      border-radius: eleVar('tab-simple', 'radius');
-
       /* 两侧反圆角 */
       & > .el-dropdown {
         $size: eleVar('tab-simple', 'angle-size');
@@ -739,6 +775,7 @@
 
       &:hover {
         color: eleVar('tab-simple', 'hover-color');
+        background: eleVar('tab-simple', 'hover-bg');
         z-index: eleVar('tab', 'hover-index');
 
         & > .el-dropdown {
@@ -828,6 +865,10 @@
         margin-left: $space;
       }
 
+      &:hover {
+        box-shadow: eleVar('tab-button', 'active-shadow');
+      }
+
       &.is-tab {
         background: eleVar('tab-button', 'bg');