From 607d8038e4e492e0734acbb5089c51ddbbe67540 Mon Sep 17 00:00:00 2001 From: Cheerego7 <48879533+Cheerego7@users.noreply.github.com> Date: Tue, 18 May 2021 13:07:21 +0800 Subject: [PATCH] refactor(flat-component): adjust title type in MainPageHeader component (#643) --- .../MainPageHeader/MainPageHeader.stories.tsx | 3 +-- .../MainPageLayout/MainPageHeader/index.less | 20 ------------------- .../MainPageLayout/MainPageHeader/index.tsx | 12 +++-------- .../src/components/MainPageLayout/index.tsx | 2 ++ 4 files changed, 6 insertions(+), 31 deletions(-) diff --git a/packages/flat-components/src/components/MainPageLayout/MainPageHeader/MainPageHeader.stories.tsx b/packages/flat-components/src/components/MainPageLayout/MainPageHeader/MainPageHeader.stories.tsx index a6449d1f58e..639fedfa988 100644 --- a/packages/flat-components/src/components/MainPageLayout/MainPageHeader/MainPageHeader.stories.tsx +++ b/packages/flat-components/src/components/MainPageLayout/MainPageHeader/MainPageHeader.stories.tsx @@ -19,6 +19,5 @@ export const Overview: Story = args => ( ); Overview.args = { routePath: "/example/path", - title: "Example", - periodicUUID: "periodicUUID", + title: Example, }; diff --git a/packages/flat-components/src/components/MainPageLayout/MainPageHeader/index.less b/packages/flat-components/src/components/MainPageLayout/MainPageHeader/index.less index 921b03cba34..5a3b2f2b9ad 100644 --- a/packages/flat-components/src/components/MainPageLayout/MainPageHeader/index.less +++ b/packages/flat-components/src/components/MainPageLayout/MainPageHeader/index.less @@ -9,23 +9,3 @@ .main-page-header-back { color: #3381ff; } - -.main-page-header-title { - margin: 0; - font-size: 16px; - font-weight: 500; - color: #444e60; - line-height: 1; -} - -.main-page-header-periodic-sign { - display: flex; - width: 36px; - height: 22px; - line-height: 22px; - margin-left: 8px; - background-color: #3381ff; - border-radius: 4px; - color: #fff; - justify-content: center; -} diff --git a/packages/flat-components/src/components/MainPageLayout/MainPageHeader/index.tsx b/packages/flat-components/src/components/MainPageLayout/MainPageHeader/index.tsx index 5485686b94c..bfc994fc126 100644 --- a/packages/flat-components/src/components/MainPageLayout/MainPageHeader/index.tsx +++ b/packages/flat-components/src/components/MainPageLayout/MainPageHeader/index.tsx @@ -7,15 +7,10 @@ import { Divider } from "antd"; export interface MainPageHeaderProps { routePath: string; - title: string; - periodicUUID?: string; + title: React.ReactNode; } -export const MainPageHeader: React.FC = ({ - routePath, - title, - periodicUUID, -}) => { +export const MainPageHeader: React.FC = ({ routePath, title }) => { return (
@@ -25,8 +20,7 @@ export const MainPageHeader: React.FC = ({
-

{title}

- {periodicUUID && 周期} + {title} ); }; diff --git a/packages/flat-components/src/components/MainPageLayout/index.tsx b/packages/flat-components/src/components/MainPageLayout/index.tsx index ad3c85337e4..bc207e140aa 100644 --- a/packages/flat-components/src/components/MainPageLayout/index.tsx +++ b/packages/flat-components/src/components/MainPageLayout/index.tsx @@ -3,6 +3,8 @@ import { Avatar, Divider, Popover } from "antd"; import React, { useState } from "react"; import classNames from "classnames"; +export * from "./MainPageHeader"; + export interface MainPageLayoutItem { key: string; icon: (active: boolean) => React.ReactNode;