diff --git a/src/forge/Main/CoderRootFileDetail.js b/src/forge/Main/CoderRootFileDetail.js index 372af720..7d1f6793 100644 --- a/src/forge/Main/CoderRootFileDetail.js +++ b/src/forge/Main/CoderRootFileDetail.js @@ -27,7 +27,8 @@ class CoderRootFileDetail extends Component { description: props.detail.replace_content, menuList:undefined, replaceVisible:false, - loading:false + loading:false, + random:0, }; } @@ -140,6 +141,12 @@ class CoderRootFileDetail extends Component { EditFile = (flag) => { const { onEdit } = this.props; onEdit && onEdit(flag); + if(flag){ + let num = Math.random(); + this.setState({ + random:num + }) + } }; DownLoadFile = (url) => { @@ -272,7 +279,7 @@ class CoderRootFileDetail extends Component { } = this.props; // 文件只读状态 const readOnly = this.props.history.location.search.indexOf('edit') === -1 - const { language, languages, description , replaceVisible , loading } = this.state; + const { language, languages, description , replaceVisible , loading , random } = this.state; let flag = current_user && current_user.login && (isManager || isDeveloper); const Option = Select.Option; return ( @@ -395,6 +402,7 @@ class CoderRootFileDetail extends Component { filepath={`/${detail.path}`} content={detail.content} readOnly={readOnly} + random={random} md={md} editorType="update" currentBranch={currentBranch} diff --git a/src/forge/Newfile/m_editor.js b/src/forge/Newfile/m_editor.js index 8740b34b..53d652ed 100644 --- a/src/forge/Newfile/m_editor.js +++ b/src/forge/Newfile/m_editor.js @@ -21,7 +21,14 @@ class m_editor extends Component { }; } componentDidUpdate = (prevProps) => { - if (prevProps && this.props && this.props.content !== prevProps.content) { + let firstCondition = prevProps && this.props && this.props.content !== prevProps.content; + let secondCondition = prevProps && this.props && this.props.random !== prevProps.random; + if (firstCondition) { + this.setState({ + editorValue: this.props.content + }) + } + if(secondCondition){ this.setState({ editorValue: this.props.content }) @@ -57,20 +64,17 @@ class m_editor extends Component { enabled: false, }, }; - let download_url = detail && detail.download_url; return (
- {!readOnly ? - : '' - // - } +
{!readOnly && (