Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
dify
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ai-tech
dify
Commits
444f035f
Commit
444f035f
authored
Jul 25, 2023
by
Joel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: chat ui
parent
b30706ff
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
9 deletions
+14
-9
page.tsx
web/app/(commonLayout)/explore/chat/page.tsx
+3
-1
index.tsx
web/app/components/explore/universal-chat/index.tsx
+11
-8
No files found.
web/app/(commonLayout)/explore/chat/page.tsx
View file @
444f035f
...
...
@@ -4,7 +4,9 @@ import UniversalChat from '@/app/components/explore/universal-chat'
const
Chat
:
FC
=
()
=>
{
return
(
<
UniversalChat
/>
<
div
className=
'h-full p-2'
>
<
UniversalChat
/>
</
div
>
)
}
...
...
web/app/components/explore/universal-chat/index.tsx
View file @
444f035f
...
...
@@ -495,9 +495,10 @@ const Main: FC<IMainProps> = () => {
setChatList
(
newListWithAnswer
)
},
async
onCompleted
(
hasError
?:
boolean
)
{
setResponsingFalse
()
if
(
hasError
)
if
(
hasError
)
{
setResponsingFalse
(
)
return
}
if
(
getConversationIdChangeBecauseOfNew
())
{
const
{
data
:
allConversations
}:
any
=
await
fetchAllConversations
()
...
...
@@ -512,6 +513,7 @@ const Main: FC<IMainProps> = () => {
setSuggestQuestions
(
data
)
setIsShowSuggestion
(
true
)
}
setResponsingFalse
()
},
onThought
(
thought
)
{
// thought finished then start to return message. Warning: use push agent_thoughts.push would caused problem when the thought is more then 2
...
...
@@ -528,12 +530,11 @@ const Main: FC<IMainProps> = () => {
},
onError
()
{
setErrorHappened
(
true
)
setResponsingFalse
()
// role back placeholder answer
setChatList
(
produce
(
getChatList
(),
(
draft
)
=>
{
draft
.
splice
(
draft
.
findIndex
(
item
=>
item
.
id
===
placeholderAnswerId
),
1
)
}))
setResponsingFalse
()
},
})
}
...
...
@@ -633,8 +634,8 @@ const Main: FC<IMainProps> = () => {
'flex-grow flex flex-col overflow-y-auto'
,
)
}
>
<
div
className=
{
cn
(
doShowSuggestion
?
'pb-[140px]'
:
(
isResponsing
?
'pb-[113px]'
:
'pb-[76px]'
),
'relative grow h-[200px] mb-3.5 overflow-hidden'
)
}
>
{
(
!
isNewConversation
||
isResponsing
||
errorHappened
)
&&
(
{
(
!
isNewConversation
||
isResponsing
||
errorHappened
)
&&
(
<
div
className=
'mb-5 antialiased font-sans shrink-0 relative mobile:min-h-[48px] tablet:min-h-[64px]'
>
<
div
className=
'absolute z-10 top-0 left-0 right-0 flex items-center justify-between border-b border-gray-100 mobile:h-12 tablet:h-16 px-8 bg-white'
>
<
div
className=
'text-gray-900'
>
{
conversationName
}
</
div
>
<
div
className=
'flex items-center shrink-0 ml-2 space-x-2'
>
...
...
@@ -655,8 +656,10 @@ const Main: FC<IMainProps> = () => {
</
div
>
</
div
>
</
div
>
)
}
<
div
className=
{
cn
((
!
isNewConversation
||
isResponsing
)
&&
'pt-[90px]'
,
'pc:w-[794px] max-w-full mobile:w-full mx-auto h-full overflow-y-auto'
)
}
ref=
{
chatListDomRef
}
>
</
div
>
)
}
<
div
className=
{
cn
(
doShowSuggestion
?
'pb-[140px]'
:
(
isResponsing
?
'pb-[113px]'
:
'pb-[76px]'
),
'relative grow h-[200px] pc:w-[794px] max-w-full mobile:w-full mx-auto mb-3.5 overflow-hidden'
)
}
>
<
div
className=
{
cn
(
'pc:w-[794px] max-w-full mobile:w-full mx-auto h-full overflow-y-auto'
)
}
ref=
{
chatListDomRef
}
>
<
Chat
isShowConfigElem=
{
isNewConversation
&&
chatList
.
length
===
0
}
configElem=
{
<
Init
...
...
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