refactor(settings): update RatioSetting component to use ModelPricingCombined and adjust tab structure
- Replaced ModelRatioSettings with ModelPricingCombined in the RatioSetting component. - Updated tab structure to prioritize pricing settings over model settings. - Removed unused imports for ModelRatioSettings and ModelSettingsVisualEditor.
This commit is contained in:
@@ -21,9 +21,8 @@ import React, { useEffect, useState } from 'react';
|
||||
import { Card, Spin, Tabs } from '@douyinfe/semi-ui';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
|
||||
import ModelPricingCombined from '../../pages/Setting/Ratio/ModelPricingCombined';
|
||||
import GroupRatioSettings from '../../pages/Setting/Ratio/GroupRatioSettings';
|
||||
import ModelRatioSettings from '../../pages/Setting/Ratio/ModelRatioSettings';
|
||||
import ModelSettingsVisualEditor from '../../pages/Setting/Ratio/ModelSettingsVisualEditor';
|
||||
import ModelRatioNotSetEditor from '../../pages/Setting/Ratio/ModelRationNotSetEditor';
|
||||
import UpstreamRatioSync from '../../pages/Setting/Ratio/UpstreamRatioSync';
|
||||
|
||||
@@ -95,18 +94,14 @@ const RatioSetting = () => {
|
||||
|
||||
return (
|
||||
<Spin spinning={loading} size='large'>
|
||||
{/* 模型倍率设置以及价格编辑器 */}
|
||||
<Card style={{ marginTop: '10px' }}>
|
||||
<Tabs type='card' defaultActiveKey='visual'>
|
||||
<Tabs.TabPane tab={t('模型倍率设置')} itemKey='model'>
|
||||
<ModelRatioSettings options={inputs} refresh={onRefresh} />
|
||||
<Tabs type='card' defaultActiveKey='pricing'>
|
||||
<Tabs.TabPane tab={t('模型定价设置')} itemKey='pricing'>
|
||||
<ModelPricingCombined options={inputs} refresh={onRefresh} />
|
||||
</Tabs.TabPane>
|
||||
<Tabs.TabPane tab={t('分组相关设置')} itemKey='group'>
|
||||
<GroupRatioSettings options={inputs} refresh={onRefresh} />
|
||||
</Tabs.TabPane>
|
||||
<Tabs.TabPane tab={t('价格设置')} itemKey='visual'>
|
||||
<ModelSettingsVisualEditor options={inputs} refresh={onRefresh} />
|
||||
</Tabs.TabPane>
|
||||
<Tabs.TabPane tab={t('未设置价格模型')} itemKey='unset_models'>
|
||||
<ModelRatioNotSetEditor options={inputs} refresh={onRefresh} />
|
||||
</Tabs.TabPane>
|
||||
|
||||
@@ -88,7 +88,7 @@ const renderStatus = (text, record, t) => {
|
||||
};
|
||||
|
||||
// Render group column
|
||||
const renderGroupColumn = (text, record, t) => {
|
||||
const renderGroupColumn = (text, record, t, groupRatios = {}) => {
|
||||
if (text === 'auto') {
|
||||
return (
|
||||
<Tooltip
|
||||
@@ -104,7 +104,17 @@ const renderGroupColumn = (text, record, t) => {
|
||||
</Tooltip>
|
||||
);
|
||||
}
|
||||
return renderGroup(text);
|
||||
const ratio = groupRatios[text];
|
||||
return (
|
||||
<span className='flex items-center gap-1'>
|
||||
{renderGroup(text)}
|
||||
{ratio !== undefined && (
|
||||
<Tag size='small' color='green' shape='circle'>
|
||||
{ratio}x
|
||||
</Tag>
|
||||
)}
|
||||
</span>
|
||||
);
|
||||
};
|
||||
|
||||
// Render token key column with show/hide and copy functionality
|
||||
@@ -469,6 +479,7 @@ export const getTokensColumns = ({
|
||||
setEditingToken,
|
||||
setShowEdit,
|
||||
refresh,
|
||||
groupRatios = {},
|
||||
}) => {
|
||||
return [
|
||||
{
|
||||
@@ -490,7 +501,7 @@ export const getTokensColumns = ({
|
||||
title: t('分组'),
|
||||
dataIndex: 'group',
|
||||
key: 'group',
|
||||
render: (text, record) => renderGroupColumn(text, record, t),
|
||||
render: (text, record) => renderGroupColumn(text, record, t, groupRatios),
|
||||
},
|
||||
{
|
||||
title: t('密钥'),
|
||||
|
||||
@@ -49,6 +49,7 @@ const TokensTable = (tokensData) => {
|
||||
setEditingToken,
|
||||
setShowEdit,
|
||||
refresh,
|
||||
groupRatios,
|
||||
t,
|
||||
} = tokensData;
|
||||
|
||||
@@ -67,6 +68,7 @@ const TokensTable = (tokensData) => {
|
||||
setEditingToken,
|
||||
setShowEdit,
|
||||
refresh,
|
||||
groupRatios,
|
||||
});
|
||||
}, [
|
||||
t,
|
||||
@@ -81,6 +83,7 @@ const TokensTable = (tokensData) => {
|
||||
setEditingToken,
|
||||
setShowEdit,
|
||||
refresh,
|
||||
groupRatios,
|
||||
]);
|
||||
|
||||
// Handle compact mode by removing fixed positioning
|
||||
|
||||
@@ -366,6 +366,14 @@ const EditTokenModal = (props) => {
|
||||
placeholder={t('令牌分组,默认为用户的分组')}
|
||||
optionList={groups}
|
||||
renderOptionItem={renderGroupOption}
|
||||
filter={(input, option) => {
|
||||
const q = input.toLowerCase();
|
||||
return (
|
||||
option.value?.toLowerCase().includes(q) ||
|
||||
(typeof option.label === 'string' &&
|
||||
option.label.toLowerCase().includes(q))
|
||||
);
|
||||
}}
|
||||
showClear
|
||||
style={{ width: '100%' }}
|
||||
/>
|
||||
|
||||
Reference in New Issue
Block a user