fix: rebase main

src/pages/usage/components/daily-usage.tsx

@@ -1,7 +1,5 @@
-import CardWrapper from '@/components/card-wrapper';
-import MixLineBar from '@/components/echarts/mix-line-bar';
-import BaseSelect from '@/components/seal-form/base/select';
 import { baseColorMap } from '@/pages/dashboard/config';
+import { BaseSelect, CardWrapper, MixLineBarChart } from '@gpustack/core-ui';
 import { useIntl } from '@umijs/max';
 import { Segmented } from 'antd';
 import dayjs from 'dayjs';
@@ -172,7 +170,7 @@ const DailyUsage: React.FC<DailyUsageProps> = (props) => {
             onChange={onGranularityChange}
           ></Segmented>
         </ControlsWrapper>
-        <MixLineBar
+        <MixLineBarChart
           chartData={chartData}
           seriesData={[]}
           xAxisData={xAxisData}

src/pages/usage/components/export-data.tsx

@@ -1,7 +1,5 @@
-import AutoTooltip from '@/components/auto-tooltip';
-import ModalFooter from '@/components/modal-footer';
-import ScrollerModal from '@/components/scroller-modal';
 import { exportJsonToExcel } from '@/utils/excel-reader';
+import { AutoTooltip, ModalFooter, ScrollerModal } from '@gpustack/core-ui';
 import { useIntl } from '@umijs/max';
 import { Table, TableColumnType } from 'antd';
 import React, { useEffect } from 'react';

src/pages/usage/components/filter-bar.tsx

@@ -1,11 +1,13 @@
-import AutoTooltip from '@/components/auto-tooltip';
-import IconFont from '@/components/icon-font';
-import SealCascader from '@/components/seal-form/seal-cascader';
-import SimpleSelect from '@/components/seal-form/simple-select';
 import useRangePickerPreset from '@/pages/dashboard/hooks/use-rangepicker-preset';
 import ProviderLogo from '@/pages/maas-provider/components/provider-logo';
 import { useModel } from '@@/plugin-model';
 import { DownloadOutlined, SyncOutlined } from '@ant-design/icons';
+import {
+  AutoTooltip,
+  Cascader,
+  IconFont,
+  SimpleSelect
+} from '@gpustack/core-ui';
 import { useIntl } from '@umijs/max';
 import { Button, DatePicker, Dropdown, MenuProps } from 'antd';
 import dayjs from 'dayjs';
@@ -308,7 +310,7 @@ const FilterBar: React.FC<FilterBarProps> = (props) => {
             minWidth: 200
           }}
         >
-          <SealCascader
+          <Cascader
             showSearch
             multiple={true}
             classNames={{
@@ -331,6 +333,7 @@ const FilterBar: React.FC<FilterBarProps> = (props) => {
             }}
             maxTagCount={1}
             size="small"
+            isInFormItems={false}
             placeholder={intl.formatMessage({ id: 'usage.filter.model' })}
             options={modelOptions}
             showCheckedStrategy="SHOW_CHILD"
@@ -339,7 +342,7 @@ const FilterBar: React.FC<FilterBarProps> = (props) => {
             value={activeModels}
             onChange={handleOnModelsChange}
             getPopupContainer={(triggerNode) => triggerNode.parentNode}
-          ></SealCascader>
+          ></Cascader>
         </div>
         {initialState?.currentUser?.is_admin && (
           <>
@@ -363,8 +366,9 @@ const FilterBar: React.FC<FilterBarProps> = (props) => {
                 minWidth: 200
               }}
             >
-              <SealCascader
+              <Cascader
                 showSearch
+                isInFormItems={false}
                 multiple={true}
                 classNames={{
                   popup: {
@@ -393,7 +397,7 @@ const FilterBar: React.FC<FilterBarProps> = (props) => {
                 optionNode={apiKeyOptionRender}
                 onChange={handleOnApiKeysChange}
                 getPopupContainer={(triggerNode) => triggerNode.parentNode}
-              ></SealCascader>
+              ></Cascader>
             </div>
           </>
         )}