Merge branch 'develop'

public/css/edu-purge.css

@@ -3908,6 +3908,17 @@ html>body #ajax-indicator {
   max-height: 340px;
 }/*头部导航条样式---2018-03-19--by-cs*/
 
+.privateTag{
+  display: block;
+  padding:0px 6px;
+  border-radius: 12px;
+  border:1px solid #2FC25B;
+  height: 18px;
+  line-height: 18px;
+  font-size: 12px;
+  margin-left: 10px;
+  color: #2FC25B;
+}
 .head-nav {
   text-align: center;
   height: 70px;

public/css/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2340181 */
-  src: url('iconfont.woff2?t=1622517296245') format('woff2'),
+  src: url('iconfont.woff2?t=1623836536204') format('woff2'),
-       url('iconfont.woff?t=1622517296245') format('woff'),
+       url('iconfont.woff?t=1623836536204') format('woff'),
-       url('iconfont.ttf?t=1622517296245') format('truetype');
+       url('iconfont.ttf?t=1623836536204') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-nv1:before {
+  content: "\e864";
+}
+
+.icon-nan1:before {
+  content: "\e865";
+}
+
 .icon-youxiang:before {
   content: "\e8b2";
 }

public/css/iconfont.json

@@ -5,6 +5,20 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "7539612",
+      "name": "nv",
+      "font_class": "nv1",
+      "unicode": "e864",
+      "unicode_decimal": 59492
+    },
+    {
+      "icon_id": "7539613",
+      "name": "nan",
+      "font_class": "nan1",
+      "unicode": "e865",
+      "unicode_decimal": 59493
+    },
     {
       "icon_id": "21936935",
       "name": "邮箱",

src/forge/Component/Component.scss

@@ -276,7 +276,7 @@ li.ant-menu-item{
   }
   .faqUl{
     padding:0px 20px 10px;
-    max-height: 220px;
+    max-height: 230px;
     overflow-y: auto;
     li{
       background: #F5F5F5;

src/forge/Main/CoderDepot.jsx

@@ -79,9 +79,11 @@ function CoderDepot(props){
         let url = pathname.split(`/tree/${branchName}/`)[1];
         setTreeValue(url);
         getFileInfo(url,branchName);
+        setType("file");
       }else{
         setTreeValue(undefined);
         getDirInfo(branchName || defaultBranch);
+        setType("dir");
       }
     } 
   },[projectsId,owner,pathname,defaultBranch])
@@ -244,7 +246,6 @@ function CoderDepot(props){
 
   const { current_user } = props;
   const fileOperate = type === "dir" && projectDetail && projectDetail.type !== 2 && (projectDetail.permission !=="Reporter" || (current_user && current_user.admin));
-  
   return(
     <WhiteBack>
       <UpdateDescModal desc={desc} website={website} lesson_url={lesson_url} visible={openModal} onCancel={()=>setOpenModal(false)} onOk={okUpdate}/>

src/forge/Main/CoderRootFileDetail.js

@@ -285,6 +285,7 @@ class CoderRootFileDetail extends Component {
                 readOnly={readOnly}
                 editorType="update"
                 currentBranch={currentBranch}
+                descName={detail && `Update ${detail.name}`}
               ></Meditor>
             )}
         </div>

src/forge/Main/Detail.js

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
-import { Spin, Tooltip , message } from 'antd';
+import { Spin, Tooltip } from 'antd';
 import { Link, Route, Switch } from 'react-router-dom';
-import { Content , FlexAJ } from '../Component/layout';
+import { Content , FlexAJ , AlignCenter } from '../Component/layout';
 import DetailBanner from './sub/DetailBanner';
 import Invite from './sub/Invite';
 import '../css/index.scss'
@@ -391,10 +391,11 @@ class Detail extends Component {
   }
 
   textFunc = (forked_from_project_id,fork_info)=>{
+    let type = fork_info && fork_info.fork_project_user_type;
     return forked_from_project_id && fork_info ?
       <div className="color-grey-9">
-        <span>forked from </span>
+        <span>复刻自 </span>
-        <Link to={`/users/${fork_info.fork_project_user_login}`} className="show-user-link color-grey-6">{fork_info.fork_project_user_name}</Link>
+        <Link to={`${type ==="Organization" ? "/organize":'/users'}/${fork_info.fork_project_user_login}`} className="show-user-link color-grey-6">{fork_info.fork_project_user_name}</Link>
         <span> / </span>
         <Link to={`/projects/${fork_info.fork_project_user_login}/${fork_info.fork_project_identifier}`} className="color-grey-6">{fork_info.fork_form_name}</Link>
       </div> : ""
@@ -425,34 +426,32 @@ class Detail extends Component {
       <div>
         <div className="detailHeader-wrapper">
           <div className="normal">
-            <div className="f-wrap-between" style={{ position: "relative" }}>
+            <FlexAJ style={{paddingTop:"15px"}}>
-              <p className="font-22 df flex-1 lineH2 mt15" style={{ alignItems: "center" }}>
+              <AlignCenter>
-                {project && project.author &&
+                <div className="projectallName">
-                  <Link to={`${project.author.type ==="Organization" ? "/organize":'/users'}/${project.author.login}`} className="show-user-link">
+                  {project && project.author &&
-                    {project.author.name}
+                    <Link to={`${project.author.type ==="Organization" ? "/organize":'/users'}/${project.author.login}`}>{project.author.name}</Link>
-                  </Link>
-                }
-                <span className="ml5 mr5">/</span>
-                <span className="hide-1 flex-1 df">
-                  <Link to={`/projects/${owner}/${projectsId}`} className="font-22">{project && project.name}</Link>
-                  
-                  {
-                    projectDetail && projectDetail.type && projectDetail.type !== 0 ? 
-                    projectDetail.type === 2 ?
-                    <Tooltip title={"镜像自: " + projectDetail.mirror_url} className="ml5" placement={'right'}>
-                      <i className="iconfont icon-banbenku font-18 mt6" style={{ color: "#8D90E3" }}/>
-                    </Tooltip>
-                    :
-                    <Tooltip title={"镜像自: " + projectDetail.mirror_url} className="ml5" placement={'right'}>
-                      <i className="iconfont icon-jingxiang font-18 color-green mt6" />
-                    </Tooltip>
-                    :""
                   }
-                </span>
+                  <span className="ml5 mr5">/</span>
-              </p>
+                  <Link to={`/projects/${owner}/${projectsId}`} className="projectN">{project && project.name}</Link>
+                </div>
+                { projectDetail && projectDetail.private && <span className="privateTag">私有</span>}
+                {
+                  projectDetail && projectDetail.type && projectDetail.type !== 0 ? 
+                  projectDetail.type === 2 ?
+                  <Tooltip title={"镜像自: " + projectDetail.mirror_url} className="ml5" placement={'right'}>
+                    <i className="iconfont icon-banbenku font-18 mt6" style={{ color: "#8D90E3" }}/>
+                  </Tooltip>
+                  :
+                  <Tooltip title={"镜像自: " + projectDetail.mirror_url} className="ml5" placement={'right'}>
+                    <i className="iconfont icon-jingxiang font-18 color-green mt6" />
+                  </Tooltip>
+                  :""
+                }
+              </AlignCenter>
               {
                 firstSync ? "":
-                <span className="df mt25">
+                <span className="df">
                   {
                     ((current_user && current_user.admin) || isManager) && (projectDetail && projectDetail.type && projectDetail.type === 2) ?
                     <a className="synchronism ml30" onClick={this.synchronismMirror}>同步镜像</a> : ""
@@ -507,7 +506,7 @@ class Detail extends Component {
                   </span>
                 </span>
               }
-            </div>
+            </FlexAJ>
             <FlexAJ>
               <div>
                 {

src/forge/Main/Index.scss

@@ -102,7 +102,6 @@
     }
   }
 }
-
 // coderDepot
 .Panels{
   max-width: 1200px;

src/forge/Main/IndexItem.js

@@ -35,9 +35,10 @@ class IndexItem extends Component {
               <div className="p-r-Infos">
                 <div className="p-r-name">
                   <AlignCenter>
-                    <Link to={`/projects/${item.author.login}/${item.identifier}`} className="color-grey-3 font-18 task-hide " style={{maxWidth: 490 }}>
+                    <Link to={`/projects/${item.author.login}/${item.identifier}`} className="color-grey-3 font-18 task-hide " style={{maxWidth: 470 }}>
                       {item.author.name}/{item.name}
                     </Link>
+                    { !item.is_public && <span className="privateTag">私有</span> }
                     {
                       item.forked_from_project_id ?
                         <span className="ml5">

src/forge/Merge/MessageCount.js

@@ -102,6 +102,8 @@ class MessageCount extends Component {
             isSpin: false,
             pr_status: 2,
           });
+          const { getDetail } = this.props;
+          getDetail && getDetail();
         } else {
           this.setState({
             isSpin: false,
@@ -138,6 +140,8 @@ class MessageCount extends Component {
             SpinMerge: false,
             pr_status: 1,
           });
+          const { getDetail } = this.props;
+          getDetail && getDetail();
         } else {
           this.setState({ SpinMerge: false });
         }
@@ -471,17 +475,16 @@ class MessageCount extends Component {
                             : !ismesrge ? "block" : "none",
                       }}
                     >
-                      <p className="mb15">
+                      <Dropdown.Button
-                        <Dropdown.Button
+                        overlay={menu}
-                          overlay={menu}
+                        type="primary"
-                          type="primary"
+                        onClick={this.submitmerge}
-                          onClick={this.submitmerge}
+                        className="mb15"
-                          icon={<Icon type="caret-down" />}
+                        icon={<Icon type="caret-down" />}
-                          disabled={!pull_request || (pull_request && !pull_request.mergeable) }
+                        disabled={!pull_request || (pull_request && !pull_request.mergeable) }
-                        >
+                      >
-                          {this.state.mergename}
+                        {this.state.mergename}
-                        </Dropdown.Button>
+                      </Dropdown.Button>
-                      </p>
                       {pull_request && pull_request.mergeable
                         ?
                         <Alert

src/forge/Merge/merge.js

@@ -38,7 +38,7 @@ class merge extends Component {
       // page: 1,
       search_count: undefined,
       issue_type: undefined,
-      status_type: undefined,
+      status_type: "1",
       //设置选择高亮
       openselect: 1,
       closeselect: undefined,
@@ -48,7 +48,7 @@ class merge extends Component {
       paix: "排序",
       priority_ids: "优先级",
       select_params: {
-        status_type: undefined, //开启中和关闭中，默认为开启中的
+        status_type: "1", //开启中和关闭中，默认为开启中的
         assigned_to_id: undefined, // 指派人
         fixed_version_id: undefined,
         priority_id: undefined,
@@ -207,12 +207,10 @@ class merge extends Component {
       paix: "排序",
       priority_ids: "优先级",
     });
-    this.state.select_params = {
+    this.state.select_params.status_type = type;
-      status_type: type,
+    this.state.select_params.page=1;
-      search: undefined,
+    this.state.select_params.limit=15;
-      page: 1,
+    
-      limit: 15,
-    };
     this.getIssueList();
   };
 

src/forge/Newfile/Index.js

@@ -73,6 +73,7 @@ class Index extends Component {
               content={undefined}
               readOnly={false}
               editorType="new"
+              descName={filename && `Add ${filename}`}
             ></Meditor>
           </div>
         </div>

src/forge/Newfile/UserSubmitComponent.js

@@ -16,6 +16,24 @@ class UserSubmitComponent extends Component {
     };
   }
 
+  componentDidMount=()=>{
+    const { descName } = this.props;
+    if(descName){
+      this.props.form.setFieldsValue({
+        desc:descName
+      })
+    }
+  }
+  
+  componentDidUpdate=(preProps)=>{
+    const { descName } = this.props;
+    if(preProps && descName && preProps.descName !== descName ){
+      this.props.form.setFieldsValue({
+        desc:descName
+      })
+    }
+  }
+
   changeSubmittype = (e) => {
     this.setState({
       submitType: e.target.value,

src/forge/Newfile/m_editor.js

@@ -27,7 +27,7 @@ class m_editor extends Component {
 
   render() {
     const { editorValue } = this.state;
-    const { readOnly, editorType, language , currentBranch } = this.props;
+    const { readOnly, editorType, language , currentBranch , descName } = this.props;
     const editor_options = {
       lineNumbers: "on",
       wordWrap: true, //强制换行
@@ -72,6 +72,7 @@ class m_editor extends Component {
                   content={editorValue}
                   editor_type={editorType}
                   currentBranch={currentBranch}
+                  descName={descName}
                 ></UserSubmitComponent>
                 </div>
             )}

src/forge/Newfile/upload_file.js

@@ -60,6 +60,7 @@ class UploadFile extends Component {
               filepath={file_path}
               content={editorValue}
               editor_type={"upload"}
+              descName={`ADD file via upload`}
             ></UserSubmitComponent>
           </div>
         </div>

src/forge/Order/Milepost.js

@@ -89,8 +89,9 @@ class Milepost extends Component {
           closeselect: status === "closed" ? current_user.user_id : undefined,
           openselect: status === "closed" ? undefined : current_user.user_id
         })
-
+        this.getList(1, status, 'desc');
-        this.getList(1, status, 'desc')
+        const { getDetail } = this.props;
+        getDetail && getDetail();
       }
     }).catch(error => {
       console.log(error);
@@ -107,7 +108,9 @@ class Milepost extends Component {
       }
     }).then((result) => {
       if (result) {
-        this.getList(1, this.state.status, 'desc')
+        this.getList(1, this.state.status, 'desc');
+        const { getDetail } = this.props;
+        getDetail && getDetail();
       }
     }).catch((error) => {
       console.log(error);
@@ -228,8 +231,8 @@ class Milepost extends Component {
                                 <Link to={`/projects/${owner}/${projectsId}/milestones/${item.id}/edit`} className="color-grey-9">编辑</Link>
                               </div>
                               <div className="grid-item ml15 color-grey-9">
-                                <i className="iconfont icon-yiguanbi1 font-14 mr5"></i>
+                                <i className={item.status === "closed" ? "iconfont icon-gouxuan font-14 mr5":"iconfont icon-yiguanbi1 font-14 mr5"}></i>
-                                <a onClick={() => this.updatestatusemile(this.state.status === "closed" ? "open" : "closed", item)} className="color-grey-9">{this.state.status === "closed" ? "开启" : "关闭"}</a>
+                                <a onClick={() => this.updatestatusemile(item.status === "closed" ? "open" : "closed", item)} className="color-grey-9">{this.state.status === "closed" ? "开启" : "关闭"}</a>
                               </div>
                               <div className="grid-item ml15 color-grey-9">
                                 <i className="iconfont icon-lajitong font-14 mr5" ></i>

src/forge/Order/MilepostDetail.js

@@ -69,6 +69,27 @@ class MilepostDetail extends Component {
     })
   }
 
+  deletedetail = (id) => {
+    const { projectsId , owner } = this.props.match.params;
+    const url = `/${owner}/${projectsId}/issues/${id}.json`;
+    axios.delete(url, {
+      data: {
+        project_id: projectsId,
+        id: id,
+      },
+    })
+    .then((result) => {
+      if (result) {
+        const { page } = this.state;
+        this.getIssueList(page);
+        const { getDetail } = this.props;
+        getDetail && getDetail();
+      }
+    })
+    .catch((error) => {
+      console.log(error);
+    });
+  };
   // 获取列表数据
   getIssueList = ( page , item , value , update , updateValue , type ) => {
     const { projectsId, meilid , owner } = this.props.match.params;
@@ -275,7 +296,15 @@ class MilepostDetail extends Component {
                 :
                 issues && issues.length>0 && issues.map((item,key)=>{
                   return(
-                    <OrderItem key={key} mile item={item} search_count={search_count} page={page} limit={limit} {...this.props} {...this.state}></OrderItem>
+                    <OrderItem 
+                      key={key} mile 
+                      item={item} 
+                      search_count={search_count} 
+                      page={page} 
+                      limit={limit} 
+                      {...this.props} {...this.state}
+                      deletedetail={this.deletedetail}
+                      ></OrderItem>
                   )
                 })
             }

src/forge/Order/OrderItem.js

@@ -92,12 +92,12 @@ class OrderItem extends Component {
               <Link to={`/projects/${owner}/${projectsId}/issues/${item.id}/detail`}><i className="iconfont icon-pinglun1 mr3 font-16"></i>{item.journals_count}</Link>
               {
                 current_user && current_user.login ?
-                <div style={{ display: this.state.orderid === item.id && this.state.isdisplay ? 'flex' : 'none' }}>
+                <div id="hoverBox" style={{ display: this.state.orderid === item.id && this.state.isdisplay ? 'flex' : 'none' }}>
                   <div className="mr8 ml8 color-grey-9">
                     <Link to={`/projects/${owner}/${projectsId}/issues/${item.id}/updatedetail`} className="color-grey-9"><i className="iconfont icon-bianji3 font-14 mr5"></i></Link>
                   </div>
                   <div className="color-grey-9">
-                    <Popconfirm placement="bottom" title={'您确定要删除吗'} okText="是" cancelText="否" onConfirm={() => this.deletedetail(item.id)}>
+                    <Popconfirm placement="bottom" overlayClassName="overlayBox" getPopupContainer={()=>document.getElementById("hoverBox")} title={'您确定要删除当前易修吗？'} okText="是" cancelText="否" onConfirm={() => this.deletedetail(item.id)}>
                       <i className="iconfont icon-yiguanbi1 font-14"></i>
                     </Popconfirm>
                   </div>

src/forge/Order/newMilepost.js

@@ -64,6 +64,8 @@ class NewMilepost extends Component {
           if (result) {
             this.setState({ isSpin: false })
             this.props.history.push(`/projects/${owner}/${projectsId}/milestones`);
+            const { getDetail } = this.props;
+            getDetail && getDetail();
           }
         }).catch(error => {
           this.setState({ isSpin: false })

src/forge/Order/order.css

@@ -17,7 +17,9 @@
   line-height: 18px;
   color: red;
 }
-
+.overlayBox{
+  width: 230px;
+}
 .topmilepost {
   box-sizing: border-box;
   display: flex;

src/forge/Order/order.js

@@ -268,11 +268,8 @@ class order extends Component {
       checkedValue:[],
       all:undefined
     });
-    this.state.select_params = {
+    this.state.select_params.page = 1;
-      search: undefined,
+    this.state.select_params.limit = 15;
-      page: 1,
-      limit: 15,
-    };
     this.getIssueList(type);
   };
 
@@ -337,6 +334,8 @@ class order extends Component {
         const { status_type } = this.state;
 
         this.getIssueList(status_type);
+        const { getDetail } = this.props;
+        getDetail && getDetail();
       }
     })
     .catch((error) => {

src/forge/Order/order_form.js

@@ -193,13 +193,14 @@ class order_form extends Component {
             if (result) {
               this.props.history.push(`/projects/${owner}/${projectsId}/issues/${orderId}/detail`);
               this.props.showNotification("任务更新成功！");
+              const { getDetail } = this.props;
+              getDetail && getDetail();
             }
           })
           .catch((error) => {
             this.setState({
               isSpin: false,
             });
-            console.log(error);
           });
         }
       }

src/forge/css/index.scss

@@ -7,6 +7,19 @@ ul,ol,dl{
 .color-black{
   color: #333;
 }
+.projectallName{
+  display: flex;
+  align-items: center;
+  font-size: 22px;
+  font-weight: normal;
+  .projectN{
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    flex: 1;
+    max-width: 500px;
+  }
+}
 .main{
   width: 1200px;
   padding:20px;

src/forge/users/Index.scss

@@ -148,12 +148,12 @@ $flex:flex;
     i{
       font-size: 25px!important;
       border-radius: 50%;
-      background-color: #fff;
+      color: #fff;
-      &.icon-nan{
+      &.icon-nan1{
-        color: #1890FF;
+        background-color: #1890FF;
       }
-      &.icon-nv{
+      &.icon-nv1{
-        color: pink;
+        background-color: pink;
       }
     }
   }

src/forge/users/Infos.js

@@ -207,9 +207,9 @@ class Infos extends Component {
                     <span>
                       {
                         user && user.gender===1?
-                        <i className="iconfont icon-nan"></i>
+                        <i className="iconfont icon-nan1"></i>
                         :
-                        <i className="iconfont icon-nv"></i>
+                        <i className="iconfont icon-nv1"></i>
                       }
                     </span>
                   </span>