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
3e6320fc
Commit
3e6320fc
authored
Jun 15, 2023
by
StyleZhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: account-setting member
parent
a0907674
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
index.tsx
...ponents/base/notion-page-selector/page-selector/index.tsx
+1
-1
index.tsx
.../components/header/account-setting/members-page/index.tsx
+9
-9
No files found.
web/app/components/base/notion-page-selector/page-selector/index.tsx
View file @
3e6320fc
...
...
@@ -167,7 +167,7 @@ const PageSelector = ({
const
[
localPreviewPageId
,
setLocalPreviewPageId
]
=
useState
(
''
)
if
(
prevDataList
!==
list
)
{
setPrevDataList
(
list
)
setDataList
(
list
.
filter
(
item
=>
item
.
parent_id
===
'root'
).
map
((
item
)
=>
{
setDataList
(
list
.
filter
(
item
=>
item
.
parent_id
===
'root'
||
!
pagesMap
[
item
.
parent_id
]
).
map
((
item
)
=>
{
return
{
...
item
,
expand
:
false
,
...
...
web/app/components/header/account-setting/members-page/index.tsx
View file @
3e6320fc
'use client'
import
{
useState
}
from
'react'
import
s
from
'./index.module.css'
import
cn
from
'classnames'
import
useSWR
from
'swr'
import
dayjs
from
'dayjs'
import
'dayjs/locale/zh-cn'
import
relativeTime
from
'dayjs/plugin/relativeTime'
import
I18n
from
'@/context/i18n'
import
{
useContext
}
from
'use-context-selector'
import
{
fetchMembers
}
from
'@/service/common'
import
{
UserPlusIcon
}
from
'@heroicons/react/24/outline'
import
{
useTranslation
}
from
'react-i18next'
import
s
from
'./index.module.css'
import
InviteModal
from
'./invite-modal'
import
InvitedModal
from
'./invited-modal'
import
Operation
from
'./operation'
import
{
fetchMembers
}
from
'@/service/common'
import
I18n
from
'@/context/i18n'
import
{
useAppContext
}
from
'@/context/app-context'
import
Avatar
from
'@/app/components/base/avatar'
import
{
useWorkspacesContext
}
from
'@/context/workspace-context'
...
...
@@ -35,18 +35,18 @@ const MembersPage = () => {
const
owner
=
accounts
.
filter
(
account
=>
account
.
role
===
'owner'
)?.[
0
]?.
email
===
userProfile
.
email
const
{
workspaces
}
=
useWorkspacesContext
()
const
currentWrokspace
=
workspaces
.
filter
(
item
=>
item
.
current
)?.[
0
]
return
(
<>
<
div
>
<
div
className=
'flex items-center mb-4 p-3 bg-gray-50 rounded-2xl'
>
<
div
className=
{
cn
(
s
[
'logo-icon'
],
'shrink-0'
)
}
></
div
>
<
div
className=
'grow mx-2'
>
<
div
className=
'text-sm font-medium text-gray-900'
>
{
currentWrokspace
.
name
}
</
div
>
<
div
className=
'text-sm font-medium text-gray-900'
>
{
currentWrokspace
?
.
name
}
</
div
>
<
div
className=
'text-xs text-gray-500'
>
{
t
(
'common.userProfile.workspace'
)
}
</
div
>
</
div
>
<
div
className=
'
shrink-0 flex items-center py-[7px] px-3 border-[0.5px] border-gray-200
shrink-0 flex items-center py-[7px] px-3 border-[0.5px] border-gray-200
text-[13px] font-medium text-primary-600 bg-white
shadow-[0_1px_2px_rgba(16,24,40,0.05)] rounded-lg cursor-pointer
'
onClick=
{
()
=>
setInviteModalVisible
(
true
)
}
>
...
...
@@ -78,10 +78,10 @@ const MembersPage = () => {
<
div
className=
'shrink-0 flex items-center w-[104px] py-2 text-[13px] text-gray-700'
>
{
dayjs
(
Number
((
account
.
last_login_at
||
account
.
created_at
))
*
1000
).
locale
(
locale
===
'zh-Hans'
?
'zh-cn'
:
'en'
).
fromNow
()
}
</
div
>
<
div
className=
'shrink-0 w-[96px] flex items-center'
>
{
owner
&&
account
.
role
!==
'owner'
(
owner
&&
account
.
role
!==
'owner'
)
?
<
Operation
member=
{
account
}
onOperate=
{
()
=>
mutate
()
}
/>
:
<
div
className=
'px-3 text-[13px] text-gray-700'
>
{
RoleMap
[
account
.
role
]
||
RoleMap
.
normal
}
</
div
>
}
}
</
div
>
</
div
>
))
...
...
@@ -111,4 +111,4 @@ const MembersPage = () => {
)
}
export
default
MembersPage
\ No newline at end of file
export
default
MembersPage
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