@teamias/pro-layout 0.0.10 → 0.0.12

package/dist/pro-layout/components/AvatarItem.js

@@ -4,9 +4,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import { LogoutOutlined, UserOutlined } from '@ant-design/icons';
 import { Avatar, Dropdown, Modal } from 'antd';
-import { LOCAL_STORAGE } from "../constant";
 import { useLayoutContext } from "../context";
-import { setLocalStorageItem } from "../utils";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export var AvatarItem = function AvatarItem(_ref) {
@@ -27,19 +25,21 @@ export var AvatarItem = function AvatarItem(_ref) {
                 _context.next = 3;
                 return onLogout();
               case 3:
-                setLocalStorageItem(LOCAL_STORAGE.ACCESS_TOKEN, '');
+                // setLocalStorageItem(LOCAL_STORAGE.ACCESS_TOKEN, '');
+                localStorage.clear();
+                sessionStorage.clear();
                 updateData({}, 'replace');
-                _context.next = 10;
+                _context.next = 11;
                 break;
-              case 7:
-                _context.prev = 7;
+              case 8:
+                _context.prev = 8;
                 _context.t0 = _context["catch"](0);
                 console.error(_context.t0);
-              case 10:
+              case 11:
               case "end":
                 return _context.stop();
             }
-          }, _callee, null, [[0, 7]]);
+          }, _callee, null, [[0, 8]]);
         }));
         function onOk() {
           return _onOk.apply(this, arguments);

package/dist/pro-layout/components/KeepAlive/KeepAliveClass.d.ts

@@ -17,7 +17,7 @@ export declare class KeepAliveClass {
     updateAllComponent(type?: 'all' | 'pagesHook' | 'context'): Promise<void>;
     /** 获取页面数据 */
     getPages(): (import("react-router-dom").Location & {
-        pageStatus: 200 | 403 | 404;
+        pageStatus: 200 | 404 | 403;
         pageTitle: string;
     })[];
     /** 关闭页面 */
@@ -32,7 +32,7 @@ export declare class KeepAliveClass {
     useLifeCycle: (callback: IPageLifeCycleCallback) => void;
     /** 获取缓存页面数组 */
     useKeepAlivePages: () => (import("react-router-dom").Location & {
-        pageStatus: 200 | 403 | 404;
+        pageStatus: 200 | 404 | 403;
         pageTitle: string;
     })[];
     /** 更新当前路由页面 */

package/dist/pro-layout/components/KeepAlive/index.d.ts

@@ -6,7 +6,7 @@ export declare const keepAliveControl: KeepAliveClass;
 export declare const useLifeCycle: (callback: import("./types").IPageLifeCycleCallback) => void;
 /** 获取页面数组 */
 export declare const useKeepAlivePages: () => (import("react-router-dom").Location & {
-    pageStatus: 200 | 403 | 404;
+    pageStatus: 200 | 404 | 403;
     pageTitle: string;
 })[];
 /** 根 */

package/dist/pro-layout/core/index.js

@@ -110,6 +110,10 @@ var InlineProLayout = function InlineProLayout(_ref) {
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [layoutContext.token ? /*#__PURE__*/_jsxs(_Fragment, {
       children: [/*#__PURE__*/_jsx(DocumentTitle, {}), /*#__PURE__*/_jsxs(Layout, {
+        style: {
+          '--header-height': layoutContext.headerHeight,
+          '--content-height': "calc(100vh - ".concat(layoutContext.headerHeight, ")")
+        },
         children: [/*#__PURE__*/_jsxs(Header, {
           children: [/*#__PURE__*/_jsxs(HeaderLogo, {
             "data-aside-width": layoutContext.defaultMaxAsideWidth,

package/dist/pro-layout/hooks/index.d.ts

@@ -1,11 +1,13 @@
 /// <reference types="react" />
 /** 这里初始化获取后,除了initialState 变化,会发生更新,其余的 pathname 不会变化 */
-export declare const useApiRouter: () => import("..").TMenuData | undefined;
+export declare const useApiRouter: () => import("../types").TMenuData | undefined;
 /** 权限router */
 export declare const useAccessRouter: () => {
     page: {
         element?: import("react").ReactNode;
         access?: string | undefined;
+        path?: string | undefined;
+        name?: string | undefined;
     };
     location: import("react-router-dom").Location & {
         pageStatus: 200 | 404 | 403;

package/dist/pro-layout/hooks/index.js

@@ -1,10 +1,25 @@
+import { useIntl } from 'react-intl';
 import { matchPath, useLocation } from 'react-router-dom';
 import { NoFoundPage } from "../components/NoFoundPage";
 import { useLayoutContext } from "../context";
-
-/** 这里初始化获取后,除了initialState 变化,会发生更新,其余的 pathname 不会变化 */
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
+var getMenuFormattedTitle = function getMenuFormattedTitle(pageComponentMap, menuKey, defaultName) {
+  // 先通过原生的路由配置,找到初始的配置路径
+  // 主要针对动态参数的那种 (/product/list/:code)
+
+  /** 本地配置的页面路由 */
+  var localConfigPath = Object.keys(pageComponentMap || {}).find(function (p) {
+    return matchPath(p, menuKey);
+  }) || menuKey;
+  return {
+    id: "menu".concat(localConfigPath.replaceAll('/', '.')),
+    defaultMessage: defaultName || '',
+    localConfigPath: localConfigPath
+  };
+};
+
+/** 这里初始化获取后,除了initialState 变化,会发生更新,其余的 pathname 不会变化 */
 export var useApiRouter = function useApiRouter() {
   var _layoutContext$routeM;
   var location = useLocation();
@@ -16,11 +31,13 @@ export var useApiRouter = function useApiRouter() {
 
 /** 权限router */
 export var useAccessRouter = function useAccessRouter() {
-  var _layoutContext$routeM2, _fullPathDataMap$loca;
+  var _layoutContext$routeM2, _fullPathDataMap, _currentPage;
   var layoutContext = useLayoutContext();
   var location = useLocation();
   var fullPathDataMap = ((_layoutContext$routeM2 = layoutContext.routeMenu) === null || _layoutContext$routeM2 === void 0 ? void 0 : _layoutContext$routeM2.fullPathDataMap) || {};
   var pageComponentMap = layoutContext.pageComponentMap || {};
+  var _useIntl = useIntl(),
+    formatMessage = _useIntl.formatMessage;
   var access = layoutContext.access;
 
   /** 匹配路径对应组件 */
@@ -30,7 +47,7 @@ export var useAccessRouter = function useAccessRouter() {
 
   // 补充数据
   location.pageStatus = 200;
-  location.pageTitle = ((_fullPathDataMap$loca = fullPathDataMap[location.pathname]) === null || _fullPathDataMap$loca === void 0 || (_fullPathDataMap$loca = _fullPathDataMap$loca.raw) === null || _fullPathDataMap$loca === void 0 ? void 0 : _fullPathDataMap$loca.title) || '';
+  location.pageTitle = ((_fullPathDataMap = fullPathDataMap[((_currentPage = currentPage) === null || _currentPage === void 0 ? void 0 : _currentPage.path) || location.pathname]) === null || _fullPathDataMap === void 0 || (_fullPathDataMap = _fullPathDataMap.raw) === null || _fullPathDataMap === void 0 ? void 0 : _fullPathDataMap.title) || formatMessage(getMenuFormattedTitle(pageComponentMap, location.pathname, '未知页面'));
 
   // 路由不存在, 但有菜单, 使用默认页面
   if (!currentPage && fullPathDataMap[location.pathname]) {
@@ -40,7 +57,6 @@ export var useAccessRouter = function useAccessRouter() {
         children: "\u8BF7\u521B\u5EFA\u8DEF\u7531\u5BF9\u5E94\u7684\u7EC4\u4EF6"
       })
     };
-    // currentPage = { element: <>低代码页面</> };
   }
 
   // 判断页面是否需要权限判断

package/dist/pro-layout/types/index.d.ts

@@ -108,6 +108,8 @@ export type TLayoutContext = {
     pageComponentMap?: Record<string, {
         element?: ReactNode;
         access?: string;
+        path?: string;
+        name?: string;
     }>;
     /** 权限相关 */
     access?: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamias/pro-layout",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",