ele-admin-plus 1.1.6-beta.3 → 1.1.6-beta.4

package/es/ele-app/style/overwrite/css-var.scss

@@ -12,6 +12,7 @@
 @use './select/css-var.scss' as *;
 @use './table-filter/css-var.scss' as *;
 @use './tag/css-var.scss' as *;
+@use './tree/css-var.scss' as *;
 @use './tree-select/css-var.scss' as *;
 
 /* El 样式重写主题变量 */
@@ -29,5 +30,6 @@
   @include set-el-select-var($var);
   @include set-el-table-filter-var($var);
   @include set-el-tag-var($var);
+  @include set-el-tree-var($var);
   @include set-el-tree-select-var($var);
 }

package/es/ele-app/style/overwrite/index.js

@@ -1,16 +1,17 @@
-import "./popper/index";
-import "./tag/index";
-import "./radio/index";
-import "./checkbox/index";
-import "./select/index";
 import "./autocomplete/index";
-import "./cascader/index";
-import "./tree-select/index";
-import "./table-filter/index";
-import "./message-box/index";
-import "./notification/index";
-import "./descriptions/index";
 import "./backtop/index";
-import "./image-viewer/index";
+import "./cascader/index";
+import "./checkbox/index";
 import "./color-picker/index";
 import "./date-picker/index";
+import "./descriptions/index";
+import "./image-viewer/index";
+import "./message-box/index";
+import "./notification/index";
+import "./popper/index";
+import "./radio/index";
+import "./select/index";
+import "./table-filter/index";
+import "./tag/index";
+import "./tree/index";
+import "./tree-select/index";

package/es/ele-app/style/overwrite/index.scss

@@ -1,16 +1,17 @@
-@use './popper/index.scss' as popper;
-@use './tag/index.scss' as tag;
-@use './radio/index.scss' as radio;
-@use './checkbox/index.scss' as checkbox;
-@use './select/index.scss' as select;
 @use './autocomplete/index.scss' as autocomplete;
-@use './cascader/index.scss' as cascader;
-@use './tree-select/index.scss' as treeSelect;
-@use './table-filter/index.scss' as tableFilter;
-@use './message-box/index.scss' as messageBox;
-@use './notification/index.scss' as notification;
-@use './descriptions/index.scss' as descriptions;
 @use './backtop/index.scss' as backtop;
-@use './image-viewer/index.scss' as imageViewer;
+@use './cascader/index.scss' as cascader;
+@use './checkbox/index.scss' as checkbox;
 @use './color-picker/index.scss' as colorPicker;
 @use './date-picker/index.scss' as datePicker;
+@use './descriptions/index.scss' as descriptions;
+@use './image-viewer/index.scss' as imageViewer;
+@use './message-box/index.scss' as messageBox;
+@use './notification/index.scss' as notification;
+@use './popper/index.scss' as popper;
+@use './radio/index.scss' as radio;
+@use './select/index.scss' as select;
+@use './table-filter/index.scss' as tableFilter;
+@use './tag/index.scss' as tag;
+@use './tree/index.scss' as tree;
+@use './tree-select/index.scss' as treeSelect;

package/es/ele-app/style/overwrite/tree/css-var.scss

@@ -0,0 +1,8 @@
+@use '../../../../style/util.scss' as *;
+
+/* ElTree 主题变量 */
+@mixin set-el-tree-var($var) {
+  .el-tree {
+    @include set-ele-var('tree', $var);
+  }
+}

package/es/ele-app/style/overwrite/tree/index.js

@@ -0,0 +1 @@
+import "./index.scss";

package/es/ele-app/style/overwrite/tree/index.scss

@@ -0,0 +1,103 @@
+@use '../../../../style/themes/default.scss' as *;
+@use '../../../../style/util.scss' as *;
+@use './css-var.scss' as *;
+
+@include set-el-tree-var($ele);
+
+/* Tree */
+.el-tree {
+  background: none;
+
+  .el-tree-node {
+    padding-top: eleVar('tree', 'item-margin');
+    box-sizing: border-box;
+  }
+
+  & > .el-tree-node:first-child {
+    padding-top: 0;
+  }
+
+  .el-tree-node__content {
+    height: eleVar('tree', 'item-height');
+    padding: eleVar('tree', 'item-padding');
+    border-radius: eleVar('tree', 'item-radius');
+    transition: (color $ele-transition, background-color $ele-transition);
+    box-sizing: border-box;
+
+    & > .el-tree-node__expand-icon {
+      flex-shrink: 0;
+      width: auto;
+      height: auto;
+      transform: none;
+      box-sizing: border-box;
+      margin: eleVar('tree', 'expand-margin');
+      padding: eleVar('tree', 'expand-padding');
+      border-radius: eleVar('tree', 'expand-radius');
+      font-size: eleVar('tree', 'expand-size');
+      transition: background-color $ele-transition;
+      z-index: 4;
+
+      & > svg {
+        transition: transform 0.3s;
+      }
+
+      &.expanded > svg {
+        transform: rotate(90deg);
+      }
+
+      &:hover {
+        background: eleVar('tree', 'expand-hover-bg');
+      }
+
+      &.is-leaf {
+        pointer-events: none;
+      }
+    }
+
+    & > .el-checkbox {
+      flex-shrink: 0;
+    }
+
+    & > .el-tree-node__label {
+      flex: 1;
+      line-height: eleVar('tree', 'item-line-height');
+      text-overflow: ellipsis;
+      word-break: break-all;
+      white-space: nowrap;
+      overflow: hidden;
+    }
+  }
+
+  &.el-tree--highlight-current {
+    .el-tree-node.is-current > .el-tree-node__content {
+      background: eleVar('tree', 'item-active-bg');
+
+      .el-tree-node__label {
+        color: eleVar('tree', 'item-active-color');
+        font-weight: eleVar('tree', 'item-active-weight');
+      }
+
+      &:hover {
+        background: eleVar('tree', 'item-active-hover-bg');
+      }
+    }
+  }
+
+  /* TreeV2 */
+  .el-vl__wrapper {
+    box-sizing: border-box;
+
+    & > .el-virtual-scrollbar {
+      margin: auto 0;
+    }
+
+    .el-tree-node {
+      padding-top: 0;
+      padding-bottom: eleVar('tree', 'item-margin');
+    }
+
+    .el-tree-node__content {
+      height: 100% !important;
+    }
+  }
+}

package/es/ele-app/style/overwrite/tree-select/index.scss

@@ -11,63 +11,20 @@
     padding: eleVar('tree-select', 'padding') !important;
   }
 
-  .el-tree-node {
-    padding-top: eleVar('tree-select', 'item-margin');
-  }
-
-  .el-tree > .el-tree-node:first-child {
-    padding-top: 0;
-  }
-
   .el-tree-node__content {
-    height: eleVar('tree-select', 'item-height');
-    padding: eleVar('tree-select', 'item-padding');
-    border-radius: eleVar('tree-select', 'item-radius');
-    transition: (color $ele-transition, background-color $ele-transition);
-    box-sizing: border-box;
     position: relative;
     z-index: 0;
 
-    & > .el-tree-node__expand-icon {
-      flex-shrink: 0;
-      width: auto;
-      height: auto;
-      transform: none;
-      box-sizing: border-box;
-      margin: eleVar('tree-select', 'expand-margin');
-      padding: eleVar('tree-select', 'expand-padding');
-      border-radius: eleVar('tree-select', 'expand-radius');
-      font-size: eleVar('tree-select', 'expand-size');
-      transition: background-color $ele-transition;
-      z-index: 4;
-
-      & > svg {
-        transition: transform 0.3s;
-      }
-
-      &.expanded > svg {
-        transform: rotate(90deg);
-      }
-
-      &:hover {
-        background: eleVar('tree-select', 'expand-hover-bg');
-      }
-
-      &.is-leaf {
-        pointer-events: none;
-      }
-    }
-
     .el-select-dropdown__item {
       height: auto;
-      line-height: eleVar('tree-select', 'item-line-height');
+      line-height: eleVar('tree', 'item-line-height');
       padding: 0;
       border-radius: 0;
       position: static;
 
       &::before {
         content: '';
-        border-radius: eleVar('tree-select', 'item-radius');
+        border-radius: eleVar('tree', 'item-radius');
         transition: background-color $ele-transition;
         position: absolute;
         top: 0;
@@ -98,16 +55,16 @@
   /* 选中 */
   .el-tree-node > .el-tree-node__content {
     .el-select-dropdown__item.selected {
-      color: eleVar('tree-select', 'item-active-color');
-      font-weight: eleVar('tree-select', 'item-active-weight');
+      color: eleVar('tree', 'item-active-color');
+      font-weight: eleVar('tree', 'item-active-weight');
 
       &::before {
-        background: eleVar('tree-select', 'item-active-bg');
+        background: eleVar('tree', 'item-active-bg');
       }
     }
 
     &:hover .el-select-dropdown__item.selected::before {
-      background: eleVar('tree-select', 'item-active-hover-bg');
+      background: eleVar('tree', 'item-active-hover-bg');
     }
   }
 

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

@@ -35,19 +35,14 @@ declare const _default: import("vue").DefineComponent<{
     visible: import("element-plus/es/utils/index").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/index").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    popperStyle: {
-        readonly type: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<(new (...args: any[]) => string | false | import("vue").CSSProperties | import("vue").StyleValue[]) | (() => import("vue").StyleValue) | ((new (...args: any[]) => string | false | import("vue").CSSProperties | import("vue").StyleValue[]) | (() => import("vue").StyleValue))[], unknown, unknown>>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
     zIndex: NumberConstructor;
     gpuAcceleration: import("element-plus/es/utils/index").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     showAfter: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     hideAfter: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 200, boolean>;
     autoClose: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
-    popperClass: StringConstructor;
     className: StringConstructor;
+    popperClass: StringConstructor;
+    popperStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
 }, {
     tooltipRef: import("vue").Ref<ElTooltipInstance | undefined>;
     rootProps: import("vue").ComputedRef<Partial<import("element-plus").ElTooltipProps>>;
@@ -101,19 +96,14 @@ declare const _default: import("vue").DefineComponent<{
     visible: import("element-plus/es/utils/index").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/index").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    popperStyle: {
-        readonly type: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<(new (...args: any[]) => string | false | import("vue").CSSProperties | import("vue").StyleValue[]) | (() => import("vue").StyleValue) | ((new (...args: any[]) => string | false | import("vue").CSSProperties | import("vue").StyleValue[]) | (() => import("vue").StyleValue))[], unknown, unknown>>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
     zIndex: NumberConstructor;
     gpuAcceleration: import("element-plus/es/utils/index").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     showAfter: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     hideAfter: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 200, boolean>;
     autoClose: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
-    popperClass: StringConstructor;
     className: StringConstructor;
+    popperClass: StringConstructor;
+    popperStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
 }>> & {
     "onUpdate:visible"?: ((visible: boolean) => any) | undefined;
     onOpen?: ((e: any) => any) | undefined;

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

@@ -43,19 +43,14 @@ export declare const tooltipProps: {
     visible: import("element-plus/es/utils/index").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/index").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    popperStyle: {
-        readonly type: PropType<import("element-plus/es/utils/index").EpPropMergeType<(new (...args: any[]) => string | false | import("vue").CSSProperties | import("vue").StyleValue[]) | (() => import("vue").StyleValue) | ((new (...args: any[]) => string | false | import("vue").CSSProperties | import("vue").StyleValue[]) | (() => import("vue").StyleValue))[], unknown, unknown>>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
     zIndex: NumberConstructor;
     gpuAcceleration: import("element-plus/es/utils/index").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     showAfter: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     hideAfter: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 200, boolean>;
     autoClose: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
-    popperClass: StringConstructor;
     className: StringConstructor;
+    popperClass: StringConstructor;
+    popperStyle: PropType<Partial<import("vue").CSSProperties>>;
 };
 export type TooltipProps = ExtractPropTypes<typeof tooltipProps>;
 /**

package/es/ele-tooltip/props.js

@@ -12,8 +12,9 @@ const normalizeProps = omit(useTooltipProps, [
   "onContextmenu"
 ]);
 const tooltipProps = {
-  popperClass: String,
   className: String,
+  popperClass: String,
+  popperStyle: Object,
   ...normalizeProps,
   /** 自定义内容样式 */
   bodyStyle: Object,

package/es/ele-tree-select/style/index.scss

@@ -5,82 +5,8 @@
 @include set-tree-select-var($ele);
 
 .ele-tree-select-popper {
-  .el-tree {
-    background: none;
-  }
-
   .el-vl__wrapper {
     padding: eleVar('tree-select', 'padding');
-    box-sizing: border-box;
-
-    & > .el-virtual-scrollbar {
-      margin: auto 0;
-    }
-  }
-
-  .el-tree-node {
-    box-sizing: border-box;
-    padding-bottom: eleVar('tree-select', 'item-margin');
-  }
-
-  .el-tree-node__content {
-    height: 100% !important;
-    padding: eleVar('tree-select', 'item-padding');
-    border-radius: eleVar('tree-select', 'item-radius');
-    transition: (color $ele-transition, background-color $ele-transition);
-    box-sizing: border-box;
-    position: relative;
-
-    & > .el-tree-node__expand-icon {
-      flex-shrink: 0;
-      width: auto;
-      height: auto;
-      transform: none;
-      box-sizing: border-box;
-      margin: eleVar('tree-select', 'expand-margin');
-      padding: eleVar('tree-select', 'expand-padding');
-      border-radius: eleVar('tree-select', 'expand-radius');
-      font-size: eleVar('tree-select', 'expand-size');
-      transition: background-color $ele-transition;
-      z-index: 4;
-
-      & > svg {
-        transition: transform 0.3s;
-      }
-
-      &.expanded > svg {
-        transform: rotate(90deg);
-      }
-
-      &:hover {
-        background: eleVar('tree-select', 'expand-hover-bg');
-      }
-    }
-
-    & > .el-checkbox {
-      flex-shrink: 0;
-    }
-
-    & > .el-tree-node__label {
-      flex: 1;
-      line-height: eleVar('tree-select', 'item-line-height');
-      text-overflow: ellipsis;
-      word-break: break-all;
-      white-space: nowrap;
-      overflow: hidden;
-    }
-  }
-
-  .el-tree--highlight-current .el-tree-node.is-current {
-    & > .el-tree-node__content {
-      color: eleVar('tree-select', 'item-active-color');
-      background: eleVar('tree-select', 'item-active-bg');
-      font-weight: eleVar('tree-select', 'item-active-weight');
-
-      &:hover {
-        background: eleVar('tree-select', 'item-active-hover-bg');
-      }
-    }
   }
 
   .el-tree-node__label.is-disabled {

package/es/ele-virtual-table/index.d.ts

@@ -1,7 +1,7 @@
 import type { Ref } from 'vue';
 import type { ElTableV2Instance, ElTableV2Props } from '../ele-app/types';
 import type { DataKey, DataItem, Column, Filter, OrderValue } from '../ele-data-table/types';
-import type { BodyColumns, HeaderRows, CellFilterChangeParams, SortBy, ScrollStrategy, ScrollPos, ColSize, TableTooltipProps } from './types';
+import type { BodyColumns, HeaderRows, CellFilterChangeParams, SortBy, ScrollStrategy, ScrollPos, ColSize } from './types';
 declare const _default: import("vue").DefineComponent<{
     rowHeight: NumberConstructor;
     stripe: {
@@ -47,7 +47,7 @@ declare const _default: import("vue").DefineComponent<{
     };
     maxHeight: (StringConstructor | NumberConstructor)[];
     fit: {
-        type: BooleanConstructor;
+        type: BooleanConstructor; /** 是否是树形数据 */
         default: boolean;
     };
     className: {
@@ -141,7 +141,7 @@ declare const _default: import("vue").DefineComponent<{
     expandedRowKeys: Ref<DataKey[]>;
     sortBy: Ref<SortBy | undefined>;
     filtered: Filter;
-    tableTooltipProps: TableTooltipProps;
+    tableTooltipProps: Partial<import("../ele-tooltip/props").TooltipProps>;
     treeHasChildrenName: import("vue").ComputedRef<string>;
     tableExpandCol: import("vue").ComputedRef<Partial<import("element-plus").Column<DataItem>> | undefined>;
     hasExpandCol: import("vue").ComputedRef<boolean>;
@@ -192,7 +192,7 @@ declare const _default: import("vue").DefineComponent<{
     setScrollTop: (top?: number) => void;
     setScrollLeft: (left?: number) => void;
     scrollToRow: (row: number, strategy: ScrollStrategy) => void;
-    hideTooltip: () => TableTooltipProps | void;
+    hideTooltip: () => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     select: (_selection: DataItem[], _row: DataItem) => boolean;
     selectAll: (_selection: DataItem[]) => boolean;
@@ -206,7 +206,7 @@ declare const _default: import("vue").DefineComponent<{
     rowContextmenu: (_row: DataItem, _column: Column, _e: MouseEvent) => boolean;
     rowDblclick: (_row: DataItem, _column: Column, _e: MouseEvent) => boolean;
     headerClick: (_column: Column, _e: MouseEvent) => boolean;
-    headerContextmenu: (_column: Column, _e: MouseEvent) => boolean;
+    headerContextmenu: (_column: Column, _e: MouseEvent) => boolean; /** 更新表格渲染 */
     sortChange: (_sorter: import("../ele-data-table/types").Sorter) => boolean;
     filterChange: (_filter: Filter) => boolean;
     currentChange: (_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => boolean;
@@ -259,7 +259,7 @@ declare const _default: import("vue").DefineComponent<{
     };
     maxHeight: (StringConstructor | NumberConstructor)[];
     fit: {
-        type: BooleanConstructor;
+        type: BooleanConstructor; /** 是否是树形数据 */
         default: boolean;
     };
     className: {

package/es/ele-virtual-table/types/index.d.ts

@@ -1,7 +1,7 @@
 import type { VNode } from 'vue';
 import type { Column as TableV2Column, ExtractRowPropGetter, RowExpandHandler, SortBy, HeaderClassNameGetter, ExtractHeaderPropGetter } from 'element-plus/es/components/table-v2';
 import type { ScrollStrategy, ScrollPos } from 'element-plus/es/components/table-v2/src/composables/use-scrollbar';
-import type { ElTableV2Props, EleTooltipProps } from '../../ele-app/types';
+import type { ElTableV2Props } from '../../ele-app/types';
 import type { DataKey, DataItem, Column, FilterValue } from '../../ele-data-table/types';
 export { RowExpandHandler, ScrollStrategy, SortBy, ScrollPos };
 /**
@@ -159,7 +159,3 @@ export interface SumCol extends ColSize {
     /** 是否是第一个右侧固定列 */
     isFixedRightFirst?: boolean;
 }
-/**
- * 表格提示属性
- */
-export type TableTooltipProps = Pick<EleTooltipProps, 'placement' | 'trigger' | 'offset' | 'hideAfter' | 'content' | 'virtualRef' | 'virtualTriggering' | 'disabled' | 'visible' | 'teleported' | 'transition'>;

package/es/style/themes/default.scss

@@ -749,21 +749,7 @@ $ele: map.deep-merge(
     'tree-select': (
       // 下拉树选择
       'padding': 6px 0,
-      'item-height': 32px,
-      'item-line-height': 20px,
-      'item-margin': 0,
-      'item-padding': 0 16px,
-      'item-radius': 0,
-      'item-active-color': elVar('color-primary'),
-      'item-active-weight': bold,
-      'item-active-bg': elVar('color-primary', 'light-9'),
-      'item-active-hover-bg': elVar('color-primary', 'light-8'),
-      'item-disabled-color': elVar('disabled', 'text-color'),
-      'expand-size': 12px,
-      'expand-padding': 4px,
-      'expand-margin': 0 2px 0 4px,
-      'expand-radius': elVar('border-radius', 'small'),
-      'expand-hover-bg': transparent
+      'item-disabled-color': elVar('disabled', 'text-color')
     ),
     'popper': (
       // 底层气泡
@@ -954,12 +940,12 @@ $ele: map.deep-merge(
       'sm-icon-width': 4.5px,
       'sm-icon-height': 7px,
       'sm-icon-left': 24.5%,
-      'lg-font-size': eleVar('checkbox', 'font-size'),
-      'lg-size': eleVar('checkbox', 'size'),
-      'lg-radius': eleVar('checkbox', 'radius'),
-      'lg-icon-width': eleVar('checkbox', 'icon-width'),
-      'lg-icon-height': eleVar('checkbox', 'icon-height'),
-      'lg-icon-left': eleVar('checkbox', 'icon-left')
+      'lg-font-size': elVar('font-size', 'base'),
+      'lg-size': 16px,
+      'lg-radius': elVar('border-radius', 'small'),
+      'lg-icon-width': 5.7142857142857135px,
+      'lg-icon-height': 9.142857142857142px,
+      'lg-icon-left': 21.5%
     ),
     'tag': (
       // 标签
@@ -1080,6 +1066,23 @@ $ele: map.deep-merge(
       'danger-close-hover-color': elVar('color-error'),
       'danger-close-hover-bg': transparent
     ),
+    'tree': (
+      // 树
+      'item-height': 30px,
+      'item-line-height': 16px,
+      'item-margin': 0,
+      'item-padding': 0 16px,
+      'item-radius': 0,
+      'item-active-color': elVar('color-primary'),
+      'item-active-weight': bold,
+      'item-active-bg': elVar('color-primary', 'light-9'),
+      'item-active-hover-bg': elVar('color-primary', 'light-8'),
+      'expand-size': 12px,
+      'expand-padding': 3px,
+      'expand-margin': 0 2px 0 4px,
+      'expand-radius': elVar('border-radius', 'small'),
+      'expand-hover-bg': transparent
+    ),
     'image-viewer': (
       // 图片预览
       'tool-bg': hsla(0, 0%, 28%, 0.6)

package/es/style/themes/rounded.scss

@@ -249,6 +249,12 @@ $ele-rounded: map.deep-merge(
       'warning-close-hover-bg': elVar('color-warning', 'light-8'),
       'danger-close-hover-bg': elVar('color-error', 'light-8')
     ),
+    'tree': (
+      'item-margin': 2px,
+      'item-padding': 0 12px,
+      'item-radius': elVar('border-radius', 'small'),
+      'expand-hover-bg': hsla(0, 0%, 60%, 0.15)
+    ),
     'descriptions': (
       'radius': $radius-large
     ),

package/lib/ele-app/style/overwrite/css-var.scss

@@ -12,6 +12,7 @@
 @use './select/css-var.scss' as *;
 @use './table-filter/css-var.scss' as *;
 @use './tag/css-var.scss' as *;
+@use './tree/css-var.scss' as *;
 @use './tree-select/css-var.scss' as *;
 
 /* El 样式重写主题变量 */
@@ -29,5 +30,6 @@
   @include set-el-select-var($var);
   @include set-el-table-filter-var($var);
   @include set-el-tag-var($var);
+  @include set-el-tree-var($var);
   @include set-el-tree-select-var($var);
 }

package/lib/ele-app/style/overwrite/index.js

@@ -1,17 +1,18 @@
 "use strict";
-require("./popper/index");
-require("./tag/index");
-require("./radio/index");
-require("./checkbox/index");
-require("./select/index");
 require("./autocomplete/index");
-require("./cascader/index");
-require("./tree-select/index");
-require("./table-filter/index");
-require("./message-box/index");
-require("./notification/index");
-require("./descriptions/index");
 require("./backtop/index");
-require("./image-viewer/index");
+require("./cascader/index");
+require("./checkbox/index");
 require("./color-picker/index");
 require("./date-picker/index");
+require("./descriptions/index");
+require("./image-viewer/index");
+require("./message-box/index");
+require("./notification/index");
+require("./popper/index");
+require("./radio/index");
+require("./select/index");
+require("./table-filter/index");
+require("./tag/index");
+require("./tree/index");
+require("./tree-select/index");

package/lib/ele-app/style/overwrite/index.scss

@@ -1,16 +1,17 @@
-@use './popper/index.scss' as popper;
-@use './tag/index.scss' as tag;
-@use './radio/index.scss' as radio;
-@use './checkbox/index.scss' as checkbox;
-@use './select/index.scss' as select;
 @use './autocomplete/index.scss' as autocomplete;
-@use './cascader/index.scss' as cascader;
-@use './tree-select/index.scss' as treeSelect;
-@use './table-filter/index.scss' as tableFilter;
-@use './message-box/index.scss' as messageBox;
-@use './notification/index.scss' as notification;
-@use './descriptions/index.scss' as descriptions;
 @use './backtop/index.scss' as backtop;
-@use './image-viewer/index.scss' as imageViewer;
+@use './cascader/index.scss' as cascader;
+@use './checkbox/index.scss' as checkbox;
 @use './color-picker/index.scss' as colorPicker;
 @use './date-picker/index.scss' as datePicker;
+@use './descriptions/index.scss' as descriptions;
+@use './image-viewer/index.scss' as imageViewer;
+@use './message-box/index.scss' as messageBox;
+@use './notification/index.scss' as notification;
+@use './popper/index.scss' as popper;
+@use './radio/index.scss' as radio;
+@use './select/index.scss' as select;
+@use './table-filter/index.scss' as tableFilter;
+@use './tag/index.scss' as tag;
+@use './tree/index.scss' as tree;
+@use './tree-select/index.scss' as treeSelect;

package/lib/ele-app/style/overwrite/tree/css-var.scss

@@ -0,0 +1,8 @@
+@use '../../../../style/util.scss' as *;
+
+/* ElTree 主题变量 */
+@mixin set-el-tree-var($var) {
+  .el-tree {
+    @include set-ele-var('tree', $var);
+  }
+}

package/lib/ele-app/style/overwrite/tree/index.js

@@ -0,0 +1,2 @@
+"use strict";
+require("./index.scss");

package/lib/ele-app/style/overwrite/tree/index.scss

@@ -0,0 +1,103 @@
+@use '../../../../style/themes/default.scss' as *;
+@use '../../../../style/util.scss' as *;
+@use './css-var.scss' as *;
+
+@include set-el-tree-var($ele);
+
+/* Tree */
+.el-tree {
+  background: none;
+
+  .el-tree-node {
+    padding-top: eleVar('tree', 'item-margin');
+    box-sizing: border-box;
+  }
+
+  & > .el-tree-node:first-child {
+    padding-top: 0;
+  }
+
+  .el-tree-node__content {
+    height: eleVar('tree', 'item-height');
+    padding: eleVar('tree', 'item-padding');
+    border-radius: eleVar('tree', 'item-radius');
+    transition: (color $ele-transition, background-color $ele-transition);
+    box-sizing: border-box;
+
+    & > .el-tree-node__expand-icon {
+      flex-shrink: 0;
+      width: auto;
+      height: auto;
+      transform: none;
+      box-sizing: border-box;
+      margin: eleVar('tree', 'expand-margin');
+      padding: eleVar('tree', 'expand-padding');
+      border-radius: eleVar('tree', 'expand-radius');
+      font-size: eleVar('tree', 'expand-size');
+      transition: background-color $ele-transition;
+      z-index: 4;
+
+      & > svg {
+        transition: transform 0.3s;
+      }
+
+      &.expanded > svg {
+        transform: rotate(90deg);
+      }
+
+      &:hover {
+        background: eleVar('tree', 'expand-hover-bg');
+      }
+
+      &.is-leaf {
+        pointer-events: none;
+      }
+    }
+
+    & > .el-checkbox {
+      flex-shrink: 0;
+    }
+
+    & > .el-tree-node__label {
+      flex: 1;
+      line-height: eleVar('tree', 'item-line-height');
+      text-overflow: ellipsis;
+      word-break: break-all;
+      white-space: nowrap;
+      overflow: hidden;
+    }
+  }
+
+  &.el-tree--highlight-current {
+    .el-tree-node.is-current > .el-tree-node__content {
+      background: eleVar('tree', 'item-active-bg');
+
+      .el-tree-node__label {
+        color: eleVar('tree', 'item-active-color');
+        font-weight: eleVar('tree', 'item-active-weight');
+      }
+
+      &:hover {
+        background: eleVar('tree', 'item-active-hover-bg');
+      }
+    }
+  }
+
+  /* TreeV2 */
+  .el-vl__wrapper {
+    box-sizing: border-box;
+
+    & > .el-virtual-scrollbar {
+      margin: auto 0;
+    }
+
+    .el-tree-node {
+      padding-top: 0;
+      padding-bottom: eleVar('tree', 'item-margin');
+    }
+
+    .el-tree-node__content {
+      height: 100% !important;
+    }
+  }
+}

package/lib/ele-app/style/overwrite/tree-select/index.scss

@@ -11,63 +11,20 @@
     padding: eleVar('tree-select', 'padding') !important;
   }
 
-  .el-tree-node {
-    padding-top: eleVar('tree-select', 'item-margin');
-  }
-
-  .el-tree > .el-tree-node:first-child {
-    padding-top: 0;
-  }
-
   .el-tree-node__content {
-    height: eleVar('tree-select', 'item-height');
-    padding: eleVar('tree-select', 'item-padding');
-    border-radius: eleVar('tree-select', 'item-radius');
-    transition: (color $ele-transition, background-color $ele-transition);
-    box-sizing: border-box;
     position: relative;
     z-index: 0;
 
-    & > .el-tree-node__expand-icon {
-      flex-shrink: 0;
-      width: auto;
-      height: auto;
-      transform: none;
-      box-sizing: border-box;
-      margin: eleVar('tree-select', 'expand-margin');
-      padding: eleVar('tree-select', 'expand-padding');
-      border-radius: eleVar('tree-select', 'expand-radius');
-      font-size: eleVar('tree-select', 'expand-size');
-      transition: background-color $ele-transition;
-      z-index: 4;
-
-      & > svg {
-        transition: transform 0.3s;
-      }
-
-      &.expanded > svg {
-        transform: rotate(90deg);
-      }
-
-      &:hover {
-        background: eleVar('tree-select', 'expand-hover-bg');
-      }
-
-      &.is-leaf {
-        pointer-events: none;
-      }
-    }
-
     .el-select-dropdown__item {
       height: auto;
-      line-height: eleVar('tree-select', 'item-line-height');
+      line-height: eleVar('tree', 'item-line-height');
       padding: 0;
       border-radius: 0;
       position: static;
 
       &::before {
         content: '';
-        border-radius: eleVar('tree-select', 'item-radius');
+        border-radius: eleVar('tree', 'item-radius');
         transition: background-color $ele-transition;
         position: absolute;
         top: 0;
@@ -98,16 +55,16 @@
   /* 选中 */
   .el-tree-node > .el-tree-node__content {
     .el-select-dropdown__item.selected {
-      color: eleVar('tree-select', 'item-active-color');
-      font-weight: eleVar('tree-select', 'item-active-weight');
+      color: eleVar('tree', 'item-active-color');
+      font-weight: eleVar('tree', 'item-active-weight');
 
       &::before {
-        background: eleVar('tree-select', 'item-active-bg');
+        background: eleVar('tree', 'item-active-bg');
       }
     }
 
     &:hover .el-select-dropdown__item.selected::before {
-      background: eleVar('tree-select', 'item-active-hover-bg');
+      background: eleVar('tree', 'item-active-hover-bg');
     }
   }
 

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

@@ -35,19 +35,14 @@ declare const _default: import("vue").DefineComponent<{
     visible: import("element-plus/es/utils/index").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/index").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    popperStyle: {
-        readonly type: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<(new (...args: any[]) => string | false | import("vue").CSSProperties | import("vue").StyleValue[]) | (() => import("vue").StyleValue) | ((new (...args: any[]) => string | false | import("vue").CSSProperties | import("vue").StyleValue[]) | (() => import("vue").StyleValue))[], unknown, unknown>>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
     zIndex: NumberConstructor;
     gpuAcceleration: import("element-plus/es/utils/index").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     showAfter: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     hideAfter: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 200, boolean>;
     autoClose: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
-    popperClass: StringConstructor;
     className: StringConstructor;
+    popperClass: StringConstructor;
+    popperStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
 }, {
     tooltipRef: import("vue").Ref<ElTooltipInstance | undefined>;
     rootProps: import("vue").ComputedRef<Partial<import("element-plus").ElTooltipProps>>;
@@ -101,19 +96,14 @@ declare const _default: import("vue").DefineComponent<{
     visible: import("element-plus/es/utils/index").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/index").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    popperStyle: {
-        readonly type: import("vue").PropType<import("element-plus/es/utils/index").EpPropMergeType<(new (...args: any[]) => string | false | import("vue").CSSProperties | import("vue").StyleValue[]) | (() => import("vue").StyleValue) | ((new (...args: any[]) => string | false | import("vue").CSSProperties | import("vue").StyleValue[]) | (() => import("vue").StyleValue))[], unknown, unknown>>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
     zIndex: NumberConstructor;
     gpuAcceleration: import("element-plus/es/utils/index").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     showAfter: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     hideAfter: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 200, boolean>;
     autoClose: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
-    popperClass: StringConstructor;
     className: StringConstructor;
+    popperClass: StringConstructor;
+    popperStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
 }>> & {
     "onUpdate:visible"?: ((visible: boolean) => any) | undefined;
     onOpen?: ((e: any) => any) | undefined;

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

@@ -43,19 +43,14 @@ export declare const tooltipProps: {
     visible: import("element-plus/es/utils/index").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/index").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    popperStyle: {
-        readonly type: PropType<import("element-plus/es/utils/index").EpPropMergeType<(new (...args: any[]) => string | false | import("vue").CSSProperties | import("vue").StyleValue[]) | (() => import("vue").StyleValue) | ((new (...args: any[]) => string | false | import("vue").CSSProperties | import("vue").StyleValue[]) | (() => import("vue").StyleValue))[], unknown, unknown>>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    };
     zIndex: NumberConstructor;
     gpuAcceleration: import("element-plus/es/utils/index").EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     showAfter: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
     hideAfter: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 200, boolean>;
     autoClose: import("element-plus/es/utils/index").EpPropFinalized<NumberConstructor, unknown, unknown, 0, boolean>;
-    popperClass: StringConstructor;
     className: StringConstructor;
+    popperClass: StringConstructor;
+    popperStyle: PropType<Partial<import("vue").CSSProperties>>;
 };
 export type TooltipProps = ExtractPropTypes<typeof tooltipProps>;
 /**

package/lib/ele-tooltip/props.js

@@ -14,8 +14,9 @@ const normalizeProps = core.omit(elementPlus.useTooltipProps, [
   "onContextmenu"
 ]);
 const tooltipProps = {
-  popperClass: String,
   className: String,
+  popperClass: String,
+  popperStyle: Object,
   ...normalizeProps,
   /** 自定义内容样式 */
   bodyStyle: Object,

package/lib/ele-tree-select/style/index.scss

@@ -5,82 +5,8 @@
 @include set-tree-select-var($ele);
 
 .ele-tree-select-popper {
-  .el-tree {
-    background: none;
-  }
-
   .el-vl__wrapper {
     padding: eleVar('tree-select', 'padding');
-    box-sizing: border-box;
-
-    & > .el-virtual-scrollbar {
-      margin: auto 0;
-    }
-  }
-
-  .el-tree-node {
-    box-sizing: border-box;
-    padding-bottom: eleVar('tree-select', 'item-margin');
-  }
-
-  .el-tree-node__content {
-    height: 100% !important;
-    padding: eleVar('tree-select', 'item-padding');
-    border-radius: eleVar('tree-select', 'item-radius');
-    transition: (color $ele-transition, background-color $ele-transition);
-    box-sizing: border-box;
-    position: relative;
-
-    & > .el-tree-node__expand-icon {
-      flex-shrink: 0;
-      width: auto;
-      height: auto;
-      transform: none;
-      box-sizing: border-box;
-      margin: eleVar('tree-select', 'expand-margin');
-      padding: eleVar('tree-select', 'expand-padding');
-      border-radius: eleVar('tree-select', 'expand-radius');
-      font-size: eleVar('tree-select', 'expand-size');
-      transition: background-color $ele-transition;
-      z-index: 4;
-
-      & > svg {
-        transition: transform 0.3s;
-      }
-
-      &.expanded > svg {
-        transform: rotate(90deg);
-      }
-
-      &:hover {
-        background: eleVar('tree-select', 'expand-hover-bg');
-      }
-    }
-
-    & > .el-checkbox {
-      flex-shrink: 0;
-    }
-
-    & > .el-tree-node__label {
-      flex: 1;
-      line-height: eleVar('tree-select', 'item-line-height');
-      text-overflow: ellipsis;
-      word-break: break-all;
-      white-space: nowrap;
-      overflow: hidden;
-    }
-  }
-
-  .el-tree--highlight-current .el-tree-node.is-current {
-    & > .el-tree-node__content {
-      color: eleVar('tree-select', 'item-active-color');
-      background: eleVar('tree-select', 'item-active-bg');
-      font-weight: eleVar('tree-select', 'item-active-weight');
-
-      &:hover {
-        background: eleVar('tree-select', 'item-active-hover-bg');
-      }
-    }
   }
 
   .el-tree-node__label.is-disabled {

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

@@ -1,7 +1,7 @@
 import type { Ref } from 'vue';
 import type { ElTableV2Instance, ElTableV2Props } from '../ele-app/types';
 import type { DataKey, DataItem, Column, Filter, OrderValue } from '../ele-data-table/types';
-import type { BodyColumns, HeaderRows, CellFilterChangeParams, SortBy, ScrollStrategy, ScrollPos, ColSize, TableTooltipProps } from './types';
+import type { BodyColumns, HeaderRows, CellFilterChangeParams, SortBy, ScrollStrategy, ScrollPos, ColSize } from './types';
 declare const _default: import("vue").DefineComponent<{
     rowHeight: NumberConstructor;
     stripe: {
@@ -47,7 +47,7 @@ declare const _default: import("vue").DefineComponent<{
     };
     maxHeight: (StringConstructor | NumberConstructor)[];
     fit: {
-        type: BooleanConstructor;
+        type: BooleanConstructor; /** 是否是树形数据 */
         default: boolean;
     };
     className: {
@@ -141,7 +141,7 @@ declare const _default: import("vue").DefineComponent<{
     expandedRowKeys: Ref<DataKey[]>;
     sortBy: Ref<SortBy | undefined>;
     filtered: Filter;
-    tableTooltipProps: TableTooltipProps;
+    tableTooltipProps: Partial<import("../ele-tooltip/props").TooltipProps>;
     treeHasChildrenName: import("vue").ComputedRef<string>;
     tableExpandCol: import("vue").ComputedRef<Partial<import("element-plus").Column<DataItem>> | undefined>;
     hasExpandCol: import("vue").ComputedRef<boolean>;
@@ -192,7 +192,7 @@ declare const _default: import("vue").DefineComponent<{
     setScrollTop: (top?: number) => void;
     setScrollLeft: (left?: number) => void;
     scrollToRow: (row: number, strategy: ScrollStrategy) => void;
-    hideTooltip: () => TableTooltipProps | void;
+    hideTooltip: () => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     select: (_selection: DataItem[], _row: DataItem) => boolean;
     selectAll: (_selection: DataItem[]) => boolean;
@@ -206,7 +206,7 @@ declare const _default: import("vue").DefineComponent<{
     rowContextmenu: (_row: DataItem, _column: Column, _e: MouseEvent) => boolean;
     rowDblclick: (_row: DataItem, _column: Column, _e: MouseEvent) => boolean;
     headerClick: (_column: Column, _e: MouseEvent) => boolean;
-    headerContextmenu: (_column: Column, _e: MouseEvent) => boolean;
+    headerContextmenu: (_column: Column, _e: MouseEvent) => boolean; /** 更新表格渲染 */
     sortChange: (_sorter: import("../ele-data-table/types").Sorter) => boolean;
     filterChange: (_filter: Filter) => boolean;
     currentChange: (_current?: DataItem | null | undefined, _old?: DataItem | null | undefined) => boolean;
@@ -259,7 +259,7 @@ declare const _default: import("vue").DefineComponent<{
     };
     maxHeight: (StringConstructor | NumberConstructor)[];
     fit: {
-        type: BooleanConstructor;
+        type: BooleanConstructor; /** 是否是树形数据 */
         default: boolean;
     };
     className: {

package/lib/ele-virtual-table/types/index.d.ts

@@ -1,7 +1,7 @@
 import type { VNode } from 'vue';
 import type { Column as TableV2Column, ExtractRowPropGetter, RowExpandHandler, SortBy, HeaderClassNameGetter, ExtractHeaderPropGetter } from 'element-plus/es/components/table-v2';
 import type { ScrollStrategy, ScrollPos } from 'element-plus/es/components/table-v2/src/composables/use-scrollbar';
-import type { ElTableV2Props, EleTooltipProps } from '../../ele-app/types';
+import type { ElTableV2Props } from '../../ele-app/types';
 import type { DataKey, DataItem, Column, FilterValue } from '../../ele-data-table/types';
 export { RowExpandHandler, ScrollStrategy, SortBy, ScrollPos };
 /**
@@ -159,7 +159,3 @@ export interface SumCol extends ColSize {
     /** 是否是第一个右侧固定列 */
     isFixedRightFirst?: boolean;
 }
-/**
- * 表格提示属性
- */
-export type TableTooltipProps = Pick<EleTooltipProps, 'placement' | 'trigger' | 'offset' | 'hideAfter' | 'content' | 'virtualRef' | 'virtualTriggering' | 'disabled' | 'visible' | 'teleported' | 'transition'>;

package/lib/style/themes/default.scss

@@ -749,21 +749,7 @@ $ele: map.deep-merge(
     'tree-select': (
       // 下拉树选择
       'padding': 6px 0,
-      'item-height': 32px,
-      'item-line-height': 20px,
-      'item-margin': 0,
-      'item-padding': 0 16px,
-      'item-radius': 0,
-      'item-active-color': elVar('color-primary'),
-      'item-active-weight': bold,
-      'item-active-bg': elVar('color-primary', 'light-9'),
-      'item-active-hover-bg': elVar('color-primary', 'light-8'),
-      'item-disabled-color': elVar('disabled', 'text-color'),
-      'expand-size': 12px,
-      'expand-padding': 4px,
-      'expand-margin': 0 2px 0 4px,
-      'expand-radius': elVar('border-radius', 'small'),
-      'expand-hover-bg': transparent
+      'item-disabled-color': elVar('disabled', 'text-color')
     ),
     'popper': (
       // 底层气泡
@@ -954,12 +940,12 @@ $ele: map.deep-merge(
       'sm-icon-width': 4.5px,
       'sm-icon-height': 7px,
       'sm-icon-left': 24.5%,
-      'lg-font-size': eleVar('checkbox', 'font-size'),
-      'lg-size': eleVar('checkbox', 'size'),
-      'lg-radius': eleVar('checkbox', 'radius'),
-      'lg-icon-width': eleVar('checkbox', 'icon-width'),
-      'lg-icon-height': eleVar('checkbox', 'icon-height'),
-      'lg-icon-left': eleVar('checkbox', 'icon-left')
+      'lg-font-size': elVar('font-size', 'base'),
+      'lg-size': 16px,
+      'lg-radius': elVar('border-radius', 'small'),
+      'lg-icon-width': 5.7142857142857135px,
+      'lg-icon-height': 9.142857142857142px,
+      'lg-icon-left': 21.5%
     ),
     'tag': (
       // 标签
@@ -1080,6 +1066,23 @@ $ele: map.deep-merge(
       'danger-close-hover-color': elVar('color-error'),
       'danger-close-hover-bg': transparent
     ),
+    'tree': (
+      // 树
+      'item-height': 30px,
+      'item-line-height': 16px,
+      'item-margin': 0,
+      'item-padding': 0 16px,
+      'item-radius': 0,
+      'item-active-color': elVar('color-primary'),
+      'item-active-weight': bold,
+      'item-active-bg': elVar('color-primary', 'light-9'),
+      'item-active-hover-bg': elVar('color-primary', 'light-8'),
+      'expand-size': 12px,
+      'expand-padding': 3px,
+      'expand-margin': 0 2px 0 4px,
+      'expand-radius': elVar('border-radius', 'small'),
+      'expand-hover-bg': transparent
+    ),
     'image-viewer': (
       // 图片预览
       'tool-bg': hsla(0, 0%, 28%, 0.6)

package/lib/style/themes/rounded.scss

@@ -249,6 +249,12 @@ $ele-rounded: map.deep-merge(
       'warning-close-hover-bg': elVar('color-warning', 'light-8'),
       'danger-close-hover-bg': elVar('color-error', 'light-8')
     ),
+    'tree': (
+      'item-margin': 2px,
+      'item-padding': 0 12px,
+      'item-radius': elVar('border-radius', 'small'),
+      'expand-hover-bg': hsla(0, 0%, 60%, 0.15)
+    ),
     'descriptions': (
       'radius': $radius-large
     ),

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "ele-admin-plus",
-  "version": "1.1.6-beta.3",
+  "version": "1.1.6-beta.4",
   "type": "module",
   "scripts": {
     "dev": "vite --host --config vite.global.ts",
     "dev:needed": "vite --host",
     "build": "esno scripts/build.ts",
     "ts2js": "esno scripts/ts2js.ts",
-    "lint:eslint": "eslint --cache --max-warnings 0  \"{src,components}/**/*.{vue,js,ts,tsx}\" --fix",
+    "lint:eslint": "eslint --cache --max-warnings 0  \"{src,components}/**/*.{vue,js,jsx,ts,tsx}\" --fix",
     "clean:cache": "rimraf node_modules/.cache/ && rimraf node_modules/.vite/",
     "clean:lib": "rimraf node_modules"
   },
@@ -42,7 +42,7 @@
     "element-plus": "^2.4.4",
     "eslint": "^8.56.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.0.1",
+    "eslint-plugin-prettier": "^5.1.0",
     "eslint-plugin-vue": "^9.19.2",
     "esno": "^4.0.0",
     "execa": "^8.0.1",
@@ -69,9 +69,9 @@
     "vue-router": "^4.2.5",
     "vue-tsc": "^1.8.25",
     "vuedraggable": "^4.1.0",
-    "xgplayer": "^3.0.10",
-    "xgplayer-hls": "^3.0.10",
-    "xgplayer-music": "^3.0.10",
+    "xgplayer": "^3.0.11",
+    "xgplayer-hls": "^3.0.11",
+    "xgplayer-music": "^3.0.11",
     "xlsx": "^0.18.5"
   },
   "main": "lib/index.js",
@@ -95,7 +95,8 @@
     "element",
     "element ui",
     "element plus",
-    "admin"
+    "admin",
+    "ele-admin"
   ],
   "description": "EleAdminPlus Library",
   "author": "eclouds@foxmail.com",