Commit 8294a76b by t0ng7u

💱 feat(settings): introduce site-wide quota display type (USD/CNY/TOKENS/CUSTOM)

Replace the legacy boolean “DisplayInCurrencyEnabled” with an injected, type-safe
configuration `general_setting.quota_display_type`, and wire it through the
backend and frontend.

Backend
- Add `QuotaDisplayType` to `operation_setting.GeneralSetting` with injected
  registration via `config.GlobalConfig.Register("general_setting", ...)`.
  Helpers: `IsCurrencyDisplay()`, `IsCNYDisplay()`, `GetQuotaDisplayType()`.
- Expose `quota_display_type` in `/api/status` and keep legacy
  `display_in_currency` for backward compatibility.
- Logger: update `LogQuota` and `FormatQuota` to support USD/CNY/TOKENS. When
  CNY is selected, convert using `operation_setting.USDExchangeRate`.
- Controllers:
  - `billing`: compute subscription/usage amounts based on the selected type
    (USD: divide by `QuotaPerUnit`; CNY: USD→CNY; TOKENS: keep raw tokens).
  - `topup` / `topup_stripe`: treat inputs as “amount” for USD/CNY and as
    token-count for TOKENS; adjust min topup and pay money accordingly.
  - `misc`: include `quota_display_type` in status payload.
- Compatibility: in `model/option.UpdateOption`, map updates to
  `DisplayInCurrencyEnabled` → `general_setting.quota_display_type`
  (true→USD, false→TOKENS). Keep exporting the legacy key in `OptionMap`.

Frontend
- Settings: replace the “display in currency” switch with a Select
  (`general_setting.quota_display_type`) offering USD / CNY / Tokens.
  Provide fallback mapping from legacy `DisplayInCurrencyEnabled`.
- Persist `quota_display_type` to localStorage (keep `display_in_currency`
  for legacy components).
- Rendering helpers: base all quota/price rendering on `quota_display_type`;
  use `usd_exchange_rate` for CNY symbol/values.
- Pricing page: default view currency follows site display type (USD/CNY),
  while TOKENS mode still allows per-view currency toggling when needed.

Notes
- No database migrations required.
- Legacy clients remain functional via compatibility fields.
parent 41ea9388
...@@ -19,6 +19,7 @@ var TopUpLink = "" ...@@ -19,6 +19,7 @@ var TopUpLink = ""
// var ChatLink = "" // var ChatLink = ""
// var ChatLink2 = "" // var ChatLink2 = ""
var QuotaPerUnit = 500 * 1000.0 // $0.002 / 1K tokens var QuotaPerUnit = 500 * 1000.0 // $0.002 / 1K tokens
// 保留旧变量以兼容历史逻辑,实际展示由 general_setting.quota_display_type 控制
var DisplayInCurrencyEnabled = true var DisplayInCurrencyEnabled = true
var DisplayTokenStatEnabled = true var DisplayTokenStatEnabled = true
var DrawingEnabled = true var DrawingEnabled = true
......
...@@ -5,6 +5,7 @@ import ( ...@@ -5,6 +5,7 @@ import (
"one-api/common" "one-api/common"
"one-api/dto" "one-api/dto"
"one-api/model" "one-api/model"
"one-api/setting/operation_setting"
) )
func GetSubscription(c *gin.Context) { func GetSubscription(c *gin.Context) {
...@@ -39,8 +40,18 @@ func GetSubscription(c *gin.Context) { ...@@ -39,8 +40,18 @@ func GetSubscription(c *gin.Context) {
} }
quota := remainQuota + usedQuota quota := remainQuota + usedQuota
amount := float64(quota) amount := float64(quota)
if common.DisplayInCurrencyEnabled { // OpenAI 兼容接口中的 *_USD 字段含义保持“额度单位”对应值:
amount /= common.QuotaPerUnit // 我们将其解释为以“站点展示类型”为准:
// - USD: 直接除以 QuotaPerUnit
// - CNY: 先转 USD 再乘汇率
// - TOKENS: 直接使用 tokens 数量
switch operation_setting.GetQuotaDisplayType() {
case operation_setting.QuotaDisplayTypeCNY:
amount = amount / common.QuotaPerUnit * operation_setting.USDExchangeRate
case operation_setting.QuotaDisplayTypeTokens:
// amount 保持 tokens 数值
default:
amount = amount / common.QuotaPerUnit
} }
if token != nil && token.UnlimitedQuota { if token != nil && token.UnlimitedQuota {
amount = 100000000 amount = 100000000
...@@ -80,8 +91,13 @@ func GetUsage(c *gin.Context) { ...@@ -80,8 +91,13 @@ func GetUsage(c *gin.Context) {
return return
} }
amount := float64(quota) amount := float64(quota)
if common.DisplayInCurrencyEnabled { switch operation_setting.GetQuotaDisplayType() {
amount /= common.QuotaPerUnit case operation_setting.QuotaDisplayTypeCNY:
amount = amount / common.QuotaPerUnit * operation_setting.USDExchangeRate
case operation_setting.QuotaDisplayTypeTokens:
// tokens 保持原值
default:
amount = amount / common.QuotaPerUnit
} }
usage := OpenAIUsageResponse{ usage := OpenAIUsageResponse{
Object: "list", Object: "list",
......
...@@ -64,7 +64,11 @@ func GetStatus(c *gin.Context) { ...@@ -64,7 +64,11 @@ func GetStatus(c *gin.Context) {
"top_up_link": common.TopUpLink, "top_up_link": common.TopUpLink,
"docs_link": operation_setting.GetGeneralSetting().DocsLink, "docs_link": operation_setting.GetGeneralSetting().DocsLink,
"quota_per_unit": common.QuotaPerUnit, "quota_per_unit": common.QuotaPerUnit,
"display_in_currency": common.DisplayInCurrencyEnabled, // 兼容旧前端:保留 display_in_currency,同时提供新的 quota_display_type
"display_in_currency": operation_setting.IsCurrencyDisplay(),
"quota_display_type": operation_setting.GetQuotaDisplayType(),
"custom_currency_symbol": operation_setting.GetGeneralSetting().CustomCurrencySymbol,
"custom_currency_exchange_rate": operation_setting.GetGeneralSetting().CustomCurrencyExchangeRate,
"enable_batch_update": common.BatchUpdateEnabled, "enable_batch_update": common.BatchUpdateEnabled,
"enable_drawing": common.DrawingEnabled, "enable_drawing": common.DrawingEnabled,
"enable_task": common.TaskEnabled, "enable_task": common.TaskEnabled,
......
...@@ -86,8 +86,9 @@ func GetEpayClient() *epay.Client { ...@@ -86,8 +86,9 @@ func GetEpayClient() *epay.Client {
func getPayMoney(amount int64, group string) float64 { func getPayMoney(amount int64, group string) float64 {
dAmount := decimal.NewFromInt(amount) dAmount := decimal.NewFromInt(amount)
// 充值金额以“展示类型”为准:
if !common.DisplayInCurrencyEnabled { // - USD/CNY: 前端传 amount 为金额单位;TOKENS: 前端传 tokens,需要换成 USD 金额
if operation_setting.GetQuotaDisplayType() == operation_setting.QuotaDisplayTypeTokens {
dQuotaPerUnit := decimal.NewFromFloat(common.QuotaPerUnit) dQuotaPerUnit := decimal.NewFromFloat(common.QuotaPerUnit)
dAmount = dAmount.Div(dQuotaPerUnit) dAmount = dAmount.Div(dQuotaPerUnit)
} }
...@@ -115,7 +116,7 @@ func getPayMoney(amount int64, group string) float64 { ...@@ -115,7 +116,7 @@ func getPayMoney(amount int64, group string) float64 {
func getMinTopup() int64 { func getMinTopup() int64 {
minTopup := operation_setting.MinTopUp minTopup := operation_setting.MinTopUp
if !common.DisplayInCurrencyEnabled { if operation_setting.GetQuotaDisplayType() == operation_setting.QuotaDisplayTypeTokens {
dMinTopup := decimal.NewFromInt(int64(minTopup)) dMinTopup := decimal.NewFromInt(int64(minTopup))
dQuotaPerUnit := decimal.NewFromFloat(common.QuotaPerUnit) dQuotaPerUnit := decimal.NewFromFloat(common.QuotaPerUnit)
minTopup = int(dMinTopup.Mul(dQuotaPerUnit).IntPart()) minTopup = int(dMinTopup.Mul(dQuotaPerUnit).IntPart())
...@@ -176,7 +177,7 @@ func RequestEpay(c *gin.Context) { ...@@ -176,7 +177,7 @@ func RequestEpay(c *gin.Context) {
return return
} }
amount := req.Amount amount := req.Amount
if !common.DisplayInCurrencyEnabled { if operation_setting.GetQuotaDisplayType() == operation_setting.QuotaDisplayTypeTokens {
dAmount := decimal.NewFromInt(int64(amount)) dAmount := decimal.NewFromInt(int64(amount))
dQuotaPerUnit := decimal.NewFromFloat(common.QuotaPerUnit) dQuotaPerUnit := decimal.NewFromFloat(common.QuotaPerUnit)
amount = dAmount.Div(dQuotaPerUnit).IntPart() amount = dAmount.Div(dQuotaPerUnit).IntPart()
......
...@@ -258,7 +258,7 @@ func GetChargedAmount(count float64, user model.User) float64 { ...@@ -258,7 +258,7 @@ func GetChargedAmount(count float64, user model.User) float64 {
func getStripePayMoney(amount float64, group string) float64 { func getStripePayMoney(amount float64, group string) float64 {
originalAmount := amount originalAmount := amount
if !common.DisplayInCurrencyEnabled { if operation_setting.GetQuotaDisplayType() == operation_setting.QuotaDisplayTypeTokens {
amount = amount / common.QuotaPerUnit amount = amount / common.QuotaPerUnit
} }
// Using float64 for monetary calculations is acceptable here due to the small amounts involved // Using float64 for monetary calculations is acceptable here due to the small amounts involved
...@@ -279,7 +279,7 @@ func getStripePayMoney(amount float64, group string) float64 { ...@@ -279,7 +279,7 @@ func getStripePayMoney(amount float64, group string) float64 {
func getStripeMinTopup() int64 { func getStripeMinTopup() int64 {
minTopup := setting.StripeMinTopUp minTopup := setting.StripeMinTopUp
if !common.DisplayInCurrencyEnabled { if operation_setting.GetQuotaDisplayType() == operation_setting.QuotaDisplayTypeTokens {
minTopup = minTopup * int(common.QuotaPerUnit) minTopup = minTopup * int(common.QuotaPerUnit)
} }
return int64(minTopup) return int64(minTopup)
......
...@@ -7,6 +7,7 @@ import ( ...@@ -7,6 +7,7 @@ import (
"io" "io"
"log" "log"
"one-api/common" "one-api/common"
"one-api/setting/operation_setting"
"os" "os"
"path/filepath" "path/filepath"
"sync" "sync"
...@@ -92,18 +93,55 @@ func logHelper(ctx context.Context, level string, msg string) { ...@@ -92,18 +93,55 @@ func logHelper(ctx context.Context, level string, msg string) {
} }
func LogQuota(quota int) string { func LogQuota(quota int) string {
if common.DisplayInCurrencyEnabled { // 新逻辑:根据额度展示类型输出
return fmt.Sprintf("$%.6f 额度", float64(quota)/common.QuotaPerUnit) q := float64(quota)
} else { switch operation_setting.GetQuotaDisplayType() {
case operation_setting.QuotaDisplayTypeCNY:
usd := q / common.QuotaPerUnit
cny := usd * operation_setting.USDExchangeRate
return fmt.Sprintf("¥%.6f 额度", cny)
case operation_setting.QuotaDisplayTypeCustom:
usd := q / common.QuotaPerUnit
rate := operation_setting.GetGeneralSetting().CustomCurrencyExchangeRate
symbol := operation_setting.GetGeneralSetting().CustomCurrencySymbol
if symbol == "" {
symbol = "¤"
}
if rate <= 0 {
rate = 1
}
v := usd * rate
return fmt.Sprintf("%s%.6f 额度", symbol, v)
case operation_setting.QuotaDisplayTypeTokens:
return fmt.Sprintf("%d 点额度", quota) return fmt.Sprintf("%d 点额度", quota)
default: // USD
return fmt.Sprintf("$%.6f 额度", q/common.QuotaPerUnit)
} }
} }
func FormatQuota(quota int) string { func FormatQuota(quota int) string {
if common.DisplayInCurrencyEnabled { q := float64(quota)
return fmt.Sprintf("$%.6f", float64(quota)/common.QuotaPerUnit) switch operation_setting.GetQuotaDisplayType() {
} else { case operation_setting.QuotaDisplayTypeCNY:
usd := q / common.QuotaPerUnit
cny := usd * operation_setting.USDExchangeRate
return fmt.Sprintf("¥%.6f", cny)
case operation_setting.QuotaDisplayTypeCustom:
usd := q / common.QuotaPerUnit
rate := operation_setting.GetGeneralSetting().CustomCurrencyExchangeRate
symbol := operation_setting.GetGeneralSetting().CustomCurrencySymbol
if symbol == "" {
symbol = "¤"
}
if rate <= 0 {
rate = 1
}
v := usd * rate
return fmt.Sprintf("%s%.6f", symbol, v)
case operation_setting.QuotaDisplayTypeTokens:
return fmt.Sprintf("%d", quota) return fmt.Sprintf("%d", quota)
default:
return fmt.Sprintf("$%.6f", q/common.QuotaPerUnit)
} }
} }
......
...@@ -240,7 +240,15 @@ func updateOptionMap(key string, value string) (err error) { ...@@ -240,7 +240,15 @@ func updateOptionMap(key string, value string) (err error) {
case "LogConsumeEnabled": case "LogConsumeEnabled":
common.LogConsumeEnabled = boolValue common.LogConsumeEnabled = boolValue
case "DisplayInCurrencyEnabled": case "DisplayInCurrencyEnabled":
common.DisplayInCurrencyEnabled = boolValue // 兼容旧字段:同步到新配置 general_setting.quota_display_type(运行时生效)
// true -> USD, false -> TOKENS
newVal := "USD"
if !boolValue {
newVal = "TOKENS"
}
if cfg := config.GlobalConfig.Get("general_setting"); cfg != nil {
_ = config.UpdateConfigFromMap(cfg, map[string]string{"quota_display_type": newVal})
}
case "DisplayTokenStatEnabled": case "DisplayTokenStatEnabled":
common.DisplayTokenStatEnabled = boolValue common.DisplayTokenStatEnabled = boolValue
case "DrawingEnabled": case "DrawingEnabled":
......
...@@ -18,7 +18,9 @@ import ( ...@@ -18,7 +18,9 @@ import (
type Adaptor struct { type Adaptor struct {
} }
func (a *Adaptor) ConvertGeminiRequest(*gin.Context, *relaycommon.RelayInfo, *dto.GeminiChatRequest) (any, error) { return nil, errors.New("not implemented") } func (a *Adaptor) ConvertGeminiRequest(*gin.Context, *relaycommon.RelayInfo, *dto.GeminiChatRequest) (any, error) {
return nil, errors.New("not implemented")
}
func (a *Adaptor) ConvertClaudeRequest(c *gin.Context, info *relaycommon.RelayInfo, request *dto.ClaudeRequest) (any, error) { func (a *Adaptor) ConvertClaudeRequest(c *gin.Context, info *relaycommon.RelayInfo, request *dto.ClaudeRequest) (any, error) {
openaiAdaptor := openai.Adaptor{} openaiAdaptor := openai.Adaptor{}
...@@ -33,16 +35,24 @@ func (a *Adaptor) ConvertClaudeRequest(c *gin.Context, info *relaycommon.RelayIn ...@@ -33,16 +35,24 @@ func (a *Adaptor) ConvertClaudeRequest(c *gin.Context, info *relaycommon.RelayIn
return openAIChatToOllamaChat(c, openaiRequest.(*dto.GeneralOpenAIRequest)) return openAIChatToOllamaChat(c, openaiRequest.(*dto.GeneralOpenAIRequest))
} }
func (a *Adaptor) ConvertAudioRequest(c *gin.Context, info *relaycommon.RelayInfo, request dto.AudioRequest) (io.Reader, error) { return nil, errors.New("not implemented") } func (a *Adaptor) ConvertAudioRequest(c *gin.Context, info *relaycommon.RelayInfo, request dto.AudioRequest) (io.Reader, error) {
return nil, errors.New("not implemented")
}
func (a *Adaptor) ConvertImageRequest(c *gin.Context, info *relaycommon.RelayInfo, request dto.ImageRequest) (any, error) { return nil, errors.New("not implemented") } func (a *Adaptor) ConvertImageRequest(c *gin.Context, info *relaycommon.RelayInfo, request dto.ImageRequest) (any, error) {
return nil, errors.New("not implemented")
}
func (a *Adaptor) Init(info *relaycommon.RelayInfo) { func (a *Adaptor) Init(info *relaycommon.RelayInfo) {
} }
func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) { func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) {
if info.RelayMode == relayconstant.RelayModeEmbeddings { return info.ChannelBaseUrl + "/api/embed", nil } if info.RelayMode == relayconstant.RelayModeEmbeddings {
if strings.Contains(info.RequestURLPath, "/v1/completions") || info.RelayMode == relayconstant.RelayModeCompletions { return info.ChannelBaseUrl + "/api/generate", nil } return info.ChannelBaseUrl + "/api/embed", nil
}
if strings.Contains(info.RequestURLPath, "/v1/completions") || info.RelayMode == relayconstant.RelayModeCompletions {
return info.ChannelBaseUrl + "/api/generate", nil
}
return info.ChannelBaseUrl + "/api/chat", nil return info.ChannelBaseUrl + "/api/chat", nil
} }
...@@ -53,7 +63,9 @@ func (a *Adaptor) SetupRequestHeader(c *gin.Context, req *http.Header, info *rel ...@@ -53,7 +63,9 @@ func (a *Adaptor) SetupRequestHeader(c *gin.Context, req *http.Header, info *rel
} }
func (a *Adaptor) ConvertOpenAIRequest(c *gin.Context, info *relaycommon.RelayInfo, request *dto.GeneralOpenAIRequest) (any, error) { func (a *Adaptor) ConvertOpenAIRequest(c *gin.Context, info *relaycommon.RelayInfo, request *dto.GeneralOpenAIRequest) (any, error) {
if request == nil { return nil, errors.New("request is nil") } if request == nil {
return nil, errors.New("request is nil")
}
// decide generate or chat // decide generate or chat
if strings.Contains(info.RequestURLPath, "/v1/completions") || info.RelayMode == relayconstant.RelayModeCompletions { if strings.Contains(info.RequestURLPath, "/v1/completions") || info.RelayMode == relayconstant.RelayModeCompletions {
return openAIToGenerate(c, request) return openAIToGenerate(c, request)
...@@ -69,7 +81,9 @@ func (a *Adaptor) ConvertEmbeddingRequest(c *gin.Context, info *relaycommon.Rela ...@@ -69,7 +81,9 @@ func (a *Adaptor) ConvertEmbeddingRequest(c *gin.Context, info *relaycommon.Rela
return requestOpenAI2Embeddings(request), nil return requestOpenAI2Embeddings(request), nil
} }
func (a *Adaptor) ConvertOpenAIResponsesRequest(c *gin.Context, info *relaycommon.RelayInfo, request dto.OpenAIResponsesRequest) (any, error) { return nil, errors.New("not implemented") } func (a *Adaptor) ConvertOpenAIResponsesRequest(c *gin.Context, info *relaycommon.RelayInfo, request dto.OpenAIResponsesRequest) (any, error) {
return nil, errors.New("not implemented")
}
func (a *Adaptor) DoRequest(c *gin.Context, info *relaycommon.RelayInfo, requestBody io.Reader) (any, error) { func (a *Adaptor) DoRequest(c *gin.Context, info *relaycommon.RelayInfo, requestBody io.Reader) (any, error) {
return channel.DoApiRequest(a, c, info, requestBody) return channel.DoApiRequest(a, c, info, requestBody)
......
...@@ -67,4 +67,3 @@ type OllamaEmbeddingResponse struct { ...@@ -67,4 +67,3 @@ type OllamaEmbeddingResponse struct {
Embeddings [][]float64 `json:"embeddings"` Embeddings [][]float64 `json:"embeddings"`
PromptEvalCount int `json:"prompt_eval_count,omitempty"` PromptEvalCount int `json:"prompt_eval_count,omitempty"`
} }
...@@ -2,10 +2,24 @@ package operation_setting ...@@ -2,10 +2,24 @@ package operation_setting
import "one-api/setting/config" import "one-api/setting/config"
// 额度展示类型
const (
QuotaDisplayTypeUSD = "USD"
QuotaDisplayTypeCNY = "CNY"
QuotaDisplayTypeTokens = "TOKENS"
QuotaDisplayTypeCustom = "CUSTOM"
)
type GeneralSetting struct { type GeneralSetting struct {
DocsLink string `json:"docs_link"` DocsLink string `json:"docs_link"`
PingIntervalEnabled bool `json:"ping_interval_enabled"` PingIntervalEnabled bool `json:"ping_interval_enabled"`
PingIntervalSeconds int `json:"ping_interval_seconds"` PingIntervalSeconds int `json:"ping_interval_seconds"`
// 当前站点额度展示类型:USD / CNY / TOKENS
QuotaDisplayType string `json:"quota_display_type"`
// 自定义货币符号,用于 CUSTOM 展示类型
CustomCurrencySymbol string `json:"custom_currency_symbol"`
// 自定义货币与美元汇率(1 USD = X Custom)
CustomCurrencyExchangeRate float64 `json:"custom_currency_exchange_rate"`
} }
// 默认配置 // 默认配置
...@@ -13,6 +27,9 @@ var generalSetting = GeneralSetting{ ...@@ -13,6 +27,9 @@ var generalSetting = GeneralSetting{
DocsLink: "https://docs.newapi.pro", DocsLink: "https://docs.newapi.pro",
PingIntervalEnabled: false, PingIntervalEnabled: false,
PingIntervalSeconds: 60, PingIntervalSeconds: 60,
QuotaDisplayType: QuotaDisplayTypeUSD,
CustomCurrencySymbol: "¤",
CustomCurrencyExchangeRate: 1.0,
} }
func init() { func init() {
...@@ -23,3 +40,52 @@ func init() { ...@@ -23,3 +40,52 @@ func init() {
func GetGeneralSetting() *GeneralSetting { func GetGeneralSetting() *GeneralSetting {
return &generalSetting return &generalSetting
} }
// IsCurrencyDisplay 是否以货币形式展示(美元或人民币)
func IsCurrencyDisplay() bool {
return generalSetting.QuotaDisplayType != QuotaDisplayTypeTokens
}
// IsCNYDisplay 是否以人民币展示
func IsCNYDisplay() bool {
return generalSetting.QuotaDisplayType == QuotaDisplayTypeCNY
}
// GetQuotaDisplayType 返回额度展示类型
func GetQuotaDisplayType() string {
return generalSetting.QuotaDisplayType
}
// GetCurrencySymbol 返回当前展示类型对应符号
func GetCurrencySymbol() string {
switch generalSetting.QuotaDisplayType {
case QuotaDisplayTypeUSD:
return "$"
case QuotaDisplayTypeCNY:
return "¥"
case QuotaDisplayTypeCustom:
if generalSetting.CustomCurrencySymbol != "" {
return generalSetting.CustomCurrencySymbol
}
return "¤"
default:
return ""
}
}
// GetUsdToCurrencyRate 返回 1 USD = X <currency> 的 X(TOKENS 不适用)
func GetUsdToCurrencyRate(usdToCny float64) float64 {
switch generalSetting.QuotaDisplayType {
case QuotaDisplayTypeUSD:
return 1
case QuotaDisplayTypeCNY:
return usdToCny
case QuotaDisplayTypeCustom:
if generalSetting.CustomCurrencyExchangeRate > 0 {
return generalSetting.CustomCurrencyExchangeRate
}
return 1
default:
return 1
}
}
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
content="OpenAI 接口聚合管理,支持多种渠道包括 Azure,可用于二次分发管理 key,仅单可执行文件,已打包好 Docker 镜像,一键部署,开箱即用" content="OpenAI 接口聚合管理,支持多种渠道包括 Azure,可用于二次分发管理 key,仅单可执行文件,已打包好 Docker 镜像,一键部署,开箱即用"
/> />
<title>New API</title> <title>New API</title>
<analytics></analytics> <analytics></analytics>
</head> </head>
<body> <body>
......
...@@ -135,7 +135,9 @@ const TwoFactorAuthModal = ({ ...@@ -135,7 +135,9 @@ const TwoFactorAuthModal = ({
autoFocus autoFocus
/> />
<Typography.Text type='tertiary' size='small' className='mt-2 block'> <Typography.Text type='tertiary' size='small' className='mt-2 block'>
{t('支持6位TOTP验证码或8位备用码,可到`个人设置-安全设置-两步验证设置`配置或查看。')} {t(
'支持6位TOTP验证码或8位备用码,可到`个人设置-安全设置-两步验证设置`配置或查看。',
)}
</Typography.Text> </Typography.Text>
</div> </div>
</div> </div>
......
...@@ -42,7 +42,7 @@ const OperationSetting = () => { ...@@ -42,7 +42,7 @@ const OperationSetting = () => {
QuotaPerUnit: 0, QuotaPerUnit: 0,
USDExchangeRate: 0, USDExchangeRate: 0,
RetryTimes: 0, RetryTimes: 0,
DisplayInCurrencyEnabled: false, 'general_setting.quota_display_type': 'USD',
DisplayTokenStatEnabled: false, DisplayTokenStatEnabled: false,
DefaultCollapseSidebar: false, DefaultCollapseSidebar: false,
DemoSiteEnabled: false, DemoSiteEnabled: false,
......
...@@ -45,7 +45,6 @@ import { useTranslation } from 'react-i18next'; ...@@ -45,7 +45,6 @@ import { useTranslation } from 'react-i18next';
const SystemSetting = () => { const SystemSetting = () => {
const { t } = useTranslation(); const { t } = useTranslation();
let [inputs, setInputs] = useState({ let [inputs, setInputs] = useState({
PasswordLoginEnabled: '', PasswordLoginEnabled: '',
PasswordRegisterEnabled: '', PasswordRegisterEnabled: '',
EmailVerificationEnabled: '', EmailVerificationEnabled: '',
...@@ -188,7 +187,9 @@ const SystemSetting = () => { ...@@ -188,7 +187,9 @@ const SystemSetting = () => {
setInputs(newInputs); setInputs(newInputs);
setOriginInputs(newInputs); setOriginInputs(newInputs);
// 同步模式布尔到本地状态 // 同步模式布尔到本地状态
if (typeof newInputs['fetch_setting.domain_filter_mode'] !== 'undefined') { if (
typeof newInputs['fetch_setting.domain_filter_mode'] !== 'undefined'
) {
setDomainFilterMode(!!newInputs['fetch_setting.domain_filter_mode']); setDomainFilterMode(!!newInputs['fetch_setting.domain_filter_mode']);
} }
if (typeof newInputs['fetch_setting.ip_filter_mode'] !== 'undefined') { if (typeof newInputs['fetch_setting.ip_filter_mode'] !== 'undefined') {
...@@ -695,7 +696,10 @@ const SystemSetting = () => { ...@@ -695,7 +696,10 @@ const SystemSetting = () => {
noLabel noLabel
extraText={t('SSRF防护开关详细说明')} extraText={t('SSRF防护开关详细说明')}
onChange={(e) => onChange={(e) =>
handleCheckboxChange('fetch_setting.enable_ssrf_protection', e) handleCheckboxChange(
'fetch_setting.enable_ssrf_protection',
e,
)
} }
> >
{t('启用SSRF防护(推荐开启以保护服务器安全)')} {t('启用SSRF防护(推荐开启以保护服务器安全)')}
...@@ -713,10 +717,15 @@ const SystemSetting = () => { ...@@ -713,10 +717,15 @@ const SystemSetting = () => {
noLabel noLabel
extraText={t('私有IP访问详细说明')} extraText={t('私有IP访问详细说明')}
onChange={(e) => onChange={(e) =>
handleCheckboxChange('fetch_setting.allow_private_ip', e) handleCheckboxChange(
'fetch_setting.allow_private_ip',
e,
)
} }
> >
{t('允许访问私有IP地址(127.0.0.1、192.168.x.x等内网地址)')} {t(
'允许访问私有IP地址(127.0.0.1、192.168.x.x等内网地址)',
)}
</Form.Checkbox> </Form.Checkbox>
</Col> </Col>
</Row> </Row>
...@@ -731,7 +740,10 @@ const SystemSetting = () => { ...@@ -731,7 +740,10 @@ const SystemSetting = () => {
noLabel noLabel
extraText={t('域名IP过滤详细说明')} extraText={t('域名IP过滤详细说明')}
onChange={(e) => onChange={(e) =>
handleCheckboxChange('fetch_setting.apply_ip_filter_for_domain', e) handleCheckboxChange(
'fetch_setting.apply_ip_filter_for_domain',
e,
)
} }
style={{ marginBottom: 8 }} style={{ marginBottom: 8 }}
> >
...@@ -740,17 +752,23 @@ const SystemSetting = () => { ...@@ -740,17 +752,23 @@ const SystemSetting = () => {
<Text strong> <Text strong>
{t(domainFilterMode ? '域名白名单' : '域名黑名单')} {t(domainFilterMode ? '域名白名单' : '域名黑名单')}
</Text> </Text>
<Text type="secondary" style={{ display: 'block', marginBottom: 8 }}> <Text
{t('支持通配符格式,如:example.com, *.api.example.com')} type='secondary'
style={{ display: 'block', marginBottom: 8 }}
>
{t(
'支持通配符格式,如:example.com, *.api.example.com',
)}
</Text> </Text>
<Radio.Group <Radio.Group
type='button' type='button'
value={domainFilterMode ? 'whitelist' : 'blacklist'} value={domainFilterMode ? 'whitelist' : 'blacklist'}
onChange={(val) => { onChange={(val) => {
const selected = val && val.target ? val.target.value : val; const selected =
val && val.target ? val.target.value : val;
const isWhitelist = selected === 'whitelist'; const isWhitelist = selected === 'whitelist';
setDomainFilterMode(isWhitelist); setDomainFilterMode(isWhitelist);
setInputs(prev => ({ setInputs((prev) => ({
...prev, ...prev,
'fetch_setting.domain_filter_mode': isWhitelist, 'fetch_setting.domain_filter_mode': isWhitelist,
})); }));
...@@ -765,9 +783,9 @@ const SystemSetting = () => { ...@@ -765,9 +783,9 @@ const SystemSetting = () => {
onChange={(value) => { onChange={(value) => {
setDomainList(value); setDomainList(value);
// 触发Form的onChange事件 // 触发Form的onChange事件
setInputs(prev => ({ setInputs((prev) => ({
...prev, ...prev,
'fetch_setting.domain_list': value 'fetch_setting.domain_list': value,
})); }));
}} }}
placeholder={t('输入域名后回车,如:example.com')} placeholder={t('输入域名后回车,如:example.com')}
...@@ -784,17 +802,21 @@ const SystemSetting = () => { ...@@ -784,17 +802,21 @@ const SystemSetting = () => {
<Text strong> <Text strong>
{t(ipFilterMode ? 'IP白名单' : 'IP黑名单')} {t(ipFilterMode ? 'IP白名单' : 'IP黑名单')}
</Text> </Text>
<Text type="secondary" style={{ display: 'block', marginBottom: 8 }}> <Text
type='secondary'
style={{ display: 'block', marginBottom: 8 }}
>
{t('支持CIDR格式,如:8.8.8.8, 192.168.1.0/24')} {t('支持CIDR格式,如:8.8.8.8, 192.168.1.0/24')}
</Text> </Text>
<Radio.Group <Radio.Group
type='button' type='button'
value={ipFilterMode ? 'whitelist' : 'blacklist'} value={ipFilterMode ? 'whitelist' : 'blacklist'}
onChange={(val) => { onChange={(val) => {
const selected = val && val.target ? val.target.value : val; const selected =
val && val.target ? val.target.value : val;
const isWhitelist = selected === 'whitelist'; const isWhitelist = selected === 'whitelist';
setIpFilterMode(isWhitelist); setIpFilterMode(isWhitelist);
setInputs(prev => ({ setInputs((prev) => ({
...prev, ...prev,
'fetch_setting.ip_filter_mode': isWhitelist, 'fetch_setting.ip_filter_mode': isWhitelist,
})); }));
...@@ -809,9 +831,9 @@ const SystemSetting = () => { ...@@ -809,9 +831,9 @@ const SystemSetting = () => {
onChange={(value) => { onChange={(value) => {
setIpList(value); setIpList(value);
// 触发Form的onChange事件 // 触发Form的onChange事件
setInputs(prev => ({ setInputs((prev) => ({
...prev, ...prev,
'fetch_setting.ip_list': value 'fetch_setting.ip_list': value,
})); }));
}} }}
placeholder={t('输入IP地址后回车,如:8.8.8.8')} placeholder={t('输入IP地址后回车,如:8.8.8.8')}
...@@ -826,7 +848,10 @@ const SystemSetting = () => { ...@@ -826,7 +848,10 @@ const SystemSetting = () => {
> >
<Col xs={24} sm={24} md={24} lg={24} xl={24}> <Col xs={24} sm={24} md={24} lg={24} xl={24}>
<Text strong>{t('允许的端口')}</Text> <Text strong>{t('允许的端口')}</Text>
<Text type="secondary" style={{ display: 'block', marginBottom: 8 }}> <Text
type='secondary'
style={{ display: 'block', marginBottom: 8 }}
>
{t('支持单个端口和端口范围,如:80, 443, 8000-8999')} {t('支持单个端口和端口范围,如:80, 443, 8000-8999')}
</Text> </Text>
<TagInput <TagInput
...@@ -834,15 +859,18 @@ const SystemSetting = () => { ...@@ -834,15 +859,18 @@ const SystemSetting = () => {
onChange={(value) => { onChange={(value) => {
setAllowedPorts(value); setAllowedPorts(value);
// 触发Form的onChange事件 // 触发Form的onChange事件
setInputs(prev => ({ setInputs((prev) => ({
...prev, ...prev,
'fetch_setting.allowed_ports': value 'fetch_setting.allowed_ports': value,
})); }));
}} }}
placeholder={t('输入端口后回车,如:80 或 8000-8999')} placeholder={t('输入端口后回车,如:80 或 8000-8999')}
style={{ width: '100%' }} style={{ width: '100%' }}
/> />
<Text type="secondary" style={{ display: 'block', marginBottom: 8 }}> <Text
type='secondary'
style={{ display: 'block', marginBottom: 8 }}
>
{t('端口配置详细说明')} {t('端口配置详细说明')}
</Text> </Text>
</Col> </Col>
......
...@@ -85,7 +85,8 @@ const AccountManagement = ({ ...@@ -85,7 +85,8 @@ const AccountManagement = ({
); );
}; };
const isBound = (accountId) => Boolean(accountId); const isBound = (accountId) => Boolean(accountId);
const [showTelegramBindModal, setShowTelegramBindModal] = React.useState(false); const [showTelegramBindModal, setShowTelegramBindModal] =
React.useState(false);
return ( return (
<Card className='!rounded-2xl'> <Card className='!rounded-2xl'>
...@@ -226,7 +227,8 @@ const AccountManagement = ({ ...@@ -226,7 +227,8 @@ const AccountManagement = ({
onGitHubOAuthClicked(status.github_client_id) onGitHubOAuthClicked(status.github_client_id)
} }
disabled={ disabled={
isBound(userState.user?.github_id) || !status.github_oauth isBound(userState.user?.github_id) ||
!status.github_oauth
} }
> >
{status.github_oauth ? t('绑定') : t('未启用')} {status.github_oauth ? t('绑定') : t('未启用')}
...@@ -384,7 +386,8 @@ const AccountManagement = ({ ...@@ -384,7 +386,8 @@ const AccountManagement = ({
onLinuxDOOAuthClicked(status.linuxdo_client_id) onLinuxDOOAuthClicked(status.linuxdo_client_id)
} }
disabled={ disabled={
isBound(userState.user?.linux_do_id) || !status.linuxdo_oauth isBound(userState.user?.linux_do_id) ||
!status.linuxdo_oauth
} }
> >
{status.linuxdo_oauth ? t('绑定') : t('未启用')} {status.linuxdo_oauth ? t('绑定') : t('未启用')}
......
...@@ -87,23 +87,7 @@ const REGION_EXAMPLE = { ...@@ -87,23 +87,7 @@ const REGION_EXAMPLE = {
// 支持并且已适配通过接口获取模型列表的渠道类型 // 支持并且已适配通过接口获取模型列表的渠道类型
const MODEL_FETCHABLE_TYPES = new Set([ const MODEL_FETCHABLE_TYPES = new Set([
1, 1, 4, 14, 34, 17, 26, 24, 47, 25, 20, 23, 31, 35, 40, 42, 48, 43,
4,
14,
34,
17,
26,
24,
47,
25,
20,
23,
31,
35,
40,
42,
48,
43,
]); ]);
function type2secretPrompt(type) { function type2secretPrompt(type) {
...@@ -348,7 +332,10 @@ const EditChannelModal = (props) => { ...@@ -348,7 +332,10 @@ const EditChannelModal = (props) => {
break; break;
case 45: case 45:
localModels = getChannelModels(value); localModels = getChannelModels(value);
setInputs((prevInputs) => ({ ...prevInputs, base_url: 'https://ark.cn-beijing.volces.com' })); setInputs((prevInputs) => ({
...prevInputs,
base_url: 'https://ark.cn-beijing.volces.com',
}));
break; break;
default: default:
localModels = getChannelModels(value); localModels = getChannelModels(value);
...@@ -442,7 +429,8 @@ const EditChannelModal = (props) => { ...@@ -442,7 +429,8 @@ const EditChannelModal = (props) => {
// 读取 Vertex 密钥格式 // 读取 Vertex 密钥格式
data.vertex_key_type = parsedSettings.vertex_key_type || 'json'; data.vertex_key_type = parsedSettings.vertex_key_type || 'json';
// 读取企业账户设置 // 读取企业账户设置
data.is_enterprise_account = parsedSettings.openrouter_enterprise === true; data.is_enterprise_account =
parsedSettings.openrouter_enterprise === true;
} catch (error) { } catch (error) {
console.error('解析其他设置失败:', error); console.error('解析其他设置失败:', error);
data.azure_responses_version = ''; data.azure_responses_version = '';
...@@ -868,7 +856,10 @@ const EditChannelModal = (props) => { ...@@ -868,7 +856,10 @@ const EditChannelModal = (props) => {
showInfo(t('请至少选择一个模型!')); showInfo(t('请至少选择一个模型!'));
return; return;
} }
if (localInputs.type === 45 && (!localInputs.base_url || localInputs.base_url.trim() === '')) { if (
localInputs.type === 45 &&
(!localInputs.base_url || localInputs.base_url.trim() === '')
) {
showInfo(t('请输入API地址!')); showInfo(t('请输入API地址!'));
return; return;
} }
...@@ -912,7 +903,8 @@ const EditChannelModal = (props) => { ...@@ -912,7 +903,8 @@ const EditChannelModal = (props) => {
} }
} }
// 设置企业账户标识,无论是true还是false都要传到后端 // 设置企业账户标识,无论是true还是false都要传到后端
settings.openrouter_enterprise = localInputs.is_enterprise_account === true; settings.openrouter_enterprise =
localInputs.is_enterprise_account === true;
localInputs.settings = JSON.stringify(settings); localInputs.settings = JSON.stringify(settings);
} }
...@@ -1318,7 +1310,9 @@ const EditChannelModal = (props) => { ...@@ -1318,7 +1310,9 @@ const EditChannelModal = (props) => {
setIsEnterpriseAccount(value); setIsEnterpriseAccount(value);
handleInputChange('is_enterprise_account', value); handleInputChange('is_enterprise_account', value);
}} }}
extraText={t('企业账户为特殊返回格式,需要特殊处理,如果非企业账户,请勿勾选')} extraText={t(
'企业账户为特殊返回格式,需要特殊处理,如果非企业账户,请勿勾选',
)}
initValue={inputs.is_enterprise_account} initValue={inputs.is_enterprise_account}
/> />
)} )}
...@@ -1955,12 +1949,12 @@ const EditChannelModal = (props) => { ...@@ -1955,12 +1949,12 @@ const EditChannelModal = (props) => {
optionList={[ optionList={[
{ {
value: 'https://ark.cn-beijing.volces.com', value: 'https://ark.cn-beijing.volces.com',
label: 'https://ark.cn-beijing.volces.com' label: 'https://ark.cn-beijing.volces.com',
}, },
{ {
value: 'https://ark.ap-southeast.bytepluses.com', value: 'https://ark.ap-southeast.bytepluses.com',
label: 'https://ark.ap-southeast.bytepluses.com' label: 'https://ark.ap-southeast.bytepluses.com',
} },
]} ]}
defaultValue='https://ark.cn-beijing.volces.com' defaultValue='https://ark.cn-beijing.volces.com'
/> />
......
...@@ -56,10 +56,10 @@ const MjLogsFilters = ({ ...@@ -56,10 +56,10 @@ const MjLogsFilters = ({
showClear showClear
pure pure
size='small' size='small'
presets={DATE_RANGE_PRESETS.map(preset => ({ presets={DATE_RANGE_PRESETS.map((preset) => ({
text: t(preset.text), text: t(preset.text),
start: preset.start(), start: preset.start(),
end: preset.end() end: preset.end(),
}))} }))}
/> />
</div> </div>
......
...@@ -56,6 +56,7 @@ const PricingDisplaySettings = ({ ...@@ -56,6 +56,7 @@ const PricingDisplaySettings = ({
const currencyItems = [ const currencyItems = [
{ value: 'USD', label: 'USD ($)' }, { value: 'USD', label: 'USD ($)' },
{ value: 'CNY', label: 'CNY (¥)' }, { value: 'CNY', label: 'CNY (¥)' },
{ value: 'CUSTOM', label: t('自定义货币') },
]; ];
const handleChange = (value) => { const handleChange = (value) => {
......
...@@ -107,6 +107,7 @@ const SearchActions = memo( ...@@ -107,6 +107,7 @@ const SearchActions = memo(
optionList={[ optionList={[
{ value: 'USD', label: 'USD' }, { value: 'USD', label: 'USD' },
{ value: 'CNY', label: 'CNY' }, { value: 'CNY', label: 'CNY' },
{ value: 'CUSTOM', label: t('自定义货币') },
]} ]}
/> />
)} )}
......
...@@ -36,8 +36,9 @@ import { ...@@ -36,8 +36,9 @@ import {
} from 'lucide-react'; } from 'lucide-react';
import { import {
TASK_ACTION_FIRST_TAIL_GENERATE, TASK_ACTION_FIRST_TAIL_GENERATE,
TASK_ACTION_GENERATE, TASK_ACTION_REFERENCE_GENERATE, TASK_ACTION_GENERATE,
TASK_ACTION_TEXT_GENERATE TASK_ACTION_REFERENCE_GENERATE,
TASK_ACTION_TEXT_GENERATE,
} from '../../../constants/common.constant'; } from '../../../constants/common.constant';
import { CHANNEL_OPTIONS } from '../../../constants/channel.constants'; import { CHANNEL_OPTIONS } from '../../../constants/channel.constants';
......
...@@ -56,10 +56,10 @@ const TaskLogsFilters = ({ ...@@ -56,10 +56,10 @@ const TaskLogsFilters = ({
showClear showClear
pure pure
size='small' size='small'
presets={DATE_RANGE_PRESETS.map(preset => ({ presets={DATE_RANGE_PRESETS.map((preset) => ({
text: t(preset.text), text: t(preset.text),
start: preset.start(), start: preset.start(),
end: preset.end() end: preset.end(),
}))} }))}
/> />
</div> </div>
......
...@@ -60,16 +60,28 @@ const ContentModal = ({ ...@@ -60,16 +60,28 @@ const ContentModal = ({
if (videoError) { if (videoError) {
return ( return (
<div style={{ textAlign: 'center', padding: '40px' }}> <div style={{ textAlign: 'center', padding: '40px' }}>
<Text type="tertiary" style={{ display: 'block', marginBottom: '16px' }}> <Text
type='tertiary'
style={{ display: 'block', marginBottom: '16px' }}
>
视频无法在当前浏览器中播放,这可能是由于: 视频无法在当前浏览器中播放,这可能是由于:
</Text> </Text>
<Text type="tertiary" style={{ display: 'block', marginBottom: '8px', fontSize: '12px' }}> <Text
type='tertiary'
style={{ display: 'block', marginBottom: '8px', fontSize: '12px' }}
>
• 视频服务商的跨域限制 • 视频服务商的跨域限制
</Text> </Text>
<Text type="tertiary" style={{ display: 'block', marginBottom: '8px', fontSize: '12px' }}> <Text
type='tertiary'
style={{ display: 'block', marginBottom: '8px', fontSize: '12px' }}
>
• 需要特定的请求头或认证 • 需要特定的请求头或认证
</Text> </Text>
<Text type="tertiary" style={{ display: 'block', marginBottom: '16px', fontSize: '12px' }}> <Text
type='tertiary'
style={{ display: 'block', marginBottom: '16px', fontSize: '12px' }}
>
• 防盗链保护机制 • 防盗链保护机制
</Text> </Text>
...@@ -81,17 +93,21 @@ const ContentModal = ({ ...@@ -81,17 +93,21 @@ const ContentModal = ({
> >
在新标签页中打开 在新标签页中打开
</Button> </Button>
<Button <Button icon={<IconCopy />} onClick={handleCopyUrl}>
icon={<IconCopy />}
onClick={handleCopyUrl}
>
复制链接 复制链接
</Button> </Button>
</div> </div>
<div style={{ marginTop: '16px', padding: '8px', backgroundColor: '#f8f9fa', borderRadius: '4px' }}> <div
style={{
marginTop: '16px',
padding: '8px',
backgroundColor: '#f8f9fa',
borderRadius: '4px',
}}
>
<Text <Text
type="tertiary" type='tertiary'
style={{ fontSize: '10px', wordBreak: 'break-all' }} style={{ fontSize: '10px', wordBreak: 'break-all' }}
> >
{modalContent} {modalContent}
...@@ -104,14 +120,16 @@ const ContentModal = ({ ...@@ -104,14 +120,16 @@ const ContentModal = ({
return ( return (
<div style={{ position: 'relative' }}> <div style={{ position: 'relative' }}>
{isLoading && ( {isLoading && (
<div style={{ <div
style={{
position: 'absolute', position: 'absolute',
top: '50%', top: '50%',
left: '50%', left: '50%',
transform: 'translate(-50%, -50%)', transform: 'translate(-50%, -50%)',
zIndex: 10 zIndex: 10,
}}> }}
<Spin size="large" /> >
<Spin size='large' />
</div> </div>
)} )}
<video <video
...@@ -119,7 +137,7 @@ const ContentModal = ({ ...@@ -119,7 +137,7 @@ const ContentModal = ({
controls controls
style={{ width: '100%' }} style={{ width: '100%' }}
autoPlay autoPlay
crossOrigin="anonymous" crossOrigin='anonymous'
onError={handleVideoError} onError={handleVideoError}
onLoadedData={handleVideoLoaded} onLoadedData={handleVideoLoaded}
onLoadStart={() => setIsLoading(true)} onLoadStart={() => setIsLoading(true)}
...@@ -137,7 +155,7 @@ const ContentModal = ({ ...@@ -137,7 +155,7 @@ const ContentModal = ({
bodyStyle={{ bodyStyle={{
height: isVideo ? '450px' : '400px', height: isVideo ? '450px' : '400px',
overflow: 'auto', overflow: 'auto',
padding: isVideo && videoError ? '0' : '24px' padding: isVideo && videoError ? '0' : '24px',
}} }}
width={800} width={800}
> >
......
...@@ -57,10 +57,10 @@ const LogsFilters = ({ ...@@ -57,10 +57,10 @@ const LogsFilters = ({
showClear showClear
pure pure
size='small' size='small'
presets={DATE_RANGE_PRESETS.map(preset => ({ presets={DATE_RANGE_PRESETS.map((preset) => ({
text: t(preset.text), text: t(preset.text),
start: preset.start(), start: preset.start(),
end: preset.end() end: preset.end(),
}))} }))}
/> />
</div> </div>
......
...@@ -30,7 +30,8 @@ import { ...@@ -30,7 +30,8 @@ import {
Space, Space,
Row, Row,
Col, Col,
Spin, Tooltip Spin,
Tooltip,
} from '@douyinfe/semi-ui'; } from '@douyinfe/semi-ui';
import { SiAlipay, SiWechat, SiStripe } from 'react-icons/si'; import { SiAlipay, SiWechat, SiStripe } from 'react-icons/si';
import { CreditCard, Coins, Wallet, BarChart2, TrendingUp } from 'lucide-react'; import { CreditCard, Coins, Wallet, BarChart2, TrendingUp } from 'lucide-react';
...@@ -266,7 +267,8 @@ const RechargeCard = ({ ...@@ -266,7 +267,8 @@ const RechargeCard = ({
{payMethods && payMethods.length > 0 ? ( {payMethods && payMethods.length > 0 ? (
<Space wrap> <Space wrap>
{payMethods.map((payMethod) => { {payMethods.map((payMethod) => {
const minTopupVal = Number(payMethod.min_topup) || 0; const minTopupVal =
Number(payMethod.min_topup) || 0;
const isStripe = payMethod.type === 'stripe'; const isStripe = payMethod.type === 'stripe';
const disabled = const disabled =
(!enableOnlineTopUp && !isStripe) || (!enableOnlineTopUp && !isStripe) ||
...@@ -280,7 +282,9 @@ const RechargeCard = ({ ...@@ -280,7 +282,9 @@ const RechargeCard = ({
type='tertiary' type='tertiary'
onClick={() => preTopUp(payMethod.type)} onClick={() => preTopUp(payMethod.type)}
disabled={disabled} disabled={disabled}
loading={paymentLoading && payWay === payMethod.type} loading={
paymentLoading && payWay === payMethod.type
}
icon={ icon={
payMethod.type === 'alipay' ? ( payMethod.type === 'alipay' ? (
<SiAlipay size={18} color='#1677FF' /> <SiAlipay size={18} color='#1677FF' />
...@@ -291,7 +295,10 @@ const RechargeCard = ({ ...@@ -291,7 +295,10 @@ const RechargeCard = ({
) : ( ) : (
<CreditCard <CreditCard
size={18} size={18}
color={payMethod.color || 'var(--semi-color-text-2)'} color={
payMethod.color ||
'var(--semi-color-text-2)'
}
/> />
) )
} }
...@@ -301,12 +308,22 @@ const RechargeCard = ({ ...@@ -301,12 +308,22 @@ const RechargeCard = ({
</Button> </Button>
); );
return disabled && minTopupVal > Number(topUpCount || 0) ? ( return disabled &&
<Tooltip content={t('此支付方式最低充值金额为') + ' ' + minTopupVal} key={payMethod.type}> minTopupVal > Number(topUpCount || 0) ? (
<Tooltip
content={
t('此支付方式最低充值金额为') +
' ' +
minTopupVal
}
key={payMethod.type}
>
{buttonEl} {buttonEl}
</Tooltip> </Tooltip>
) : ( ) : (
<React.Fragment key={payMethod.type}>{buttonEl}</React.Fragment> <React.Fragment key={payMethod.type}>
{buttonEl}
</React.Fragment>
); );
})} })}
</Space> </Space>
...@@ -324,7 +341,10 @@ const RechargeCard = ({ ...@@ -324,7 +341,10 @@ const RechargeCard = ({
<Form.Slot label={t('选择充值额度')}> <Form.Slot label={t('选择充值额度')}>
<div className='grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 gap-2'> <div className='grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 gap-2'>
{presetAmounts.map((preset, index) => { {presetAmounts.map((preset, index) => {
const discount = preset.discount || topupInfo?.discount?.[preset.value] || 1.0; const discount =
preset.discount ||
topupInfo?.discount?.[preset.value] ||
1.0;
const originalPrice = preset.value * priceRatio; const originalPrice = preset.value * priceRatio;
const discountedPrice = originalPrice * discount; const discountedPrice = originalPrice * discount;
const hasDiscount = discount < 1.0; const hasDiscount = discount < 1.0;
...@@ -336,11 +356,12 @@ const RechargeCard = ({ ...@@ -336,11 +356,12 @@ const RechargeCard = ({
key={index} key={index}
style={{ style={{
cursor: 'pointer', cursor: 'pointer',
border: selectedPreset === preset.value border:
selectedPreset === preset.value
? '2px solid var(--semi-color-primary)' ? '2px solid var(--semi-color-primary)'
: '1px solid var(--semi-color-border)', : '1px solid var(--semi-color-border)',
height: '100%', height: '100%',
width: '100%' width: '100%',
}} }}
bodyStyle={{ padding: '12px' }} bodyStyle={{ padding: '12px' }}
onClick={() => { onClick={() => {
...@@ -352,24 +373,35 @@ const RechargeCard = ({ ...@@ -352,24 +373,35 @@ const RechargeCard = ({
}} }}
> >
<div style={{ textAlign: 'center' }}> <div style={{ textAlign: 'center' }}>
<Typography.Title heading={6} style={{ margin: '0 0 8px 0' }}> <Typography.Title
heading={6}
style={{ margin: '0 0 8px 0' }}
>
<Coins size={18} /> <Coins size={18} />
{formatLargeNumber(preset.value)} {formatLargeNumber(preset.value)}
{hasDiscount && ( {hasDiscount && (
<Tag style={{ marginLeft: 4 }} color="green"> <Tag style={{ marginLeft: 4 }} color='green'>
{t('折').includes('off') ? {t('折').includes('off')
((1 - parseFloat(discount)) * 100).toFixed(1) : ? (
(discount * 10).toFixed(1)}{t('折')} (1 - parseFloat(discount)) *
100
).toFixed(1)
: (discount * 10).toFixed(1)}
{t('折')}
</Tag> </Tag>
)} )}
</Typography.Title> </Typography.Title>
<div style={{ <div
style={{
color: 'var(--semi-color-text-2)', color: 'var(--semi-color-text-2)',
fontSize: '12px', fontSize: '12px',
margin: '4px 0' margin: '4px 0',
}}> }}
>
{t('实付')} {actualPay.toFixed(2)} {t('实付')} {actualPay.toFixed(2)}
{hasDiscount ? `${t('节省')} ${save.toFixed(2)}` : `${t('节省')} 0.00`} {hasDiscount
? `${t('节省')} ${save.toFixed(2)}`
: `${t('节省')} 0.00`}
</div> </div>
</div> </div>
</Card> </Card>
......
...@@ -84,7 +84,7 @@ const TopUp = () => { ...@@ -84,7 +84,7 @@ const TopUp = () => {
// 充值配置信息 // 充值配置信息
const [topupInfo, setTopupInfo] = useState({ const [topupInfo, setTopupInfo] = useState({
amount_options: [], amount_options: [],
discount: {} discount: {},
}); });
const topUp = async () => { const topUp = async () => {
...@@ -262,7 +262,7 @@ const TopUp = () => { ...@@ -262,7 +262,7 @@ const TopUp = () => {
if (success) { if (success) {
setTopupInfo({ setTopupInfo({
amount_options: data.amount_options || [], amount_options: data.amount_options || [],
discount: data.discount || {} discount: data.discount || {},
}); });
// 处理支付方式 // 处理支付方式
...@@ -280,10 +280,15 @@ const TopUp = () => { ...@@ -280,10 +280,15 @@ const TopUp = () => {
payMethods = payMethods.map((method) => { payMethods = payMethods.map((method) => {
// 规范化最小充值数 // 规范化最小充值数
const normalizedMinTopup = Number(method.min_topup); const normalizedMinTopup = Number(method.min_topup);
method.min_topup = Number.isFinite(normalizedMinTopup) ? normalizedMinTopup : 0; method.min_topup = Number.isFinite(normalizedMinTopup)
? normalizedMinTopup
: 0;
// Stripe 的最小充值从后端字段回填 // Stripe 的最小充值从后端字段回填
if (method.type === 'stripe' && (!method.min_topup || method.min_topup <= 0)) { if (
method.type === 'stripe' &&
(!method.min_topup || method.min_topup <= 0)
) {
const stripeMin = Number(data.stripe_min_topup); const stripeMin = Number(data.stripe_min_topup);
if (Number.isFinite(stripeMin)) { if (Number.isFinite(stripeMin)) {
method.min_topup = stripeMin; method.min_topup = stripeMin;
...@@ -313,7 +318,11 @@ const TopUp = () => { ...@@ -313,7 +318,11 @@ const TopUp = () => {
setPayMethods(payMethods); setPayMethods(payMethods);
const enableStripeTopUp = data.enable_stripe_topup || false; const enableStripeTopUp = data.enable_stripe_topup || false;
const enableOnlineTopUp = data.enable_online_topup || false; const enableOnlineTopUp = data.enable_online_topup || false;
const minTopUpValue = enableOnlineTopUp? data.min_topup : enableStripeTopUp? data.stripe_min_topup : 1; const minTopUpValue = enableOnlineTopUp
? data.min_topup
: enableStripeTopUp
? data.stripe_min_topup
: 1;
setEnableOnlineTopUp(enableOnlineTopUp); setEnableOnlineTopUp(enableOnlineTopUp);
setEnableStripeTopUp(enableStripeTopUp); setEnableStripeTopUp(enableStripeTopUp);
setMinTopUp(minTopUpValue); setMinTopUp(minTopUpValue);
...@@ -333,9 +342,9 @@ const TopUp = () => { ...@@ -333,9 +342,9 @@ const TopUp = () => {
// 如果有自定义充值数量选项,使用它们替换默认的预设选项 // 如果有自定义充值数量选项,使用它们替换默认的预设选项
if (data.amount_options && data.amount_options.length > 0) { if (data.amount_options && data.amount_options.length > 0) {
const customPresets = data.amount_options.map(amount => ({ const customPresets = data.amount_options.map((amount) => ({
value: amount, value: amount,
discount: data.discount[amount] || 1.0 discount: data.discount[amount] || 1.0,
})); }));
setPresetAmounts(customPresets); setPresetAmounts(customPresets);
} }
......
...@@ -40,9 +40,10 @@ const PaymentConfirmModal = ({ ...@@ -40,9 +40,10 @@ const PaymentConfirmModal = ({
amountNumber, amountNumber,
discountRate, discountRate,
}) => { }) => {
const hasDiscount = discountRate && discountRate > 0 && discountRate < 1 && amountNumber > 0; const hasDiscount =
const originalAmount = hasDiscount ? (amountNumber / discountRate) : 0; discountRate && discountRate > 0 && discountRate < 1 && amountNumber > 0;
const discountAmount = hasDiscount ? (originalAmount - amountNumber) : 0; const originalAmount = hasDiscount ? amountNumber / discountRate : 0;
const discountAmount = hasDiscount ? originalAmount - amountNumber : 0;
return ( return (
<Modal <Modal
title={ title={
......
...@@ -24,26 +24,26 @@ export const DATE_RANGE_PRESETS = [ ...@@ -24,26 +24,26 @@ export const DATE_RANGE_PRESETS = [
{ {
text: '今天', text: '今天',
start: () => dayjs().startOf('day').toDate(), start: () => dayjs().startOf('day').toDate(),
end: () => dayjs().endOf('day').toDate() end: () => dayjs().endOf('day').toDate(),
}, },
{ {
text: '近 7 天', text: '近 7 天',
start: () => dayjs().subtract(6, 'day').startOf('day').toDate(), start: () => dayjs().subtract(6, 'day').startOf('day').toDate(),
end: () => dayjs().endOf('day').toDate() end: () => dayjs().endOf('day').toDate(),
}, },
{ {
text: '本周', text: '本周',
start: () => dayjs().startOf('week').toDate(), start: () => dayjs().startOf('week').toDate(),
end: () => dayjs().endOf('week').toDate() end: () => dayjs().endOf('week').toDate(),
}, },
{ {
text: '近 30 天', text: '近 30 天',
start: () => dayjs().subtract(29, 'day').startOf('day').toDate(), start: () => dayjs().subtract(29, 'day').startOf('day').toDate(),
end: () => dayjs().endOf('day').toDate() end: () => dayjs().endOf('day').toDate(),
}, },
{ {
text: '本月', text: '本月',
start: () => dayjs().startOf('month').toDate(), start: () => dayjs().startOf('month').toDate(),
end: () => dayjs().endOf('month').toDate() end: () => dayjs().endOf('month').toDate(),
}, },
]; ];
...@@ -131,13 +131,11 @@ export const buildApiPayload = ( ...@@ -131,13 +131,11 @@ export const buildApiPayload = (
seed: 'seed', seed: 'seed',
}; };
Object.entries(parameterMappings).forEach(([key, param]) => { Object.entries(parameterMappings).forEach(([key, param]) => {
const enabled = parameterEnabled[key]; const enabled = parameterEnabled[key];
const value = inputs[param]; const value = inputs[param];
const hasValue = value !== undefined && value !== null; const hasValue = value !== undefined && value !== null;
if (enabled && hasValue) { if (enabled && hasValue) {
payload[param] = value; payload[param] = value;
} }
......
...@@ -23,7 +23,9 @@ export function setStatusData(data) { ...@@ -23,7 +23,9 @@ export function setStatusData(data) {
localStorage.setItem('logo', data.logo); localStorage.setItem('logo', data.logo);
localStorage.setItem('footer_html', data.footer_html); localStorage.setItem('footer_html', data.footer_html);
localStorage.setItem('quota_per_unit', data.quota_per_unit); localStorage.setItem('quota_per_unit', data.quota_per_unit);
// 兼容:保留旧字段,同时写入新的额度展示类型
localStorage.setItem('display_in_currency', data.display_in_currency); localStorage.setItem('display_in_currency', data.display_in_currency);
localStorage.setItem('quota_display_type', data.quota_display_type || 'USD');
localStorage.setItem('enable_drawing', data.enable_drawing); localStorage.setItem('enable_drawing', data.enable_drawing);
localStorage.setItem('enable_task', data.enable_task); localStorage.setItem('enable_task', data.enable_task);
localStorage.setItem('enable_data_export', data.enable_data_export); localStorage.setItem('enable_data_export', data.enable_data_export);
......
...@@ -830,12 +830,25 @@ export function renderQuotaNumberWithDigit(num, digits = 2) { ...@@ -830,12 +830,25 @@ export function renderQuotaNumberWithDigit(num, digits = 2) {
if (typeof num !== 'number' || isNaN(num)) { if (typeof num !== 'number' || isNaN(num)) {
return 0; return 0;
} }
let displayInCurrency = localStorage.getItem('display_in_currency'); const quotaDisplayType = localStorage.getItem('quota_display_type') || 'USD';
num = num.toFixed(digits); num = num.toFixed(digits);
if (displayInCurrency) { if (quotaDisplayType === 'CNY') {
return '¥' + num;
} else if (quotaDisplayType === 'USD') {
return '$' + num; return '$' + num;
} else if (quotaDisplayType === 'CUSTOM') {
const statusStr = localStorage.getItem('status');
let symbol = '¤';
try {
if (statusStr) {
const s = JSON.parse(statusStr);
symbol = s?.custom_currency_symbol || symbol;
} }
} catch (e) {}
return symbol + num;
} else {
return num; return num;
}
} }
export function renderNumberWithPoint(num) { export function renderNumberWithPoint(num) {
...@@ -887,33 +900,67 @@ export function getQuotaWithUnit(quota, digits = 6) { ...@@ -887,33 +900,67 @@ export function getQuotaWithUnit(quota, digits = 6) {
} }
export function renderQuotaWithAmount(amount) { export function renderQuotaWithAmount(amount) {
let displayInCurrency = localStorage.getItem('display_in_currency'); const quotaDisplayType = localStorage.getItem('quota_display_type') || 'USD';
displayInCurrency = displayInCurrency === 'true'; if (quotaDisplayType === 'TOKENS') {
if (displayInCurrency) {
return '$' + amount;
} else {
return renderNumber(renderUnitWithQuota(amount)); return renderNumber(renderUnitWithQuota(amount));
} }
if (quotaDisplayType === 'CNY') {
return '¥' + amount;
} else if (quotaDisplayType === 'CUSTOM') {
const statusStr = localStorage.getItem('status');
let symbol = '¤';
try {
if (statusStr) {
const s = JSON.parse(statusStr);
symbol = s?.custom_currency_symbol || symbol;
}
} catch (e) {}
return symbol + amount;
}
return '$' + amount;
} }
export function renderQuota(quota, digits = 2) { export function renderQuota(quota, digits = 2) {
let quotaPerUnit = localStorage.getItem('quota_per_unit'); let quotaPerUnit = localStorage.getItem('quota_per_unit');
let displayInCurrency = localStorage.getItem('display_in_currency'); const quotaDisplayType = localStorage.getItem('quota_display_type') || 'USD';
quotaPerUnit = parseFloat(quotaPerUnit); quotaPerUnit = parseFloat(quotaPerUnit);
displayInCurrency = displayInCurrency === 'true'; if (quotaDisplayType === 'TOKENS') {
if (displayInCurrency) { return renderNumber(quota);
const result = quota / quotaPerUnit;
const fixedResult = result.toFixed(digits);
// 如果 toFixed 后结果为 0 但原始值不为 0,显示最小值
if (parseFloat(fixedResult) === 0 && quota > 0 && result > 0) {
const minValue = Math.pow(10, -digits);
return '$' + minValue.toFixed(digits);
} }
const resultUSD = quota / quotaPerUnit;
return '$' + fixedResult; let symbol = '$';
let value = resultUSD;
if (quotaDisplayType === 'CNY') {
const statusStr = localStorage.getItem('status');
let usdRate = 1;
try {
if (statusStr) {
const s = JSON.parse(statusStr);
usdRate = s?.usd_exchange_rate || 1;
} }
return renderNumber(quota); } catch (e) {}
value = resultUSD * usdRate;
symbol = '¥';
} else if (quotaDisplayType === 'CUSTOM') {
const statusStr = localStorage.getItem('status');
let symbolCustom = '¤';
let rate = 1;
try {
if (statusStr) {
const s = JSON.parse(statusStr);
symbolCustom = s?.custom_currency_symbol || symbolCustom;
rate = s?.custom_currency_exchange_rate || rate;
}
} catch (e) {}
value = resultUSD * rate;
symbol = symbolCustom;
}
const fixedResult = value.toFixed(digits);
if (parseFloat(fixedResult) === 0 && quota > 0 && value > 0) {
const minValue = Math.pow(10, -digits);
return symbol + minValue.toFixed(digits);
}
return symbol + fixedResult;
} }
function isValidGroupRatio(ratio) { function isValidGroupRatio(ratio) {
...@@ -1072,7 +1119,7 @@ export function renderModelPrice( ...@@ -1072,7 +1119,7 @@ export function renderModelPrice(
(completionTokens / 1000000) * completionRatioPrice * groupRatio + (completionTokens / 1000000) * completionRatioPrice * groupRatio +
(webSearchCallCount / 1000) * webSearchPrice * groupRatio + (webSearchCallCount / 1000) * webSearchPrice * groupRatio +
(fileSearchCallCount / 1000) * fileSearchPrice * groupRatio + (fileSearchCallCount / 1000) * fileSearchPrice * groupRatio +
(imageGenerationCallPrice * groupRatio); imageGenerationCallPrice * groupRatio;
return ( return (
<> <>
...@@ -1510,9 +1557,8 @@ export function renderAudioModelPrice( ...@@ -1510,9 +1557,8 @@ export function renderAudioModelPrice(
} }
export function renderQuotaWithPrompt(quota, digits) { export function renderQuotaWithPrompt(quota, digits) {
let displayInCurrency = localStorage.getItem('display_in_currency'); const quotaDisplayType = localStorage.getItem('quota_display_type') || 'USD';
displayInCurrency = displayInCurrency === 'true'; if (quotaDisplayType !== 'TOKENS') {
if (displayInCurrency) {
return i18next.t('等价金额:') + renderQuota(quota, digits); return i18next.t('等价金额:') + renderQuota(quota, digits);
} }
return ''; return '';
......
...@@ -646,9 +646,25 @@ export const calculateModelPrice = ({ ...@@ -646,9 +646,25 @@ export const calculateModelPrice = ({
const numCompletion = const numCompletion =
parseFloat(rawDisplayCompletion.replace(/[^0-9.]/g, '')) / unitDivisor; parseFloat(rawDisplayCompletion.replace(/[^0-9.]/g, '')) / unitDivisor;
let symbol = '$';
if (currency === 'CNY') {
symbol = '¥';
} else if (currency === 'CUSTOM') {
try {
const statusStr = localStorage.getItem('status');
if (statusStr) {
const s = JSON.parse(statusStr);
symbol = s?.custom_currency_symbol || '¤';
} else {
symbol = '¤';
}
} catch (e) {
symbol = '¤';
}
}
return { return {
inputPrice: `${currency === 'CNY' ? '¥' : '$'}${numInput.toFixed(precision)}`, inputPrice: `${symbol}${numInput.toFixed(precision)}`,
completionPrice: `${currency === 'CNY' ? '¥' : '$'}${numCompletion.toFixed(precision)}`, completionPrice: `${symbol}${numCompletion.toFixed(precision)}`,
unitLabel, unitLabel,
isPerToken: true, isPerToken: true,
usedGroup, usedGroup,
......
...@@ -155,7 +155,10 @@ export const useSidebar = () => { ...@@ -155,7 +155,10 @@ export const useSidebar = () => {
sidebarEventTarget.addEventListener(SIDEBAR_REFRESH_EVENT, handleRefresh); sidebarEventTarget.addEventListener(SIDEBAR_REFRESH_EVENT, handleRefresh);
return () => { return () => {
sidebarEventTarget.removeEventListener(SIDEBAR_REFRESH_EVENT, handleRefresh); sidebarEventTarget.removeEventListener(
SIDEBAR_REFRESH_EVENT,
handleRefresh,
);
}; };
}, [adminConfig]); }, [adminConfig]);
......
...@@ -64,6 +64,29 @@ export const useModelPricingData = () => { ...@@ -64,6 +64,29 @@ export const useModelPricingData = () => {
() => statusState?.status?.usd_exchange_rate ?? priceRate, () => statusState?.status?.usd_exchange_rate ?? priceRate,
[statusState, priceRate], [statusState, priceRate],
); );
const customExchangeRate = useMemo(
() => statusState?.status?.custom_currency_exchange_rate ?? 1,
[statusState],
);
const customCurrencySymbol = useMemo(
() => statusState?.status?.custom_currency_symbol ?? '¤',
[statusState],
);
// 默认货币与站点展示类型同步(USD/CNY),TOKENS 时仍允许切换视图内货币
const siteDisplayType = useMemo(
() => statusState?.status?.quota_display_type || 'USD',
[statusState],
);
useEffect(() => {
if (
siteDisplayType === 'USD' ||
siteDisplayType === 'CNY' ||
siteDisplayType === 'CUSTOM'
) {
setCurrency(siteDisplayType);
}
}, [siteDisplayType]);
const filteredModels = useMemo(() => { const filteredModels = useMemo(() => {
let result = models; let result = models;
...@@ -156,6 +179,8 @@ export const useModelPricingData = () => { ...@@ -156,6 +179,8 @@ export const useModelPricingData = () => {
if (currency === 'CNY') { if (currency === 'CNY') {
return ${(priceInUSD * usdExchangeRate).toFixed(3)}`; return ${(priceInUSD * usdExchangeRate).toFixed(3)}`;
} else if (currency === 'CUSTOM') {
return `${customCurrencySymbol}${(priceInUSD * customExchangeRate).toFixed(3)}`;
} }
return `$${priceInUSD.toFixed(3)}`; return `$${priceInUSD.toFixed(3)}`;
}; };
......
...@@ -1773,7 +1773,10 @@ ...@@ -1773,7 +1773,10 @@
"自定义模型名称": "Custom model name", "自定义模型名称": "Custom model name",
"启用全部密钥": "Enable all keys", "启用全部密钥": "Enable all keys",
"充值价格显示": "Recharge price", "充值价格显示": "Recharge price",
"美元汇率(非充值汇率,仅用于定价页面换算)": "USD exchange rate (not recharge rate, only used for pricing page conversion)", "自定义货币": "Custom currency",
"自定义货币符号": "Custom currency symbol",
"例如 €, £, Rp, ₩, ₹...": "For example, €, £, Rp, ₩, ₹...",
"站点额度展示类型及汇率": "Site quota display type and exchange rate",
"美元汇率": "USD exchange rate", "美元汇率": "USD exchange rate",
"隐藏操作项": "Hide actions", "隐藏操作项": "Hide actions",
"显示操作项": "Show actions", "显示操作项": "Show actions",
......
...@@ -1773,7 +1773,10 @@ ...@@ -1773,7 +1773,10 @@
"自定义模型名称": "Nom de modèle personnalisé", "自定义模型名称": "Nom de modèle personnalisé",
"启用全部密钥": "Activer toutes les clés", "启用全部密钥": "Activer toutes les clés",
"充值价格显示": "Prix de recharge", "充值价格显示": "Prix de recharge",
"美元汇率(非充值汇率,仅用于定价页面换算)": "Taux de change USD (pas de taux de recharge, uniquement utilisé pour la conversion de la page de tarification)", "站点额度展示类型及汇率": "Type d'affichage du quota du site et taux de change",
"自定义货币": "Devise personnalisée",
"自定义货币符号": "Symbole de devise personnalisé",
"例如 €, £, Rp, ₩, ₹...": "Par exemple, €, £, Rp, ₩, ₹...",
"美元汇率": "Taux de change USD", "美元汇率": "Taux de change USD",
"隐藏操作项": "Masquer les actions", "隐藏操作项": "Masquer les actions",
"显示操作项": "Afficher les actions", "显示操作项": "Afficher les actions",
......
...@@ -17,8 +17,19 @@ along with this program. If not, see <https://www.gnu.org/licenses/>. ...@@ -17,8 +17,19 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
For commercial licensing, please contact support@quantumnous.com For commercial licensing, please contact support@quantumnous.com
*/ */
import React, { useEffect, useState, useRef } from 'react'; import React, { useEffect, useState, useRef, useMemo } from 'react';
import { Banner, Button, Col, Form, Row, Spin, Modal } from '@douyinfe/semi-ui'; import {
Banner,
Button,
Col,
Form,
Row,
Spin,
Modal,
Select,
InputGroup,
Input,
} from '@douyinfe/semi-ui';
import { import {
compareObjects, compareObjects,
API, API,
...@@ -35,10 +46,12 @@ export default function GeneralSettings(props) { ...@@ -35,10 +46,12 @@ export default function GeneralSettings(props) {
const [inputs, setInputs] = useState({ const [inputs, setInputs] = useState({
TopUpLink: '', TopUpLink: '',
'general_setting.docs_link': '', 'general_setting.docs_link': '',
'general_setting.quota_display_type': 'USD',
'general_setting.custom_currency_symbol': '¤',
'general_setting.custom_currency_exchange_rate': '',
QuotaPerUnit: '', QuotaPerUnit: '',
RetryTimes: '', RetryTimes: '',
USDExchangeRate: '', USDExchangeRate: '',
DisplayInCurrencyEnabled: false,
DisplayTokenStatEnabled: false, DisplayTokenStatEnabled: false,
DefaultCollapseSidebar: false, DefaultCollapseSidebar: false,
DemoSiteEnabled: false, DemoSiteEnabled: false,
...@@ -88,6 +101,30 @@ export default function GeneralSettings(props) { ...@@ -88,6 +101,30 @@ export default function GeneralSettings(props) {
}); });
} }
// 计算展示在输入框中的“1 USD = X <currency>”中的 X
const combinedRate = useMemo(() => {
const type = inputs['general_setting.quota_display_type'];
if (type === 'USD') return '1';
if (type === 'CNY') return String(inputs['USDExchangeRate'] || '');
if (type === 'TOKENS') return String(inputs['QuotaPerUnit'] || '');
if (type === 'CUSTOM')
return String(
inputs['general_setting.custom_currency_exchange_rate'] || '',
);
return '';
}, [inputs]);
const onCombinedRateChange = (val) => {
const type = inputs['general_setting.quota_display_type'];
if (type === 'CNY') {
handleFieldChange('USDExchangeRate')(val);
} else if (type === 'TOKENS') {
handleFieldChange('QuotaPerUnit')(val);
} else if (type === 'CUSTOM') {
handleFieldChange('general_setting.custom_currency_exchange_rate')(val);
}
};
useEffect(() => { useEffect(() => {
const currentInputs = {}; const currentInputs = {};
for (let key in props.options) { for (let key in props.options) {
...@@ -95,6 +132,28 @@ export default function GeneralSettings(props) { ...@@ -95,6 +132,28 @@ export default function GeneralSettings(props) {
currentInputs[key] = props.options[key]; currentInputs[key] = props.options[key];
} }
} }
// 若旧字段存在且新字段缺失,则做一次兜底映射
if (
currentInputs['general_setting.quota_display_type'] === undefined &&
props.options?.DisplayInCurrencyEnabled !== undefined
) {
currentInputs['general_setting.quota_display_type'] = props.options
.DisplayInCurrencyEnabled
? 'USD'
: 'TOKENS';
}
// 回填自定义货币相关字段(如果后端已存在)
if (props.options['general_setting.custom_currency_symbol'] !== undefined) {
currentInputs['general_setting.custom_currency_symbol'] =
props.options['general_setting.custom_currency_symbol'];
}
if (
props.options['general_setting.custom_currency_exchange_rate'] !==
undefined
) {
currentInputs['general_setting.custom_currency_exchange_rate'] =
props.options['general_setting.custom_currency_exchange_rate'];
}
setInputs(currentInputs); setInputs(currentInputs);
setInputsRow(structuredClone(currentInputs)); setInputsRow(structuredClone(currentInputs));
refForm.current.setValues(currentInputs); refForm.current.setValues(currentInputs);
...@@ -130,53 +189,64 @@ export default function GeneralSettings(props) { ...@@ -130,53 +189,64 @@ export default function GeneralSettings(props) {
showClear showClear
/> />
</Col> </Col>
{inputs.QuotaPerUnit !== '500000' && inputs.QuotaPerUnit !== 500000 && ( {/* 单位美元额度已合入汇率组合控件(TOKENS 模式下编辑),不再单独展示 */}
<Col xs={24} sm={12} md={8} lg={8} xl={8}> <Col xs={24} sm={12} md={8} lg={8} xl={8}>
<Form.Input <Form.Input
field={'QuotaPerUnit'} field={'RetryTimes'}
label={t('单位美元额度')} label={t('失败重试次数')}
initValue={''} initValue={''}
placeholder={t('一单位货币能兑换的额度')} placeholder={t('失败重试次数')}
onChange={handleFieldChange('QuotaPerUnit')} onChange={handleFieldChange('RetryTimes')}
showClear showClear
onClick={() => setShowQuotaWarning(true)}
/> />
</Col> </Col>
)}
<Col xs={24} sm={12} md={8} lg={8} xl={8}> <Col xs={24} sm={12} md={8} lg={8} xl={8}>
<Form.Input <Form.Slot label={t('站点额度展示类型及汇率')}>
field={'USDExchangeRate'} <InputGroup style={{ width: '100%' }}>
label={t('美元汇率(非充值汇率,仅用于定价页面换算)')} <Input
initValue={''} prefix={'1 USD = '}
placeholder={t('美元汇率')} style={{ width: '50%' }}
onChange={handleFieldChange('USDExchangeRate')} value={combinedRate}
showClear onChange={onCombinedRateChange}
disabled={
inputs['general_setting.quota_display_type'] === 'USD'
}
/> />
<Select
style={{ width: '50%' }}
value={inputs['general_setting.quota_display_type']}
onChange={handleFieldChange(
'general_setting.quota_display_type',
)}
>
<Select.Option value='USD'>USD ($)</Select.Option>
<Select.Option value='CNY'>CNY (¥)</Select.Option>
<Select.Option value='TOKENS'>Tokens</Select.Option>
<Select.Option value='CUSTOM'>
{t('自定义货币')}
</Select.Option>
</Select>
</InputGroup>
</Form.Slot>
</Col> </Col>
<Col xs={24} sm={12} md={8} lg={8} xl={8}> <Col xs={24} sm={12} md={8} lg={8} xl={8}>
<Form.Input <Form.Input
field={'RetryTimes'} field={'general_setting.custom_currency_symbol'}
label={t('失败重试次数')} label={t('自定义货币符号')}
initValue={''} placeholder={t('例如 €, £, Rp, ₩, ₹...')}
placeholder={t('失败重试次数')} onChange={handleFieldChange(
onChange={handleFieldChange('RetryTimes')} 'general_setting.custom_currency_symbol',
)}
showClear showClear
disabled={
inputs['general_setting.quota_display_type'] !== 'CUSTOM'
}
/> />
</Col> </Col>
</Row> </Row>
<Row gutter={16}> <Row gutter={16}>
<Col xs={24} sm={12} md={8} lg={8} xl={8}> <Col xs={24} sm={12} md={8} lg={8} xl={8}>
<Form.Switch <Form.Switch
field={'DisplayInCurrencyEnabled'}
label={t('以货币形式显示额度')}
size='default'
checkedText='|'
uncheckedText='〇'
onChange={handleFieldChange('DisplayInCurrencyEnabled')}
/>
</Col>
<Col xs={24} sm={12} md={8} lg={8} xl={8}>
<Form.Switch
field={'DisplayTokenStatEnabled'} field={'DisplayTokenStatEnabled'}
label={t('额度查询接口返回令牌额度而非用户额度')} label={t('额度查询接口返回令牌额度而非用户额度')}
size='default' size='default'
...@@ -195,8 +265,6 @@ export default function GeneralSettings(props) { ...@@ -195,8 +265,6 @@ export default function GeneralSettings(props) {
onChange={handleFieldChange('DefaultCollapseSidebar')} onChange={handleFieldChange('DefaultCollapseSidebar')}
/> />
</Col> </Col>
</Row>
<Row gutter={16}>
<Col xs={24} sm={12} md={8} lg={8} xl={8}> <Col xs={24} sm={12} md={8} lg={8} xl={8}>
<Form.Switch <Form.Switch
field={'DemoSiteEnabled'} field={'DemoSiteEnabled'}
......
...@@ -128,7 +128,8 @@ export default function SettingsMonitoring(props) { ...@@ -128,7 +128,8 @@ export default function SettingsMonitoring(props) {
onChange={(value) => onChange={(value) =>
setInputs({ setInputs({
...inputs, ...inputs,
'monitor_setting.auto_test_channel_minutes': parseInt(value), 'monitor_setting.auto_test_channel_minutes':
parseInt(value),
}) })
} }
/> />
......
...@@ -118,14 +118,20 @@ export default function SettingsPaymentGateway(props) { ...@@ -118,14 +118,20 @@ export default function SettingsPaymentGateway(props) {
} }
} }
if (originInputs['AmountOptions'] !== inputs.AmountOptions && inputs.AmountOptions.trim() !== '') { if (
originInputs['AmountOptions'] !== inputs.AmountOptions &&
inputs.AmountOptions.trim() !== ''
) {
if (!verifyJSON(inputs.AmountOptions)) { if (!verifyJSON(inputs.AmountOptions)) {
showError(t('自定义充值数量选项不是合法的 JSON 数组')); showError(t('自定义充值数量选项不是合法的 JSON 数组'));
return; return;
} }
} }
if (originInputs['AmountDiscount'] !== inputs.AmountDiscount && inputs.AmountDiscount.trim() !== '') { if (
originInputs['AmountDiscount'] !== inputs.AmountDiscount &&
inputs.AmountDiscount.trim() !== ''
) {
if (!verifyJSON(inputs.AmountDiscount)) { if (!verifyJSON(inputs.AmountDiscount)) {
showError(t('充值金额折扣配置不是合法的 JSON 对象')); showError(t('充值金额折扣配置不是合法的 JSON 对象'));
return; return;
...@@ -163,10 +169,16 @@ export default function SettingsPaymentGateway(props) { ...@@ -163,10 +169,16 @@ export default function SettingsPaymentGateway(props) {
options.push({ key: 'PayMethods', value: inputs.PayMethods }); options.push({ key: 'PayMethods', value: inputs.PayMethods });
} }
if (originInputs['AmountOptions'] !== inputs.AmountOptions) { if (originInputs['AmountOptions'] !== inputs.AmountOptions) {
options.push({ key: 'payment_setting.amount_options', value: inputs.AmountOptions }); options.push({
key: 'payment_setting.amount_options',
value: inputs.AmountOptions,
});
} }
if (originInputs['AmountDiscount'] !== inputs.AmountDiscount) { if (originInputs['AmountDiscount'] !== inputs.AmountDiscount) {
options.push({ key: 'payment_setting.amount_discount', value: inputs.AmountDiscount }); options.push({
key: 'payment_setting.amount_discount',
value: inputs.AmountDiscount,
});
} }
// 发送请求 // 发送请求
...@@ -282,9 +294,13 @@ export default function SettingsPaymentGateway(props) { ...@@ -282,9 +294,13 @@ export default function SettingsPaymentGateway(props) {
<Form.TextArea <Form.TextArea
field='AmountOptions' field='AmountOptions'
label={t('自定义充值数量选项')} label={t('自定义充值数量选项')}
placeholder={t('为一个 JSON 数组,例如:[10, 20, 50, 100, 200, 500]')} placeholder={t(
'为一个 JSON 数组,例如:[10, 20, 50, 100, 200, 500]',
)}
autosize autosize
extraText={t('设置用户可选择的充值数量选项,例如:[10, 20, 50, 100, 200, 500]')} extraText={t(
'设置用户可选择的充值数量选项,例如:[10, 20, 50, 100, 200, 500]',
)}
/> />
</Col> </Col>
</Row> </Row>
...@@ -297,9 +313,13 @@ export default function SettingsPaymentGateway(props) { ...@@ -297,9 +313,13 @@ export default function SettingsPaymentGateway(props) {
<Form.TextArea <Form.TextArea
field='AmountDiscount' field='AmountDiscount'
label={t('充值金额折扣配置')} label={t('充值金额折扣配置')}
placeholder={t('为一个 JSON 对象,例如:{"100": 0.95, "200": 0.9, "500": 0.85}')} placeholder={t(
'为一个 JSON 对象,例如:{"100": 0.95, "200": 0.9, "500": 0.85}',
)}
autosize autosize
extraText={t('设置不同充值金额对应的折扣,键为充值金额,值为折扣率,例如:{"100": 0.95, "200": 0.9, "500": 0.85}')} extraText={t(
'设置不同充值金额对应的折扣,键为充值金额,值为折扣率,例如:{"100": 0.95, "200": 0.9, "500": 0.85}',
)}
/> />
</Col> </Col>
</Row> </Row>
......
...@@ -226,8 +226,12 @@ export default function ModelRatioSettings(props) { ...@@ -226,8 +226,12 @@ export default function ModelRatioSettings(props) {
<Col xs={24} sm={16}> <Col xs={24} sm={16}>
<Form.TextArea <Form.TextArea
label={t('图片输入倍率(仅部分模型支持该计费)')} label={t('图片输入倍率(仅部分模型支持该计费)')}
extraText={t('图片输入相关的倍率设置,键为模型名称,值为倍率,仅部分模型支持该计费')} extraText={t(
placeholder={t('为一个 JSON 文本,键为模型名称,值为倍率,例如:{"gpt-image-1": 2}')} '图片输入相关的倍率设置,键为模型名称,值为倍率,仅部分模型支持该计费',
)}
placeholder={t(
'为一个 JSON 文本,键为模型名称,值为倍率,例如:{"gpt-image-1": 2}',
)}
field={'ImageRatio'} field={'ImageRatio'}
autosize={{ minRows: 6, maxRows: 12 }} autosize={{ minRows: 6, maxRows: 12 }}
trigger='blur' trigger='blur'
...@@ -238,9 +242,7 @@ export default function ModelRatioSettings(props) { ...@@ -238,9 +242,7 @@ export default function ModelRatioSettings(props) {
message: '不是合法的 JSON 字符串', message: '不是合法的 JSON 字符串',
}, },
]} ]}
onChange={(value) => onChange={(value) => setInputs({ ...inputs, ImageRatio: value })}
setInputs({ ...inputs, ImageRatio: value })
}
/> />
</Col> </Col>
</Row> </Row>
...@@ -249,7 +251,9 @@ export default function ModelRatioSettings(props) { ...@@ -249,7 +251,9 @@ export default function ModelRatioSettings(props) {
<Form.TextArea <Form.TextArea
label={t('音频倍率(仅部分模型支持该计费)')} label={t('音频倍率(仅部分模型支持该计费)')}
extraText={t('音频输入相关的倍率设置,键为模型名称,值为倍率')} extraText={t('音频输入相关的倍率设置,键为模型名称,值为倍率')}
placeholder={t('为一个 JSON 文本,键为模型名称,值为倍率,例如:{"gpt-4o-audio-preview": 16}')} placeholder={t(
'为一个 JSON 文本,键为模型名称,值为倍率,例如:{"gpt-4o-audio-preview": 16}',
)}
field={'AudioRatio'} field={'AudioRatio'}
autosize={{ minRows: 6, maxRows: 12 }} autosize={{ minRows: 6, maxRows: 12 }}
trigger='blur' trigger='blur'
...@@ -260,9 +264,7 @@ export default function ModelRatioSettings(props) { ...@@ -260,9 +264,7 @@ export default function ModelRatioSettings(props) {
message: '不是合法的 JSON 字符串', message: '不是合法的 JSON 字符串',
}, },
]} ]}
onChange={(value) => onChange={(value) => setInputs({ ...inputs, AudioRatio: value })}
setInputs({ ...inputs, AudioRatio: value })
}
/> />
</Col> </Col>
</Row> </Row>
...@@ -270,8 +272,12 @@ export default function ModelRatioSettings(props) { ...@@ -270,8 +272,12 @@ export default function ModelRatioSettings(props) {
<Col xs={24} sm={16}> <Col xs={24} sm={16}>
<Form.TextArea <Form.TextArea
label={t('音频补全倍率(仅部分模型支持该计费)')} label={t('音频补全倍率(仅部分模型支持该计费)')}
extraText={t('音频输出补全相关的倍率设置,键为模型名称,值为倍率')} extraText={t(
placeholder={t('为一个 JSON 文本,键为模型名称,值为倍率,例如:{"gpt-4o-realtime": 2}')} '音频输出补全相关的倍率设置,键为模型名称,值为倍率',
)}
placeholder={t(
'为一个 JSON 文本,键为模型名称,值为倍率,例如:{"gpt-4o-realtime": 2}',
)}
field={'AudioCompletionRatio'} field={'AudioCompletionRatio'}
autosize={{ minRows: 6, maxRows: 12 }} autosize={{ minRows: 6, maxRows: 12 }}
trigger='blur' trigger='blur'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment