Apr 6, 2021 · Apr 6, 2021
diff --git a/src/components/Buttons/OrButton/index.tsx b/src/components/Buttons/OrButton/index.tsx
 import VerticalButton from './VerticalButton'

 export type TProps = {
  direction: 'row' | 'column'
  direction?: 'row' | 'column'
  size?: TSIZE_SM
  activeKey: string
  onClick: (key: string) => void
  group: {
    key: string
    title: string
  }[]
  children: React.ReactNode
 }

 const OrButton: React.FC<TProps> = ({ direction, ...restProps }) => {
 const OrButton: React.FC<TProps> = ({ direction = 'row', ...restProps }) => {
  return direction === 'row' ? (
    <HorizontalButton {...restProps} />
  ) : (
diff --git a/src/components/NaviCatalog/index.tsx b/src/components/NaviCatalog/index.tsx
  testid?: string
  items: TMenuItem[]

  onSelect: (id: string, type: string) => void
  onSelect?: (id: string, type: string) => void
  onShowMore?: () => void
 }

diff --git a/src/containers/content/WorksContent/Banner/Backgrounds.js b/src/containers/content/WorksContent/Banner/Backgrounds.js
diff --git a/src/containers/content/WorksContent/Banner/Recommendation.js b/src/containers/content/WorksContent/Banner/Recommendation.js
diff --git a/src/containers/content/WorksContent/Banner/index.js b/src/containers/content/WorksContent/Banner/index.js
diff --git a/src/containers/content/WorksContent/Brand.js → ...containers/content/WorksContent/Brand.tsx b/src/containers/content/WorksContent/Brand.js → ...containers/content/WorksContent/Brand.tsx

 import { Wrapper, Title, Desc } from './styles/brand'

 const Brand = () => {
 type TProps = {
  testid?: string
 }

 const Brand: React.FC<TProps> = ({ testid = 'works-content-brand' }) => {
  return (
    <Wrapper>
    <Wrapper testid={testid}>
      <Title>作品集市</Title>
      <Desc>by makers, for makers.</Desc>
    </Wrapper>
diff --git a/...tainers/content/WorksContent/FilterBar.js → ...ainers/content/WorksContent/FilterBar.tsx b/...tainers/content/WorksContent/FilterBar.js → ...ainers/content/WorksContent/FilterBar.tsx
 import React from 'react'

 import { mockNaviCatalogMenu } from '@/utils'

 import { Br } from '@/components/Common'
 import { OrButton } from '@/components/Buttons'
 import FiltersMenu from '@/components/FiltersMenu'

 import { changeView } from './logic'

 const FilterBar = ({ activeView }) => {
 type TProps = {
  activeView: string
 }

 const FilterBar: React.FC<TProps> = ({ activeView }) => {
  return (
    <Wrapper>
      <OrButton
        size="small"
        type="primary"
        activeKey={activeView}
        group={[
          {
          },
          {
            key: VIEW.MILESTONE,
            title: '动态',
            title: '动态', // 里面再成 里程碑，和讨论
          },
        ]}
        onClick={changeView}
      />
      <Br bottom={30} />
      <FilterWrapper>
        <NaviCatalog title="类别筛选" withDivider={false} />
        <NaviCatalog
          title="类别筛选"
          withDivider={false}
          items={mockNaviCatalogMenu()}
        />
      </FilterWrapper>
      <Br bottom={40} />
      <FilterWrapper>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,18 +6,17 @@ import HorizontalButton from './HorizontalButton'
		import VerticalButton from './VerticalButton'

		export type TProps = {
		direction: 'row' \| 'column'
		direction?: 'row' \| 'column'
		size?: TSIZE_SM
		activeKey: string
		onClick: (key: string) => void
		group: {
		key: string
		title: string
		}[]
		children: React.ReactNode
		}

		const OrButton: React.FC<TProps> = ({ direction, ...restProps }) => {
		const OrButton: React.FC<TProps> = ({ direction = 'row', ...restProps }) => {
		return direction === 'row' ? (
		<HorizontalButton {...restProps} />
		) : (
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -39,7 +39,7 @@ type TProps = {
		testid?: string
		items: TMenuItem[]

		onSelect: (id: string, type: string) => void
		onSelect?: (id: string, type: string) => void
		onShowMore?: () => void
		}

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,9 +2,13 @@ import React from 'react'

		import { Wrapper, Title, Desc } from './styles/brand'

		const Brand = () => {
		type TProps = {
		testid?: string
		}

		const Brand: React.FC<TProps> = ({ testid = 'works-content-brand' }) => {
		return (
		<Wrapper>
		<Wrapper testid={testid}>
		<Title>作品集市</Title>
		<Desc>by makers, for makers.</Desc>
		</Wrapper>
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,5 +1,7 @@
		import React from 'react'

		import { mockNaviCatalogMenu } from '@/utils'

		import { Br } from '@/components/Common'
		import { OrButton } from '@/components/Buttons'
		import FiltersMenu from '@/components/FiltersMenu'
Expand All		@@ -12,12 +14,15 @@ import { Wrapper, FilterWrapper } from './styles/filter_bar'

		import { changeView } from './logic'

		const FilterBar = ({ activeView }) => {
		type TProps = {
		activeView: string
		}

		const FilterBar: React.FC<TProps> = ({ activeView }) => {
		return (
		<Wrapper>
		<OrButton
		size="small"
		type="primary"
		activeKey={activeView}
		group={[
		{
Expand All		@@ -26,14 +31,18 @@ const FilterBar = ({ activeView }) => {
		},
		{
		key: VIEW.MILESTONE,
		title: '动态',
		title: '动态', // 里面再成里程碑，和讨论
		},
		]}
		onClick={changeView}
		/>
		<Br bottom={30} />
		<FilterWrapper>
		<NaviCatalog title="类别筛选" withDivider={false} />
		<NaviCatalog
		title="类别筛选"
		withDivider={false}
		items={mockNaviCatalogMenu()}
		/>
		</FilterWrapper>
		<Br bottom={40} />
		<FilterWrapper>
Expand Down