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:
@@ -62,6 +62,7 @@ export type SelectProps<T = any> = {
|
||||
onOpenFunc?: () => void;
|
||||
|
||||
tagStyle?: FlexProps;
|
||||
menuBottomSlot?: React.ReactNode;
|
||||
} & Omit<ButtonProps, 'onSelect'>;
|
||||
|
||||
type SelectedItemType<T> = {
|
||||
@@ -91,6 +92,7 @@ const MultipleSelect = <T = any,>({
|
||||
onOpenFunc,
|
||||
|
||||
tagStyle,
|
||||
menuBottomSlot,
|
||||
isLoading,
|
||||
...props
|
||||
}: SelectProps<T>) => {
|
||||
@@ -135,7 +137,7 @@ const MultipleSelect = <T = any,>({
|
||||
if (!isOpen) {
|
||||
setInputValue?.('');
|
||||
}
|
||||
}, [isOpen]);
|
||||
}, [isOpen, setInputValue]);
|
||||
|
||||
const onclickItem = useCallback(
|
||||
(val: T) => {
|
||||
@@ -480,6 +482,15 @@ const MultipleSelect = <T = any,>({
|
||||
|
||||
{ScrollData ? <ScrollData minH={20}>{ListRender}</ScrollData> : ListRender}
|
||||
|
||||
{menuBottomSlot && (
|
||||
<>
|
||||
<MyDivider my={1} />
|
||||
<Box px={1} py={1}>
|
||||
{menuBottomSlot}
|
||||
</Box>
|
||||
</>
|
||||
)}
|
||||
|
||||
{isLoading && <MyLoading fixed={false} />}
|
||||
</MenuList>
|
||||
</Menu>
|
||||
|
||||
Reference in New Issue
Block a user