feat: 调整整体布局

.gitignore

@@ -65,4 +65,4 @@ mvnw
 /react-ui/types/tsconfig.tsbuildinfo
 /react-ui/storybook-static
 /react-ui/.storybook/scripts
-/react-ui/dist.zip
+/react-ui/@alita/*

react-ui/src/app.tsx

@@ -23,6 +23,7 @@ import {
 } from './services/session';
 import './styles/menu.less';
 import { isLoginPage, needAuth } from './utils';
+import { addAlpha } from './utils/color';
 import { HomeUrl } from './utils/constant';
 import { closeAllModals } from './utils/modal';
 import { gotoHomePage } from './utils/ui';
@@ -208,14 +209,14 @@ export const antd: RuntimeAntdConfig = (memo) => {
   memo.theme.components ??= {};
   memo.theme.components.Tabs = {};
   memo.theme.components.Button = {
-    defaultBg: 'rgba(22, 100, 255, 0.06)',
-    defaultBorderColor: 'rgba(22, 100, 255, 0.11)',
+    defaultBg: addAlpha(themes['primaryColor'], 0.06),
+    defaultBorderColor: addAlpha(themes['primaryColor'], 0.11),
     defaultColor: themes['textColor'],
-    defaultHoverBg: 'rgba(22, 100, 255, 0.06)',
-    defaultHoverBorderColor: 'rgba(22, 100, 255, 0.5)',
-    defaultHoverColor: '#3F7FFF',
-    defaultActiveBg: 'rgba(22, 100, 255, 0.12)',
-    defaultActiveBorderColor: 'rgba(22, 100, 255, 0.75)',
+    defaultHoverBg: addAlpha(themes['primaryColor'], 0.06),
+    defaultHoverBorderColor: addAlpha(themes['primaryColor'], 0.5),
+    defaultHoverColor: themes['primaryHoverColor'],
+    defaultActiveBg: addAlpha(themes['primaryColor'], 0.12),
+    defaultActiveBorderColor: addAlpha(themes['primaryColor'], 0.75),
     defaultActiveColor: themes['primaryColor'],
     contentFontSize: parseInt(themes['fontSize']),
   };
@@ -245,7 +246,12 @@ export const antd: RuntimeAntdConfig = (memo) => {
     separatorColor: 'rgba(29, 29, 32, 0.7)',
   };
   memo.theme.components.Tree = {
-    directoryNodeSelectedBg: 'rgba(22, 100, 255, 0.7)',
+    directoryNodeSelectedBg: addAlpha(themes['primaryColor'], 0.7),
+  };
+  memo.theme.components.Breadcrumb = {
+    itemColor: themes['textColorSecondary'],
+    separatorColor: themes['textColorSecondary'],
+    linkColor: themes['textColorSecondary'],
   };
 
   memo.theme.cssVar = true;

react-ui/src/components/PageContainer/index.less

@@ -16,5 +16,6 @@
   &__content {
     flex: 1;
     width: 100%;
+    min-height: 0;
   }
 }

react-ui/src/components/PageContainer/index.tsx

@@ -1,3 +1,4 @@
+import { RightOutlined } from '@ant-design/icons';
 import { ProBreadcrumb } from '@ant-design/pro-components';
 import React from 'react';
 import './index.less';
@@ -5,13 +6,12 @@ import './index.less';
 function PageContainer({ children }: { children: React.ReactNode }) {
   const { pathname } = location;
   const showBreadcrumb = pathname.split('/').filter((v) => v !== '').length >= 2;
-  console.log('111', pathname);
 
   return (
     <div className="kf-page-container">
       {showBreadcrumb && (
         <div className="kf-page-container__breadcrumb">
-          <ProBreadcrumb></ProBreadcrumb>
+          <ProBreadcrumb separator={<RightOutlined style={{ fontSize: 14 }} />}></ProBreadcrumb>
         </div>
       )}
 

react-ui/src/enums/index.ts

@@ -174,6 +174,7 @@ export enum ComponentType {
 
 // 消息类型
 export enum MessageType {
+  All = -1,
   System = 1,
   Mine = 2,
 }

react-ui/src/global.less

@@ -72,7 +72,7 @@ body {
   background-color: #fff;
 }
 .ant-pro-global-header-logo img {
-  height: 21px;
+  height: 32px;
 }
 .ant-pro-layout .ant-layout-sider.ant-pro-sider {
   height: 100vh;

react-ui/src/pages/Message/components/Content/index.tsx

@@ -113,11 +113,11 @@ function MessageContent({
         };
     const [res] = await to(readMessagesReq(params, skipLoading));
 
-    // 点击消息置为已读时，不需要修改数据
+    // 点击消息，置为已读时，不需要修改数据
     if (!skipResult && res) {
-      // 如果当前是【未读】状态
+      // 如果当前是【未读】状态 tab
       // 【一键已读】后，设置分页为第一页
-      //  如果是一页的唯一数据，设置为前一页
+      //  单个标记为已读，如果是一页的唯一数据，设置为前一页
       if (messageStatus === MessageStatus.UnRead) {
         onPaginationChange({
           ...pagination,
@@ -127,9 +127,10 @@ function MessageContent({
               : pagination.current
             : 1,
         });
+      } else {
+        // 如果当前是【全部】 tab，直接刷新数据
+        getMessages();
       }
-    } else {
-      getMessages();
     }
   };