Merge pull request '代码库二级页面改版-修改issue' (#129) from durian/forgeplus-react:pre_develop_dev into pre_develop_dev

src/forge/Main/Diff.jsx

@@ -85,7 +85,7 @@ export default (props) => {
             <div className="f-wrap-between">
               <div>
                 {commit && commit.message &&
-                  <pre className="task-hide">{commit.message}</pre>
+                  <div dangerouslySetInnerHTML={{__html:commit.message.replaceAll('\n\n','<br/>').replaceAll('\n\r','<br/>').replaceAll('\n','<br/>')}} className="task-hide"></div>
                 }
                 <Link to={`/${owner}/${projectsId}/tree/${truncateCommitId(sha)}`}><i className="iconfont icon-fenzhi2 font-18"></i>{data.branch}</Link>
               </div>

src/forge/Main/version/version.js

@@ -15,10 +15,9 @@ function version(props) {
   const [ releases , setReleases ] = useState(undefined);
   const [ isSpin , setIsSpin ] = useState(true);
   const { projectsId ,owner } = props.match.params;
-  const { isManager, isDeveloper, location , user } = props;
+  const { location } = props;
   const type = props.projectDetail && props.projectDetail.type;
   const turnFromNew = location && location.query && location.query.turnFromNew;
-  const current_user_login = user && user.login;
   useEffect(()=>{
     getIssueList();
   },[])
@@ -34,7 +33,6 @@ function version(props) {
         setReleases(result.data.releases);
         setIsSpin(false);
       }
-      
     }).catch((error) => {
       console.log(error);
     })
@@ -130,6 +128,8 @@ function version(props) {
           addFunc={addFunc}
         />
       )
+    } else{
+      return (<div></div>)
     }
   }
 

src/forge/Team/List.jsx

@@ -19,7 +19,6 @@ function List(props){
   const [ search , setSearch ] = useState(undefined);
   const [ page , setPage ] = useState(1);
   const [ sortBy , setSortBy ] = useState("updated_on");
-  const [ sortDirection , setSortDirection ] = useState("asc");
 
   const OIdentifier = props.match.params.OIdentifier;
   const organizeDetail = props.organizeDetail;
@@ -37,7 +36,7 @@ function List(props){
       params:{
         search,page,limit,
         sort_by:sortBy,
-        sort_direction:sortDirection
+        sort_direction:"desc"
       }
     }).then(result=>{
       if(result && result.data){