ele-admin-plus 1.1.9 → 1.2.0-beta.2

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

@@ -1,38 +1,38 @@
-import { MenuMeta, MenuItem, TabItem, LevelItem, CurrentRoute, WindowListenerOption, MatchedResult, MixActiveResult } from './types';
-import { ProLayoutProps } from './props';
-import { RouteLocationMatched } from 'vue-router';
+import { MenuItem, TabItem, LevelItem, MatchedResult, ProLayoutProvide, ResponsiveProps } from './types';
+import { LayoutProvide } from '../ele-admin-layout/types';
+import { EleMenuItemProps } from '../ele-app/plus';
+import { RouteLocationNormalizedLoaded, RouteLocationMatched } from 'vue-router';
 
 /**
- * 判断路由是否是主页
- * @param route 路由信息
- * @param homePath 主页地址
+ * 根据菜单地址获取菜单
+ * @param path 菜单地址
+ * @param menus 菜单数据
  */
-export declare function isHomeRoute(route: CurrentRoute, homePath: string): boolean;
+export declare function findMenuByPath(path?: string, menus?: MenuItem[]): MenuItem | undefined;
 /**
- * 获取主页路由地址
+ * 根据路由地址获取页签
  * @param path 路由地址
+ * @param tabs 页签数据
  */
-export declare function getHomePath(path?: string | null): string;
+export declare function findTabByPath(path?: string, tabs?: TabItem[] | null): TabItem | undefined;
 /**
- * 获取路由匹配的菜单数据
- * @param path 路由地址
- * @param fullPath 路由完整地址
- * @param meta 路由元数据
- * @param menus 菜单数据
+ * 根据页签标识获取页签
+ * @param key 页签标识
+ * @param tabs 页签数据
  */
-export declare function getRouteMatched(path: string, fullPath: string, meta: MenuMeta, menus: MenuItem[]): MatchedResult;
+export declare function findTabByKey(key?: string, tabs?: TabItem[] | null): TabItem | undefined;
 /**
- * 根据菜单地址获取菜单
+ * 根据菜单地址获取菜单及所有父级
  * @param path 菜单地址
  * @param menus 菜单数据
  */
-export declare function findMenuByPath(path?: string, menus?: MenuItem[]): MenuItem | undefined;
+export declare function getMatchedMenus(path: string, menus: MenuItem[], parents?: MenuItem[]): MenuItem[] | undefined;
 /**
- * 根据菜单地址获取菜单及所有父级
- * @param path 菜单地址
+ * 获取路由匹配的菜单数据
+ * @param route 路由信息
  * @param menus 菜单数据
  */
-export declare function getMatchedMenus(path: string, menus: MenuItem[], parents?: MenuItem[]): MenuItem[] | undefined;
+export declare function getRouteMatched(route: RouteLocationNormalizedLoaded, menus: MenuItem[]): MatchedResult;
 /**
  * 获取面包屑导航数据
  * @param matched 匹配的菜单数据
@@ -41,13 +41,7 @@ export declare function getMatchedMenus(path: string, menus: MenuItem[], parents
  * @param menus 菜单数据
  * @param tabs 页签数据
  */
-export declare function getMatchedLevels(matched: MenuItem[] | undefined, activeOther: boolean, route: CurrentRoute, menus: MenuItem[], tabs: TabItem[]): LevelItem[];
-/**
- * 根据路由地址获取页签数据
- * @param path 路由地址
- * @param tabs 全部页签数据
- */
-export declare function findTabByPath(path?: string, tabs?: TabItem[]): TabItem | undefined;
+export declare function getMatchedLevels(matched: MenuItem[] | undefined, activeOther: boolean | undefined, route: RouteLocationNormalizedLoaded, menus: MenuItem[], tabs: TabItem[]): LevelItem[];
 /**
  * 获取路由对应的组件名称
  * @param matched 路由匹配数据
@@ -55,18 +49,12 @@ export declare function findTabByPath(path?: string, tabs?: TabItem[]): TabItem
 export declare function getMatchedComponents(matched: RouteLocationMatched[]): string[];
 /**
  * 返回路由对应的页签数据
- * @param current 路由信息
+ * @param route 路由信息
  * @param tabs 当前页签数据
  * @param homePath 主页地址
- * @param repeatableTabs 可重复打开的页签
  * @param routeTitle 路由对应的标题
  */
-export declare function getRouteTab(current: CurrentRoute, tabs: TabItem[], homePath: string, routeTitle?: string): TabItem;
-/**
- * 获取混合导航布局选中
- * @param matched 路由匹配的菜单层级数据
- */
-export declare function getMixActive(matched?: MenuItem[]): MixActiveResult;
+export declare function getRouteTab(route: RouteLocationNormalizedLoaded, tabs: TabItem[], homePath: string | undefined, routeTitle?: string): TabItem;
 /**
  * 获取选中菜单的子级
  * @param menus 菜单数据
@@ -75,24 +63,20 @@ export declare function getMixActive(matched?: MenuItem[]): MixActiveResult;
  */
 export declare function getActiveChilds(menus: MenuItem[], active?: string, childrenName?: string): MenuItem[];
 /**
- * 绑定窗口事件监听
+ * 菜单数据转换
+ * @param menus 菜单数据
+ * @param link 是否使用超链接
  */
-export declare function useWindowListener(option: WindowListenerOption, props: ProLayoutProps): void;
+export declare function getMenuItems(menus: MenuItem[], link: boolean): EleMenuItemProps[];
 /**
- * 菜单滚动到选中位置
+ * 获取布局共享数据
  */
-export declare function useMenuScroll(getEl: () => HTMLDivElement | null): {
-    scrollIntoView: () => void;
-};
+export declare function useLayoutState(): LayoutProvide;
 /**
- * 禁用过渡动画
+ * 获取高级布局共享数据
  */
-export declare function useDisableTransition(): {
-    disableTransition: () => void;
-};
+export declare function useProLayoutState(): ProLayoutProvide;
 /**
- * 菜单数据转换
- * @param menus 菜单数据
- * @param link 是否使用超链接
+ * 获取是否开启布局响应
  */
-export declare function getMenuItems(menus: MenuItem[], link: boolean): Partial<import('../ele-menus/types').MenuItem>[];
+export declare function useResponsive(props: ResponsiveProps): import('vue').ComputedRef<boolean>;

package/lib/ele-pro-table/components/table-tools.cjs

@@ -49,6 +49,8 @@ const _sfc_main = vue.defineComponent({
     pageData: Array,
     /** 单元格合并行列方法 */
     spanMethod: Function,
+    /** 表格是否有表头 */
+    tableHeader: Boolean,
     /** 是否显示合计行 */
     showSummary: Boolean,
     /** 合计行文本 */
@@ -65,6 +67,8 @@ const _sfc_main = vue.defineComponent({
     headerCellClassName: [String, Function],
     /** 序号列起始索引 */
     pageIndex: Number,
+    /** 树表字段名 */
+    treeProps: Object,
     /** 表格请求数据方法 */
     fetch: Function,
     /** 导出配置 */
@@ -214,53 +218,36 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       }, 1032, ["placement", "title", "onClick"])) : tool === "export" ? (vue.openBlock(), vue.createBlock(_component_ToolExport, {
         key: index + "-export",
         placement: _ctx.placement,
-        title: _ctx.lang.export,
-        checkAllText: _ctx.lang.columnTitle,
-        resetText: _ctx.lang.columnReset,
-        untitledText: _ctx.lang.columnUntitled,
-        fileNameText: _ctx.lang.exportFileName,
-        fileNamePlaceholderText: _ctx.lang.exportFileNamePlaceholder,
-        selectDataText: _ctx.lang.exportSelectData,
-        selectColumnText: _ctx.lang.exportSelectColumn,
-        dataTypePageText: _ctx.lang.exportDataTypePage,
-        dataTypeSelectedText: _ctx.lang.exportDataTypeSelected,
-        dataTypeAllText: _ctx.lang.exportDataTypeAll,
-        cancelText: _ctx.lang.exportCancel,
-        okText: _ctx.lang.exportOk,
+        locale: _ctx.lang,
         modalProps: _ctx.exportConfig.modalProps,
         columns: _ctx.columns,
         selections: _ctx.selections,
         pageData: _ctx.pageData,
         datasource: _ctx.exportConfig.datasource,
         spanMethod: _ctx.spanMethod,
+        tableHeader: _ctx.tableHeader,
         showSummary: _ctx.showSummary,
         sumText: _ctx.sumText,
         summaryMethod: _ctx.summaryMethod,
         pageIndex: _ctx.pageIndex,
+        treeProps: _ctx.treeProps,
         fetch: _ctx.fetch,
         defaultFileName: _ctx.exportConfig.fileName,
         defaultDataType: _ctx.exportConfig.dataType,
         beforeExport: _ctx.exportConfig.beforeExport
-      }, null, 8, ["placement", "title", "checkAllText", "resetText", "untitledText", "fileNameText", "fileNamePlaceholderText", "selectDataText", "selectColumnText", "dataTypePageText", "dataTypeSelectedText", "dataTypeAllText", "cancelText", "okText", "modalProps", "columns", "selections", "pageData", "datasource", "spanMethod", "showSummary", "sumText", "summaryMethod", "pageIndex", "fetch", "defaultFileName", "defaultDataType", "beforeExport"])) : tool === "print" ? (vue.openBlock(), vue.createBlock(_component_ToolPrint, {
+      }, null, 8, ["placement", "locale", "modalProps", "columns", "selections", "pageData", "datasource", "spanMethod", "tableHeader", "showSummary", "sumText", "summaryMethod", "pageIndex", "treeProps", "fetch", "defaultFileName", "defaultDataType", "beforeExport"])) : tool === "print" ? (vue.openBlock(), vue.createBlock(_component_ToolPrint, {
         key: index + "-print",
         placement: _ctx.placement,
-        title: _ctx.lang.print,
-        checkAllText: _ctx.lang.columnTitle,
-        resetText: _ctx.lang.columnReset,
-        untitledText: _ctx.lang.columnUntitled,
-        selectDataText: _ctx.lang.exportSelectData,
-        selectColumnText: _ctx.lang.exportSelectColumn,
-        dataTypePageText: _ctx.lang.exportDataTypePage,
-        dataTypeSelectedText: _ctx.lang.exportDataTypeSelected,
-        dataTypeAllText: _ctx.lang.exportDataTypeAll,
-        cancelText: _ctx.lang.exportCancel,
-        okText: _ctx.lang.exportOk,
+        locale: _ctx.lang,
         modalProps: _ctx.printConfig.modalProps,
+        printerProps: _ctx.printConfig.printerProps,
+        tableProps: _ctx.printConfig.tableProps,
         columns: _ctx.columns,
         selections: _ctx.selections,
         pageData: _ctx.pageData,
         datasource: _ctx.printConfig.datasource,
         spanMethod: _ctx.spanMethod,
+        tableHeader: _ctx.tableHeader,
         showSummary: _ctx.showSummary,
         sumText: _ctx.sumText,
         summaryMethod: _ctx.summaryMethod,
@@ -269,6 +256,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         headerCellStyle: _ctx.headerCellStyle,
         headerCellClassName: _ctx.headerCellClassName,
         pageIndex: _ctx.pageIndex,
+        treeProps: _ctx.treeProps,
         fetch: _ctx.fetch,
         defaultDataType: _ctx.printConfig.dataType,
         beforePrint: _ctx.printConfig.beforePrint
@@ -281,7 +269,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             ])
           };
         })
-      ]), 1032, ["placement", "title", "checkAllText", "resetText", "untitledText", "selectDataText", "selectColumnText", "dataTypePageText", "dataTypeSelectedText", "dataTypeAllText", "cancelText", "okText", "modalProps", "columns", "selections", "pageData", "datasource", "spanMethod", "showSummary", "sumText", "summaryMethod", "cellStyle", "cellClassName", "headerCellStyle", "headerCellClassName", "pageIndex", "fetch", "defaultDataType", "beforePrint"])) : tool && !["default", "printTop", "printBottom"].includes(tool) && _ctx.$slots[tool] ? vue.renderSlot(_ctx.$slots, tool, {
+      ]), 1032, ["placement", "locale", "modalProps", "printerProps", "tableProps", "columns", "selections", "pageData", "datasource", "spanMethod", "tableHeader", "showSummary", "sumText", "summaryMethod", "cellStyle", "cellClassName", "headerCellStyle", "headerCellClassName", "pageIndex", "treeProps", "fetch", "defaultDataType", "beforePrint"])) : tool && !["default", "printTop", "printBottom"].includes(tool) && _ctx.$slots[tool] ? vue.renderSlot(_ctx.$slots, tool, {
         key: 6,
         pageIndex: _ctx.pageIndex,
         fetch: _ctx.fetch

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

@@ -1,5 +1,5 @@
 import { TableLocale, FetchFunction, ExportConfig, PrintConfig } from '../types';
-import { Columns, TableSize, DataItem } from '../../ele-data-table/types';
+import { Columns, TableSize, DataItem, TreeProps } from '../../ele-data-table/types';
 import { PropType } from 'vue';
 
 declare const _default: import('vue').DefineComponent<{
@@ -28,7 +28,7 @@ declare const _default: import('vue').DefineComponent<{
     pageData: PropType<DataItem[]>;
     /** 单元格合并行列方法 */
     spanMethod: PropType<((data: {
-        row: DataItem; /** 提示方向 */
+        row: DataItem;
         rowIndex: number;
         column: import('element-plus').TableColumnCtx<DataItem>;
         columnIndex: number;
@@ -36,6 +36,8 @@ declare const _default: import('vue').DefineComponent<{
         rowspan: number;
         colspan: number;
     } | undefined) | undefined>;
+    /** 表格是否有表头 */
+    tableHeader: BooleanConstructor;
     /** 是否显示合计行 */
     showSummary: BooleanConstructor;
     /** 合计行文本 */
@@ -52,6 +54,8 @@ declare const _default: import('vue').DefineComponent<{
     headerCellClassName: PropType<import('element-plus').CellCls<DataItem> | undefined>;
     /** 序号列起始索引 */
     pageIndex: NumberConstructor;
+    /** 树表字段名 */
+    treeProps: PropType<TreeProps>;
     /** 表格请求数据方法 */
     fetch: PropType<FetchFunction>;
     /** 导出配置 */
@@ -102,7 +106,7 @@ declare const _default: import('vue').DefineComponent<{
     pageData: PropType<DataItem[]>;
     /** 单元格合并行列方法 */
     spanMethod: PropType<((data: {
-        row: DataItem; /** 提示方向 */
+        row: DataItem;
         rowIndex: number;
         column: import('element-plus').TableColumnCtx<DataItem>;
         columnIndex: number;
@@ -110,6 +114,8 @@ declare const _default: import('vue').DefineComponent<{
         rowspan: number;
         colspan: number;
     } | undefined) | undefined>;
+    /** 表格是否有表头 */
+    tableHeader: BooleanConstructor;
     /** 是否显示合计行 */
     showSummary: BooleanConstructor;
     /** 合计行文本 */
@@ -126,6 +132,8 @@ declare const _default: import('vue').DefineComponent<{
     headerCellClassName: PropType<import('element-plus').CellCls<DataItem> | undefined>;
     /** 序号列起始索引 */
     pageIndex: NumberConstructor;
+    /** 树表字段名 */
+    treeProps: PropType<TreeProps>;
     /** 表格请求数据方法 */
     fetch: PropType<FetchFunction>;
     /** 导出配置 */
@@ -148,5 +156,6 @@ declare const _default: import('vue').DefineComponent<{
     maximized: boolean;
     columnSortable: boolean;
     columnFixed: boolean;
+    tableHeader: boolean;
 }, {}>;
 export default _default;

package/lib/ele-pro-table/components/tool-column.cjs

@@ -228,6 +228,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         effect: "light",
         isPopover: true,
         popperOptions: {
+          strategy: "fixed",
           modifiers: [{ name: "offset", options: { offset: [20, 10] } }]
         }
       }, {

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

@@ -32,6 +32,7 @@ declare const _default: import('vue').DefineComponent<{
         checked?: boolean | undefined;
         fixed?: string | boolean | undefined;
         children?: any[] | undefined;
+        type?: string | undefined;
     }[]>;
     isCheckAll: import('vue').Ref<boolean>;
     isIndeterminate: import('vue').Ref<boolean>;