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

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

@@ -9,7 +9,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     bodyStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     footerStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     title: StringConstructor;
-    margin: (NumberConstructor | StringConstructor)[];
+    margin: (StringConstructor | NumberConstructor)[];
     direction: import('vue').PropType<import('./types').PrintDirection | null>;
     orientation: import('vue').PropType<import('./types').PrintOrientation | null>;
     target: import('vue').PropType<import('./types').PrintTarget | null>;
@@ -26,7 +26,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     bodyStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     footerStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     title: StringConstructor;
-    margin: (NumberConstructor | StringConstructor)[];
+    margin: (StringConstructor | NumberConstructor)[];
     direction: import('vue').PropType<import('./types').PrintDirection | null>;
     orientation: import('vue').PropType<import('./types').PrintOrientation | null>;
     target: import('vue').PropType<import('./types').PrintTarget | null>;

package/lib/ele-pro-form/components/render-util.d.ts

@@ -77,10 +77,10 @@ export declare const ChildrenRender: import('vue').DefineComponent<import('vue')
     rowProps: import('vue').PropType<import('../../ele-app/el').ElRowProps>;
     editable: BooleanConstructor;
     items: import('vue').PropType<ProFormItemProps[]>;
+    httpRequest: (ObjectConstructor | FunctionConstructor)[];
     screenSize: import('vue').PropType<import('../types').ScreenSize>;
     activeItemKey: import('vue').PropType<ProFormItemKey>;
     itemTypeData: import('vue').PropType<ProFormItemTypeData[]>;
-    httpRequest: (ObjectConstructor | FunctionConstructor)[];
 }>, () => string | VNode<import('vue').RendererNode, import('vue').RendererElement, {
     [key: string]: any;
 }> | (string | VNode<import('vue').RendererNode, import('vue').RendererElement, {
@@ -119,10 +119,10 @@ export declare const ChildrenRender: import('vue').DefineComponent<import('vue')
     rowProps: import('vue').PropType<import('../../ele-app/el').ElRowProps>;
     editable: BooleanConstructor;
     items: import('vue').PropType<ProFormItemProps[]>;
+    httpRequest: (ObjectConstructor | FunctionConstructor)[];
     screenSize: import('vue').PropType<import('../types').ScreenSize>;
     activeItemKey: import('vue').PropType<ProFormItemKey>;
     itemTypeData: import('vue').PropType<ProFormItemTypeData[]>;
-    httpRequest: (ObjectConstructor | FunctionConstructor)[];
 }>> & Readonly<{
     onUpdateItemValue?: ((_prop: string, _value: any) => any) | undefined;
     onUpdateItemsData?: ((_items: ProFormItemProps[], _parentItem?: ProFormItemProps | undefined) => any) | undefined;

package/lib/ele-pro-form/index.d.ts

@@ -8,7 +8,7 @@ declare function __VLS_template(): Partial<Record<string, (_: any) => any>> & Pa
 };
 declare const __VLS_component: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
     labelWidth: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: (NumberConstructor | StringConstructor)[];
         default: string;
     };
     items: import('vue').PropType<ProFormItemProps[]>;
@@ -126,7 +126,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     "update:items": (_items: ProFormItemProps[]) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     labelWidth: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: (NumberConstructor | StringConstructor)[];
         default: string;
     };
     items: import('vue').PropType<ProFormItemProps[]>;

package/lib/ele-pro-form/props.d.ts

@@ -8,7 +8,7 @@ import { ProFormItemKey, ProFormItemProps, ProFormItemTypeData, ProFormItemRende
 export declare const proFormProps: {
     /** 标签宽度 */
     labelWidth: {
-        type: (StringConstructor | NumberConstructor)[];
+        type: (NumberConstructor | StringConstructor)[];
         default: string;
     };
     /** 表单项 */

package/lib/ele-pro-form-builder/components/body-form.d.ts

@@ -1,5 +1,5 @@
 import { UserComponent } from '../../ele-app/types';
-import { EleProFormProps } from '../../ele-app/plus';
+import { EleProFormProps } from '../../ele-app/plusx';
 import { ProFormItemKey, ProFormItemProps, ProFormItemTypeData, ScreenSize } from '../../ele-pro-form/types';
 import { ComponentGroup, UpdateItemsResult } from '../types';
 

package/lib/ele-pro-form-builder/components/body-header.d.ts

@@ -1,5 +1,5 @@
 import { UserComponent } from '../../ele-app/types';
-import { EleProFormProps } from '../../ele-app/plus';
+import { EleProFormProps } from '../../ele-app/plusx';
 import { ProFormItemTypeData, ScreenSize } from '../../ele-pro-form/types';
 import { HeaderRightToolName, ComponentGroup } from '../types';
 

package/lib/ele-pro-form-builder/components/code-generator.d.ts

@@ -1,4 +1,4 @@
-import { EleProFormProps } from '../../ele-app/plus';
+import { EleProFormProps } from '../../ele-app/plusx';
 import { ProFormItemProps, ProFormItemTypeData } from '../../ele-pro-form/types';
 import { ComponentGroup } from '../types';
 

package/lib/ele-pro-form-builder/components/code-preview.d.ts

@@ -1,5 +1,5 @@
 import { UserComponent } from '../../ele-app/types';
-import { EleProFormProps } from '../../ele-app/plus';
+import { EleProFormProps } from '../../ele-app/plusx';
 import { ComponentGroup } from '../types';
 
 declare const _default: import('vue').DefineComponent<import('vue').ExtractPropTypes<__VLS_TypePropsToRuntimeProps<{

package/lib/ele-pro-form-builder/components/config-form.d.ts

@@ -1,5 +1,5 @@
 import { UserComponent } from '../../ele-app/types';
-import { EleProFormProps } from '../../ele-app/plus';
+import { EleProFormProps } from '../../ele-app/plusx';
 import { ProFormItemProps, ProFormItemTypeData } from '../../ele-pro-form/types';
 
 declare function __VLS_template(): Partial<Record<string, (_: any) => any>>;

package/lib/ele-pro-form-builder/components/import-modal.d.ts

@@ -1,5 +1,5 @@
 import { UserComponent } from '../../ele-app/types';
-import { EleProFormProps } from '../../ele-app/plus';
+import { EleProFormProps } from '../../ele-app/plusx';
 
 declare const _default: import('vue').DefineComponent<import('vue').ExtractPropTypes<__VLS_TypePropsToRuntimeProps<{
     /** 弹窗是否打开 */

package/lib/ele-pro-form-builder/components/preview-modal.d.ts

@@ -1,6 +1,6 @@
 import { ProFormItemTypeData } from '../../ele-pro-form/types';
 import { UserComponent } from '../../ele-app/types';
-import { EleProFormProps } from '../../ele-app/plus';
+import { EleProFormProps } from '../../ele-app/plusx';
 
 declare function __VLS_template(): Partial<Record<string, (_: any) => any>>;
 declare const __VLS_component: import('vue').DefineComponent<import('vue').ExtractPropTypes<__VLS_TypePropsToRuntimeProps<{

package/lib/ele-pro-form-builder/components/props-form.d.ts

@@ -1,5 +1,5 @@
 import { UserComponent } from '../../ele-app/types';
-import { EleProFormProps } from '../../ele-app/plus';
+import { EleProFormProps } from '../../ele-app/plusx';
 import { ProFormItemKey, ProFormItemTypeData } from '../../ele-pro-form/types';
 import { ComponentGroup, UpdateItemsResult } from '../types';
 

package/lib/ele-pro-form-builder/components/table-util.cjs

@@ -433,6 +433,9 @@ function generateAddTableRowData(tableFormItem, formItems, tdFormItem, position,
       );
       if (childTr.children) {
         childTr.children.push(childTd);
+        if (!gridData) {
+          childTr.children.push(buildCore.generateChildFormItem("views"));
+        }
       } else {
         childTr.children = [childTd];
       }

package/lib/ele-pro-form-builder/components/template-list.d.ts

@@ -1,4 +1,4 @@
-import { EleProFormProps } from '../../ele-app/plus';
+import { EleProFormProps } from '../../ele-app/plusx';
 import { TemplateItem } from '../types';
 
 declare const _default: import('vue').DefineComponent<import('vue').ExtractPropTypes<__VLS_TypePropsToRuntimeProps<{

package/lib/ele-pro-form-builder/index.d.ts

@@ -1,4 +1,4 @@
-import { EleProFormProps } from '../ele-app/plus';
+import { EleProFormProps } from '../ele-app/plusx';
 import { ProFormItemProps } from '../ele-pro-form/types';
 
 declare function __VLS_template(): Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>>;

package/lib/ele-pro-form-builder/props.d.ts

@@ -1,6 +1,7 @@
 import { PropType, ExtractPropTypes } from 'vue';
 import { UserComponent } from '../ele-app/types';
-import { EleProFormProps, EleSplitPanelProps } from '../ele-app/plus';
+import { EleSplitPanelProps } from '../ele-app/plus';
+import { EleProFormProps } from '../ele-app/plusx';
 import { ProFormItemProps, ProFormItemTypeData } from '../ele-pro-form/types';
 import { TemplateFormProps, ComponentGroup, TemplateItem, HeaderRightToolName } from './types';
 

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

@@ -1,5 +1,5 @@
 import type { UserComponent, StyleValue } from '../ele-app/types';
-import type { EleProFormProps } from '../ele-app/plus';
+import type { EleProFormProps } from '../ele-app/plusx';
 import type {
   ProFormItemKey,
   ProFormItemProps,

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

@@ -94,18 +94,6 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     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;
@@ -127,6 +115,10 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         default: string;
     };
     mixSidebarStyle: import('vue').PropType<import('./types').SidebarStyle>;
+    tabStyle: {
+        type: import('vue').PropType<import('./types').TabStyle>;
+        default: string;
+    };
     fixedHeader: {
         type: BooleanConstructor;
         default: boolean;
@@ -140,6 +132,14 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         default: boolean;
     };
     logoInHeader: BooleanConstructor;
+    fixedHome: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    homePath: StringConstructor;
+    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;
@@ -185,6 +185,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     layoutRef: import('vue').Ref<EleAdminLayoutInstance, EleAdminLayoutInstance>;
 }, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     tabContextMenu: (_option: TabItemEventOption) => void;
+    "update:maximized": (_maximized: boolean) => void;
     tabSortChange: (_data: TabItem[]) => void;
     tabClick: (_option: TabItemEventOption) => void;
     tabRemove: (_option: TabItemEventOption) => void;
@@ -195,7 +196,6 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     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: {
@@ -262,18 +262,6 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     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;
@@ -295,6 +283,10 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         default: string;
     };
     mixSidebarStyle: import('vue').PropType<import('./types').SidebarStyle>;
+    tabStyle: {
+        type: import('vue').PropType<import('./types').TabStyle>;
+        default: string;
+    };
     fixedHeader: {
         type: BooleanConstructor;
         default: boolean;
@@ -308,6 +300,14 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         default: boolean;
     };
     logoInHeader: BooleanConstructor;
+    fixedHome: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    homePath: StringConstructor;
+    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;
@@ -351,6 +351,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     };
 }>> & Readonly<{
     onTabContextMenu?: ((_option: TabItemEventOption) => any) | undefined;
+    "onUpdate:maximized"?: ((_maximized: boolean) => any) | undefined;
     onTabSortChange?: ((_data: TabItem[]) => any) | undefined;
     onTabClick?: ((_option: TabItemEventOption) => any) | undefined;
     onTabRemove?: ((_option: TabItemEventOption) => any) | undefined;
@@ -361,7 +362,6 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     onHeadMenuClose?: ((_index: string, _indexPath: string[]) => any) | undefined;
     onSideMenuOpen?: ((_index: string, _indexPath: string[]) => any) | undefined;
     onSideMenuClose?: ((_index: string, _indexPath: string[]) => any) | undefined;
-    "onUpdate:maximized"?: ((_maximized: boolean) => any) | undefined;
     onBodySizeChange?: ((_option: import('./types').BodySizeChangeOption) => any) | undefined;
 }>, {
     height: string | number;
@@ -372,17 +372,17 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     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;

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

@@ -105,18 +105,6 @@ export declare const proLayoutProps: {
     compact: BooleanConstructor;
     maximized: PropType<import('../ele-admin-layout/types').Maximized>;
     headerStyle: PropType<import('./types').HeaderStyle>;
-    tabContextMenu: PropType<boolean | import('../ele-app/plus').EleDropdownProps>;
-    fixedHome: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    homePath: StringConstructor;
-    tabSortable: BooleanConstructor;
-    tabStyle: {
-        type: PropType<import('./types').TabStyle>;
-        default: string;
-    };
-    tabContextMenus: PropType<import('../ele-tabs/types').ContextMenus>;
     tabBar: {
         type: PropType<import('./types').TabBar>;
         default: boolean;
@@ -138,6 +126,10 @@ export declare const proLayoutProps: {
         default: string;
     };
     mixSidebarStyle: PropType<import('./types').SidebarStyle>;
+    tabStyle: {
+        type: PropType<import('./types').TabStyle>;
+        default: string;
+    };
     fixedHeader: {
         type: BooleanConstructor;
         default: boolean;
@@ -151,6 +143,14 @@ export declare const proLayoutProps: {
         default: boolean;
     };
     logoInHeader: BooleanConstructor;
+    fixedHome: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
+    homePath: StringConstructor;
+    tabContextMenu: PropType<boolean | import('../ele-app/plus').EleDropdownProps>;
+    tabContextMenus: PropType<import('../ele-tabs/types').ContextMenus>;
+    tabSortable: BooleanConstructor;
     headerTitleSlot: {
         type: StringConstructor;
         default: string;

package/lib/ele-pro-layout/style/index.scss

@@ -23,8 +23,6 @@
   left: 0;
   right: 0;
   bottom: 0;
-  width: 100%;
-  height: 100%;
   display: flex;
   flex-direction: column;
   pointer-events: none;

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

@@ -60,6 +60,8 @@ export interface MenuItem {
   component?: string;
   /** 路由重定向 */
   redirect?: string;
+  /** 路由参数是否映射到组件属性 */
+  props?: any;
   /** 路由元数据 */
   meta?: MenuMeta;
   /** 子路由 */

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

@@ -149,9 +149,9 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
 }>, {
     showSummary: boolean;
     maximized: boolean;
+    tableHeader: boolean;
     columnSortable: boolean;
     columnFixed: boolean;
-    tableHeader: boolean;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;
 export default _default;

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

@@ -116,9 +116,9 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
 }>> & Readonly<{}>, {
     showSummary: boolean;
     tableHeader: boolean;
-    defaultDataType: ExportDataType;
-    defaultShowFooter: boolean;
     defaultShowTreeIndex: boolean;
     defaultFileName: string;
+    defaultDataType: ExportDataType;
+    defaultShowFooter: boolean;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 export default _default;

package/lib/ele-pro-table/components/tool-print.d.ts

@@ -147,9 +147,9 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
 }>> & Readonly<{}>, {
     showSummary: boolean;
     tableHeader: boolean;
+    defaultShowTreeIndex: boolean;
     defaultDataType: ExportDataType;
     defaultShowFooter: boolean;
-    defaultShowTreeIndex: boolean;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;
 export default _default;

package/lib/ele-pro-table/index.cjs

@@ -171,19 +171,6 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         }
       };
     });
-    const loadingProps = vue.computed(() => {
-      const zIndex = props2.maximizedIndex ?? globalProps.value.maximizedIndex;
-      return {
-        ...props2.loadingProps || {},
-        loading: tableLoading.value,
-        class: [
-          "ele-pro-table",
-          { "is-maximized": tableMaximized.value },
-          { "is-border": tableProps.value.border }
-        ],
-        style: tableMaximized.value ? { zIndex } : void 0
-      };
-    });
     const reload = (option, parent, resolve) => {
       if (option) {
         if (option.page) {
@@ -567,7 +554,15 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       exportData
     });
     return (_ctx, _cache) => {
-      return vue.openBlock(), vue.createBlock(EleLoading, vue.normalizeProps(vue.guardReactiveProps(loadingProps.value)), {
+      return vue.openBlock(), vue.createBlock(EleLoading, vue.mergeProps(props2.loadingProps || {}, {
+        loading: tableLoading.value,
+        class: [
+          "ele-pro-table",
+          { "is-maximized": tableMaximized.value },
+          { "is-border": tableProps.value.border }
+        ],
+        style: tableMaximized.value ? { zIndex: _ctx.maximizedIndex ?? vue.unref(globalProps).maximizedIndex } : void 0
+      }), {
         default: vue.withCtx(() => [
           vue.renderSlot(_ctx.$slots, "topExtra"),
           tableToolbarProps.value ? (vue.openBlock(), vue.createBlock(EleToolbar, vue.normalizeProps(vue.mergeProps({ key: 0 }, tableToolbarProps.value === true ? {} : tableToolbarProps.value)), {
@@ -679,7 +674,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           vue.renderSlot(_ctx.$slots, "bottomExtra")
         ]),
         _: 3
-      }, 16);
+      }, 16, ["loading", "class", "style"]);
     };
   }
 });