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
b7b3084c
Commit
b7b3084c
authored
Jun 28, 2023
by
Joel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: show op has scrollbar
parent
5a402b5a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
index.tsx
web/app/components/share/chat/sidebar/index.tsx
+3
-3
index.tsx
web/app/components/share/chat/sidebar/list/index.tsx
+1
-1
No files found.
web/app/components/share/chat/sidebar/index.tsx
View file @
b7b3084c
...
@@ -96,10 +96,10 @@ const Sidebar: FC<ISidebarProps> = ({
...
@@ -96,10 +96,10 @@ const Sidebar: FC<ISidebarProps> = ({
<
PencilSquareIcon
className=
"mr-2 h-4 w-4"
/>
{
t
(
'share.chat.newChat'
)
}
<
PencilSquareIcon
className=
"mr-2 h-4 w-4"
/>
{
t
(
'share.chat.newChat'
)
}
</
Button
>
</
Button
>
</
div
>
</
div
>
<
div
className=
'flex-grow h-0 overflow-y-auto overflow-x-hidden'
>
<
div
className=
{
'flex-grow flex flex-col h-0 overflow-y-auto overflow-x-hidden'
}
>
{
/* pinned list */
}
{
/* pinned list */
}
{
hasPinned
&&
(
{
hasPinned
&&
(
<
div
className=
'mt-4 px-4'
>
<
div
className=
{
cn
(
'mt-4 px-4'
,
list
.
length
===
0
&&
'flex flex-col flex-grow'
)
}
>
<
div
className=
'mb-1.5 leading-[18px] text-xs text-gray-500 font-medium uppercase'
>
{
t
(
'share.chat.pinnedTitle'
)
}
</
div
>
<
div
className=
'mb-1.5 leading-[18px] text-xs text-gray-500 font-medium uppercase'
>
{
t
(
'share.chat.pinnedTitle'
)
}
</
div
>
<
List
<
List
className=
{
cn
(
list
.
length
>
0
?
maxListHeight
:
'flex-grow'
)
}
className=
{
cn
(
list
.
length
>
0
?
maxListHeight
:
'flex-grow'
)
}
...
@@ -119,7 +119,7 @@ const Sidebar: FC<ISidebarProps> = ({
...
@@ -119,7 +119,7 @@ const Sidebar: FC<ISidebarProps> = ({
</
div
>
</
div
>
)
}
)
}
{
/* unpinned list */
}
{
/* unpinned list */
}
<
div
className=
'mt-4 px-4'
>
<
div
className=
{
cn
(
'mt-4 px-4'
,
!
hasPinned
&&
'flex flex-col flex-grow'
)
}
>
{
(
hasPinned
&&
list
.
length
>
0
)
&&
(
{
(
hasPinned
&&
list
.
length
>
0
)
&&
(
<
div
className=
'mb-1.5 leading-[18px] text-xs text-gray-500 font-medium uppercase'
>
{
t
(
'share.chat.unpinnedTitle'
)
}
</
div
>
<
div
className=
'mb-1.5 leading-[18px] text-xs text-gray-500 font-medium uppercase'
>
{
t
(
'share.chat.unpinnedTitle'
)
}
</
div
>
)
}
)
}
...
...
web/app/components/share/chat/sidebar/list/index.tsx
View file @
b7b3084c
...
@@ -65,7 +65,7 @@ const List: FC<IListProps> = ({
...
@@ -65,7 +65,7 @@ const List: FC<IListProps> = ({
return
(
return
(
<
nav
<
nav
ref=
{
listRef
}
ref=
{
listRef
}
className=
{
cn
(
className
,
'shrink-0 space-y-1 bg-white pb-[
60
px] overflow-y-auto'
)
}
className=
{
cn
(
className
,
'shrink-0 space-y-1 bg-white pb-[
85
px] overflow-y-auto'
)
}
>
>
{
list
.
map
((
item
)
=>
{
{
list
.
map
((
item
)
=>
{
const
isCurrent
=
item
.
id
===
currentId
const
isCurrent
=
item
.
id
===
currentId
...
...
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