beer-assembly-biz 1.1.3-alpha.18 → 1.1.3-alpha.19

package/layout/AppLayout.d.ts

@@ -82,6 +82,10 @@ export declare type LayoutProps = {
      * 菜单类型.
      */
     siderMenuType?: 'sub' | 'group';
+    /**
+     * 头像的标题.
+     */
+    avatarTitle?: (userInfo: UserInfo | undefined) => ReactNode;
     /**
      * 布局内容
      */
@@ -131,6 +135,10 @@ export declare type LayoutProps = {
      * 头部: 从右到左菜单
      */
     headerMenus?: ReactNode[];
+    /**
+     * 头部: 从左到右菜单
+     */
+    headerContentRender?: ReactNode[];
     /**
      * 切换菜单触发事件
      * @param path 路径.

package/layout/AppLayout.js

@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import { css } from '@emotion/css';
 import { ProLayout } from '@ant-design/pro-components';
-import { Alert, Dropdown, message, theme, Typography } from 'antd';
+import { Alert, Dropdown, message, Space, theme, Typography } from 'antd';
 import { Session } from 'beer-network/session';
 import dayjs from 'dayjs';
 import Marquee from 'react-fast-marquee';
@@ -120,6 +120,10 @@ export const AppLayout = (props) => {
     return React.createElement(React.Fragment, null,
         contextHolder,
         React.createElement(ProLayout, { theme: "light", className: css `
+          .ant-pro-global-header-logo {
+              margin-inline-end: 0;
+          }
+
           .ant-pro-sider-logo {
               .ant-pro-layout-apps-icon {
                   display: ${collapsed ? 'flex' : 'none'};
@@ -197,7 +201,7 @@ export const AppLayout = (props) => {
                     paddingInlinePageContainerContent: 0,
                     paddingBlockPageContainerContent: 0
                 }
-            }, siderMenuType: props?.siderMenuType ?? 'sub', fixedHeader: true, collapsedButtonRender: (collapsed, reactNode) => {
+            }, siderMenuType: props?.siderMenuType ?? 'sub', fixedHeader: true, collapsedButtonRender: (_collapsed, reactNode) => {
                 return isMobile || props?.siderMenuType === 'group' ? undefined : reactNode;
             }, appList: (props.apps?.length || 0) > 1 || collapsed ? props.apps?.map(it => {
                 return {
@@ -207,7 +211,12 @@ export const AppLayout = (props) => {
                     desc: it.description,
                     url: it.defaultPath || it.path
                 };
-            }) : [], menuHeaderRender: (_logo, _title, props) => {
+            }) : [], headerContentRender: () => {
+                if (props?.headerContentRender === undefined) {
+                    return undefined;
+                }
+                return React.createElement(Space, { size: 4 }, props?.headerContentRender?.map(item => item));
+            }, menuHeaderRender: (_logo, _title, props) => {
                 if (props !== undefined) {
                     setTimeout(() => {
                         setCollapsed(props?.collapsed === true);
@@ -295,10 +304,7 @@ export const AppLayout = (props) => {
                 React.createElement("img", { src: props?.logo?.path, alt: "" })), title: false, avatarProps: {
                 src: (userInfo?.avatar || '') === '' ? '/avatar.png' : userInfo?.avatar,
                 size: 'small',
-                title: React.createElement("span", { style: {
-                        color: '#333',
-                        fontSize: token.fontSize + 1
-                    } }, userInfo?.nickName || '系统用户'),
+                title: props?.avatarTitle?.(userInfo),
                 render: (_props, dom) => {
                     return (React.createElement(Dropdown, { menu: {
                             items: [

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "beer-assembly-biz",
   "private": false,
-  "version": "1.1.3-alpha.18",
+  "version": "1.1.3-alpha.19",
   "scripts": {
     "pub-w": "tsc && copy package.json .\\dist\\package.json && npm publish ./dist",
     "copy": "cp -a src/rich/AIEditor.css dist/rich/AIEditor.css && cp -a src/icon dist/icon && cp -a src/images dist/images",