From 5eaebd4e424195129fac1b569e5bde1aa9a46260 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 18 Jun 2021 14:23:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E6=98=BE?= =?UTF-8?q?=E7=A4=BA:=20ADD=20file=20via=20upload=20=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=96=B0=E6=96=87=E4=BB=B6=E6=98=BE=E7=A4=BA=EF=BC=9A=20Add=20?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=20=E4=BF=AE=E6=94=B9=E6=96=87?= =?UTF-8?q?=E4=BB=B6=EF=BC=9A=20Update=20=E6=96=87=E4=BB=B6=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Main/CoderRootFileDetail.js | 1 + src/forge/Newfile/Index.js | 1 + src/forge/Newfile/UserSubmitComponent.js | 18 ++++++++++++++++++ src/forge/Newfile/m_editor.js | 3 ++- src/forge/Newfile/upload_file.js | 1 + src/forge/Order/Milepost.js | 4 +++- 6 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/forge/Main/CoderRootFileDetail.js b/src/forge/Main/CoderRootFileDetail.js index deb555a82..f86706e4b 100644 --- a/src/forge/Main/CoderRootFileDetail.js +++ b/src/forge/Main/CoderRootFileDetail.js @@ -285,6 +285,7 @@ class CoderRootFileDetail extends Component { readOnly={readOnly} editorType="update" currentBranch={currentBranch} + descName={detail && `Update ${detail.name}`} > )} diff --git a/src/forge/Newfile/Index.js b/src/forge/Newfile/Index.js index 56eae752d..9b7769552 100644 --- a/src/forge/Newfile/Index.js +++ b/src/forge/Newfile/Index.js @@ -73,6 +73,7 @@ class Index extends Component { content={undefined} readOnly={false} editorType="new" + descName={filename && `Add ${filename}`} > diff --git a/src/forge/Newfile/UserSubmitComponent.js b/src/forge/Newfile/UserSubmitComponent.js index 6c921c9fc..3a35467cc 100644 --- a/src/forge/Newfile/UserSubmitComponent.js +++ b/src/forge/Newfile/UserSubmitComponent.js @@ -16,6 +16,24 @@ class UserSubmitComponent extends Component { }; } + componentDidMount=()=>{ + const { descName } = this.props; + if(descName){ + this.props.form.setFieldsValue({ + desc:descName + }) + } + } + + componentDidUpdate=(preProps)=>{ + const { descName } = this.props; + if(preProps && descName && preProps.descName !== descName ){ + this.props.form.setFieldsValue({ + desc:descName + }) + } + } + changeSubmittype = (e) => { this.setState({ submitType: e.target.value, diff --git a/src/forge/Newfile/m_editor.js b/src/forge/Newfile/m_editor.js index e342eec38..05a7b2ac0 100644 --- a/src/forge/Newfile/m_editor.js +++ b/src/forge/Newfile/m_editor.js @@ -27,7 +27,7 @@ class m_editor extends Component { render() { const { editorValue } = this.state; - const { readOnly, editorType, language , currentBranch } = this.props; + const { readOnly, editorType, language , currentBranch , descName } = this.props; const editor_options = { lineNumbers: "on", wordWrap: true, //强制换行 @@ -72,6 +72,7 @@ class m_editor extends Component { content={editorValue} editor_type={editorType} currentBranch={currentBranch} + descName={descName} > )} diff --git a/src/forge/Newfile/upload_file.js b/src/forge/Newfile/upload_file.js index 1a9b1da05..2e2f49b65 100644 --- a/src/forge/Newfile/upload_file.js +++ b/src/forge/Newfile/upload_file.js @@ -60,6 +60,7 @@ class UploadFile extends Component { filepath={file_path} content={editorValue} editor_type={"upload"} + descName={`ADD file via upload`} > diff --git a/src/forge/Order/Milepost.js b/src/forge/Order/Milepost.js index 5d56e7a94..e6e63991f 100644 --- a/src/forge/Order/Milepost.js +++ b/src/forge/Order/Milepost.js @@ -108,7 +108,9 @@ class Milepost extends Component { } }).then((result) => { if (result) { - this.getList(1, this.state.status, 'desc') + this.getList(1, this.state.status, 'desc'); + const { getDetail } = this.props; + getDetail && getDetail(); } }).catch((error) => { console.log(error);