Merge branch 'gitlink_server' of http://106.75.45.236:3000/Gitlink/forgeplus-react into feature_GLCC

.gitignore

@@ -37,7 +37,7 @@ bower_components
 
 # Compiled binary addons (https://nodejs.org/api/addons.html)
 build/
-
+src/.umi/
 # Dependency directories
 node_modules/
 jspm_packages/

src/forge/Head/Header.js

@@ -200,7 +200,7 @@ class NewHeader extends Component {
     const isdev2= isDev ?'https://testforgeplus.trustie.net':`https://${window.location.hostname}`;
     let str = "";
     if(url.indexOf("http")>-1){
-      str = isdev2+match.path;
+      str = isdev2+match.url;
     }else{
       str = match.path;
     }
@@ -299,7 +299,7 @@ class NewHeader extends Component {
               {
                 publicNav &&
                 <a href={'https://www.ccf.org.cn/'} className={"fl"}>
-                  <img src={MainLogo} alt="ccf" />
+                  <img src={MainLogo} alt="ccf" width="63px"/>
                 </a>
               }
             </div>

src/forge/Main/CoderDepot.jsx

@@ -75,6 +75,8 @@ function CoderDepot(props){
       }
       if(i && i.length === 0){
         setIssuesFlag(false);
+      console.log(bannerList);
+
       }
     }
   },[bannerList])
@@ -431,19 +433,16 @@ function CoderDepot(props){
                       }
                     </AlignCenter>
                     <AlignCenter className="depotBtn">
-                      {
-                        <div className="addOptionBtn">
-                          {
-                            baseOperate &&
-                            <CheckProfile {...props} sureFunc={()=>urlLink(`/${owner}/${projectsId}/compare/master...${turnbar(branchName || defaultBranch)}`)} >+ 合并请求</CheckProfile>
-                          }
+                      <div className="addOptionBtn">
+                        {
+                          baseOperate &&
+                          <CheckProfile {...props} sureFunc={()=>urlLink(`/${owner}/${projectsId}/compare/master...${turnbar(branchName || defaultBranch)}`)} >+ 合并请求</CheckProfile>
+                        }
+                        {
+                          issuesFlag &&
                           <a onClick={createIssue}>+ 疑修</a>
-                          {/* {
-                            baseOper &&
-                            <CheckProfile {...props} sureFunc={()=>urlLink(`/${owner}/${projectsId}/issues/new`)} >+ 疑修</CheckProfile>
-                          } */}
-                        </div>
-                      }
+                        }
+                      </div>
                       { fileOperate &&
                         <Dropdown 
                           overlay={fileMenu()} 

src/forge/Main/Detail.js

@@ -524,6 +524,7 @@ class Detail extends Component {
 
     const common = {
       getDetail: this.getDetail,
+      getBanner:this.getBanner,
       changeOpenDevops: this.changeOpenDevops,
       defaultBranch
     }

src/forge/Main/version/New.jsx

@@ -110,7 +110,8 @@ export default Form.create()(
             axios.post(url, {
               ...value,
               body: desc,
-              attachment_ids: fileList
+              attachment_ids: fileList,
+              target_commitish:branch
             })
             .then(result => {
               if (result) {

src/forge/Order/MilepostDetail.js

@@ -46,7 +46,8 @@ class MilepostDetail extends Component {
       assigned_to_ids: '负责人',
       status_ids: "状态",
       done_ratios: '完成度',
-      paix: '排序'
+      paix: '排序',
+      issueFlag:true
     }
   }
 
@@ -54,6 +55,20 @@ class MilepostDetail extends Component {
     this.getSelectList();
     const { page } = this.state;
     this.getIssueList(page);
+    // 
+  }
+
+  componentDidUpdate=(prevProps)=>{
+    const prebannerList = prevProps && prevProps.bannerList;
+    const bannerList = this.props && this.props.bannerList;
+    if(prebannerList !== bannerList){
+      if(bannerList && bannerList.length>0){
+        let i = bannerList.filter(i=>i.menu_name === "issues");
+        this.setState({
+          issueFlag:i && i.length === 0 ? false :true
+        })
+      }
+    }
   }
 
   getSelectList = () => {
@@ -209,7 +224,7 @@ class MilepostDetail extends Component {
 
   render() {
 
-    const { issue_chosen, issues, limit, page, search_count, data, isSpin , status_type } = this.state;
+    const { issue_chosen, issues, limit, page, search_count, data, isSpin , status_type , issueFlag } = this.state;
     const { projectsId, meilid ,owner} = this.props.match.params;
     const { current_user , showLoginDialog , projectDetail } = this.props;
     const menu = (
@@ -245,10 +260,11 @@ class MilepostDetail extends Component {
                 :""
               }
               {
-                current_user && current_user.login ?
+                issueFlag ? (current_user && current_user.login ?
                 <CheckProfile {...this.props} sureFunc={()=>{this.props.history.push(`/${owner}/${projectsId}/issues/${meilid}/new`)}} className="topWrapper_btn">创建疑修</CheckProfile>
                 :
                 <a className="topWrapper_btn" onClick={showLoginDialog}>创建疑修</a>
+                ):""
               }
             </div>
           </FlexAJ>

src/forge/Settings/Setting.js

@@ -147,7 +147,7 @@ class Setting extends Component {
 
   update=(values)=>{
     const { projectsId , owner } = this.props.match.params;
-    const { private_check } = this.state;
+    const { private_check , project_units } = this.state;
     const url = `/${owner}/${projectsId}.json`;
     axios.put(url, {
       name: values.project_name,
@@ -164,6 +164,9 @@ class Setting extends Component {
           const { getDetail } = this.props;
           getDetail && getDetail();
         }
+        if(project_units!==values.project_units){
+          window.location.reload();
+        }
       }
       this.setState({
         loading:false

src/forge/users/Infos.js

@@ -315,9 +315,9 @@ class Infos extends Component {
             <div className="list-right">
               { !route_type && menuKey &&
                 <Menu selectedKeys={[menuKey]} mode={`horizontal`} className="infosRightMenu">
-                  <Menu.Item key="0"><Link to={`/${user && user.login}`}><i className="iconfont icon-gailan"></i>概览</Link></Menu.Item>
+                  <Menu.Item key="0"><Link to={`/${user && user.login}`}><i className="iconfont icon-gailan"></i>活动概览</Link></Menu.Item>
                   <Menu.Item key="1"><Link to={`/${user && user.login}/statistics`}><i className="iconfont icon-shujutongji"></i>数据统计</Link></Menu.Item>
-                  <Menu.Item key="2"><Link to={`/${user && user.login}/projects`}><i className="iconfont icon-xiangmu"></i>项目</Link></Menu.Item>
+                  <Menu.Item key="2"><Link to={`/${user && user.login}/projects`}><i className="iconfont icon-xiangmu"></i>参与项目</Link></Menu.Item>
                   {
                     current_user && user && user.login === current_user.login ?
                     <Menu.Item key="3">
@@ -334,7 +334,7 @@ class Infos extends Component {
                   }
                   <Menu.Item key="5">
                     <Link to={`/${user && user.login}/organizes`}>
-                      <i className="iconfont icon-zuzhi"></i>组织
+                      <i className="iconfont icon-zuzhi"></i>参与组织
                       { user && user.user_org_count && user.user_org_count > 0 ? <span className="menuNum">({user.user_org_count})</span>:""}
                     </Link>
                   </Menu.Item>