mirror of
https://github.com/labring/FastGPT.git
synced 2026-05-07 01:02:55 +08:00
V4.14.10 dev (#6674)
* feat: model config with brand-new price calculate machanism (#6616) * fix: image read and json error (Agent) (#6502) * fix: 1.image read 2.JSON parsing error * dataset cite and pause * perf: plancall second parse * add test --------- Co-authored-by: archer <545436317@qq.com> * master message * remove invalid code * wip: model config * feat: model config with brand-new price calculate machanism * merge main branch * ajust calculate way * ajust priceTiers resolve procession * perf: price config code * fix: default price * fix: test * fix: comment * fix test --------- Co-authored-by: YeYuheng <57035043+YYH211@users.noreply.github.com> Co-authored-by: archer <545436317@qq.com> * wip: fix modal UI (#6634) * wip: fix modal UI * fix: maxInputToken set * chore: add price unit for non llm models * chore: replace question mark icon with beta tag (#6672) * feat:rerank too long; fix:rerank ui(agent),embedding returns 0 (#6663) * feat:rerank too long; fix:rerank ui(agent),embedding returns 0 * rerank * fix:rerank function * perf: rerank code * fix rerank * perf: model price ui --------- Co-authored-by: archer <545436317@qq.com> * remove llmtype field * revert model init * fix: filed * fix: model select filter * perf: multiple selector render * remove invalid checker * remove invalid i18n * perf: model selector tip * perf: model selector tip * fix cr * limit pnpm version * fix: i18n * fix action * set default mintoken * update i18n * perf: usage push * fix:rerank model ui (#6677) * fix: tier match error * fix: testr --------- Co-authored-by: Ryo <whoeverimf5@gmail.com> Co-authored-by: YeYuheng <57035043+YYH211@users.noreply.github.com>
This commit is contained in:
@@ -17,6 +17,9 @@ export interface MyModalProps extends ModalContentProps {
|
||||
iconSrc?: string;
|
||||
iconColor?: ImageProps['color'];
|
||||
title?: any;
|
||||
contentPx?: ModalContentProps['px'];
|
||||
contentPy?: ModalContentProps['py'];
|
||||
headerPx?: ModalContentProps['px'];
|
||||
isCentered?: boolean;
|
||||
isLoading?: boolean;
|
||||
isOpen?: boolean;
|
||||
@@ -38,6 +41,9 @@ const MyModal = ({
|
||||
iconColor,
|
||||
size = 'sm',
|
||||
showCloseButton = true,
|
||||
contentPx = '8',
|
||||
contentPy = '8',
|
||||
headerPx,
|
||||
...props
|
||||
}: MyModalProps) => {
|
||||
const { isPc } = useSystem();
|
||||
@@ -77,7 +83,8 @@ const MyModal = ({
|
||||
position={'relative'}
|
||||
maxH={'80vh'}
|
||||
boxShadow={'3.5'}
|
||||
padding={'8'}
|
||||
px={contentPx}
|
||||
py={contentPy}
|
||||
containerProps={{
|
||||
zIndex: props.zIndex
|
||||
}}
|
||||
@@ -92,7 +99,7 @@ const MyModal = ({
|
||||
fontWeight={'500'}
|
||||
mb={6}
|
||||
py={0}
|
||||
px={0}
|
||||
px={headerPx ?? contentPx}
|
||||
gap={3}
|
||||
>
|
||||
{iconSrc && (
|
||||
|
||||
Reference in New Issue
Block a user