Skip to content

X
xiaomai-cloud-class-web
Commit 22f3a98d by zhangleyuan
Options

feat:处理合并代码后的冲突

parents fdf4d28a 14445fa0
Showing with 62 additions and 31 deletions
src/modules/college-manage/EmployeeManage.tsx
...@@ -189,7 +189,7 @@ function EmployeeManage() { ...@@ -189,7 +189,7 @@ function EmployeeManage() {
// return <span><WWOpenDataCom type="departmentName" openid={item}/>{index<(record.depNameList.length -1)?';':''}</span>; // return <span><WWOpenDataCom type="departmentName" openid={item}/>{index<(record.depNameList.length -1)?';':''}</span>;
// }) // })
return <Tooltip title={<div>{handleDepName(record.depNameList)}</div>} placement='top' arrowPointAtCenter><div className="post-name"> {record.depNameList.map((item, index) => { return <Tooltip title={<div>{handleDepName(record.depNameList)}</div>} placement='top' arrowPointAtCenter><div className="post-name"> {record.depNameList.map((item, index) => {
return <span><WWOpenDataCom type="departmentName" openid={item}/>{index<(record.depNameList.length -1)?';':''}</span> return <span><WWOpenDataCom type="departmentName" openid={item}/>{index<(record.depNameList.length -1)?'；':''}</span>
})} })}
</div> </div>
</Tooltip> </Tooltip>
...@@ -246,7 +246,7 @@ function EmployeeManage() { ...@@ -246,7 +246,7 @@ function EmployeeManage() {
function handleDepName(depArray:any):any{ function handleDepName(depArray:any):any{
const depArrayDom = depArray.map((item:any, index:any) => { const depArrayDom = depArray.map((item:any, index:any) => {
return <WWOpenDataCom type="departmentName" openid={item}/> return <span><WWOpenDataCom type="departmentName" openid={item}/>；</span>
}); });
return depArrayDom; return depArrayDom;
}; };
...@@ -356,10 +356,10 @@ function EmployeeManage() { ...@@ -356,10 +356,10 @@ function EmployeeManage() {
userType:'USER' userType:'USER'
} }
StoreService.syncWorkWeChatDepartment(params).then((res) => { StoreService.syncWorkWeChatDepartment(params).then((res) => {
getEmployeeList();
message.success('已更新'); message.success('已更新');
}); });
} }
return ( return (
<div className="page employee-manage-page"> <div className="page employee-manage-page">
<div className="content-header">角色管理</div> <div className="content-header">角色管理</div>
......
src/modules/college-manage/components/DepartMentTabCon.jsx
...@@ -81,7 +81,7 @@ function DepartMentTabCon(props) { ...@@ -81,7 +81,7 @@ function DepartMentTabCon(props) {
return <span>-</span> return <span>-</span>
} }
return <Tooltip title={handleDepName(record.depNameList)} placement='top' arrowPointAtCenter><div className="post-name"> {record.depNameList.map((item, index) => { return <Tooltip title={handleDepName(record.depNameList)} placement='top' arrowPointAtCenter><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> </div>
</Tooltip> </Tooltip>
...@@ -128,7 +128,7 @@ function DepartMentTabCon(props) { ...@@ -128,7 +128,7 @@ function DepartMentTabCon(props) {
let depStr = ''; let depStr = '';
depArray.forEach((item, index) => { depArray.forEach((item, index) => {
if (index < depArray.length - 1) { if (index < depArray.length - 1) {
depStr = depStr + item + '、'; depStr = depStr + item + '；';
} else { } else {
depStr = depStr + item; depStr = depStr + item;
} }
......
src/modules/college-manage/components/LeftStructureTree.jsx
...@@ -24,10 +24,32 @@ function LeftStructureTree(props) { ...@@ -24,10 +24,32 @@ function LeftStructureTree(props) {
const [currentGroupData,setCurrentGroupData] = useState({}); const [currentGroupData,setCurrentGroupData] = useState({});
const [completeOptions,setCompleteOption] = useState([]); const [completeOptions,setCompleteOption] = useState([]);
const [selectedKeys,setSelectedKeys]= useState([]); // 设置选中的部门key值 const [selectedKeys,setSelectedKeys]= useState([]); // 设置选中的部门key值
const [queryName,setQueryName] = useState(''); const [queryName,setQueryName] = useState(''); // 搜索框内的值
const [selctQueryName,setSelctQueryName]= useState(''); // 搜索出结果后最终选择的名字
const [postGroupTreeData,setPostGroupTreeData] = useState([]); // 为了判定创建和编辑时的数据会不会重明 const [postGroupTreeData,setPostGroupTreeData] = useState([]); // 为了判定创建和编辑时的数据会不会重明
const [open,setOpen]=useState(false); const [open,setOpen]=useState(false);
useEffect(()=>{
setQueryName(''); //切换tab时搜索置空
setCompleteOption([]);
setOpen(false); //切换tab时搜索的下拉框置为空
getTreeData().then((res)=>{
const _defaultSelectedKeys = [];
if(res.length > 0){
_defaultSelectedKeys.push(res[0].id);
setSelectedKeys(_defaultSelectedKeys);
props.onChangeSelectDep(res[0])
props.searchUserList(res[0],treeType,1);
}
});
},[props.treeType]);
useEffect(()=>{
Bus.bind("addCustomer",(record)=>{addCustomer(record.treeType,record.query)})
},[]);
useEffect(()=>{
Bus.bind("changeTreeData",(record)=>{getTreeData(record.treeType)})
},[]);
const renderTitle = (title) => ( const renderTitle = (title) => (
<span> <span>
{title} {title}
...@@ -80,9 +102,10 @@ function LeftStructureTree(props) { ...@@ -80,9 +102,10 @@ function LeftStructureTree(props) {
return placeholder return placeholder
} }
function confirmSearchSelect(value,option){ function confirmSearchSelect(value,option){
console.log('option',option);
setOpen(false); setOpen(false);
setQueryName(value); setQueryName(value);
// console.log('option',option);
// setSelctQueryName(option)
props.searchUserList({queryName:value},treeType,1); props.searchUserList({queryName:value},treeType,1);
} }
...@@ -160,27 +183,7 @@ function LeftStructureTree(props) { ...@@ -160,27 +183,7 @@ function LeftStructureTree(props) {
}); });
} }
useEffect(()=>{
setQueryName(''); //切换tab时搜索置空
setCompleteOption([]);
setOpen(false); //切换tab时搜索的下拉框置为空
getTreeData().then((res)=>{
const _defaultSelectedKeys = [];
if(res.length > 0){
_defaultSelectedKeys.push(res[0].id);
setSelectedKeys(_defaultSelectedKeys);
props.onChangeSelectDep(res[0])
props.searchUserList(res[0],treeType,1);
}
});
},[props.treeType]);
useEffect(()=>{
Bus.bind("addCustomer",(record)=>{addCustomer(record.treeType,record.query)})
},[]);
useEffect(()=>{
Bus.bind("changeTreeData",(record)=>{getTreeData(record.treeType)})
},[]);
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);
...@@ -359,9 +362,10 @@ function LeftStructureTree(props) { ...@@ -359,9 +362,10 @@ function LeftStructureTree(props) {
return; return;
} }
} }
console.log("record.sonDepartmentVOList",record.sonDepartmentVOList)
if(level===1){ if(level===1){
if(record.sonDepartmentVOList){ if(record.sonDepartmentVOList){
if(record.sonDepartmentVOList.lenght > 19){ if(record.sonDepartmentVOList.length > 19){
message.error("自定义分组数量已达20个上限"); message.error("自定义分组数量已达20个上限");
return; return;
} }
...@@ -484,6 +488,7 @@ function LeftStructureTree(props) { ...@@ -484,6 +488,7 @@ function LeftStructureTree(props) {
</div> </div>
)} )}
<div className="tree-con"> <div className="tree-con">
{!selctQueryName ?
<DirectoryTree <DirectoryTree
defaultExpandAll defaultExpandAll
showIcon={false} showIcon={false}
...@@ -559,6 +564,32 @@ function LeftStructureTree(props) { ...@@ -559,6 +564,32 @@ function LeftStructureTree(props) {
); );
}} }}
/> />
:
<div>
{ (props.treeType==='departMentTab') &&
<div>
{ option.name?
<WWOpenDataCom type="departmentName" openid={option.name}/>
:
<WWOpenDataCom type="userName" openid={option.userName}/>
}
</div>
}
{ (props.treeType==='postGrouptab' || props.treeType=== 'customGroupTab') &&
<div>
{ option.name?
<span>{option.name}</span>
:
<span>{option.userName}</span>
}
</div>
}
</div>
}
</div> </div>
</div> </div>
{addOrEditPostGroupShow && ( {addOrEditPostGroupShow && (
......
src/modules/college-manage/modal/AddOrEditPostGroupModal.jsx
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: wufan * @Author: wufan
* @Date: 2020-11-27 16:21:49 * @Date: 2020-11-27 16:21:49
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @LastEditTime: 2021-08-06 15:07:53 * @LastEditTime: 2021-08-06 17:10:50
* @Description: Description * @Description: Description
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/ */
...@@ -24,7 +24,7 @@ function AddOrEditPostGroupModal(props) { ...@@ -24,7 +24,7 @@ function AddOrEditPostGroupModal(props) {
setIsError(false) setIsError(false)
setValidateStatus('success'); setValidateStatus('success');
setNameErrorMsg(''); setNameErrorMsg('');
if((!postGroupName) || /^\s+$/.test(postGroupName)){ if((!e.target.value) || /^\s+$/.test(e.target.value)){
setValidateStatus('error'); setValidateStatus('error');
setNameErrorMsg(`${props.label}不能为空`); setNameErrorMsg(`${props.label}不能为空`);
setIsError(true) setIsError(true)
......
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