Merge branch 'develop' into dev_orgnize

src/forge/DevOps/Dispose/Editors.jsx

@@ -23,7 +23,7 @@ function Editors({value,onChange,theme,height,visible}){
   return(
     <Editor
       height={height}
-      language={"yml"}
+      language={"yaml"}
       theme={theme}
       placeholder="请输入内容"
       value={value}

src/forge/DevOps/Dispose/StageItem.jsx

@@ -33,7 +33,7 @@ function StageItem({item, templates,saveItems,k, slideItems , deleteStep}){
       </FlexAJ>
       <div className={(!item.hide || item.hide === false) ? "stepsBody active" : "stepsBody"}>
         <Choosen chooseFunc={chooseFunc} category={item.category} templateId={item.template_id} temp={templates}/>
-        <Editors value={item.content} onChange={onChangevalue} theme="vs-dark" height="180px" />
+        <Editors value={item.content} onChange={onChangevalue} theme="vs-dark" height="270px" />
       </div>
     </div>
   )

src/forge/DevOps/Structure.jsx

@@ -295,6 +295,7 @@ function Structure(props,ref){
         <div className="listPart">
           <FlexAJ>
             {renderStatus()}
+            <a onClick={()=>Init(status)} className="color-red font-16">刷新</a>
           </FlexAJ>
           <Table
             onRow={(record,index)=>{

src/forge/Version/version.js

@@ -2,8 +2,8 @@ import React, { Component } from "react";
 import { Link } from 'react-router-dom';
 import NoneData from '../Nodata';
 import './version.css';
-import { getImageUrl } from 'educoder';
 import axios from 'axios';
+import RenderHtml from '../../components/render-html';
 
 /**
  * issue_chosen:下拉的筛选列表,
@@ -82,8 +82,9 @@ class version extends Component {
                     {item.user_name}:<span className="color-grey-8">发布了这个版本，并在发布后提交给{item.target_commitish}</span>
                   </span>
                   {
-                    item.bodyshow && <p className="mt10">{item.body}</p>
+                    item.bodyshow && <RenderHtml className="break_word_comments imageLayerParent" value={item.body} url={this.props.history.location}/>
                   }
+                  <RenderHtml />
                   <p className="mt10 pl3">
                     <a href={item.tarball_url} style={{color:"#4CC1DA"}} className="mr30"><i className="iconfont icon-TAR font-18 mr5"></i>TAR</a>
                     <a href={item.zipball_url} style={{color:"#28BD6C"}}><i className="iconfont icon-ZIP font-18 mr5"></i>ZIP</a>
@@ -119,7 +120,6 @@ class version extends Component {
         <div className="releasesVersion">
           {this.renderList(releases)}
         </div>
-
       </div>
     )
   }

src/forge/users/CIdispose.jsx

@@ -177,7 +177,7 @@ function CIdispose(props){
       <div className="disposeItem">
         <AlignCenter>
           <span>CI服务器地址</span>
-          {CIData && step >= 1 && <span className="ml10">{CIData.ip}</span>}
+          {CIData && CIData.ip && step >= 1 ? <span className="ml10">{CIData.ip}</span> :""}
           { step === 0 && <span className="ml10 authTag red">未绑定</span> }
           { step === 1 && !ci_certification && <span className="ml10 authTag red">未认证</span> }
           { ci_certification && <span className="ml10 authTag green">已认证</span> }