ele-admin-plus 1.3.0 → 1.4.0-beta.1

package/es/ele-pro-form-builder/types.d.ts

@@ -1,17 +1,17 @@
-import type { ComponentProps, UserComponent } from '../ele-app/types';
-import type { ProFormItemKey, ProFormItemProps } from '../ele-pro-form/types';
-import type { ProFormProps } from '../ele-pro-form/props';
+import type { UserComponent, StyleValue } from '../ele-app/types';
+import type { EleProFormProps } from '../ele-app/plus';
+import type {
+  ProFormItemKey,
+  ProFormItemProps,
+  ScreenSize
+} from '../ele-pro-form/types';
 import type { TreeTableColumn } from '../ele-tree-table/types';
-
-/**
- * 表单配置模板
- */
-export type TemplateFormConfig = ComponentProps<ProFormProps>;
+export type TemplateFormConfig = EleProFormProps;
 
 /**
  * 表单除表单项外的配置数据
  */
-export type TemplateFormProps = Omit<TemplateFormConfig, 'items'>;
+export type TemplateFormProps = Omit<EleProFormProps, 'items'>;
 
 /**
  * 表单模板库模板
@@ -22,7 +22,7 @@ export interface TemplateItem {
   /** 模板缩略图 */
   cover?: UserComponent;
   /** 模板数据 */
-  config: TemplateFormConfig;
+  config: EleProFormProps;
 }
 
 /**
@@ -51,6 +51,8 @@ export interface ComponentItem {
   configForm?: ProFormItemProps[];
   /** 生成 ElForm 代码时组件名称 */
   componentName: string;
+  /** 生成代码时组件引入语句 */
+  componentImport?: string;
 }
 
 /**
@@ -66,7 +68,12 @@ export interface ComponentGroup {
 /**
  * 顶栏右侧操作按钮名称
  */
-export type HeaderRightToolName = 'import' | 'export' | 'clear' | 'preview';
+export type HeaderRightToolName =
+  | 'import'
+  | 'export'
+  | 'clear'
+  | 'preview'
+  | 'code';
 
 /**
  * 添加表单项需要的数据
@@ -104,11 +111,6 @@ export interface UpdateItemsResult {
   updateItems: UpdateItemResult[];
 }
 
-/**
- * 屏幕尺寸
- */
-export type ScreenSize = 'pc' | 'pad' | 'phone';
-
 /**
  * 样式编辑数据
  */
@@ -170,3 +172,22 @@ export interface TableGridRow {
  * 表格跨行跨列处理时数据
  */
 export type TableGridData = TableGridRow[];
+
+/**
+ * 组件选择弹窗配置
+ */
+export interface ComponentPickerOption {
+  visible?: boolean;
+  addParentFormItemId?: ProFormItemKey;
+  editFormItemId?: ProFormItemKey;
+  editFormItemType?: string;
+}
+
+/**
+ * 屏幕尺寸数据
+ */
+export interface ScreenItem {
+  value: ScreenSize;
+  icon: UserComponent;
+  iconStyle?: StyleValue;
+}

package/es/ele-pro-form-builder/util.d.ts

@@ -1,21 +1,15 @@
 import { ProFormItemProps } from '../ele-pro-form/types';
-import { TemplateFormProps } from './types';
+import { TemplateFormProps, HeaderRightToolName, ScreenItem } from './types';
 
 export { defaultComponentData } from './components/component-data';
+/**
+ * 默认表头工具栏右侧按钮布局
+ */
+export declare const defaultHeaderRightTools: HeaderRightToolName[];
 /**
  * 屏幕尺寸选项
  */
-export declare const screenItems: ({
-    value: string;
-    icon: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
-    iconStyle?: undefined;
-} | {
-    value: string;
-    icon: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
-    iconStyle: {
-        transform: string;
-    };
-})[];
+export declare const screenItems: ScreenItem[];
 /**
  * 表单属性设置的表单项配置
  */

package/es/ele-pro-form-builder/util.js

@@ -1,13 +1,20 @@
-import { DesktopOutlined, MobileOutlined } from "../icons";
+import { markRaw } from "vue";
+import { DesktopOutlined, MobileOutlined } from "../icons/index";
 import { defaultComponentData } from "./components/component-data";
+const defaultHeaderRightTools = [
+  "import",
+  "export",
+  "clear",
+  "preview"
+];
 const screenItems = [
-  { value: "pc", icon: DesktopOutlined },
+  { value: "pc", icon: markRaw(DesktopOutlined) },
   {
     value: "pad",
-    icon: MobileOutlined,
+    icon: markRaw(MobileOutlined),
     iconStyle: { transform: "rotate(270deg) scale(1.06)" }
   },
-  { value: "phone", icon: MobileOutlined }
+  { value: "phone", icon: markRaw(MobileOutlined) }
 ];
 const defaultConfigFormItems = [
   {
@@ -21,6 +28,9 @@ const defaultConfigFormItems = [
         { value: "small", label: "小型" }
       ],
       class: "ele-pro-form-builder-props-options-check-card"
+    },
+    itemProps: {
+      style: { marginTop: "8px" }
     }
   },
   {
@@ -177,5 +187,6 @@ export {
   defaultComponentData,
   defaultConfigFormItems,
   defaultConfigFormPresetProps,
+  defaultHeaderRightTools,
   screenItems
 };

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

@@ -1,4 +1,4 @@
-import { defineComponent, computed, ref, watch, openBlock, createElementBlock, Fragment, renderList, withDirectives, vShow, createCommentVNode, createBlock, TransitionGroup, withCtx, nextTick } from "vue";
+import { defineComponent, computed, ref, watch, createElementBlock, openBlock, createBlock, Fragment, renderList, withDirectives, createCommentVNode, vShow, TransitionGroup, withCtx, nextTick } from "vue";
 import { useTimer } from "../../utils/hook";
 import { getIframeSrc } from "../util";
 const _hoisted_1 = { class: "ele-admin-iframe-wrap" };

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

@@ -36,50 +36,6 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     };
     menus: import('vue').PropType<MenuItem[] | null>;
     tabs: import('vue').PropType<TabItem[] | null>;
-    collapse: BooleanConstructor;
-    compact: BooleanConstructor;
-    maximized: import('vue').PropType<Maximized>;
-    tabBar: {
-        type: import('vue').PropType<TabBar>;
-        default: boolean;
-    };
-    breadcrumb: {
-        type: import('vue').PropType<boolean | EleBreadcrumbProps>;
-        default: boolean;
-    };
-    backTop: {
-        type: import('vue').PropType<boolean | EleBacktopProps>;
-        default: boolean;
-    };
-    layout: import('vue').PropType<Layout>;
-    sidebarLayout: import('vue').PropType<SidebarLayout>;
-    headerStyle: import('vue').PropType<import('./types').HeaderStyle>;
-    sidebarStyle: {
-        type: import('vue').PropType<import('./types').SidebarStyle>;
-        default: string;
-    };
-    tabStyle: {
-        type: import('vue').PropType<import('./types').TabStyle>;
-        default: string;
-    };
-    fixedHeader: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    fixedSidebar: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    fixedBody: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    logoInHeader: BooleanConstructor;
-    fixedHome: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    homePath: StringConstructor;
     redirectPath: {
         type: StringConstructor;
         default: string;
@@ -113,46 +69,6 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     };
     locale: StringConstructor;
     i18n: import('vue').PropType<import('./types').MenuI18n>;
-    tabContextMenu: import('vue').PropType<boolean | import('../ele-app/plus').EleDropdownProps>;
-    tabContextMenus: import('vue').PropType<import('../ele-tabs/types').ContextMenus>;
-    tabSortable: BooleanConstructor;
-    headerTitleSlot: {
-        type: StringConstructor;
-        default: string;
-    };
-    headerIconSlot: {
-        type: StringConstructor;
-        default: string;
-    };
-    sidebarTitleSlot: {
-        type: StringConstructor;
-        default: string;
-    };
-    sidebarIconSlot: {
-        type: StringConstructor;
-        default: string;
-    };
-    sideboxTitleSlot: {
-        type: StringConstructor;
-        default: string;
-    };
-    sideboxIconSlot: {
-        type: StringConstructor;
-        default: string;
-    };
-    headerCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    sidebarCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    sideboxCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    tabsCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    contentCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    logoStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    logoTitleStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    headerMenusStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    sidebarMenusStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    sideboxMenusStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    headerMenuProps: import('vue').PropType<EleMenusProps>;
-    sidebarMenuProps: import('vue').PropType<EleMenusProps>;
-    sideboxMenuProps: import('vue').PropType<EleMenusProps>;
     ellipsis: {
         type: BooleanConstructor;
         default: boolean;
@@ -173,32 +89,23 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     backTopRight: NumberConstructor;
     backTopBottom: NumberConstructor;
     backTopTarget: StringConstructor;
-}>, {
-    layoutRef: import('vue').Ref<EleAdminLayoutInstance, EleAdminLayoutInstance>;
-}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-    tabContextMenu: (_option: TabItemEventOption) => void;
-    tabSortChange: (_data: TabItem[]) => void;
-    tabClick: (_option: TabItemEventOption) => void;
-    tabRemove: (_option: TabItemEventOption) => void;
-    tabAdd: (_data: TabItem) => void;
-    "update:collapse": (_collapse: boolean) => void;
-    logoClick: (_isHome: boolean, _e: MouseEvent) => void;
-    headMenuOpen: (_index: string, _indexPath: string[]) => void;
-    headMenuClose: (_index: string, _indexPath: string[]) => void;
-    sideMenuOpen: (_index: string, _indexPath: string[]) => void;
-    sideMenuClose: (_index: string, _indexPath: string[]) => void;
-    "update:maximized": (_maximized: boolean) => void;
-    bodySizeChange: (_option: import('./types').BodySizeChangeOption) => void;
-}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
-    height: {
-        type: (StringConstructor | NumberConstructor)[];
-        default: null;
-    };
-    menus: import('vue').PropType<MenuItem[] | null>;
-    tabs: import('vue').PropType<TabItem[] | null>;
     collapse: BooleanConstructor;
+    layout: import('vue').PropType<Layout>;
     compact: BooleanConstructor;
     maximized: import('vue').PropType<Maximized>;
+    headerStyle: import('vue').PropType<import('./types').HeaderStyle>;
+    tabContextMenu: import('vue').PropType<boolean | import('../ele-app/plus').EleDropdownProps>;
+    fixedHome: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    homePath: StringConstructor;
+    tabSortable: BooleanConstructor;
+    tabStyle: {
+        type: import('vue').PropType<import('./types').TabStyle>;
+        default: string;
+    };
+    tabContextMenus: import('vue').PropType<import('../ele-tabs/types').ContextMenus>;
     tabBar: {
         type: import('vue').PropType<TabBar>;
         default: boolean;
@@ -211,17 +118,15 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         type: import('vue').PropType<boolean | EleBacktopProps>;
         default: boolean;
     };
-    layout: import('vue').PropType<Layout>;
+    headerMenuProps: import('vue').PropType<EleMenusProps>;
+    sidebarMenuProps: import('vue').PropType<EleMenusProps>;
+    sideboxMenuProps: import('vue').PropType<EleMenusProps>;
     sidebarLayout: import('vue').PropType<SidebarLayout>;
-    headerStyle: import('vue').PropType<import('./types').HeaderStyle>;
     sidebarStyle: {
         type: import('vue').PropType<import('./types').SidebarStyle>;
         default: string;
     };
-    tabStyle: {
-        type: import('vue').PropType<import('./types').TabStyle>;
-        default: string;
-    };
+    mixSidebarStyle: import('vue').PropType<import('./types').SidebarStyle>;
     fixedHeader: {
         type: BooleanConstructor;
         default: boolean;
@@ -235,11 +140,70 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         default: boolean;
     };
     logoInHeader: BooleanConstructor;
-    fixedHome: {
+    headerTitleSlot: {
+        type: StringConstructor;
+        default: string;
+    };
+    headerIconSlot: {
+        type: StringConstructor;
+        default: string;
+    };
+    sidebarTitleSlot: {
+        type: StringConstructor;
+        default: string;
+    };
+    sidebarIconSlot: {
+        type: StringConstructor;
+        default: string;
+    };
+    sideboxTitleSlot: {
+        type: StringConstructor;
+        default: string;
+    };
+    sideboxIconSlot: {
+        type: StringConstructor;
+        default: string;
+    };
+    headerCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue | null>;
+    sidebarCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue | null>;
+    sideboxCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue | null>;
+    sideCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue | null>;
+    tabsCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue | null>;
+    contentCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue | null>;
+    logoStyle: import('vue').PropType<import('../ele-app/types').StyleValue | null>;
+    logoTitleStyle: import('vue').PropType<import('../ele-app/types').StyleValue | null>;
+    headerMenusStyle: import('vue').PropType<import('../ele-app/types').StyleValue | null>;
+    sidebarMenusStyle: import('vue').PropType<import('../ele-app/types').StyleValue | null>;
+    sideboxMenusStyle: import('vue').PropType<import('../ele-app/types').StyleValue | null>;
+    logoSrc: StringConstructor;
+    logoTitle: StringConstructor;
+    menuScrollToActive: {
         type: BooleanConstructor;
         default: boolean;
     };
-    homePath: StringConstructor;
+}>, {
+    layoutRef: import('vue').Ref<EleAdminLayoutInstance, EleAdminLayoutInstance>;
+}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
+    tabContextMenu: (_option: TabItemEventOption) => void;
+    tabSortChange: (_data: TabItem[]) => void;
+    tabClick: (_option: TabItemEventOption) => void;
+    tabRemove: (_option: TabItemEventOption) => void;
+    tabAdd: (_data: TabItem) => void;
+    "update:collapse": (_collapse: boolean) => void;
+    logoClick: (_isHome: boolean, _e: MouseEvent) => void;
+    headMenuOpen: (_index: string, _indexPath: string[]) => void;
+    headMenuClose: (_index: string, _indexPath: string[]) => void;
+    sideMenuOpen: (_index: string, _indexPath: string[]) => void;
+    sideMenuClose: (_index: string, _indexPath: string[]) => void;
+    "update:maximized": (_maximized: boolean) => void;
+    bodySizeChange: (_option: import('./types').BodySizeChangeOption) => void;
+}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
+    height: {
+        type: (StringConstructor | NumberConstructor)[];
+        default: null;
+    };
+    menus: import('vue').PropType<MenuItem[] | null>;
+    tabs: import('vue').PropType<TabItem[] | null>;
     redirectPath: {
         type: StringConstructor;
         default: string;
@@ -273,9 +237,77 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     };
     locale: StringConstructor;
     i18n: import('vue').PropType<import('./types').MenuI18n>;
+    ellipsis: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    ellipsisProps: import('vue').PropType<EleMenusProps["ellipsisProps"]>;
+    menuTrigger: import('vue').PropType<EleMenusProps["menuTrigger"]>;
+    sidebarOpeneds: import('vue').PropType<string[]>;
+    uniqueOpened: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    colorfulIcon: BooleanConstructor;
+    tooltipEffect: import('vue').PropType<EleMenusProps["popperEffect"]>;
+    menuTextEllipsisTooltip: import('vue').PropType<import('../ele-menus/types').TextEllipsisTooltip | undefined>;
+    expanded: BooleanConstructor;
+    breadcrumbSeparator: import('vue').PropType<import('../ele-breadcrumb/types').BreadcrumbSeparator>;
+    backTopVisibilityHeight: NumberConstructor;
+    backTopRight: NumberConstructor;
+    backTopBottom: NumberConstructor;
+    backTopTarget: StringConstructor;
+    collapse: BooleanConstructor;
+    layout: import('vue').PropType<Layout>;
+    compact: BooleanConstructor;
+    maximized: import('vue').PropType<Maximized>;
+    headerStyle: import('vue').PropType<import('./types').HeaderStyle>;
     tabContextMenu: import('vue').PropType<boolean | import('../ele-app/plus').EleDropdownProps>;
-    tabContextMenus: import('vue').PropType<import('../ele-tabs/types').ContextMenus>;
+    fixedHome: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    homePath: StringConstructor;
     tabSortable: BooleanConstructor;
+    tabStyle: {
+        type: import('vue').PropType<import('./types').TabStyle>;
+        default: string;
+    };
+    tabContextMenus: import('vue').PropType<import('../ele-tabs/types').ContextMenus>;
+    tabBar: {
+        type: import('vue').PropType<TabBar>;
+        default: boolean;
+    };
+    breadcrumb: {
+        type: import('vue').PropType<boolean | EleBreadcrumbProps>;
+        default: boolean;
+    };
+    backTop: {
+        type: import('vue').PropType<boolean | EleBacktopProps>;
+        default: boolean;
+    };
+    headerMenuProps: import('vue').PropType<EleMenusProps>;
+    sidebarMenuProps: import('vue').PropType<EleMenusProps>;
+    sideboxMenuProps: import('vue').PropType<EleMenusProps>;
+    sidebarLayout: import('vue').PropType<SidebarLayout>;
+    sidebarStyle: {
+        type: import('vue').PropType<import('./types').SidebarStyle>;
+        default: string;
+    };
+    mixSidebarStyle: import('vue').PropType<import('./types').SidebarStyle>;
+    fixedHeader: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    fixedSidebar: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    fixedBody: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    logoInHeader: BooleanConstructor;
     headerTitleSlot: {
         type: StringConstructor;
         default: string;
@@ -300,39 +332,23 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         type: StringConstructor;
         default: string;
     };
-    headerCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    sidebarCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    sideboxCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    tabsCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    contentCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    logoStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    logoTitleStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    headerMenusStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    sidebarMenusStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    sideboxMenusStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-    headerMenuProps: import('vue').PropType<EleMenusProps>;
-    sidebarMenuProps: import('vue').PropType<EleMenusProps>;
-    sideboxMenuProps: import('vue').PropType<EleMenusProps>;
-    ellipsis: {
+    headerCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue | null>;
+    sidebarCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue | null>;
+    sideboxCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue | null>;
+    sideCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue | null>;
+    tabsCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue | null>;
+    contentCustomStyle: import('vue').PropType<import('../ele-app/types').StyleValue | null>;
+    logoStyle: import('vue').PropType<import('../ele-app/types').StyleValue | null>;
+    logoTitleStyle: import('vue').PropType<import('../ele-app/types').StyleValue | null>;
+    headerMenusStyle: import('vue').PropType<import('../ele-app/types').StyleValue | null>;
+    sidebarMenusStyle: import('vue').PropType<import('../ele-app/types').StyleValue | null>;
+    sideboxMenusStyle: import('vue').PropType<import('../ele-app/types').StyleValue | null>;
+    logoSrc: StringConstructor;
+    logoTitle: StringConstructor;
+    menuScrollToActive: {
         type: BooleanConstructor;
         default: boolean;
     };
-    ellipsisProps: import('vue').PropType<EleMenusProps["ellipsisProps"]>;
-    menuTrigger: import('vue').PropType<EleMenusProps["menuTrigger"]>;
-    sidebarOpeneds: import('vue').PropType<string[]>;
-    uniqueOpened: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    colorfulIcon: BooleanConstructor;
-    tooltipEffect: import('vue').PropType<EleMenusProps["popperEffect"]>;
-    menuTextEllipsisTooltip: import('vue').PropType<import('../ele-menus/types').TextEllipsisTooltip | undefined>;
-    expanded: BooleanConstructor;
-    breadcrumbSeparator: import('vue').PropType<import('../ele-breadcrumb/types').BreadcrumbSeparator>;
-    backTopVisibilityHeight: NumberConstructor;
-    backTopRight: NumberConstructor;
-    backTopBottom: NumberConstructor;
-    backTopTarget: StringConstructor;
 }>> & Readonly<{
     onTabContextMenu?: ((_option: TabItemEventOption) => any) | undefined;
     onTabSortChange?: ((_data: TabItem[]) => any) | undefined;
@@ -355,25 +371,26 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     expanded: boolean;
     compact: boolean;
     transitionDelay: number;
+    responsive: boolean;
+    fixedHome: boolean;
+    tabSortable: boolean;
+    tabStyle: import('./types').TabStyle;
     tabBar: TabBar;
     breadcrumb: boolean | EleBreadcrumbProps;
     backTop: boolean | EleBacktopProps;
     sidebarStyle: import('./types').SidebarStyle;
-    tabStyle: import('./types').TabStyle;
     fixedHeader: boolean;
     fixedSidebar: boolean;
     fixedBody: boolean;
     logoInHeader: boolean;
-    fixedHome: boolean;
-    tabSortable: boolean;
     headerTitleSlot: string;
     headerIconSlot: string;
     sidebarTitleSlot: string;
     sidebarIconSlot: string;
     sideboxTitleSlot: string;
     sideboxIconSlot: string;
+    menuScrollToActive: boolean;
     keepAlive: boolean;
-    responsive: boolean;
     redirectPath: string;
     fluid: boolean;
     compressOnEsc: boolean;

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

@@ -1,11 +1,11 @@
-import { defineComponent, ref, shallowRef, computed, markRaw, watch, unref, shallowReactive, provide, nextTick, onMounted, openBlock, createBlock, normalizeClass, createSlots, withCtx, createCommentVNode, renderSlot, renderList, normalizeProps, guardReactiveProps } from "vue";
+import { defineComponent, ref, shallowRef, computed, markRaw, watch, unref, shallowReactive, provide, nextTick, onMounted, createBlock, openBlock, normalizeClass, createSlots, withCtx, renderSlot, createCommentVNode, renderList, normalizeProps, guardReactiveProps } from "vue";
 import { useRouter } from "vue-router";
-import { HomeOutlined } from "../icons";
+import { HomeOutlined } from "../icons/index";
 import { useTimer, useMediaQuery, useWindowListener } from "../utils/hook";
-import { debounce, isExternalLink, mapTree } from "../utils/core";
+import { debounce, isExternalLink, mapTree } from "../utils/common";
 import ProIframe from "./components/pro-iframe";
 import { getMenuItems, getRouteMatched, getActiveChilds, findTabByKey, getMatchedLevels, getRouteTab, findMenuByPath, findTabByPath } from "./util";
-import { proLayoutProps, proLayoutEmits, PRO_LAYOUT_KEY } from "./props";
+import { proLayoutEmits, proLayoutProps, PRO_LAYOUT_KEY } from "./props";
 import EleAdminLayout from "../ele-admin-layout/index";
 const mobileQuery = "(max-width: 768px)";
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -775,7 +775,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const handleResize = () => {
       const el = getContentElem();
       if (el) {
-        const width = el.clientWidth;
+        const clientWidth = el.clientWidth || 0;
+        const limitedWidth = 1120;
+        const maxWidth = clientWidth > limitedWidth ? limitedWidth : clientWidth;
+        const width = props.fluid ? clientWidth : maxWidth;
         const height = el.clientHeight;
         if (width !== state.contentWidth || height !== state.contentHeight) {
           state.contentWidth = width;
@@ -838,6 +841,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         sidebarLayout: routeSideType.value,
         headerStyle: _ctx.headerStyle,
         sidebarStyle: _ctx.sidebarStyle,
+        mixSidebarStyle: _ctx.mixSidebarStyle,
         tabStyle: _ctx.tabStyle,
         fixedHeader: _ctx.fixedHeader,
         fixedSidebar: _ctx.fixedSidebar,
@@ -858,6 +862,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         headerCustomStyle: _ctx.headerCustomStyle,
         sidebarCustomStyle: _ctx.sidebarCustomStyle,
         sideboxCustomStyle: _ctx.sideboxCustomStyle,
+        sideCustomStyle: _ctx.sideCustomStyle,
         tabsCustomStyle: _ctx.tabsCustomStyle,
         contentCustomStyle: _ctx.contentCustomStyle,
         logoStyle: _ctx.logoStyle,
@@ -865,6 +870,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         headerMenusStyle: _ctx.headerMenusStyle,
         sidebarMenusStyle: _ctx.sidebarMenusStyle,
         sideboxMenusStyle: _ctx.sideboxMenusStyle,
+        logoSrc: _ctx.logoSrc,
+        logoTitle: _ctx.logoTitle,
+        menuScrollToActive: _ctx.menuScrollToActive,
         mobile: mobile.value,
         class: normalizeClass(["ele-pro-layout", { "ele-admin-limited": !_ctx.fluid }]),
         "onUpdate:collapse": updateCollapse,
@@ -978,7 +986,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             ])
           };
         })
-      ]), 1032, ["height", "headerMenus", "headerActive", "sidebarMenus", "sidebarActive", "sideboxMenus", "sideboxActive", "tabs", "tabActive", "levels", "collapse", "compact", "maximized", "tabBar", "breadcrumb", "backTop", "headerMenuProps", "sidebarMenuProps", "sideboxMenuProps", "layout", "sidebarLayout", "headerStyle", "sidebarStyle", "tabStyle", "fixedHeader", "fixedSidebar", "fixedBody", "logoInHeader", "fixedHome", "homePath", "isHome", "tabContextMenu", "tabContextMenus", "tabSortable", "headerTitleSlot", "headerIconSlot", "sidebarTitleSlot", "sidebarIconSlot", "sideboxTitleSlot", "sideboxIconSlot", "headerCustomStyle", "sidebarCustomStyle", "sideboxCustomStyle", "tabsCustomStyle", "contentCustomStyle", "logoStyle", "logoTitleStyle", "headerMenusStyle", "sidebarMenusStyle", "sideboxMenusStyle", "mobile", "class"]);
+      ]), 1032, ["height", "headerMenus", "headerActive", "sidebarMenus", "sidebarActive", "sideboxMenus", "sideboxActive", "tabs", "tabActive", "levels", "collapse", "compact", "maximized", "tabBar", "breadcrumb", "backTop", "headerMenuProps", "sidebarMenuProps", "sideboxMenuProps", "layout", "sidebarLayout", "headerStyle", "sidebarStyle", "mixSidebarStyle", "tabStyle", "fixedHeader", "fixedSidebar", "fixedBody", "logoInHeader", "fixedHome", "homePath", "isHome", "tabContextMenu", "tabContextMenus", "tabSortable", "headerTitleSlot", "headerIconSlot", "sidebarTitleSlot", "sidebarIconSlot", "sideboxTitleSlot", "sideboxIconSlot", "headerCustomStyle", "sidebarCustomStyle", "sideboxCustomStyle", "sideCustomStyle", "tabsCustomStyle", "contentCustomStyle", "logoStyle", "logoTitleStyle", "headerMenusStyle", "sidebarMenusStyle", "sideboxMenusStyle", "logoSrc", "logoTitle", "menuScrollToActive", "mobile", "class"]);
     };
   }
 });