Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
赵月辉
/
fastgpt-migrated
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Unverified
Commit
aebe789e
authored
Jul 27, 2023
by
archer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
perf: modal
parent
1c4d2e92
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
40 additions
and
21 deletions
+40
-21
client/src/components/ChatBox/ContextModal.tsx
+8
-1
client/src/components/ChatBox/QuoteModal.tsx
+15
-7
client/src/components/MyModal/index.tsx
+10
-6
client/src/pages/app/detail/components/KBSelectModal.tsx
+2
-2
client/src/pages/kb/detail/components/InputDataModal.tsx
+2
-1
client/src/service/ai/openai.ts
+2
-1
client/src/service/mongo.ts
+1
-3
No files found.
client/src/components/ChatBox/ContextModal.tsx
View file @
aebe789e
...
...
@@ -13,7 +13,14 @@ const ContextModal = ({
const
theme
=
useTheme
();
return
(
<
MyModal
isOpen=
{
true
}
onClose=
{
onClose
}
title=
{
`完整对话记录(${context.length}条)`
}
h=
{
'80vh'
}
>
<
MyModal
isOpen=
{
true
}
onClose=
{
onClose
}
title=
{
`完整对话记录(${context.length}条)`
}
minW=
{
[
'90vw'
,
'600px'
]
}
h=
{
[
'90vh'
,
'80vh'
]
}
isCentered
>
<
ModalBody
pt=
{
0
}
whiteSpace=
{
'pre-wrap'
}
textAlign=
{
'justify'
}
fontSize=
{
'sm'
}
>
{
context
.
map
((
item
,
i
)
=>
(
<
Box
...
...
client/src/components/ChatBox/QuoteModal.tsx
View file @
aebe789e
...
...
@@ -61,13 +61,21 @@ const QuoteModal = ({
return
(
<>
<
MyModal
isOpen=
{
true
}
onClose=
{
onClose
}
h=
{
'80vh'
}
>
<
ModalHeader
>
知识库引用(
{
rawSearch
.
length
}
条)
<
Box
fontSize=
{
'sm'
}
fontWeight=
{
'normal'
}
>
注意: 修改知识库内容成功后,此处不会显示变更情况。点击编辑后,会显示知识库最新的内容。
</
Box
>
</
ModalHeader
>
<
MyModal
isOpen=
{
true
}
onClose=
{
onClose
}
h=
{
[
'90vh'
,
'80vh'
]
}
isCentered
minW=
{
[
'90vw'
,
'600px'
]
}
title=
{
<>
知识库引用(
{
rawSearch
.
length
}
条)
<
Box
fontSize=
{
[
'xs'
,
'sm'
]
}
fontWeight=
{
'normal'
}
>
注意: 修改知识库内容成功后,此处不会显示变更情况。点击编辑后,会显示知识库最新的内容。
</
Box
>
</>
}
>
<
ModalCloseButton
/>
<
ModalBody
pt=
{
0
}
whiteSpace=
{
'pre-wrap'
}
textAlign=
{
'justify'
}
fontSize=
{
'sm'
}
>
{
rawSearch
.
map
((
item
)
=>
(
...
...
client/src/components/MyModal/index.tsx
View file @
aebe789e
...
...
@@ -5,9 +5,9 @@ import {
ModalContent
,
ModalHeader
,
ModalCloseButton
,
ModalContentProps
ModalContentProps
,
Box
}
from
'@chakra-ui/react'
;
import
{
DefaultTFuncReturn
}
from
'i18next'
;
interface
Props
extends
ModalContentProps
{
showCloseBtn
?:
boolean
;
...
...
@@ -32,16 +32,20 @@ const MyModal = ({
<
Modal
isOpen=
{
isOpen
}
onClose=
{
onClose
}
autoFocus=
{
false
}
isCentered=
{
isCentered
}
>
<
ModalOverlay
/>
<
ModalContent
display=
{
'flex'
}
flexDirection=
{
'column'
}
w=
{
w
}
minW=
{
[
'
300px
'
,
'400px'
]
}
minW=
{
[
'
90vw
'
,
'400px'
]
}
maxW=
{
maxW
}
position=
{
'relative'
}
overflow=
{
'overlay
'
}
maxH=
{
'90vh
'
}
{
...
props
}
>
{
!!
title
&&
<
ModalHeader
>
{
title
}
</
ModalHeader
>
}
{
showCloseBtn
&&
<
ModalCloseButton
/>
}
{
children
}
<
Box
overflow=
{
'overlay'
}
>
{
showCloseBtn
&&
<
ModalCloseButton
/>
}
{
children
}
</
Box
>
</
ModalContent
>
</
Modal
>
);
...
...
client/src/pages/app/detail/components/KBSelectModal.tsx
View file @
aebe789e
...
...
@@ -132,10 +132,10 @@ export const KbParamsModal = ({
});
return
(
<
MyModal
isOpen=
{
true
}
onClose=
{
onClose
}
title=
{
'搜索参数调整'
}
>
<
MyModal
isOpen=
{
true
}
onClose=
{
onClose
}
title=
{
'搜索参数调整'
}
minW=
{
[
'90vw'
,
'600px'
]
}
>
<
Flex
flexDirection=
{
'column'
}
>
<
ModalBody
>
<
Box
display=
{
[
'block'
,
'flex'
]
}
p
t=
{
3
}
pb=
{
5
}
>
<
Box
display=
{
[
'block'
,
'flex'
]
}
p
y=
{
5
}
pt=
{
[
0
,
5
]
}
>
<
Box
flex=
{
'0 0 100px'
}
mb=
{
[
8
,
0
]
}
>
相似度
<
MyTooltip
label=
{
'高相似度推荐0.8及以上。'
}
forceShow
>
...
...
client/src/pages/kb/detail/components/InputDataModal.tsx
View file @
aebe789e
...
...
@@ -130,8 +130,9 @@ const InputDataModal = ({
title=
{
defaultValues
.
dataId
?
'变更数据'
:
'手动导入数据'
}
w=
{
'90vw'
}
maxW=
{
'90vw'
}
h=
{
'90vh'
}
>
<
Flex
display=
{
'flex'
}
flexDirection=
{
'column'
}
h=
{
'90vh
'
}
>
<
Flex
flexDirection=
{
'column'
}
h=
{
'100%
'
}
>
<
Box
display=
{
'flex'
}
flexDirection=
{
[
'column'
,
'row'
]
}
...
...
client/src/service/ai/openai.ts
View file @
aebe789e
import
{
Configuration
,
OpenAIApi
}
from
'openai'
;
const
baseUrl
=
process
.
env
.
ONEAPI_URL
||
process
.
env
.
OPENAI_BASE_URL
||
'api.openai.com'
;
const
baseUrl
=
process
.
env
.
ONEAPI_URL
||
process
.
env
.
OPENAI_BASE_URL
||
'https://api.openai.com/v1'
;
export
const
getSystemOpenAiKey
=
()
=>
{
return
process
.
env
.
ONEAPI_KEY
||
process
.
env
.
OPENAIKEY
||
''
;
...
...
client/src/service/mongo.ts
View file @
aebe789e
...
...
@@ -50,7 +50,7 @@ export async function connectToDatabase(): Promise<void> {
minPoolSize
:
2
});
initRootUser
();
await
initRootUser
();
initPg
();
console
.
log
(
'mongo connected'
);
}
catch
(
error
)
{
...
...
@@ -84,7 +84,6 @@ async function initRootUser() {
});
}
catch
(
error
)
{
console
.
log
(
'init root user error'
,
error
);
initRootUser
();
}
}
async
function
initPg
()
{
...
...
@@ -108,7 +107,6 @@ async function initPg() {
console
.
log
(
'init pg successful'
);
}
catch
(
error
)
{
console
.
log
(
'init pg error'
,
error
);
initPg
();
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment