Merge branch 'newVersion_forge' into dev_devOps

src/forge/Main/CoderRootDirectory.js

@@ -521,6 +521,7 @@ class CoderRootDirectory extends Component {
               {...this.state}
               readOnly={this.state.readOnly}
               onEdit={this.onEdit}
+              currentBranch={branch}
             ></CoderRootFileDetail>
           )}
           {

src/forge/Main/CoderRootFileDetail.js

@@ -164,7 +164,8 @@ class CoderRootFileDetail extends Component {
       current_user,
       isManager,
       isDeveloper,
-      md
+      md,
+      currentBranch
     } = this.props;
     const { language, languages, description } = this.state;
     let flag = current_user && current_user.login && (isManager || isDeveloper);
@@ -194,12 +195,9 @@ class CoderRootFileDetail extends Component {
                           <a onClick={() => this.EditFile(false)} className="ml20">
                             <i className="iconfont icon-bianji1 font-15 color-grey-6"></i>
                           </a>
-
                         </span>
                     }
-
                   </span>
-
                 ) : (
                     <React.Fragment>
                       <Select
@@ -260,21 +258,22 @@ class CoderRootFileDetail extends Component {
               </a>
             </div>
           ) : (
-                md && readOnly ?
+            md && readOnly ?
-                  <div className="files-md">
+              <div className="files-md">
-                    <RenderHtml className="file-md imageLayerParent" value={description} />
+                <RenderHtml className="file-md imageLayerParent" value={description} />
-                  </div>
+              </div>
-                  :
+              :
-                  <Meditor
+              <Meditor
-                    {...this.props}
+                {...this.props}
-                    {...this.state}
+                {...this.state}
-                    language={language ? language : "javascript"}
+                language={language ? language : "javascript"}
-                    filepath={`/${detail.path}`}
+                filepath={`/${detail.path}`}
-                    content={detail.content}
+                content={detail.content}
-                    readOnly={readOnly}
+                readOnly={readOnly}
-                    editorType="update"
+                editorType="update"
-                  ></Meditor>
+                currentBranch={currentBranch}
-              )}
+              ></Meditor>
+            )}
         </div>
       </div>
     );

src/forge/Newfile/UserSubmitComponent.js

@@ -115,7 +115,7 @@ class UserSubmitComponent extends Component {
 
     const { branch, projectsId , owner } = this.props.match.params;
 
-    const { current_user, filepath, projectDetail } = this.props;
+    const { current_user, filepath, projectDetail , currentBranch } = this.props;
     const { editor_type } = this.props;
     return (
       <div>
@@ -175,7 +175,7 @@ class UserSubmitComponent extends Component {
                 >
                   <Radio value="0" className="mb10">
                     <i className="iconfont icon-banbenku font-16 mr5"></i>
-                    直接提交至<span className="color-orange">{branch}</span>分支
+                    直接提交至<span className="color-orange">{currentBranch || branch}</span>分支
                   </Radio>
                   <Radio value="1">
                     <Icon type="pull-request" className="mr5" />

src/forge/Newfile/m_editor.js

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

src/forge/Order/order.css

@@ -187,6 +187,9 @@
   -o-text-overflow: ellipsis;
   text-overflow: ellipsis;
 }
+.topWrapper_select.wrapperStyle li{
+  width:90px;
+}
 .topWrapper_select li {
   text-align: center;
   cursor: pointer;

src/forge/Order/order.js

@@ -608,7 +608,7 @@ class order extends Component {
             </div>
             {
               checkedValue && checkedValue.length > 0 ?
-                <ul className="topWrapper_select">
+                <ul className="topWrapper_select wrapperStyle">
                   <li className="mr20">
                     <Dropdown
                       className="topWrapperSelect"
@@ -628,7 +628,7 @@ class order extends Component {
                   </li>
                   <li className="mr20">
                     <Dropdown
-                      className="topWrapperSelect"
+                      className="topWrapperSelect wrapperStyle"
                       overlay={this.renderMenu(
                         issue_chosen && issue_chosen.issue_version,
                         "更换里程碑",
@@ -645,7 +645,7 @@ class order extends Component {
                   </li>
                   <li className="mr20">
                     <Dropdown
-                      className="topWrapperSelect"
+                      className="topWrapperSelect wrapperStyle"
                       overlay={this.renderMenu(
                         issue_chosen && issue_chosen.issue_status,
                         "修改状态",

src/modules/tpm/NewHeader.js

@@ -603,10 +603,8 @@ class NewHeader extends Component {
     })
   }
   render() {
-    const isLogin = true;   // 这里不会出现未登录的情况，服务端在服务端路由时发现如果是未登录，则跳转到登录页了。
     const { match } = this.props;
 
-
     let { Addcoursestypes,
       tojoinitemtype,
       tojoinclasstitle,
@@ -623,9 +621,7 @@ class NewHeader extends Component {
       mygetHelmetapi2,
       goshowqqgtounp,
     } = this.state;
-    /*
+    /*用户名称  用户头像url*/
-        用户名称  用户头像url
-    */
     let activeIndex = false;
     let activeForums = false;
     let activeShixuns = false;
@@ -671,7 +667,6 @@ class NewHeader extends Component {
               }
             }
           }
-
         }
       }
     }
@@ -765,33 +760,22 @@ class NewHeader extends Component {
             }
           </div>
           <div className="head-right">
-            {this.props.user && this.props.user.login ?
+            {this.props.user && this.props.user.login &&
               <div className="edu-menu-panel">
                 <i className="iconfont icon-tianjiafangda color-grey-6"></i>
-                <div className="edu-menu-list" style={{ top: '60px' }}>
+                <div className="edu-menu-list" style={{ top: '48px' }}>
                   <div className="overPart"></div>
-                  {/* <ul className={coursestypes === true && this.props.user && this.props.user.main_site === false ? "fl headwith100b edu-txt-center pr ul-leftline" : "fl with50 edu-txt-center pr ul-leftline"}>
-                    {
-                      mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.new_syllabuses &&
-                      <li><a href={`${mygetHelmetapi2.new_course.new_syllabuses}`} target="_blank">新建课程</a></li>
-                    }
-                    {
-                      mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.new_course &&
-                      <li><a href={`${mygetHelmetapi2.new_course.new_course}`} target="_blank">新建班级</a></li>
-                    }
-                  </ul> */}
                   {
                     coursestypes === true && this.props.user && this.props.user.main_site === false ? "" :
-                      <ul className="fl edu-txt-center">
+                      <ul className="edu-txt-center">
                         <li><Link to={"/projects/mirror/new"}>新建镜像项目</Link></li>
                         <li><Link to={"/projects/deposit/new"}>新建托管项目</Link></li>
                       </ul>
                   }
                 </div>
               </div>
-              : ""
             }
-            {this.props.user && this.props.user.login ?
+            {this.props.user && this.props.user.login &&
               <div className="ml30 edu-menu-panel">
                 {user && user.login &&
                   <a href={`${mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.tiding_url}`} style={{ position: 'relative' }} target="_blank">
@@ -801,7 +785,6 @@ class NewHeader extends Component {
                   </a>
                 }
               </div>
-              : ""
             }
             <Modal
               keyboard={false}

src/modules/tpm/TPMIndex.css

@@ -37,7 +37,7 @@ body>.-task-title {
   margin:0px auto;
   display: flex;
   align-items: center;
-  height: 100%
+  height: 100%;
 }
 .globalSpin {
   max-height: 700px !important;