diff --git a/src/pages/dashboard/components/usage-inner/filter-bar.tsx b/src/pages/dashboard/components/usage-inner/filter-bar.tsx index e50750e8..c7f7fe09 100644 --- a/src/pages/dashboard/components/usage-inner/filter-bar.tsx +++ b/src/pages/dashboard/components/usage-inner/filter-bar.tsx @@ -7,44 +7,15 @@ import { useIntl } from '@umijs/max'; import { Button, DatePicker, Tooltip } from 'antd'; import dayjs from 'dayjs'; import React from 'react'; -import styled from 'styled-components'; import { DASHBOARD_STATS_API } from '../../apis'; import useRangePickerPreset from '../../hooks/use-rangepicker-preset'; - -const OptionWrapper = styled.span` - display: flex; - align-items: center; - gap: 8px; -`; - -const LabelWrapper = styled.div` - display: flex; - align-items: center; - gap: 8px; -`; +import FilterBarCss from '../../styles/filter-bar.less'; const DefaultDateConfig = { maxRange: 60, defaultRange: 29 }; -const FilterWrapper = styled.div` - position: relative; - z-index: 10; - display: flex; - justify-content: space-between; - align-items: center; - margin-bottom: 0px; - .selection { - display: flex; - align-items: center; - gap: 12px; - } - .ant-select-selection-overflow-item > span { - height: 24px; - } -`; - interface FilterBarProps { query: any; userList: any[]; @@ -105,28 +76,28 @@ const FilterBar: React.FC = (props) => { if (data.providerType === 'deployments') { return ( - + - + {intl.formatMessage({ id: 'menu.models.deployment' })} - + ); } return ( - + - + {data.label} - + ); }; return ( - -
+
+
= (props) => { placeholder={intl.formatMessage({ id: 'dashboard.usage.selectuser' })} - style={{ maxWidth: 200, minWidth: 160 }} + style={{ width: '100%' }} value={query.user_ids} onChange={handleUsersChange} > @@ -164,9 +135,12 @@ const FilterBar: React.FC = (props) => { }} styles={{ root: { - width: cascaderWidth + width: '100%' }, popup: { + list: { + flex: 1 + }, listItem: { padding: '5px 10px' } @@ -190,7 +164,7 @@ const FilterBar: React.FC = (props) => { )}
- +
); }; diff --git a/src/pages/dashboard/components/usage-inner/index.tsx b/src/pages/dashboard/components/usage-inner/index.tsx index 11a7862f..fa573415 100644 --- a/src/pages/dashboard/components/usage-inner/index.tsx +++ b/src/pages/dashboard/components/usage-inner/index.tsx @@ -2,23 +2,17 @@ import breakpoints from '@/config/breakpoints'; import { useIntl } from '@umijs/max'; import { Col, Row } from 'antd'; import { FC, useContext, useEffect, useMemo } from 'react'; -import styled from 'styled-components'; import { DASHBOARD_STATS_API } from '../../apis'; import { baseColorMap } from '../../config'; import { DashboardContext } from '../../config/dashboard-context'; import { DashboardUsageData } from '../../config/types'; +import FilterBarCss from '../../styles/filter-bar.less'; import ExportData from './export-data'; import FilterBar from './filter-bar'; import RequestTokenInner from './request-token-inner'; import TopUser from './top-user'; import useUsageData from './use-usage-data'; -const TitleWrapper = styled.div` - margin: 0; - font-weight: 700; - min-width: max-content; -`; - const UsageInner: FC<{ maxWidth: number }> = ({ maxWidth }) => { const intl = useIntl(); const { model_usage } = useContext(DashboardContext); @@ -95,17 +89,10 @@ const UsageInner: FC<{ maxWidth: number }> = ({ maxWidth }) => {
-
- +
+
{intl.formatMessage({ id: 'dashboard.usage' })} - +
= ({ maxWidth }) => {
- +
{intl.formatMessage({ id: 'dashboard.topusers' })} - +
span { + height: 24px; + } + } +} + +.optionsWrapper { + display: flex; + align-items: center; + gap: 8px; + padding-right: 4px; +} + +.usageTitle { + margin: 20px 0; + display: grid; + align-items: center; + grid-template-columns: minmax(45px, 200px) 1fr; +} + +.usageTitleText { + margin: 0; + font-weight: 700; + min-width: max-content; +}