Commit fa4275cc by zhangleyuan

feat:处理点击下一步弹框消失

parent 896a00f9
...@@ -73,16 +73,19 @@ function DepartMentTabCon(props) { ...@@ -73,16 +73,19 @@ function DepartMentTabCon(props) {
title: "岗位", title: "岗位",
dataIndex: "depNameList", dataIndex: "depNameList",
render: (val, record) => { render: (val, record) => {
if(!record.depNameList){ if(!record.depNameList){
return <span>-</span> return <span>-</span>
}else{ }else{
if(record.depNameList.length === 0){ if(record.depNameList.length === 0){
return <span>-</span> return <span>-</span>
} }
return record.depNameList.map((item, index) => { return <div className="post-name"> {record.depNameList.map((item, index) => {
return <span>{item}{index!==record.depNameList.length-1 && <span></span>}</span>; return <span>{item}{index!==record.depNameList.length-1 && <span></span>}</span>;
}) })}
</div>
} }
} }
}, },
{ {
...@@ -202,8 +205,8 @@ function DepartMentTabCon(props) { ...@@ -202,8 +205,8 @@ function DepartMentTabCon(props) {
StoreService.delDepartmentUser(params).then((res) => { StoreService.delDepartmentUser(params).then((res) => {
message.success(`删除成功`); message.success(`删除成功`);
getUserList(); getUserList();
Bus.trigger("changeTreeData");
}); });
} }
function handleSelectUserList(record, selected){ function handleSelectUserList(record, selected){
let _list = []; let _list = [];
......
...@@ -3,6 +3,12 @@ ...@@ -3,6 +3,12 @@
.table-con{ .table-con{
margin-left:16px; margin-left:16px;
flex:1; flex:1;
.post-name{
max-width: 200px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.operate-area{ .operate-area{
margin-bottom:16px; margin-bottom:16px;
.add-user-btn{ .add-user-btn{
......
...@@ -184,7 +184,9 @@ function LeftStructureTree(props) { ...@@ -184,7 +184,9 @@ function LeftStructureTree(props) {
useEffect(()=>{ useEffect(()=>{
Bus.bind("addCustomer",(record)=>{addCustomer(record.treeType,record.query)}) Bus.bind("addCustomer",(record)=>{addCustomer(record.treeType,record.query)})
},[]); },[]);
useEffect(()=>{
Bus.bind("changeTreeData",(record)=>{getTreeData()})
},[]);
async function addCustomer(treeType,query){ async function addCustomer(treeType,query){
await getTreeData(treeType); await getTreeData(treeType);
props.searchUserList(query,treeType,1); props.searchUserList(query,treeType,1);
......
...@@ -41,7 +41,7 @@ function UserTable() { ...@@ -41,7 +41,7 @@ function UserTable() {
title: '岗位', title: '岗位',
dataIndex: 'post', dataIndex: 'post',
render: (val, record) => { render: (val, record) => {
return <span>{val}</span> return <span className="post-name">{val}</span>
} }
}, },
{ {
......
.user-table{ .user-table{
.post-name{
max-width: 100px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
} }
\ No newline at end of file
...@@ -56,7 +56,7 @@ class NewChooseMembersModal extends React.Component { ...@@ -56,7 +56,7 @@ class NewChooseMembersModal extends React.Component {
return ( return (
<div className='avatar'> <div className='avatar'>
<span className="icon iconfont avatar-icon">&#xe84a;</span> <span className="icon iconfont avatar-icon">&#xe84a;</span>
<Tooltip title={userName}> <Tooltip title={<WWOpenDataCom type="userName" openid={userName}/>}>
<span className='userImg'> <span className='userImg'>
<WWOpenDataCom type="userName" openid={userName}/> <WWOpenDataCom type="userName" openid={userName}/>
{/* {userName} */} {/* {userName} */}
...@@ -348,7 +348,7 @@ class NewChooseMembersModal extends React.Component { ...@@ -348,7 +348,7 @@ class NewChooseMembersModal extends React.Component {
this.setState({ selectObject }); this.setState({ selectObject });
}} }}
onClose={() => { onClose={() => {
this.setState({ openSetModal: true},()=>{this.handleClose()}) // this.setState({ openSetModal: true},()=>{this.handleClose()})
this.setState({ openSetModal: false, visible: true }) this.setState({ openSetModal: false, visible: true })
}} }}
onCancel={() => { onCancel={() => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment