feat:解决合并代码后的冲突

aed8c88c · zhangleyuan · dd78e1b7 · 586ff46c · aed8c88c · aed8c88c
Commit aed8c88c authored Aug 03, 2021 by zhangleyuan
7 changed files
--- a/src/components/WWOpenDataCom.jsx
+++ b/src/components/WWOpenDataCom.jsx
@@ -2,9 +2,9 @@ import React, { useRef, useLayoutEffect } from 'react'
 export default function WWOpenDataCom({ type, openid }) {
    const ref = useRef(null)
    useLayoutEffect(() => {
-        console.log(WWOpenData)
+        console.log('1111');
+        console.log(WWOpenData);
        WWOpenData && WWOpenData.bind(ref.current)
    })
    return <ww-open-data ref={ref} type={type} openid={openid} />
 }
\ No newline at end of file
--- a/src/modules/college-manage/NewUsersManagePage.jsx
+++ b/src/modules/college-manage/NewUsersManagePage.jsx
@@ -2,7 +2,7 @@
 * @Author: wufan
 * @Date: 2020-11-30 10:47:38
 * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-07-28 15:50:38
+ * @LastEditTime: 2021-08-03 16:04:30
 * @Description: 学员管理页面
 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */
@@ -28,8 +28,6 @@ function UserManagePage() {
    size: 10,
  });
  return (
    <div className="page new-user-manage-page">
        <div className="content-header">学员管理</div>
@@ -48,15 +46,6 @@ function UserManagePage() {
          </div>
          <div className="box-body tab-con">
            <DepartMentTabCon currentTab={currentTab}/>
-            {/* {currentTab=== 'department' &&
-            }
-            {currentTab=== 'postGroup' &&
-              <PostGroupTabCon/>
-            }
-             {currentTab=== 'customGroup' &&
-              <CustomGroupTabCon/>
-            } */}
          </div>
        </div>
    </div>

--- a/src/modules/college-manage/components/LeftStructureTree.jsx
+++ b/src/modules/college-manage/components/LeftStructureTree.jsx
@@ -25,6 +25,7 @@ function LeftStructureTree(props) {
  const [completeOptions,setCompleteOption] = useState([]); 
  const [selectedKeys,setSelectedKeys]= useState([]); // 设置选中的部门key值
  const [queryName,setQueryName] = useState('');
+  const [postGroupTreeData,setPostGroupTreeData] = useState([]);
  const [open,setOpen]=useState(false);
  const renderTitle = (title) => (
@@ -258,13 +259,16 @@ function LeftStructureTree(props) {
    setAddOrEditPostGroupShow(true);
    setOperatePostGroupModalType("add");
    setPostGroupModalLevel(level);
-    setCurrentGroupData(record)
+    setCurrentGroupData(record);
+    console.log('treeData',record);
    if(level===0){
      setPostGroupModalTitle('添加岗位组');
      setPostGroupModalLable('岗位组');
+      setPostGroupTreeData(treeData);
    }else{
      setPostGroupModalTitle('添加岗位'); // sub代表岗位
      setPostGroupModalLable('岗位');
+      setPostGroupTreeData(record.sonDepartmentVOList || []);
    }
  }
  //编辑岗位组/岗位
@@ -273,13 +277,16 @@ function LeftStructureTree(props) {
    setOperatePostGroupModalType("edit");
   //level为0的时候编辑的是岗位组 大于0的时候
   setPostGroupModalLevel(record.depLevel);
-   setCurrentGroupData(record)
+   setCurrentGroupData(record);
+   console.log('treeData',record);
   if(record.depLevel===0){
    setPostGroupModalTitle('编辑岗位组');
    setPostGroupModalLable('岗位组');
+    setPostGroupTreeData(treeData);
   }else{
    setPostGroupModalTitle('编辑岗位');
    setPostGroupModalLable('岗位');
+    setPostGroupTreeData([]);
   }
  }
  function delPostGroup(record){
@@ -332,9 +339,11 @@ function LeftStructureTree(props) {
    if(level===0){
      setPostGroupModalTitle('添加分组集合');
      setPostGroupModalLable('分组集合');
+      setPostGroupTreeData(treeData);
    }else{
      setPostGroupModalTitle('添加分组'); // sub代表岗位
      setPostGroupModalLable('分组');
+      setPostGroupTreeData(record.sonDepartmentVOList || []);
    }
  }
  //编辑自定义分组集合/分组
@@ -347,9 +356,11 @@ function LeftStructureTree(props) {
   if(record.level===0){
    setPostGroupModalTitle('编辑分组集合');
    setPostGroupModalLable('分组集合');
+    setPostGroupTreeData(treeData);
   }else{
    setPostGroupModalTitle('编辑分组');
    setPostGroupModalLable('分组');
+    setPostGroupTreeData([]);
   }
  }
  function delCustomGroup(record){
@@ -522,7 +533,7 @@ function LeftStructureTree(props) {
          postGroupModalLevel={postGroupModalLevel}
          modalOperateType={operatePostGroupModalType}
          postGroupName={postGroupName}
-          postGroupTreeData={treeData}
+          postGroupTreeData={postGroupTreeData}
          label={postGroupModalLable}
          currentTab={props.treeType}
          currentGroupData={currentGroupData}

--- a/src/modules/college-manage/components/SearchUser.jsx
+++ b/src/modules/college-manage/components/SearchUser.jsx
@@ -61,14 +61,14 @@ function SearchUser(props) {
                      <div>
                        {props.data.departmentUserVOList.map((item,index)=>{
                          return  <div>
-                            <Checkbox onChange={(e)=>{selectuser(e,item)}}>
+                            <Checkbox onChange={(e)=>{selectuser(e,item)}} >
                                <div className="drop-down__item__con__item">
                                  <div className="drop-down__item__con__item__left">
                                    <WWOpenDataCom type="userName" openid={item.userName}/>
                                  </div>
                                  <div className="drop-down__item__con__item__right">
-                                    {item.postDepNamesList.map((_item,index)=>{
+                                    {item.depNamesList.map((_item,index)=>{
-                                      return <span> <WWOpenDataCom type="departmentName" openid={_item}/>{index<(item.postDepNamesList.length -1)?'、':''}</span>
+                                      return <span> <WWOpenDataCom type="departmentName" openid={_item}/>{index<(item.depNamesList.length -1)?';':''}</span>
                                      })
                                    }
                                  </div>

--- a/src/modules/college-manage/components/SearchUser.less
+++ b/src/modules/college-manage/components/SearchUser.less
@@ -8,9 +8,23 @@
        background: #FFFFFF;
        box-shadow: 0px 2px 15px 6px rgba(0, 0, 0, 0.05);
        border-radius:2px;
-        .drop-down__item__con__item{
+        .ant-checkbox-wrapper{
-            display:flex;
+            width:100%;
-            justify-content:space-between;
+            .drop-down__item__con__item{
+                display:flex;
+                width:240px;
+                justify-content:space-between;
+                color:#333;
+                font-size:14px;
+                .drop-down__item__con__item__right{
+                    width:84px;
+                    text-align:right;
+                    overflow: hidden; 
+                    text-overflow: ellipsis;
+                    white-space: nowrap;
+                    color:#999;
+                }
+            }
        }
    }
 }
\ No newline at end of file
--- a/src/modules/college-manage/modal/AddOrEditPostGroupModal.jsx
+++ b/src/modules/college-manage/modal/AddOrEditPostGroupModal.jsx
@@ -2,7 +2,7 @@
 * @Author: wufan
 * @Date: 2020-11-27 16:21:49
 * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-08-03 08:39:25
+ * @LastEditTime: 2021-08-03 17:23:40
 * @Description: Description
 * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
 */
@@ -20,15 +20,20 @@ function AddOrEditPostGroupModal(props) {
  },[]);
  function changePostGroupName(e){
+    let isError = false;
    setValidateStatus('success');
-    // props.postGroupTreeData.map((item,index)=>{
+    setNameErrorMsg('');
-    //     if(item.name === e.target.value){
+    props.postGroupTreeData.map((item,index)=>{
-    //         setValidateStatus('error');
+        if(item.name === e.target.value){
-    //         setNameErrorMsg('该岗位组已存在');
+          setValidateStatus('error');
-    //     }
+          setNameErrorMsg(`该${props.label}已存在`);
-    //     return item;
+          isError = true;
-    // })
+        }
-    setPostGroupName(e.target.value);
+        return item;
+    })
+    if(!isError){
+      setPostGroupName(e.target.value);
+    }
  }
  function handleConfirm(){
@@ -39,6 +44,9 @@ function AddOrEditPostGroupModal(props) {
    }
  }
  function addGroup(){
+    if(!postGroupName){
+      return;
+    }
    const { postGroupModalLevel,currentTab,currentGroupData,label} = props
    let parmas={
      depLevel:postGroupModalLevel,
@@ -60,6 +68,9 @@ function AddOrEditPostGroupModal(props) {
    });
  }
  function editGroup(){
+    if(!postGroupName){
+      return;
+    }
    const {postGroupModalLevel,currentTab,currentGroupData,label} = props
    let parmas={
      departmentLevel:postGroupModalLevel,

--- a/src/modules/root/CollegeManagePage.jsx
+++ b/src/modules/root/CollegeManagePage.jsx
@@ -6,7 +6,7 @@ import User from "@/common/js/user";
 import { LIVE_SHARE } from "@/domains/course-domain/constants";
 import { Modal, message } from 'antd';
 import { brandLogo } from '@/domains/brand/constants'
-import WWOpenDataCom from '@/components/WWOpenDataCom';
+// import WWOpenDataCom from '@/components/WWOpenDataCom';
 import './CollegeManagePage.less';
 import storage from '@/common/js/storage';
@@ -249,8 +249,8 @@ export default class CollegeManagePage extends React.Component {
            <div className="user">
              <img className="image" src={avatar} />
              <span className="name">
-                {/* {name} */}
+                {name}
-                <WWOpenDataCom type="userName" openid={name}/>
+                {/* <WWOpenDataCom type="userName" openid={name}/> */}
              </span>
              <span
                className="logout"
@@ -276,7 +276,8 @@ export default class CollegeManagePage extends React.Component {
          <div className="user">
            <img className="image" src={avatar} />
            <span className="name">
-            <WWOpenDataCom type="userName" openid={name}/>
+                {name}
+            {/* <WWOpenDataCom type="userName" openid={name}/> */}
            </span>
          </div>
          <div>