root/gpustack-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: rebase main

Browse Source
This commit is contained in:
jialin
2026-04-24 14:28:30 +08:00
committed by jialin
parent 16449613e0
commit 597a86562a
28 changed files with 88 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/api-keys/components/add-apikey-modal/index.tsx
+2 -1
View File
@@ -201,10 +201,11 @@ const AddModal: React.FC<AddModalProps> = ({
};
useEffect(() => {
initValues();
if (!open) {
setIsChanged(false);
cacheFormRef.current = {} as any;
} else {
initValues();
}
}, [open]);
src/pages/api-keys/index.tsx
+1 -1
View File
@@ -182,7 +182,7 @@ const APIKeys: React.FC = () => {
rowSelection={rowSelection}
loading={{
spinning: dataSource.loading,
size: 'default'
size: 'middle'
}}
sortDirections={TABLE_SORT_DIRECTIONS}
showSorterTooltip={false}
src/pages/cluster-management/components/k8s-volume-mount.tsx
+1
View File
@@ -206,6 +206,7 @@ const VolumeMountsForm: React.FC<{ action: PageActionType }> = ({ action }) => {
]}
>
<CInput.Input
disabled={name === 0}
label={intl.formatMessage({
id: 'clusters.volume.name'
})}
src/pages/dashboard/components/active-table.tsx
+8 -1
View File
@@ -80,6 +80,13 @@ const ActiveTable = () => {
}
}
];
const generateRowKey = (record: any) => {
return record.provider_name
? `${record.provider_name}/${record.name}`
: record.name;
};
return (
<Row gutter={[20, 0]}>
<Col xs={24} sm={24} md={24} lg={24} xl={24}>
@@ -101,7 +108,7 @@ const ActiveTable = () => {
columns={modelColumns}
dataSource={data}
pagination={false}
rowKey="id"
rowKey={generateRowKey}
/>
</div>
</Col>
src/pages/dashboard/components/usage-inner/filter-bar.tsx
+1
View File
@@ -152,6 +152,7 @@ const FilterBar: React.FC<FilterBarProps> = (props) => {
placeholder={intl.formatMessage({
id: 'dashboard.usage.selectmodel'
})}
isInFormItems={false}
options={modelList}
value={selectedModels}
showCheckedStrategy="SHOW_CHILD"
src/pages/playground/embedding/page.tsx
+3 -3
View File
@@ -10,7 +10,7 @@ import {
InputNumber as CInputNumber,
HighlightCode,
IconFont,
ResizeContainer,
ResizePanel,
ScatterChart,
useOverlayScroller
} from '@gpustack/core-ui';
@@ -691,7 +691,7 @@ const GroundEmbedding: React.FC<MessageProps> = forwardRef((props, ref) => {
<Spin spinning={true} size="middle"></Spin>
</div>
)}
<ResizeContainer
<ResizePanel
ref={resizeRef}
maxHeight={resizeMaxHeight}
minHeight={180}
@@ -715,7 +715,7 @@ const GroundEmbedding: React.FC<MessageProps> = forwardRef((props, ref) => {
items={outputItems}
></Tabs>
</div>
</ResizeContainer>
</ResizePanel>
</div>
</div>
</div>
src/pages/usage/components/daily-usage.tsx
+2 -4
View File
@@ -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 -3
View File
@@ -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
+12 -8
View File
@@ -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>
</>
)}
src/pages/usage/hooks/use-apikeys-columns.tsx
+1 -1
View File
@@ -1,5 +1,5 @@
// columns.ts
import AutoTooltip from '@/components/auto-tooltip';
import { AutoTooltip } from '@gpustack/core-ui';
import { useIntl } from '@umijs/max';
import { Tag } from 'antd';
import { useMemo } from 'react';
src/pages/usage/hooks/use-models-columns.tsx
+1 -1
View File
@@ -1,6 +1,6 @@
// columns.ts
import AutoTooltip from '@/components/auto-tooltip';
import ProviderLogo from '@/pages/maas-provider/components/provider-logo';
import { AutoTooltip } from '@gpustack/core-ui';
import { useIntl } from '@umijs/max';
import { Tag } from 'antd';
import { useMemo } from 'react';
src/pages/usage/hooks/use-users-columns.tsx
+1 -1
View File
@@ -1,5 +1,5 @@
// columns.ts
import AutoTooltip from '@/components/auto-tooltip';
import { AutoTooltip } from '@gpustack/core-ui';
import { useIntl } from '@umijs/max';
import { Tag } from 'antd';
import { useMemo } from 'react';
src/pages/usage/index.tsx
+1 -1
View File
@@ -1,7 +1,7 @@
import { SimpleCard } from '@/components/card-wrapper/simple-card';
import { baseColorMap } from '@/pages/dashboard/config';
import { formatLargeNumber } from '@/utils';
import { useModel } from '@@/plugin-model';
import { SimpleCard } from '@gpustack/core-ui';
import { useIntl } from '@umijs/max';
import React, { useEffect, useMemo, useState } from 'react';
import BreakdownTabs from './components/breakdown-tabs';
src/pages/usage/tables/apikeys-table.tsx
+2 -3
View File
@@ -1,7 +1,6 @@
import IconFont from '@/components/icon-font';
import { TABLE_SORT_DIRECTIONS } from '@/config/settings';
import NoResult from '@/pages/_components/no-result';
import PageBox from '@/pages/_components/page-box';
import { IconFont, NoResult } from '@gpustack/core-ui';
import { useIntl } from '@umijs/max';
import { ConfigProvider, Table } from 'antd';
import _ from 'lodash';
@@ -35,7 +34,7 @@ const APIKeys: React.FC<{
const pendingPageResetRef = useRef(false);
const handleTableChange = (pagination: any, filters: any, sorter: any) => {
let sort_by =
const sort_by =
sorter.order === 'descend' ? `-${sorter.field}` : sorter.field;
setQueryParams((prev) => ({
...prev,
src/pages/usage/tables/models-table.tsx
+2 -3
View File
@@ -1,7 +1,6 @@
import IconFont from '@/components/icon-font';
import { TABLE_SORT_DIRECTIONS } from '@/config/settings';
import NoResult from '@/pages/_components/no-result';
import PageBox from '@/pages/_components/page-box';
import { IconFont, NoResult } from '@gpustack/core-ui';
import { useIntl } from '@umijs/max';
import { ConfigProvider, Table } from 'antd';
import _ from 'lodash';
@@ -36,7 +35,7 @@ const Models: React.FC<{
const handleTableChange = (pagination: any, filters: any, sorter: any) => {
console.log('pagination, filters, sorter: ', pagination, filters, sorter);
let sort_by =
const sort_by =
sorter.order === 'descend' ? `-${sorter.field}` : sorter.field;
setQueryParams((prev) => ({
...prev,
src/pages/usage/tables/users-table.tsx
+2 -3
View File
@@ -1,7 +1,6 @@
import IconFont from '@/components/icon-font';
import { TABLE_SORT_DIRECTIONS } from '@/config/settings';
import NoResult from '@/pages/_components/no-result';
import PageBox from '@/pages/_components/page-box';
import { IconFont, NoResult } from '@gpustack/core-ui';
import { useIntl } from '@umijs/max';
import { ConfigProvider, Table } from 'antd';
import _ from 'lodash';
@@ -35,7 +34,7 @@ const Users: React.FC<{
const pendingPageResetRef = useRef(false);
const handleTableChange = (pagination: any, filters: any, sorter: any) => {
let sort_by =
const sort_by =
sorter.order === 'descend' ? `-${sorter.field}` : sorter.field;
setQueryParams((prev) => ({
...prev,