Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
xiaomai-cloud-class-web
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
xiaomai-cloud-class
xiaomai-cloud-class-web
Commits
e5172866
Commit
e5172866
authored
Aug 04, 2021
by
zhangleyuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:处理中文不能输入的问题
parent
c1e330b9
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
33 additions
and
20 deletions
+33
-20
src/modules/college-manage/components/DepartMentTabCon.jsx
+2
-2
src/modules/college-manage/components/LeftStructureTree.jsx
+18
-13
src/modules/college-manage/modal/NewChooseMembersModal.jsx
+8
-4
src/modules/college-manage/modal/SetEmployeeModal.jsx
+5
-1
No files found.
src/modules/college-manage/components/DepartMentTabCon.jsx
View file @
e5172866
...
@@ -263,7 +263,7 @@ function DepartMentTabCon(props) {
...
@@ -263,7 +263,7 @@ function DepartMentTabCon(props) {
<
div
className=
"department-tab-con"
>
<
div
className=
"department-tab-con"
>
<
LeftStructureTree
<
LeftStructureTree
treeType=
{
props
.
currentTab
}
treeType=
{
props
.
currentTab
}
searchUserList=
{
(
params
,
treeType
)
=>
getUserList
(
params
,
treeType
)
}
searchUserList=
{
(
params
,
treeType
)
=>
getUserList
(
params
,
treeType
,
1
)
}
onChangeSelectDep=
{
(
record
)
=>
{
setSelectDep
(
record
)}
}
onChangeSelectDep=
{
(
record
)
=>
{
setSelectDep
(
record
)}
}
/>
/>
<
div
className=
"table-con"
>
<
div
className=
"table-con"
>
...
@@ -352,7 +352,7 @@ function DepartMentTabCon(props) {
...
@@ -352,7 +352,7 @@ function DepartMentTabCon(props) {
const
queryStates
=
_
.
clone
(
query
);
const
queryStates
=
_
.
clone
(
query
);
queryStates
.
current
=
page
;
queryStates
.
current
=
page
;
setQuery
(
queryStates
);
setQuery
(
queryStates
);
getUserList
();
getUserList
(
null
,
null
,
current
);
}
}
}
}
/>
/>
</
div
>
</
div
>
...
...
src/modules/college-manage/components/LeftStructureTree.jsx
View file @
e5172866
...
@@ -68,7 +68,8 @@ function LeftStructureTree(props) {
...
@@ -68,7 +68,8 @@ function LeftStructureTree(props) {
dropdownClassName=
"certain-category-search-dropdown"
dropdownClassName=
"certain-category-search-dropdown"
dropdownMatchSelectWidth=
{
250
}
dropdownMatchSelectWidth=
{
250
}
allowClear
allowClear
onChange=
{
getCompleteOptionData
}
// onChange={(value)=>{setQueryName(value)}}
onSearch=
{
(
value
)
=>
{
setQueryName
(
value
)}
}
notFoundContent=
{
notFoundContentNode
()
}
notFoundContent=
{
notFoundContentNode
()
}
value=
{
queryName
}
value=
{
queryName
}
open=
{
open
}
open=
{
open
}
...
@@ -92,7 +93,7 @@ function LeftStructureTree(props) {
...
@@ -92,7 +93,7 @@ function LeftStructureTree(props) {
// 获取关键词的搜索结果
// 获取关键词的搜索结果
function
getCompleteOptionData
(
value
){
function
getCompleteOptionData
(
value
){
setQueryName
(
value
);
//
setQueryName(value);
const
params
=
{
const
params
=
{
depType
:
DepType
[
props
.
treeType
],
depType
:
DepType
[
props
.
treeType
],
queryName
:
value
,
queryName
:
value
,
...
@@ -402,22 +403,26 @@ function LeftStructureTree(props) {
...
@@ -402,22 +403,26 @@ function LeftStructureTree(props) {
<
div
className=
"left-structure-tree"
>
<
div
className=
"left-structure-tree"
>
<
div
className=
"organization"
>
<
div
className=
"organization"
>
<
div
className=
"search-con"
>
<
div
className=
"search-con"
>
<
Complete
/>
{
/* <Complete/> */
}
{
/* <AutoComplete
<
AutoComplete
dropdownClassName=
"certain-category-search-dropdown"
dropdownMatchSelectWidth=
{
250
}
allowClear
allowClear
onChange=
{
(
value
)
=>
setQueryName
(
value
)
}
onSearch=
{
(
value
)
=>
{
getCompleteOptionData
(
value
)}
}
notFoundContent=
{
notFoundContentNode
()
}
value=
{
queryName
}
open=
{
open
}
onFocus=
{
()
=>
{
setOpen
(
true
)}
}
onBlur=
{
()
=>
{
setOpen
(
false
)}
}
style=
{
{
style=
{
{
width
:
250
,
width
:
250
,
}
}
}
}
onSearch={getCompleteOptionData}
options=
{
completeOptions
}
placeholder="搜索员工、部门"
onSelect=
{
confirmSearchSelect
}
placeholder=
'搜索员工、部门'
>
>
<Option><span>部门</span></Option>
</
AutoComplete
>
{departmentUserResult.map((item) => (
<Option key={item.userName} value={item.userName}>
{email}
</Option>
))}
</AutoComplete> */
}
</
div
>
</
div
>
{
(
props
.
treeType
===
'postGrouptab'
||
props
.
treeType
===
'customGroupTab'
)
&&
(
{
(
props
.
treeType
===
'postGrouptab'
||
props
.
treeType
===
'customGroupTab'
)
&&
(
<
div
className=
"operate"
>
<
div
className=
"operate"
>
...
...
src/modules/college-manage/modal/NewChooseMembersModal.jsx
View file @
e5172866
...
@@ -57,7 +57,10 @@ class NewChooseMembersModal extends React.Component {
...
@@ -57,7 +57,10 @@ class NewChooseMembersModal extends React.Component {
<
div
className=
'avatar'
>
<
div
className=
'avatar'
>
<
span
className=
"icon iconfont avatar-icon"
>

</
span
>
<
span
className=
"icon iconfont avatar-icon"
>

</
span
>
<
Tooltip
title=
{
userName
}
>
<
Tooltip
title=
{
userName
}
>
<
span
className=
'userImg'
>
{
userName
}
</
span
>
<
span
className=
'userImg'
>
<
WWOpenDataCom
type=
"userName"
openid=
{
userName
}
/>
{
/* {userName} */
}
</
span
>
</
Tooltip
>
</
Tooltip
>
</
div
>
</
div
>
)
)
...
@@ -99,7 +102,7 @@ class NewChooseMembersModal extends React.Component {
...
@@ -99,7 +102,7 @@ class NewChooseMembersModal extends React.Component {
})
})
}
}
// 清空所有成员
// 清空所有成员
clearAllUser
=
()
=>
{
clearAllUser
=
()
=>
{
this
.
setState
({
this
.
setState
({
selectUserList
:
[],
selectUserList
:
[],
})
})
...
@@ -132,7 +135,8 @@ class NewChooseMembersModal extends React.Component {
...
@@ -132,7 +135,8 @@ class NewChooseMembersModal extends React.Component {
this
.
props
.
onConfirm
();
this
.
props
.
onConfirm
();
})
})
}
}
// 批量添加成员(点击确定)
// 批量添加成员(点击确定)
addUser
=
(
selectUserList
)
=>
{
addUser
=
(
selectUserList
)
=>
{
let
enterpriseUserList
=
[];
// 保存新加进去的成员
let
enterpriseUserList
=
[];
// 保存新加进去的成员
selectUserList
.
map
((
item
)
=>
{
selectUserList
.
map
((
item
)
=>
{
...
@@ -155,6 +159,7 @@ class NewChooseMembersModal extends React.Component {
...
@@ -155,6 +159,7 @@ class NewChooseMembersModal extends React.Component {
}
}
})
})
}
}
renderTitle
=
(
title
)
=>
{
renderTitle
=
(
title
)
=>
{
return
<
span
>
{
title
}
</
span
>
return
<
span
>
{
title
}
</
span
>
}
}
...
@@ -207,7 +212,6 @@ class NewChooseMembersModal extends React.Component {
...
@@ -207,7 +212,6 @@ class NewChooseMembersModal extends React.Component {
>
>
</
AutoComplete
>
</
AutoComplete
>
}
}
getCompleteOptionData
=
(
value
)
=>
{
getCompleteOptionData
=
(
value
)
=>
{
if
(
!
value
){
if
(
!
value
){
this
.
setState
({
this
.
setState
({
...
...
src/modules/college-manage/modal/SetEmployeeModal.jsx
View file @
e5172866
import
React
from
'react'
;
import
React
from
'react'
;
import
{
Modal
,
Button
,
Radio
,
Tooltip
}
from
'antd'
;
import
{
Modal
,
Button
,
Radio
,
Tooltip
}
from
'antd'
;
import
WWOpenDataCom
from
'@/components/WWOpenDataCom'
;
import
'./SetEmployeeModal.less'
import
'./SetEmployeeModal.less'
const
RadioGroup
=
Radio
.
Group
;
const
RadioGroup
=
Radio
.
Group
;
...
@@ -70,7 +71,10 @@ export default class SetEmployeeModal extends React.Component {
...
@@ -70,7 +71,10 @@ export default class SetEmployeeModal extends React.Component {
>
>
<
span
className=
"icon iconfont avatar-icon"
>

</
span
>
<
span
className=
"icon iconfont avatar-icon"
>

</
span
>
<
Tooltip
title=
{
item
.
name
}
>
<
Tooltip
title=
{
item
.
name
}
>
<
span
className=
'name'
>
{
item
.
userName
}
</
span
>
<
span
className=
'name'
>
{
/* {item.userName} */
}
<
WWOpenDataCom
type=
"userName"
openid=
{
tem
.
userName
}
/>
</
span
>
</
Tooltip
>
</
Tooltip
>
<
span
className=
"tag"
>
{
tagMap
[
item
.
roleCode
]
}
</
span
>
<
span
className=
"tag"
>
{
tagMap
[
item
.
roleCode
]
}
</
span
>
</
div
>
</
div
>
...
...
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