ChatGPT/FastGPT
1
0
Fork 0
mirror of https://github.com/labring/FastGPT.git synced 2025-07-29 09:44:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

4.6.7-alpha commit (#743)

Browse Source 
Co-authored-by: Archer <545436317@qq.com>
Co-authored-by: heheer <71265218+newfish-cmyk@users.noreply.github.com>
This commit is contained in:
Archer
2024-01-19 11:17:28 +08:00
committed by GitHub
parent 8ee7407c4c
commit c031e6dcc9
324 changed files with 8509 additions and 4757 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
projects/app/src/pages/account/components/BillDetail.tsx
View File

@@ -30,7 +30,7 @@ const BillDetail = ({ bill, onClose }: { bill: BillItemType; onClose: () => void
hasTokens,
hasInputTokens,
hasOutputTokens,
hasTextLen,
hasCharsLen,
hasDuration,
hasDataLen
} = useMemo(() => {
@@ -38,7 +38,7 @@ const BillDetail = ({ bill, onClose }: { bill: BillItemType; onClose: () => void
let hasTokens = false;
let hasInputTokens = false;
let hasOutputTokens = false;
let hasTextLen = false;
let hasCharsLen = false;
let hasDuration = false;
let hasDataLen = false;
@@ -46,24 +46,21 @@ const BillDetail = ({ bill, onClose }: { bill: BillItemType; onClose: () => void
if (item.model !== undefined) {
hasModel = true;
}
if (item.tokenLen !== undefined) {
if (typeof item.tokenLen === 'number') {
hasTokens = true;
}
if (item.inputTokens !== undefined) {
if (typeof item.inputTokens === 'number') {
hasInputTokens = true;
}
if (item.outputTokens !== undefined) {
if (typeof item.outputTokens === 'number') {
hasOutputTokens = true;
}
if (item.textLen !== undefined) {
hasTextLen = true;
if (typeof item.charsLength === 'number') {
hasCharsLen = true;
}
if (item.duration !== undefined) {
if (typeof item.duration === 'number') {
hasDuration = true;
}
if (item.dataLen !== undefined) {
hasDataLen = true;
}
});
return {
@@ -71,7 +68,7 @@ const BillDetail = ({ bill, onClose }: { bill: BillItemType; onClose: () => void
hasTokens,
hasInputTokens,
hasOutputTokens,
hasTextLen,
hasCharsLen,
hasDuration,
hasDataLen
};
@@ -123,9 +120,8 @@ const BillDetail = ({ bill, onClose }: { bill: BillItemType; onClose: () => void
{hasTokens && <Th>{t('wallet.bill.Token Length')}</Th>}
{hasInputTokens && <Th>{t('wallet.bill.Input Token Length')}</Th>}
{hasOutputTokens && <Th>{t('wallet.bill.Output Token Length')}</Th>}
{hasTextLen && <Th>{t('wallet.bill.Text Length')}</Th>}
{hasCharsLen && <Th>{t('wallet.bill.Text Length')}</Th>}
{hasDuration && <Th>{t('wallet.bill.Duration')}</Th>}
{hasDataLen && <Th>{t('wallet.bill.Data Length')}</Th>}
<Th>费用(￥)</Th>
</Tr>
</Thead>
@@ -137,10 +133,8 @@ const BillDetail = ({ bill, onClose }: { bill: BillItemType; onClose: () => void
{hasTokens && <Td>{item.tokenLen ?? '-'}</Td>}
{hasInputTokens && <Td>{item.inputTokens ?? '-'}</Td>}
{hasOutputTokens && <Td>{item.outputTokens ?? '-'}</Td>}
{hasTextLen && <Td>{item.textLen ?? '-'}</Td>}
{hasCharsLen && <Td>{item.charsLength ?? '-'}</Td>}
{hasDuration && <Td>{item.duration ?? '-'}</Td>}
{hasDataLen && <Td>{item.dataLen ?? '-'}</Td>}
<Td>{formatStorePrice2Read(item.amount)}</Td>
</Tr>
))}

4
projects/app/src/pages/account/components/Info.tsx
View File

@@ -108,12 +108,12 @@ const UserInfo = () => {
});
} catch (err: any) {
toast({
title: typeof err === 'string' ? err : '头像选择异常',
title: typeof err === 'string' ? err : t('common.error.Select avatar failed'),
status: 'warning'
});
}
},
[onclickSave, toast, userInfo]
[onclickSave, t, toast, userInfo]
);
useQuery(['init'], initUserInfo, {