Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop

src/forge/Main/IndexItem.js

@@ -25,7 +25,7 @@ class IndexItem extends Component{
             <img className="p-r-photo" alt="" src={getImageUrl(`images/${item.author && item.author.image_url}`)} ></img>
             <div className="p-r-Infos">
               <div className="p-r-name">
-                <Link to={`/projects/${item.id}/coders`} className="hide-1 font-16 color-grey-3" style={{whiteSpace:"wrap"}}>{item.name}</Link>
+                <Link to={`/projects/${item.id}/${item.author && item.author.login}/coder`} className="hide-1 font-16 color-grey-3" style={{whiteSpace:"wrap",display:'flex'}}><p className="task-hide font-18" style={{width:50,marginTop:5}}>{item.author.name}</p>{item.name}</Link>
               </div>
               <div className="p-r-content">
                 <p className="break_word task-hide flex1" style={{maxHeight:"40px",width:"0"}}>{item.description}</p>

src/forge/Order/Detail.js

@@ -314,11 +314,13 @@ class Detail extends Component{
 
   commentCtx = (ctx) => {
     let _ctx = null;
+
     try {
       _ctx = JSON.parse(ctx);
     } catch (e) {
       _ctx = ctx;
     }
+
     return (
       <QuillForEditor
         readOnly={true}
@@ -463,7 +465,8 @@ class Detail extends Component{
                   readOnly={true}
                   value={ data && data.description}
                 /> */}
-                {this.commentCtx(data && data.description)}
+                
+                {data&&data.description===""?<span className="color-grey-9 ml3 mr3">没有描述</span>:this.commentCtx(data && data.description)}
               </div>
               {
                 data && data.attachments && data.attachments.length > 0 ?

src/forge/quillForEditor/index.js

@@ -208,7 +208,6 @@ function QuillForEditor({
     const previous = quill.getContents()
 
     if (value && value.hasOwnProperty('ops')) {
-      // console.log(value.ops);
       const ops = value.ops || [];
       ops.forEach((item, i) => {
         if (item.insert['image']) {