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

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

@@ -21,10 +21,11 @@ declare const _default: import('vue').DefineComponent<{
     teleported: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     disabled: BooleanConstructor;
     offset: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, undefined, boolean>;
-    popperOptions: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => Partial<import('element-plus').Options>) | (() => Partial<import('element-plus').Options>) | ((new (...args: any[]) => Partial<import('element-plus').Options>) | (() => Partial<import('element-plus').Options>))[], unknown, unknown, () => {}, boolean>;
+    persistent: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     width: import('element-plus/es/utils/index').EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, 150, boolean>;
     visible: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => (boolean | null) & {}) | (() => boolean | null) | ((new (...args: any[]) => (boolean | null) & {}) | (() => boolean | null))[], unknown, unknown, null, boolean>;
     trigger: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType> & {}) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>) | ((new (...args: any[]) => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType> & {}) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>))[], unknown, unknown, "hover", boolean>;
+    popperOptions: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => Partial<import('element-plus').Options>) | (() => Partial<import('element-plus').Options>) | ((new (...args: any[]) => Partial<import('element-plus').Options>) | (() => Partial<import('element-plus').Options>))[], unknown, unknown, () => {}, boolean>;
     tabindex: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => (string | number) & {}) | (() => string | number) | ((new (...args: any[]) => (string | number) & {}) | (() => string | number))[], unknown, unknown, 0, boolean>;
     content: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
     enterable: {
@@ -38,7 +39,6 @@ declare const _default: import('vue').DefineComponent<{
     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>;
     showArrow: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    persistent: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     popperStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     popperClass: StringConstructor;
     ariaLabel: StringConstructor;
@@ -51,7 +51,6 @@ declare const _default: import('vue').DefineComponent<{
     };
     zIndex: NumberConstructor;
     triggerKeys: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string[]) | (() => string[]) | ((new (...args: any[]) => string[]) | (() => string[]))[], unknown, unknown, () => string[], boolean>;
-    gpuAcceleration: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     arrowOffset: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 5, boolean>;
     virtualRef: {
         readonly type: import('vue').PropType<import('element-plus').Measurable>;
@@ -61,8 +60,8 @@ declare const _default: import('vue').DefineComponent<{
     };
     virtualTriggering: BooleanConstructor;
     className: StringConstructor;
+    gpuAcceleration: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     arrowBg: StringConstructor;
-    isPopover: BooleanConstructor;
 }, {
     tooltipRef: import('vue').Ref<EleTooltipInstance>;
     tooltipProps: import('vue').ComputedRef<Partial<import('../ele-tooltip/props').TooltipProps>>;
@@ -99,10 +98,11 @@ declare const _default: import('vue').DefineComponent<{
     teleported: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     disabled: BooleanConstructor;
     offset: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, undefined, boolean>;
-    popperOptions: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => Partial<import('element-plus').Options>) | (() => Partial<import('element-plus').Options>) | ((new (...args: any[]) => Partial<import('element-plus').Options>) | (() => Partial<import('element-plus').Options>))[], unknown, unknown, () => {}, boolean>;
+    persistent: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     width: import('element-plus/es/utils/index').EpPropFinalized<readonly [StringConstructor, NumberConstructor], unknown, unknown, 150, boolean>;
     visible: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => (boolean | null) & {}) | (() => boolean | null) | ((new (...args: any[]) => (boolean | null) & {}) | (() => boolean | null))[], unknown, unknown, null, boolean>;
     trigger: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType> & {}) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>) | ((new (...args: any[]) => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType> & {}) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>))[], unknown, unknown, "hover", boolean>;
+    popperOptions: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => Partial<import('element-plus').Options>) | (() => Partial<import('element-plus').Options>) | ((new (...args: any[]) => Partial<import('element-plus').Options>) | (() => Partial<import('element-plus').Options>))[], unknown, unknown, () => {}, boolean>;
     tabindex: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => (string | number) & {}) | (() => string | number) | ((new (...args: any[]) => (string | number) & {}) | (() => string | number))[], unknown, unknown, 0, boolean>;
     content: import('element-plus/es/utils/index').EpPropFinalized<StringConstructor, unknown, unknown, "", boolean>;
     enterable: {
@@ -116,7 +116,6 @@ declare const _default: import('vue').DefineComponent<{
     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>;
     showArrow: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
-    persistent: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     popperStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     popperClass: StringConstructor;
     ariaLabel: StringConstructor;
@@ -129,7 +128,6 @@ declare const _default: import('vue').DefineComponent<{
     };
     zIndex: NumberConstructor;
     triggerKeys: import('element-plus/es/utils/index').EpPropFinalized<(new (...args: any[]) => string[]) | (() => string[]) | ((new (...args: any[]) => string[]) | (() => string[]))[], unknown, unknown, () => string[], boolean>;
-    gpuAcceleration: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     arrowOffset: import('element-plus/es/utils/index').EpPropFinalized<NumberConstructor, unknown, unknown, 5, boolean>;
     virtualRef: {
         readonly type: import('vue').PropType<import('element-plus').Measurable>;
@@ -139,24 +137,25 @@ declare const _default: import('vue').DefineComponent<{
     };
     virtualTriggering: BooleanConstructor;
     className: StringConstructor;
+    gpuAcceleration: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     arrowBg: StringConstructor;
-    isPopover: BooleanConstructor;
 }>> & {
     "onUpdate:visible"?: ((value: boolean) => any) | undefined;
-    "onBefore-enter"?: (() => any) | undefined;
-    "onBefore-leave"?: (() => any) | undefined;
     "onAfter-enter"?: (() => any) | undefined;
     "onAfter-leave"?: (() => any) | undefined;
+    "onBefore-enter"?: (() => any) | undefined;
+    "onBefore-leave"?: (() => any) | undefined;
 }, {
     effect: string;
     placement: import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement) | ((new (...args: any[]) => import('element-plus').Placement & {}) | (() => import('element-plus').Placement))[], unknown, unknown>;
     teleported: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
     disabled: boolean;
     offset: number;
-    popperOptions: Partial<import('element-plus').Options>;
+    persistent: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
     width: import('element-plus/es/utils/index').EpPropMergeType<readonly [StringConstructor, NumberConstructor], unknown, unknown>;
     visible: import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (boolean | null) & {}) | (() => boolean | null) | ((new (...args: any[]) => (boolean | null) & {}) | (() => boolean | null))[], unknown, unknown>;
     trigger: import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType> & {}) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>) | ((new (...args: any[]) => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType> & {}) | (() => import('element-plus/es/utils/typescript').Arrayable<import('element-plus').TooltipTriggerType>))[], unknown, unknown>;
+    popperOptions: Partial<import('element-plus').Options>;
     tabindex: import('element-plus/es/utils/index').EpPropMergeType<(new (...args: any[]) => (string | number) & {}) | (() => string | number) | ((new (...args: any[]) => (string | number) & {}) | (() => string | number))[], unknown, unknown>;
     triggerKeys: string[];
     transition: string;
@@ -166,10 +165,8 @@ declare const _default: import('vue').DefineComponent<{
     hideAfter: number;
     autoClose: number;
     showArrow: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
-    persistent: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
-    gpuAcceleration: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
     arrowOffset: number;
     virtualTriggering: boolean;
-    isPopover: boolean;
+    gpuAcceleration: import('element-plus/es/utils/index').EpPropMergeType<BooleanConstructor, unknown, unknown>;
 }, {}>;
 export default _default;

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

@@ -70,7 +70,6 @@ export declare const popoverProps: {
     gpuAcceleration: import('element-plus/es/utils/index').EpPropFinalized<BooleanConstructor, unknown, unknown, true, boolean>;
     bg: StringConstructor;
     arrowBg: StringConstructor;
-    isPopover: BooleanConstructor;
 };
 export type PopoverProps = ExtractPropTypes<typeof popoverProps>;
 /**

package/es/ele-popover/props.js

@@ -3,7 +3,7 @@ import { omit } from "../utils/core";
 import { tooltipProps } from "../ele-tooltip/props";
 const normalizeProps = omit(popoverProps$1, ["onUpdate:visible"]);
 const popoverProps = {
-  ...omit(tooltipProps, ["rawContent"]),
+  ...omit(tooltipProps, ["rawContent", "isPopover"]),
   popperStyle: [String, Array, Object],
   popperClass: String,
   ...normalizeProps,

package/es/ele-printer/util.js

@@ -111,7 +111,7 @@ function doPrintOnFrame(opt, printId) {
 function usePrinter(done) {
   printIdNum++;
   const printId = printIdNum;
-  const [startPrintTimer] = useTimer(400);
+  const [startPrintTimer] = useTimer(500);
   const doPrint = (option, target) => {
     if (target === "_iframe") {
       doPrintOnFrame(option, printId);

package/es/ele-pro-layout/components/pro-iframe.d.ts

@@ -2,11 +2,11 @@ import { PropType } from 'vue';
 import { TabItem, IframeItem } from '../types';
 
 declare const _default: import('vue').DefineComponent<{
-    /** 是否支持内链缓存 */
+    /** 是否支持内嵌缓存 */
     keepAlive: BooleanConstructor;
-    /** 内链切换动画 */
+    /** 内嵌切换动画 */
     transitionName: StringConstructor;
-    /** 内链进入动画延迟时间 */
+    /** 内嵌进入动画延迟时间 */
     transitionDelay: NumberConstructor;
     /** 页签数据 */
     tabData: {
@@ -20,11 +20,11 @@ declare const _default: import('vue').DefineComponent<{
     data: import('vue').ComputedRef<IframeItem[]>;
     handleLeave: (delay?: number) => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
-    /** 是否支持内链缓存 */
+    /** 是否支持内嵌缓存 */
     keepAlive: BooleanConstructor;
-    /** 内链切换动画 */
+    /** 内嵌切换动画 */
     transitionName: StringConstructor;
-    /** 内链进入动画延迟时间 */
+    /** 内嵌进入动画延迟时间 */
     transitionDelay: NumberConstructor;
     /** 页签数据 */
     tabData: {

package/es/ele-pro-layout/components/pro-iframe.js

@@ -1,13 +1,14 @@
 import { defineComponent, computed, ref, watch, nextTick, openBlock, createElementBlock, Fragment, renderList, withDirectives, vShow, createCommentVNode, createBlock, TransitionGroup, withCtx } from "vue";
 import { useTimer } from "../../utils/hook";
+import { getIframeSrc } from "../util";
 const _sfc_main = defineComponent({
   name: "ProIframe",
   props: {
-    /** 是否支持内链缓存 */
+    /** 是否支持内嵌缓存 */
     keepAlive: Boolean,
-    /** 内链切换动画 */
+    /** 内嵌切换动画 */
     transitionName: String,
-    /** 内链进入动画延迟时间 */
+    /** 内嵌进入动画延迟时间 */
     transitionDelay: Number,
     /** 页签数据 */
     tabData: {
@@ -25,7 +26,8 @@ const _sfc_main = defineComponent({
         var _a, _b;
         const isAlive = ((_a = t.meta) == null ? void 0 : _a.keepAlive) !== false;
         if (t.key && ((_b = t.meta) == null ? void 0 : _b.iframe) && isAlive) {
-          list.push({ id: t.key, src: t.meta.iframe, refresh: t.refresh });
+          const src = getIframeSrc(t.fullPath, t.meta.iframe);
+          list.push({ id: t.key, src, refresh: t.refresh });
         }
       });
       return list.sort((a, b) => a.id === b.id ? 0 : a.id > b.id ? 1 : -1);

package/es/ele-pro-layout/index.d.ts

@@ -371,7 +371,6 @@ declare const _default: import('vue').DefineComponent<{
     "onUpdate:maximized"?: ((_maximized: boolean) => any) | undefined;
     onBodySizeChange?: ((_option: import('./types').BodySizeChangeOption) => any) | undefined;
 }, {
-    breadcrumb: boolean | EleBreadcrumbProps;
     uniqueOpened: boolean;
     collapse: boolean;
     ellipsis: boolean;
@@ -380,6 +379,7 @@ declare const _default: import('vue').DefineComponent<{
     transitionDelay: number;
     expanded: boolean;
     tabBar: TabBar;
+    breadcrumb: boolean | EleBreadcrumbProps;
     backTop: boolean | EleBacktopProps;
     sidebarStyle: import('./types').SidebarStyle;
     tabStyle: import('./types').TabStyle;

package/es/ele-pro-layout/index.js

@@ -643,7 +643,10 @@ const _sfc_main = defineComponent({
       }
       tabData.value = props.tabs.map((item) => {
         const m = findMenuByPath(item.path, menuData.value);
-        return { ...item, title: routeI18n(item.path, m) || item.title };
+        return {
+          ...item,
+          title: routeI18n(item.path, m, item) || item.title
+        };
       });
     };
     const updateLevelData = () => {
@@ -651,13 +654,19 @@ const _sfc_main = defineComponent({
         var _a;
         const t = findTabByPath(item.path, tabData.value);
         const m = findMenuByPath(item.path, menuData.value);
-        const title = (t == null ? void 0 : t.title) || ((_a = m == null ? void 0 : m.meta) == null ? void 0 : _a.title) || routeI18n(item.path, m);
+        const title = (t == null ? void 0 : t.title) || ((_a = m == null ? void 0 : m.meta) == null ? void 0 : _a.title) || routeI18n(item.path, m, t, item);
         return { ...item, title: title || item.title };
       });
     };
-    const routeI18n = (path, menu) => {
+    const routeI18n = (path, menu, tab, level) => {
       if (props.i18n && path) {
-        return props.i18n({ path, menu, locale: props.locale });
+        return props.i18n({
+          locale: props.locale,
+          path,
+          menu,
+          tab,
+          level
+        });
       }
     };
     watch(

package/es/ele-pro-layout/props.d.ts

@@ -112,11 +112,11 @@ export declare const proLayoutProps: {
     };
     /** 菜单点击事件前钩子 */
     beforeClick: PropType<BeforeClick>;
-    /** 是否支持内链缓存 */
+    /** 是否支持内嵌缓存 */
     keepAlive: BooleanConstructor;
-    /** 内链切换动画 */
+    /** 内嵌切换动画 */
     transitionName: StringConstructor;
-    /** 内链进入动画延迟时间 */
+    /** 内嵌进入动画延迟时间 */
     transitionDelay: {
         type: NumberConstructor;
         default: number;

package/es/ele-pro-layout/props.js

@@ -99,11 +99,11 @@ const proLayoutProps = {
   },
   /** 菜单点击事件前钩子 */
   beforeClick: Function,
-  /** 是否支持内链缓存 */
+  /** 是否支持内嵌缓存 */
   keepAlive: Boolean,
-  /** 内链切换动画 */
+  /** 内嵌切换动画 */
   transitionName: String,
-  /** 内链进入动画延迟时间 */
+  /** 内嵌进入动画延迟时间 */
   transitionDelay: {
     type: Number,
     default: 250

package/es/ele-pro-layout/types.d.ts

@@ -44,7 +44,7 @@ export interface MenuMeta extends Record<string, any> {
   layout?: boolean;
   /** 路由地址 */
   routePath?: string;
-  /** 内链地址, 内部属性 */
+  /** 内嵌地址, 内部属性 */
   iframe?: string;
 }
 
@@ -106,12 +106,16 @@ export interface LevelItem {
  * 菜单标题国际化方法参数
  */
 export interface MenuI18nOption {
+  /** 当前语言 */
+  locale?: string;
   /** 菜单地址 */
   path: string;
   /** 菜单数据 */
   menu?: MenuItem;
-  /** 当前语言 */
-  locale?: string;
+  /** 页签数据 */
+  tab?: TabItem;
+  /** 面包屑数据 */
+  level?: LevelItem;
 }
 
 /**
@@ -172,7 +176,7 @@ export type MenuItemTrigger = 'route' | 'click' | 'hover';
 export type BeforeClick = (item: EleMenuItemProps, e: MouseEvent) => boolean;
 
 /**
- * 内链数据
+ * 内嵌数据
  */
 export interface IframeItem {
   /** id */
@@ -202,7 +206,7 @@ export interface LayoutState {
  * 共享数据
  */
 export interface ProLayoutProvide {
-  /** 是否支持内链缓存 */
+  /** 是否支持内嵌缓存 */
   keepAlive?: boolean;
   /** 是否开启响应式 */
   responsive?: boolean;

package/es/ele-pro-layout/util.d.ts

@@ -62,6 +62,12 @@ export declare function getRouteTab(route: RouteLocationNormalizedLoaded, tabs:
  * @param childrenName 子级字段名称
  */
 export declare function getActiveChilds(menus: MenuItem[], active?: string, childrenName?: string): MenuItem[];
+/**
+ * 拼接内嵌地址
+ * @param routePath 路由地址含参数
+ * @param iframeUrl 内嵌地址
+ */
+export declare function getIframeSrc(routePath?: string, iframeUrl?: string): string;
 /**
  * 菜单数据转换
  * @param menus 菜单数据

package/es/ele-pro-layout/util.js

@@ -114,6 +114,17 @@ function getActiveChilds(menus, active, childrenName) {
   }
   return m[field] || [];
 }
+function getIframeSrc(routePath, iframeUrl) {
+  const [_path1, query1 = ""] = (routePath ?? "").split("?");
+  const [path2, query2 = ""] = (iframeUrl ?? "").split("?");
+  const params1 = new URLSearchParams(query1);
+  const params2 = new URLSearchParams(query2);
+  for (const [key, value] of params2.entries()) {
+    params1.append(key, value);
+  }
+  const newQuery = params1.toString();
+  return `${path2}${newQuery ? `?${newQuery}` : ""}`;
+}
 function getMenuItems(menus, link) {
   return mapTree(menus, (m) => {
     const { path, meta } = m;
@@ -147,6 +158,7 @@ export {
   findTabByKey,
   findTabByPath,
   getActiveChilds,
+  getIframeSrc,
   getMatchedComponents,
   getMatchedLevels,
   getMatchedMenus,

package/es/ele-pro-table/components/table-tools.d.ts

@@ -63,7 +63,7 @@ declare const _default: import('vue').DefineComponent<{
 }, {
     ownSlots: string[];
     SizeSlackOutlined: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
-    MenuOutlined: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
+    SizeMiddleOutlined: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
     SizeCompactOutlined: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
     lang: import('vue').ComputedRef<TableLocale>;
     toolExportRef: import('vue').Ref<import('vue').CreateComponentPublicInstance<Readonly<import('vue').ExtractPropTypes<{
@@ -110,12 +110,12 @@ declare const _default: import('vue').DefineComponent<{
         dataType: import('vue').Ref<import('../types').ExportDataType>;
         colItems: import('vue').Ref<{
             uid: string;
-            label?: string;
-            checked?: boolean;
-            fixed?: boolean | string;
+            label?: string | undefined;
+            checked?: boolean | undefined;
+            fixed?: (boolean | string) | undefined;
             children?: any[] | undefined;
-            type?: string;
-            width?: number | string;
+            type?: string | undefined;
+            width?: (number | string) | undefined;
         }[]>;
         isCheckAll: import('vue').Ref<boolean>;
         isIndeterminate: import('vue').Ref<boolean>;
@@ -224,12 +224,12 @@ declare const _default: import('vue').DefineComponent<{
         dataType: import('vue').Ref<import('../types').ExportDataType>;
         colItems: import('vue').Ref<{
             uid: string;
-            label?: string;
-            checked?: boolean;
-            fixed?: boolean | string;
+            label?: string | undefined;
+            checked?: boolean | undefined;
+            fixed?: (boolean | string) | undefined;
             children?: any[] | undefined;
-            type?: string;
-            width?: number | string;
+            type?: string | undefined;
+            width?: (number | string) | undefined;
         }[]>;
         isCheckAll: import('vue').Ref<boolean>;
         isIndeterminate: import('vue').Ref<boolean>;
@@ -297,12 +297,12 @@ declare const _default: import('vue').DefineComponent<{
         dataType: import('vue').Ref<import('../types').ExportDataType>;
         colItems: import('vue').Ref<{
             uid: string;
-            label?: string;
-            checked?: boolean;
-            fixed?: boolean | string;
+            label?: string | undefined;
+            checked?: boolean | undefined;
+            fixed?: (boolean | string) | undefined;
             children?: any[] | undefined;
-            type?: string;
-            width?: number | string;
+            type?: string | undefined;
+            width?: (number | string) | undefined;
         }[]>;
         isCheckAll: import('vue').Ref<boolean>;
         isIndeterminate: import('vue').Ref<boolean>;
@@ -412,12 +412,12 @@ declare const _default: import('vue').DefineComponent<{
         dataType: import('vue').Ref<import('../types').ExportDataType>;
         colItems: import('vue').Ref<{
             uid: string;
-            label?: string;
-            checked?: boolean;
-            fixed?: boolean | string;
+            label?: string | undefined;
+            checked?: boolean | undefined;
+            fixed?: (boolean | string) | undefined;
             children?: any[] | undefined;
-            type?: string;
-            width?: number | string;
+            type?: string | undefined;
+            width?: (number | string) | undefined;
         }[]>;
         isCheckAll: import('vue').Ref<boolean>;
         isIndeterminate: import('vue').Ref<boolean>;
@@ -447,7 +447,7 @@ declare const _default: import('vue').DefineComponent<{
     placement: import('vue').ComputedRef<"top" | "bottom">;
     reload: () => void;
     updateSize: (size: string) => void;
-    updateColumns: (columns: Columns, tableColumns: Columns) => void;
+    updateColumns: (columns: Columns, tableColumns: Columns, isReset: boolean) => void;
     toggleMaximized: () => void;
     openExportModal: () => void;
     openPrintModal: () => void;
@@ -456,7 +456,7 @@ declare const _default: import('vue').DefineComponent<{
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     reload: () => true;
     'update:size': (_size: TableSize) => true;
-    'update:columns': (_columns: Columns, _tableColumns: Columns) => true;
+    'update:columns': (_columns: Columns, _tableColumns: Columns, _isReset: boolean) => true;
     'update:maximized': (_maximized: boolean) => true;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 工具按钮布局 */
@@ -517,7 +517,7 @@ declare const _default: import('vue').DefineComponent<{
         required: true;
     };
 }>> & {
-    "onUpdate:columns"?: ((_columns: Columns, _tableColumns: Columns) => any) | undefined;
+    "onUpdate:columns"?: ((_columns: Columns, _tableColumns: Columns, _isReset: boolean) => any) | undefined;
     onReload?: (() => any) | undefined;
     "onUpdate:size"?: ((_size: "" | "small" | "default" | "large" | undefined) => any) | undefined;
     "onUpdate:maximized"?: ((_maximized: boolean) => any) | undefined;

package/es/ele-pro-table/components/table-tools.js

@@ -1,6 +1,6 @@
 import { defineComponent, ref, computed, resolveComponent, openBlock, createElementBlock, Fragment, createVNode, createSlots, renderList, withCtx, renderSlot, normalizeProps, guardReactiveProps, createBlock, createCommentVNode } from "vue";
 import { ElIcon } from "element-plus";
-import { ReloadOutlined, DownloadOutlined, PrinterOutlined, ColumnHeightOutlined, FullscreenOutlined, FullscreenExitOutlined, SizeSlackOutlined, MenuOutlined, SizeCompactOutlined } from "../../icons";
+import { ReloadOutlined, DownloadOutlined, PrinterOutlined, ColumnHeightOutlined, FullscreenOutlined, FullscreenExitOutlined, SizeSlackOutlined, SizeMiddleOutlined, SizeCompactOutlined } from "../../icons";
 import EleDropdown from "../../ele-dropdown/index";
 import { useLocale } from "../../ele-config-provider/receiver";
 import { getSizeCacheKey } from "../util";
@@ -87,7 +87,7 @@ const _sfc_main = defineComponent({
   emits: {
     reload: () => true,
     "update:size": (_size) => true,
-    "update:columns": (_columns, _tableColumns) => true,
+    "update:columns": (_columns, _tableColumns, _isReset) => true,
     "update:maximized": (_maximized) => true
   },
   setup(props, { emit }) {
@@ -104,8 +104,8 @@ const _sfc_main = defineComponent({
       }
       emit("update:size", size);
     };
-    const updateColumns = (columns, tableColumns) => {
-      emit("update:columns", columns, tableColumns);
+    const updateColumns = (columns, tableColumns, isReset) => {
+      emit("update:columns", columns, tableColumns, isReset);
     };
     const toggleMaximized = () => {
       emit("update:maximized", !props.maximized);
@@ -133,7 +133,7 @@ const _sfc_main = defineComponent({
     return {
       ownSlots,
       SizeSlackOutlined,
-      MenuOutlined,
+      SizeMiddleOutlined,
       SizeCompactOutlined,
       lang,
       toolExportRef,
@@ -296,8 +296,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                 {
                   title: _ctx.lang.sizeDefault,
                   command: "default",
-                  icon: _ctx.MenuOutlined,
-                  iconStyle: { transform: "scale(0.94)", transformOrigin: "left" }
+                  icon: _ctx.SizeMiddleOutlined
                 },
                 { title: _ctx.lang.sizeSmall, command: "small", icon: _ctx.SizeCompactOutlined }
               ],

package/es/ele-pro-table/components/tool-column.d.ts

@@ -23,12 +23,12 @@ declare const _default: import('vue').DefineComponent<{
     toolRef: import('vue').Ref<EleToolInstance>;
     colItems: import('vue').Ref<{
         uid: string;
-        label?: string;
-        checked?: boolean;
-        fixed?: boolean | string;
+        label?: string | undefined;
+        checked?: boolean | undefined;
+        fixed?: (boolean | string) | undefined;
         children?: any[] | undefined;
-        type?: string;
-        width?: number | string;
+        type?: string | undefined;
+        width?: (number | string) | undefined;
     }[]>;
     isCheckAll: import('vue').Ref<boolean>;
     isIndeterminate: import('vue').Ref<boolean>;
@@ -41,7 +41,7 @@ declare const _default: import('vue').DefineComponent<{
     handleFixedLeftTooltip: (el: HTMLElement) => void;
     handleFixedRightTooltip: (el: HTMLElement) => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-    'update:columns': (_columns: Columns, _tableColumns: Columns) => true;
+    'update:columns': (_columns: Columns, _tableColumns: Columns, _isReset: boolean) => true;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 提示位置 */
     placement: PropType<EleTooltipProps["placement"]>;
@@ -59,7 +59,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 列配置缓存本地的名称 */
     cacheKey: StringConstructor;
 }>> & {
-    "onUpdate:columns"?: ((_columns: Columns, _tableColumns: Columns) => any) | undefined;
+    "onUpdate:columns"?: ((_columns: Columns, _tableColumns: Columns, _isReset: boolean) => any) | undefined;
 }, {
     sortable: boolean;
     allowFixed: boolean;

package/es/ele-pro-table/components/tool-column.js

@@ -34,7 +34,7 @@ const _sfc_main = defineComponent({
     cacheKey: String
   },
   emits: {
-    "update:columns": (_columns, _tableColumns) => true
+    "update:columns": (_columns, _tableColumns, _isReset) => true
   },
   setup(props, { emit }) {
     const toolRef = ref(null);
@@ -52,7 +52,7 @@ const _sfc_main = defineComponent({
       isCheckAll.value = checkAll;
       isIndeterminate.value = indeterminate;
     };
-    const updateColumns = () => {
+    const updateColumns = (isReset) => {
       const colsWidth = getCacheColsWidth(props.cacheKey);
       const columns = getCheckedColumns(
         props.columns,
@@ -72,7 +72,7 @@ const _sfc_main = defineComponent({
         true,
         colsWidth
       );
-      emit("update:columns", columns, tableColumns);
+      emit("update:columns", columns, tableColumns, !!isReset);
     };
     const cacheSettingCols = () => {
       if (props.cacheKey) {
@@ -163,7 +163,7 @@ const _sfc_main = defineComponent({
     const handleReset = () => {
       cleanSettingCols();
       initColItems();
-      updateColumns();
+      updateColumns(true);
     };
     watch(
       [() => props.columns, () => props.locale],

package/es/ele-pro-table/components/tool-export.d.ts

@@ -68,12 +68,12 @@ declare const _default: import('vue').DefineComponent<{
     dataType: import('vue').Ref<ExportDataType>;
     colItems: import('vue').Ref<{
         uid: string;
-        label?: string;
-        checked?: boolean;
-        fixed?: boolean | string;
+        label?: string | undefined;
+        checked?: boolean | undefined;
+        fixed?: (boolean | string) | undefined;
         children?: any[] | undefined;
-        type?: string;
-        width?: number | string;
+        type?: string | undefined;
+        width?: (number | string) | undefined;
     }[]>;
     isCheckAll: import('vue').Ref<boolean>;
     isIndeterminate: import('vue').Ref<boolean>;

package/es/ele-pro-table/components/tool-print-body-cell.js

@@ -23,7 +23,7 @@ const _sfc_main = defineComponent({
       const { text, row, column, index: $index } = props.col;
       const params = [{ row, column, $index }];
       const slotName = column ? column.printSlot || column.slot : void 0;
-      if (column && !["expand", "selection", "index"].includes(column.type || "") && slotName && typeof slots[slotName] === "function") {
+      if (column && "expand" !== column.type && slotName && typeof slots[slotName] === "function") {
         return { render: slots[slotName], params };
       }
       return { render: () => text, params };