Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
CivManage
Project
Project
Details
Activity
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
ReactWeb5
CivManage
Commits
d7e3bf7e
Commit
d7e3bf7e
authored
Mar 20, 2024
by
涂伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: '1.角色管理的关联用户搜索高亮2.站点管理的关联用户搜索高亮3.站点管理搜索后机构层级丢失bug修复'
parent
45859c6f
Pipeline
#86236
passed with stages
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
49 additions
and
4 deletions
+49
-4
CardCheck.jsx
src/pages/userCenter/roleManage/SelectUser/CardCheck.jsx
+22
-2
NewSelectUser.jsx
src/pages/userCenter/roleManage/SelectUser/NewSelectUser.jsx
+1
-0
SiteManage.jsx
src/pages/userCenter/siteManage/SiteManage.jsx
+26
-2
No files found.
src/pages/userCenter/roleManage/SelectUser/CardCheck.jsx
View file @
d7e3bf7e
...
...
@@ -4,7 +4,7 @@ import styles from './SelectUser.less';
const
CheckboxGroup
=
Checkbox
.
Group
;
const
CardCheck
=
props
=>
{
const
{
cardMsg
,
callback
,
checkList
,
deleKey
,
delFlag
}
=
props
;
const
{
cardMsg
,
callback
,
checkList
,
deleKey
,
delFlag
,
searchName
}
=
props
;
const
[
checkedList
,
setCheckedList
]
=
useState
([]);
// 选中列表
const
[
indeterminate
,
setIndeterminate
]
=
useState
(
false
);
const
[
checkAll
,
setCheckAll
]
=
useState
(
false
);
...
...
@@ -76,6 +76,23 @@ const CardCheck = props => {
setIndeterminate
(
false
);
setCheckAll
(
e
.
target
.
checked
);
};
const
renderName
=
(
name
)
=>
{
const
indexsearch
=
name
.
indexOf
(
searchName
);
const
beforeStr
=
name
.
substring
(
0
,
indexsearch
);
const
afterStr
=
name
.
slice
(
indexsearch
+
searchName
.
length
);
if
(
name
.
includes
(
searchName
)
&&
searchName
!==
''
)
{
return
(
<
div
>
{
beforeStr
}
<
span
style=
{
{
color
:
'red'
}
}
>
{
searchName
}
</
span
>
{
afterStr
}
</
div
>
)
}
else
{
return
(<
div
>
{
name
}
</
div
>)
}
}
return
(
<
div
className=
{
styles
.
checkContent
}
>
<
div
className=
{
styles
.
topCheckbox
}
>
...
...
@@ -96,7 +113,10 @@ const CardCheck = props => {
{
plainOptions
.
map
(
item
=>
(
<
Checkbox
key=
{
item
.
value
}
value=
{
item
.
value
}
>
{
/* <Tooltip placement="topLeft" title={item.label}> */
}
<
span
className=
{
styles
.
fontlabel
}
>
{
item
.
label
}
</
span
>
<
span
className=
{
styles
.
fontlabel
}
>
{
/* {item.label}{searchName} */
}
{
renderName
(
item
.
label
)
}
</
span
>
{
/* </Tooltip> */
}
</
Checkbox
>
))
}
...
...
src/pages/userCenter/roleManage/SelectUser/NewSelectUser.jsx
View file @
d7e3bf7e
...
...
@@ -289,6 +289,7 @@ const NewSelectUser = props => {
checkList=
{
checkList
}
deleKey=
{
deleKey
}
delFlag=
{
delFlag
}
searchName=
{
searchName
}
/>
</
div
>
))
}
...
...
src/pages/userCenter/siteManage/SiteManage.jsx
View file @
d7e3bf7e
...
...
@@ -284,6 +284,9 @@ const SiteManageV2 = () => {
if
(
res
.
code
===
0
&&
res
.
data
)
{
setShowSearchStyle
(
true
);
let
list
=
res
.
data
.
data
;
list
.
map
(
v
=>
{
v
.
groupName
=
v
.
level
})
// 还原选择的数据
let
indete
=
indeterminate
;
if
(
selectList
.
length
>
0
)
{
...
...
@@ -338,6 +341,9 @@ const SiteManageV2 = () => {
if
(
res
.
code
===
0
&&
res
.
data
)
{
setShowSearchStyle
(
true
);
let
list
=
res
.
data
.
data
;
list
.
map
(
v
=>
{
v
.
groupName
=
v
.
level
})
// 还原选择的数据
let
indete
=
indeterminate
;
if
(
selectList
.
length
>
0
)
{
...
...
@@ -735,6 +741,7 @@ const SiteManageV2 = () => {
key=
{
v
.
userId
}
selectList=
{
selectList
}
handleChangeSignel=
{
props
.
handleChangeSignel
}
searchName=
{
name
}
/>
))
}
</
div
>
...
...
@@ -975,6 +982,7 @@ const SiteManageV2 = () => {
handleChangeAll=
{
handleChangeAll
}
handleChangeSignel=
{
handleChangeSignel
}
item=
{
item
}
name=
{
name
}
/>
))
}
</
div
>
...
...
@@ -1004,14 +1012,30 @@ const SiteManageV2 = () => {
};
const
CheckBoxRow
=
props
=>
{
let
{
vIndex
,
index
,
isChecked
,
userName
,
item
,
selectList
,
groupName
}
=
props
;
let
{
vIndex
,
index
,
isChecked
,
userName
,
item
,
selectList
,
groupName
,
searchName
}
=
props
;
const
renderName
=
(
name
)
=>
{
const
indexsearch
=
name
.
indexOf
(
searchName
);
const
beforeStr
=
name
.
substring
(
0
,
indexsearch
);
const
afterStr
=
name
.
slice
(
indexsearch
+
searchName
.
length
);
if
(
name
.
includes
(
searchName
)
&&
searchName
!==
''
)
{
return
(
<
div
>
{
beforeStr
}
<
span
style=
{
{
color
:
'red'
}
}
>
{
searchName
}
</
span
>
{
afterStr
}
</
div
>
)
}
else
{
return
(<
div
>
{
name
}
</
div
>)
}
}
return
(
<
Checkbox
className=
{
styles
.
siteList
}
checked=
{
selectList
.
size
>
0
&&
selectList
.
has
(
`${item.userId}|${item.groupId}`
)
}
onClick=
{
e
=>
props
.
handleChangeSignel
(
e
,
index
,
vIndex
,
item
,
groupName
)
}
>
{
userName
}
{
renderName
(
userName
)
}
</
Checkbox
>
);
};
...
...
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