修改冲突

.idea/workspace.xml

@@ -242,10 +242,9 @@
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds" extendedState="6" fullScreen="true">
-    <option name="y" value="23" />
+  <component name="ProjectFrameBounds" fullScreen="true">
     <option name="width" value="1440" />
-    <option name="height" value="877" />
+    <option name="height" value="900" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">

src/forge/Merge/MessageCount.js

@@ -10,6 +10,8 @@ import Attachments from '../Upload/attachment'
 import './merge.css';
 import QuillForEditor from '../quillForEditor';
 import MergeSubmit from './MergeSubmit';
+import AmplifyImg from '../Order/AmplifyImg';
+
 const Option = Select.Option;
 const TextArea = Input.TextArea;
 
@@ -54,7 +56,9 @@ class MessageCount extends Component{
       issue_tag_ids: undefined,
       issue_chosen: undefined,
       fixed_version_id: undefined,
-      assigned_to_id: undefined
+      assigned_to_id: undefined,
+      imageUrl:undefined,
+      visible:false
     }
   }
   
@@ -464,10 +468,21 @@ class MessageCount extends Component{
       />
     )
   };
+  handleShowImage=(value)=>{
+    this.setState({
+      imageUrl:value,
+      visible:true
+    })
+  }
+  setVisible=(flag)=>{
+    this.setState({
+      visible:flag
+    })
+  }
 
   render(){
     const { projectsId,mergeId } = this.props.match.params;
-    const { data,journalsdata, page, limit, search_count, isSpin, isedit, showFiles , commentsContent , quillFlag, editMerge, issue_tag_ids, issue_chosen,fixed_version_id,assigned_to_id } = this.state;
+    const { data,journalsdata, page, limit, search_count, isSpin, isedit, showFiles , commentsContent , quillFlag, editMerge, issue_tag_ids, issue_chosen,fixed_version_id,assigned_to_id , visible , imageUrl } = this.state;
     const { getFieldDecorator } = this.props.form;
     const { current_user } = this.props;
     const url = this.props.history.location.pathname;
@@ -628,14 +643,7 @@ class MessageCount extends Component{
 
     return(
       <div className="main">
-      {/*<div className="topWrapper">*/}
-        {/*<Nav  {...this.props} {...this.state}/>*/}
-        {/*{*/}
-          {/*data && data.issue.user_permission ?*/}
-            {/*<Link to={`/projects/${projectsId}/merge/new`} className="topWrapper_btn">创建合并请求</Link>*/}
-            {/*: ''*/}
-        {/*}*/}
-      {/*</div>*/}
+        { visible && <AmplifyImg url={imageUrl} visible={visible} setVisible={this.setVisible}/> }
       <div>
         <div className="detailContent">
           {

src/forge/Order/AmplifyImg.js

@@ -0,0 +1,24 @@
+import React , { useEffect, useState } from 'react';
+import { Modal } from 'antd';
+
+import './order.css';
+function AmplifyImg (props){
+
+  return(
+    <Modal
+      title={null}
+      footer={null}
+      visible={props.visible}
+      onCancel={()=>props.setVisible(false)}
+      closable={true}
+      centered={true}
+      width={'96%'}
+      className={'AmplifyImg'}
+    >
+      <div className={"amplifyContent"}>
+        <img src={props.url} alt=""/>
+      </div>
+    </Modal>
+  );
+}
+export default AmplifyImg;

src/forge/Order/Detail.js

@@ -2,16 +2,13 @@ import React , {Component} from 'react';
 import {Link} from 'react-router-dom';
 
 import axios from 'axios';
-import Nav from './Nav';
 import UploadComponent from '../Upload/Index';
 import { getImageUrl } from 'educoder';
-import {Modal , Form, Input, Tooltip, Popconfirm, Pagination  , Spin} from 'antd'
+import {Modal , Form , Tooltip, Popconfirm, Pagination  , Spin} from 'antd'
 import Attachments from '../Upload/attachment';
 import QuillForEditor from '../quillForEditor';
-import { QuillDeltaToHtmlConverter } from 'quill-delta-to-html'
+import AmplifyImg from './AmplifyImg';
 
-
-const TextArea = Input.TextArea;
 const options = [
   ['bold', 'italic', 'underline'],
   [{header: [1,2,3,false]}],
@@ -41,7 +38,10 @@ class Detail extends Component{
       isSpin:false,
       showFiles: true,
       quillValue:'',
-      quillFlag:false
+      quillFlag:false,
+      // 点击放大的图片路径
+      imageUrl:undefined,
+      visible:false
     }
   }
   
@@ -313,7 +313,15 @@ class Detail extends Component{
   }
 
   handleShowImage=(value)=>{
-    // console.log("imgOnclick",value);
+    this.setState({
+      imageUrl:value,
+      visible:true
+    })
+  }
+  setVisible=(flag)=>{
+    this.setState({
+      visible:flag
+    })
   }
 
   stringJson=(value) =>{
@@ -340,14 +348,14 @@ class Detail extends Component{
       <QuillForEditor
         readOnly={true}
         value={_ctx}
-        // showUploadImage={this.handleShowImage}
+        showUploadImage={this.handleShowImage}
       />
     )
   };
 
   render(){
     const { projectsId , orderId } = this.props.match.params;
-    const { data,journalsdata, page, limit, search_count, isSpin, isedit, showFiles , quillValue , quillFlag , countvalue } = this.state;
+    const { data,journalsdata, page, limit, search_count, isSpin, isedit, showFiles , quillValue , quillFlag , countvalue , imageUrl , visible } = this.state;
     const { current_user } = this.props;
     const Paginations = (
       <React.Fragment>
@@ -421,7 +429,6 @@ class Detail extends Component{
                               options={options}
                               value={countvalue}
                               onContentChange={this.onEditContentChange}
-                              // showUploadImage={this.handleShowImage}
                             />
                             <p className="quillFlag">
                               { quillFlag && <span className="">请输入评论内容</span>}
@@ -461,15 +468,7 @@ class Detail extends Component{
 
     return(
       <div className="main">
-        {/*<div className="topWrapper">*/}
-          {/*<Nav  {...this.props} {...this.state}/>*/}
-          {/*{*/}
-            {/*data && data.user_permission ?*/}
-              {/*<Link to={`/projects/${projectsId}/orders/new`} className="topWrapper_btn">创建任务</Link>*/}
-              {/*: ''*/}
-          {/*}*/}
-
-        {/*</div>*/}
+        { visible && <AmplifyImg url={imageUrl} visible={visible} setVisible={this.setVisible}/> }
         <div>
           <div className="detailContent">
             <p>
@@ -506,10 +505,7 @@ class Detail extends Component{
           <div className="f-wrap-between mt20" style={{alignItems:"flex-start"}}>
             <div className="item-list-right" >
               <div className="df ">
-              <Link to={`/users/${data && data.author_login}/projects`} className="show-user-link">
-                <img className="user_img" src={getImageUrl(`images/${data && data.author_picture}`)} alt=""/>
-              </Link>
-              {/*<Link to={``}><img className="user_img" src={getImageUrl(`images/${data && data.author_picture}`)} alt=""/></Link>*/}
+                <Link to={``}><img className="user_img" src={getImageUrl(`images/${data && data.author_picture}`)} alt=""/></Link>
                 <div className="detail_context">
                   <div className="detail_p">
                     {data&&data.description&&(data.description.length > 0)?this.commentCtx(data.description): <span className="color-grey-9 ml3 mr3">没有描述</span>}
@@ -535,10 +531,7 @@ class Detail extends Component{
                 <React.Fragment>
                 <div className="order_line" style={{marginLeft:80}}></div>
                 <div className="df">
-                <Link to={`/users/${current_user && current_user.login}/projects`} className="show-user-link">
                   <img className="user_img" src={getImageUrl(`images/${current_user && current_user.image_url}`)} alt=""/>
-                </Link>
-
                   <div className="new_context">
                     <div className="quillContent">
                       <QuillForEditor

src/forge/Order/order.css

@@ -536,3 +536,19 @@ a.issue-type-button.active:hover{background: #f4f4f4; color: #4CACFF;}
   max-height: 350px;
   overflow-y:auto;
 }
+.ql-bubble .ql-editor img{
+  width:100px!important;
+}
+.AmplifyImg .ant-modal{
+  padding:0px;
+}
+.AmplifyImg img{
+  max-width: 100%;
+  margin: 0px auto;
+}
+.AmplifyImg .ant-modal-body{
+  padding:25px;
+}
+.amplifyContent{
+  text-align: center;
+}