Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into pre_develop_dev

# Conflicts:
#	src/forge/Main/Detail.js

src/App.js

@@ -19,7 +19,7 @@ import moment from 'moment'
 import { MuiThemeProvider, createMuiTheme } from 'material-ui/styles';
 import SiderBar from './forge/Component/SiderBar'
 
-import { SnackbarHOC } from 'educoder'
+import { SnackbarHOC } from 'educoder';
 import { initAxiosInterceptors } from './AppConfig'
 import { Provider } from 'react-redux';
 import configureStore from './redux/stores/configureStore';
@@ -39,6 +39,11 @@ const Projects = Loadable({
 	loader: () => import('./forge/Index'),
 	loading: Loading,
 })
+// forge项目详情
+const ProjectDetail = Loadable({
+  loader: () => import("./forge/Main/DetailAdaptor"),
+  loading: Loading,
+});
 //forge安全设置
 const Security = Loadable({
 	loader: () => import('./forge/SecuritySetting/Index'),
@@ -92,8 +97,13 @@ const ProjectIndex = Loadable({
 	loading: Loading,
 });
 
+const CreateMerge = Loadable({
+  loader: () => import('./forge/Merge/NewMerge'),
+  loading: Loading,
+})
+
 // 此处仅维护前端可能的一级路由，不用进行项目或者组织判断的字段。
-const keyWord = ["explore", "settings", "setting", "CCF", "mulan", "wiki", "issues", "setting", "trending", "code", "projects", "pulls", "mine", "login", "register", "email", "export", "nopage", "404", "403", "500", "501", "search"];
+const keyWord = ["explore", "settings", "setting", "mulan", "wiki", "issues", "setting", "trending", "code", "projects", "pulls", "mine", "login", "register", "email", "export", "nopage", "404", "403", "500", "501", "search", "organize"];
 
 class App extends Component {
 	constructor(props) {
@@ -268,6 +278,13 @@ class App extends Component {
 								}
 							} />
 
+							{/* 项目PR */}
+							<Route path="/:owner/:projectsId/pulls/new"
+								render={
+									(props) => (<ProjectDetail {...this.props} {...props} {...this.state} />)
+								}
+							></Route>
+
 							{/*项目*/}
 							<Route
 								path={"/:owner/:projectId/devops/:opsId/detail"}
@@ -348,7 +365,7 @@ class App extends Component {
 												return (<OrganizeIndex {...props} {...this.props} {...this.state} />)
 											}
 										}>
-									</Route> : pathType === '404' ? <Route path="/" component={Shixunnopage} /> :
+									</Route> : pathType === '404' ? <Route component={Shixunnopage} />:
 										<Route exact path="/"
 											render={
 												(props) => (
@@ -360,6 +377,7 @@ class App extends Component {
 											}
 										/>
 								// <Route path="/" component={Loading} />
+								// <Route path="/" component={Shixunnopage} /> 
 							}
 
 

src/AppConfig.js

@@ -11,9 +11,9 @@ broadcastChannelOnmessage('refreshPage', () => {
 })
 
 function locationurl(list) {
-  // if (window.location.port !== "3007") {
+  if (window.location.port !== "3007") {
   window.location.href = list
-  // }
+  }
 }
 // TODO 开发期多个身份切换
 let debugType = ""
@@ -86,7 +86,7 @@ export function initAxiosInterceptors(props) {
 
     if (response.data.status === 404) {
       let responseURL = response.request ? response.request.responseURL:'';
-      if (responseURL.indexOf('/api/users/') === -1 && responseURL.indexOf('/api/organizations/') === -1 && responseURL.indexOf('/api/owners/') === -1) {
+      if (responseURL.indexOf('/api/users/') === -1 && responseURL.indexOf('/api/organizations/') === -1 ) {
         locationurl('/nopage');
       }
     }

src/forge/Main/Detail.js

@@ -6,9 +6,6 @@ import DetailBanner from './sub/DetailBanner';
 import '../css/index.scss'
 import './list.css';
 
-import { ImageLayerOfCommentHOC } from "../../modules/page/layers/ImageLayerOfCommentHOC";
-
-
 import Loadable from 'react-loadable';
 import Loading from '../../Loading';
 
@@ -145,7 +142,7 @@ const WikiEdit = Loadable({
 function checkPathname(projectsId, owner, pathname) {
   let name = "";
   if (pathname && pathname !== `/${owner}/${projectsId}`) {
-    let url = pathname.split(`/${owner}/${projectsId}`)[1] || "";
+    let url = pathname.split(`/${owner}/${projectsId}`)[1] || '';
     if (url.indexOf("/about") > -1) {
       name = "about"
     } else if (url.indexOf("/issues") > -1 || url.indexOf("Milepost") > 0) {
@@ -783,7 +780,4 @@ class Detail extends Component {
   }
 }
 
-export default ImageLayerOfCommentHOC({
-  imgSelector: ".imageLayerParent img, .imageLayerParent .imageTarget",
-  parentSelector: ".newContainer",
-})(Detail);
+export default Detail;

src/forge/Main/DetailAdaptor.js

@@ -0,0 +1,28 @@
+import React from 'react';
+import { Route, Switch } from "react-router-dom";
+import { withRouter } from "react-router";
+import Loadable from "react-loadable";
+import Loading from "../../Loading";
+import { SnackbarHOC } from "educoder";
+import { CNotificationHOC } from "../../modules/courses/common/CNotificationHOC";
+import { TPMIndexHOC } from "../../modules/tpm/TPMIndexHOC";
+
+// forge项目详情
+const ProjectDetail = Loadable({
+  loader: () => import("../Main/Detail"),
+  loading: Loading,
+});
+export default withRouter(
+  (CNotificationHOC()(SnackbarHOC()(TPMIndexHOC((props) => {
+    return (
+      <Switch>
+        <Route
+          path="/:owner/:projectsId"
+          render={(p) => (
+            <ProjectDetail  {...props} {...p} />
+          )}
+        ></Route>
+      </Switch>
+    )
+  }))))
+)

src/forge/Merge/NewMerge.js

@@ -48,8 +48,10 @@ class NewMerge extends Component {
       this.compareProject(this.state.id,pull,"master");
     }
   }
+
   // 页面销毁取消监听 
   componentWillUnmount () {
+    console.log('----------destoyed---------');
     window.removeEventListener('popstate', this.handleBack, false);
   };
 
@@ -60,8 +62,11 @@ class NewMerge extends Component {
 
   //获取新建分支数据
   getmergelist = (projectsId) => {
-    this.setState({isSpin: true})
-    const { owner } = this.props.match.params;
+    this.setState({isSpin: true});
+    // const { owner } = this.props.match.params;
+    let owner =this.props.history.location.pathname.split('/')[1];
+    console.log('owner:'+owner);
+    console.log(this.props);
     const url = `/${owner}/${projectsId}/pulls/new.json`;
     axios
       .get(url)
@@ -264,7 +269,9 @@ class NewMerge extends Component {
       show_message,
       default_message,
       merge_head,
-      projects_names,id,comparesData
+      projects_names,
+      id,
+      comparesData
     } = this.state;
     
     const renderBrances = (list, type) => {
@@ -298,6 +305,7 @@ class NewMerge extends Component {
       return <div dangerouslySetInnerHTML={{ __html: html }}></div>;
     };
     let { project } = this.props;
+
     return (
       <div>
         <div className="main">