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

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

@@ -243,11 +243,20 @@
   z-index: 0;
 
   & > .el-tree-node__expand-icon {
-    width: eleVar('select', 'item-height');
+    width: auto;
     height: eleVar('select', 'item-height');
     box-sizing: border-box;
-    padding: 0;
+    padding: 0 4px 0 10px;
+    transform: none;
     margin: 0;
+
+    & > svg {
+      transition: transform 0.3s;
+    }
+
+    &.expanded > svg {
+      transform: rotate(90deg);
+    }
   }
 
   .el-select-dropdown__item {

package/lib/ele-app/types/components.d.ts

@@ -0,0 +1,32 @@
+import type { ComponentProps } from '../../ele-app/types';
+import type { TooltipProps } from '../../ele-tooltip/props';
+import type EleTooltip from "../../ele-tooltip/index";
+import type { PopoverProps } from '../../ele-popover/props';
+import type ElePopover from "../ele-popover/index";
+import type EleText from "../../ele-text/index";
+import type { DropdownProps } from '../../ele-dropdown/props';
+import type EleDropdown from "../../ele-dropdown/index";
+import type EleTabs from "../../ele-tabs/index";
+import type EleProTable from "../ele-pro-table/index";
+import type EleBasicSelect from "../ele-basic-select/index";
+import type EleDataTable from '../../ele-data-table/index';
+import type EleVirtualTable from "../../ele-virtual-table/index";
+export type { ComponentProps };
+/**
+ * 组件属性
+ */
+export type EleDropdownProps = ComponentProps<DropdownProps>;
+export type ElePopoverProps = Partial<PopoverProps>;
+export type EleTooltipProps = Partial<TooltipProps>;
+/**
+ * 组件实例
+ */
+export type EleBasicSelectInstance = InstanceType<typeof EleBasicSelect> | null;
+export type EleDataTableInstance = InstanceType<typeof EleDataTable>;
+export type EleDropdownInstance = InstanceType<typeof EleDropdown> | null;
+export type ElePopoverInstance = InstanceType<typeof ElePopover> | null;
+export type EleProTableInstance = InstanceType<typeof EleProTable> | null;
+export type EleTabsInstance = InstanceType<typeof EleTabs> | null;
+export type EleTextInstance = InstanceType<typeof EleText> | null;
+export type EleTooltipInstance = InstanceType<typeof EleTooltip> | null;
+export type EleVirtualTableInstance = InstanceType<typeof EleVirtualTable>;

package/lib/ele-app/types/index.d.ts

@@ -44,10 +44,10 @@ export type ElDropdownProps = ComponentProps<ExtractPropTypes<typeof dropdownPro
 export type ElDropdownItemProps = ComponentProps<ExtractPropTypes<typeof dropdownItemProps>>;
 export type ElInputProps = ComponentProps<InputProps>;
 export type ElTagProps = ComponentProps<TagProps>;
-export type ElPopoverProps = ComponentProps<PopoverProps>;
 export type ElAvatarProps = ComponentProps<AvatarProps>;
-export type ElTooltipProps = ComponentProps<TooltipProps>;
-export type ElPopconfirmProps = ComponentProps<PopconfirmProps>;
+export type ElTooltipProps = Partial<TooltipProps>;
+export type ElPopoverProps = Partial<PopoverProps>;
+export type ElPopconfirmProps = Partial<PopconfirmProps>;
 export type ElAlertProps = ComponentProps<AlertProps>;
 export type ElButtonProps = ComponentProps<ButtonProps>;
 export type ElCardProps = ComponentProps<CardProps>;

package/lib/ele-basic-select/index.d.ts

@@ -1,3 +1,4 @@
+import type { EleTooltipInstance } from '../ele-app/types/components';
 import type { SelectedItem } from './types';
 declare const _default: import("vue").DefineComponent<{
     value: import("vue").PropType<import("./types").SelectValue>;
@@ -15,14 +16,14 @@ declare const _default: import("vue").DefineComponent<{
     visible: BooleanConstructor;
     teleported: BooleanConstructor;
     persistent: BooleanConstructor;
-    automaticDropdown: BooleanConstructor;
+    automaticDropdown: BooleanConstructor; /** 是否未选中 */
     tagType: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "" | "success" | "warning" | "info" | "danger", unknown> | undefined>;
     placement: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, import("element-plus").Placement, unknown> | undefined>;
     popperWidth: (StringConstructor | NumberConstructor)[];
     popperOptions: import("vue").PropType<Partial<import("element-plus").Options> | undefined>;
     popperClass: StringConstructor;
 }, {
-    tooltipRef: EleTooltipInstance;
+    tooltipRef: import("vue").Ref<EleTooltipInstance>;
     isDisabled: import("vue").ComputedRef<boolean>;
     closeEnable: import("vue").ComputedRef<boolean>;
     inputPlaceholder: import("vue").ComputedRef<string | undefined>;
@@ -57,24 +58,24 @@ declare const _default: import("vue").DefineComponent<{
     visible: BooleanConstructor;
     teleported: BooleanConstructor;
     persistent: BooleanConstructor;
-    automaticDropdown: BooleanConstructor;
+    automaticDropdown: BooleanConstructor; /** 是否未选中 */
     tagType: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "" | "success" | "warning" | "info" | "danger", unknown> | undefined>;
     placement: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, import("element-plus").Placement, unknown> | undefined>;
     popperWidth: (StringConstructor | NumberConstructor)[];
     popperOptions: import("vue").PropType<Partial<import("element-plus").Options> | undefined>;
     popperClass: StringConstructor;
 }>> & {
-    "onUpdate:visible"?: ((_visible: boolean) => any) | undefined;
     onFocus?: ((_e: FocusEvent) => any) | undefined;
     onBlur?: ((_e: FocusEvent) => any) | undefined;
+    "onUpdate:visible"?: ((_visible: boolean) => any) | undefined;
     onClear?: (() => any) | undefined;
     onRemoveTag?: ((_item: SelectedItem) => any) | undefined;
 }, {
     disabled: boolean;
     teleported: boolean;
     clearable: boolean;
-    visible: boolean;
     persistent: boolean;
+    visible: boolean;
     multiple: boolean;
     automaticDropdown: boolean;
 }, {}>;

package/lib/ele-basic-select/index.js

@@ -141,6 +141,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     popperClass: _ctx.popperClass,
     popperOptions: _ctx.popperOptions,
     gpuAcceleration: false,
+    persistent: true,
     effect: "light",
     isPopover: true,
     "onUpdate:visible": _ctx.updateVisible

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

@@ -1,6 +1,7 @@
 declare const _default: import("vue").DefineComponent<{
     header: StringConstructor;
     bodyStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    bodyClass: StringConstructor;
     shadow: {
         type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "hover" | "always" | "never", unknown> | undefined>;
         default: string;
@@ -12,6 +13,7 @@ declare const _default: import("vue").DefineComponent<{
 }, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     header: StringConstructor;
     bodyStyle: import("vue").PropType<Partial<import("vue").CSSProperties>>;
+    bodyClass: StringConstructor;
     shadow: {
         type: import("vue").PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "hover" | "always" | "never", unknown> | undefined>;
         default: string;

package/lib/ele-card/index.js

@@ -18,6 +18,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_ElCard = vue.resolveComponent("ElCard");
   return vue.openBlock(), vue.createBlock(_component_ElCard, {
     bodyStyle: _ctx.bodyStyle,
+    bodyClass: _ctx.bodyClass,
     shadow: _ctx.shadow,
     class: vue.normalizeClass([
       "ele-card",
@@ -50,7 +51,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       ]),
       key: "0"
     } : void 0
-  ]), 1032, ["bodyStyle", "shadow", "class"]);
+  ]), 1032, ["bodyStyle", "bodyClass", "shadow", "class"]);
 }
 const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 module.exports = index;

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

@@ -7,6 +7,8 @@ export declare const cardProps: {
     header: StringConstructor;
     /** 主体样式 */
     bodyStyle: PropType<Partial<import("vue").CSSProperties>>;
+    /** 主体类名 */
+    bodyClass: StringConstructor;
     /** 阴影 */
     shadow: {
         type: PropType<import("element-plus/es/utils").EpPropMergeType<StringConstructor, "hover" | "always" | "never", unknown> | undefined>;

package/lib/ele-card/props.js

@@ -5,6 +5,8 @@ const cardProps = {
   header: String,
   /** 主体样式 */
   bodyStyle: Object,
+  /** 主体类名 */
+  bodyClass: String,
   /** 阴影 */
   shadow: {
     type: String,

package/lib/ele-config-provider/receiver.js

@@ -1,2 +1,2 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const h=require("vue"),P=require("./props"),I=require("../lang/zh_CN"),Y="EleAdminPlus \u4E3A\u5546\u4E1A\u4EA7\u54C1\u9700\u8981\u6388\u6743\u4F7F\u7528, \u8BF7\u524D\u5F80\u5B98\u7F51 www.eleadmin.com \u8D2D\u4E70\u6388\u6743",_="BAFEDIHGLKJONMRQPUTSXWVaZYdcbgfejihmlkponsrqvutyxw10z432765+98/C",N=1691081914,R="1.1";function S(){return h.inject(P.PROVIDE_KEY,{})}function U(t){const o=S();return h.computed(()=>o[t]??{})}function K(t,o){const u=S();return{lang:h.computed(()=>{const r=u.locale??I;return t?Object.assign({},r[t]??{},o==null?void 0:o.locale):r}),globalConfig:u}}function x(){const t=S(),o=h.computed(()=>t.license),u=h.ref(!1),s=(r,p,n,l)=>{const e=[new Array(60).join("*")];if(e.push(Y),o.value?!r&&p==null&&!n&&e.push("\u8BF7\u4F7F\u7528\u6B63\u786E\u683C\u5F0F\u7684\u6388\u6743\u7801;"):e.push("\u8BF7\u5148\u914D\u7F6E\u81EA\u5DF1\u7684\u6388\u6743\u7801;"),r&&e.push(`\u6388\u6743\u7248\u672C\u53F7\u4E0D\u5339\u914D, \u8BF7\u4F7F\u7528: ${r}, \u5F53\u524D\u7248\u672C: ${R};`),typeof p=="number"){const a=new Date(p*1e3).toLocaleString();e.push(`\u6388\u6743\u5DF2\u5931\u6548, \u5230\u671F\u65F6\u95F4: ${a};`)}n&&e.push(`\u57DF\u540D\u4E0D\u5339\u914D, \u8BF7\u90E8\u7F72\u5728: ${n} \u4E0B, \u5F53\u524D\u57DF\u540D: ${l};`),e.push(new Array(60).join("*")),console.error(e.join(`
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const h=require("vue"),P=require("./props"),I=require("../lang/zh_CN"),Y="EleAdminPlus \u4E3A\u5546\u4E1A\u4EA7\u54C1\u9700\u8981\u6388\u6743\u4F7F\u7528, \u8BF7\u524D\u5F80\u5B98\u7F51 www.eleadmin.com \u8D2D\u4E70\u6388\u6743",_="BAFEDIHGLKJONMRQPUTSXWVaZYdcbgfejihmlkponsrqvutyxw10z432765+98/C",N=1698336417,R="1.1";function S(){return h.inject(P.PROVIDE_KEY,{})}function U(t){const o=S();return h.computed(()=>o[t]??{})}function K(t,o){const u=S();return{lang:h.computed(()=>{const r=u.locale??I;return t?Object.assign({},r[t]??{},o==null?void 0:o.locale):r}),globalConfig:u}}function x(){const t=S(),o=h.computed(()=>t.license),u=h.ref(!1),s=(r,p,n,l)=>{const e=[new Array(60).join("*")];if(e.push(Y),o.value?!r&&p==null&&!n&&e.push("\u8BF7\u4F7F\u7528\u6B63\u786E\u683C\u5F0F\u7684\u6388\u6743\u7801;"):e.push("\u8BF7\u5148\u914D\u7F6E\u81EA\u5DF1\u7684\u6388\u6743\u7801;"),r&&e.push(`\u6388\u6743\u7248\u672C\u53F7\u4E0D\u5339\u914D, \u8BF7\u4F7F\u7528: ${r}, \u5F53\u524D\u7248\u672C: ${R};`),typeof p=="number"){const a=new Date(p*1e3).toLocaleString();e.push(`\u6388\u6743\u5DF2\u5931\u6548, \u5230\u671F\u65F6\u95F4: ${a};`)}n&&e.push(`\u57DF\u540D\u4E0D\u5339\u914D, \u8BF7\u90E8\u7F72\u5728: ${n} \u4E0B, \u5F53\u524D\u57DF\u540D: ${l};`),e.push(new Array(60).join("*")),console.error(e.join(`
 `)),u.value=!1};return h.watch(o,r=>{var p;if(typeof r!="string"||!r)return s();try{const n=JSON.parse(y(r));if(n.product!=="EleAdminPlus")return s();const{version:l,expiration:e,domain:a}=n;if(l&&l!==R)return s(l);if(e&&e<N)return s(void 0,e);if(a){const d=(p=window==null?void 0:window.location)==null?void 0:p.hostname;if(!d)return s(void 0,void 0,a,"");if(d!=="localhost"&&d!=="127.0.0.1"){const E=a.split("."),m=d.split(".");for(let g=E.length-1;g>=0;g--)if(E[g]!==m[g])return s(void 0,void 0,a,d);if(m.length>E.length&&m[m.length-E.length-1]!=="www")return s(void 0,void 0,a,d)}}}catch(n){return console.error(n),s()}u.value=!0},{immediate:!0}),{authenticated:u,globalConfig:t}}function y(t){const o=(F,O,f)=>{const i=((c,v)=>{const T=c.length-v;if(T<=0)return c;const L=new Array(c.length);for(let D=0;D<c.length;D++)D<v?L[D]=c[T+D]:L[D]=c[D-v];return L})(F.split(""),f).join(""),A=[];let C=0;for(;C<i.length;){let c=C+O;c>i.length&&(c=i.length);const v=i.substring(C,c);A.push(v.split("").reverse().join("")),C=c}return A.join("")},u=t.indexOf("="),s=u===-1?t:t.substring(0,u),r=u===-1?"":t.substring(u),n=(o(s,12,3)+r).replace(/[^A-Za-z0-9\+\/\=]/g,""),l=o(_,3,1)+"=";let e="",a,d,E,m,g,w,j,b=0;for(;b<n.length;)m=l.indexOf(n.charAt(b++)),g=l.indexOf(n.charAt(b++)),w=l.indexOf(n.charAt(b++)),j=l.indexOf(n.charAt(b++)),a=m<<2|g>>4,d=(g&15)<<4|w>>2,E=(w&3)<<6|j,e=e+String.fromCharCode(a),w!=64&&(e=e+String.fromCharCode(d)),j!=64&&(e=e+String.fromCharCode(E));return e=(F=>{let O="",f=0,i=0,A=0,C=0;for(;f<F.length;)i=F.charCodeAt(f),i<128?(O+=String.fromCharCode(i),f++):i>191&&i<224?(A=F.charCodeAt(f+1),O+=String.fromCharCode((i&31)<<6|A&63),f+=2):(A=F.charCodeAt(f+1),C=F.charCodeAt(f+2),O+=String.fromCharCode((i&15)<<12|(A&63)<<6|C&63),f+=3);return O})(e),e}function B(t){return h.inject(P.LAYOUT_KEY,t??h.ref({}))}function M(t){const o=B();return h.computed(()=>{var u;return t.responsive??((u=h.unref(o))==null?void 0:u.responsive)??!0})}Object.defineProperty(exports,"LAYOUT_KEY",{enumerable:!0,get:()=>P.LAYOUT_KEY});exports.UNAUTHORIZED_TIP=Y;exports.useGlobalProps=U;exports.useLayoutState=B;exports.useLicense=x;exports.useLocale=K;exports.useReceiver=S;exports.useResponsive=M;

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

@@ -41,7 +41,6 @@ declare const _default: import("vue").DefineComponent<{
         __epPropKey: true;
     };
     maxHeight: (StringConstructor | NumberConstructor)[];
-    width: (StringConstructor | NumberConstructor)[];
     fit: {
         type: BooleanConstructor;
         default: boolean;
@@ -50,6 +49,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>;
     data: {
@@ -61,7 +61,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>;
     showHeader: {
         type: BooleanConstructor;
         default: boolean;
@@ -84,7 +84,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;
@@ -196,7 +196,6 @@ declare const _default: import("vue").DefineComponent<{
         __epPropKey: true;
     };
     maxHeight: (StringConstructor | NumberConstructor)[];
-    width: (StringConstructor | NumberConstructor)[];
     fit: {
         type: BooleanConstructor;
         default: boolean;
@@ -205,6 +204,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>;
     data: {
@@ -216,7 +216,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>;
     showHeader: {
         type: BooleanConstructor;
         default: boolean;
@@ -239,7 +239,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-data-table/props.d.ts

@@ -43,7 +43,7 @@ declare const normalizeProps: Omit<{
     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;
@@ -90,7 +90,7 @@ declare const normalizeProps: Omit<{
         default: boolean;
     };
     flexible: BooleanConstructor;
-    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>;
 }, "style">;
 /**
  * 属性
@@ -144,7 +144,6 @@ export declare const dataTableProps: {
         __epPropKey: true;
     };
     maxHeight: (StringConstructor | NumberConstructor)[];
-    width: (StringConstructor | NumberConstructor)[];
     fit: {
         type: BooleanConstructor;
         default: boolean;
@@ -153,6 +152,7 @@ export declare const dataTableProps: {
         type: StringConstructor;
         default: string;
     };
+    width: (StringConstructor | NumberConstructor)[];
     lazy: BooleanConstructor;
     rowKey: PropType<string | ((row: any) => string) | undefined>;
     data: {
@@ -164,7 +164,7 @@ export declare const dataTableProps: {
         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>;
     showHeader: {
         type: BooleanConstructor;
         default: boolean;
@@ -187,7 +187,7 @@ export declare const dataTableProps: {
     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-data-table/util.d.ts

@@ -50,105 +50,7 @@ export declare function mergeTooltipProps(props?: ShowOverflowTooltip, globalPro
  * @param tooltipEffect 溢出提示组件主题
  * @param tooltipOptions 溢出提示组件配置
  */
-export declare function getGlobalTooltipProps(showOverflowTooltip?: ShowOverflowTooltip, tooltipEffect?: TooltipEffect, tooltipOptions?: TooltipOptions): false | {
-    offset?: number | undefined;
-    effect: string | undefined;
-    placement?: import("element-plus/es/utils").EpPropMergeType<StringConstructor, import("element-plus").Placement, unknown> | undefined;
-    popperOptions?: Partial<import("element-plus").Options> | undefined;
-    popperClass?: import("element-plus/es/utils").EpPropMergeType<(new (...args: any[]) => string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | any[] | {
-        [x: string]: boolean;
-    })[])[])[])[])[])[])[])[])[])[]) | (() => string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | any[] | {
-        [x: string]: boolean;
-    })[])[])[])[])[])[])[])[])[])[]) | ((new (...args: any[]) => string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | any[] | {
-        [x: string]: boolean;
-    })[])[])[])[])[])[])[])[])[])[]) | (() => string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | {
-        [x: string]: boolean;
-    } | (string | any[] | {
-        [x: string]: boolean;
-    })[])[])[])[])[])[])[])[])[])[]))[], unknown, unknown> | undefined;
-    enterable?: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown> | undefined;
-    showAfter?: number | undefined;
-    hideAfter?: number | undefined;
-    showArrow?: import("element-plus/es/utils").EpPropMergeType<BooleanConstructor, unknown, unknown> | undefined;
-};
+export declare function getGlobalTooltipProps(showOverflowTooltip?: ShowOverflowTooltip, tooltipEffect?: TooltipEffect, tooltipOptions?: TooltipOptions): ShowOverflowTooltip;
 /**
  * 获取单元格提示组件属性
  * @param props 单元格提示组件属性
@@ -219,6 +121,11 @@ export declare function isDisableRow(row: DataItem, index: number, columns?: Col
  * @param columns 列配置
  */
 export declare function isReserveSelected(columns?: Columns): boolean;
+/**
+ * 用于根据列的固定值排序
+ * @param fixed 固定值
+ */
+export declare function getColFixedNumber(fixed?: boolean | string): 0 | 1 | 2;
 /**
  * 表格状态数据
  */

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

@@ -230,6 +230,15 @@ function isReserveSelected(columns) {
   });
   return isReserve;
 }
+function getColFixedNumber(fixed) {
+  if (fixed === true || fixed === "left") {
+    return 0;
+  }
+  if (fixed === "right") {
+    return 2;
+  }
+  return 1;
+}
 function useState(defaultSort) {
   const state = { sorter: defaultSort };
   const getSorter = () => {
@@ -396,6 +405,7 @@ function useEmits(emit) {
   };
 }
 exports.getBodyRowClass = getBodyRowClass;
+exports.getColFixedNumber = getColFixedNumber;
 exports.getCols = getCols;
 exports.getEmptyProps = getEmptyProps;
 exports.getEmptySlot = getEmptySlot;

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

@@ -67,6 +67,7 @@
   /* 水平菜单 */
   &.el-menu--horizontal {
     padding: eleVar('menu-horizontal', 'padding');
+    height: auto;
 
     & > .el-menu-item,
     & > .el-sub-menu > .el-sub-menu__title {