From 559f5da65e09eade228b3d58280dba18a75c8bb9 Mon Sep 17 00:00:00 2001 From: dinglink <837816638@qq.com> Date: Fri, 20 Mar 2020 23:48:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=99=90=E5=88=B6=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=90=8D=E5=AD=97=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Main/IndexItem.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js index 2b939fe5..f6ba8fdd 100644 --- a/src/forge/Main/IndexItem.js +++ b/src/forge/Main/IndexItem.js @@ -25,7 +25,7 @@ class IndexItem extends Component{
-

{item.author.name}

{item.name} + {item.author.name}/

{item.name}

{item.description}

From 1f687dd36929a69be38a08056373f5b622a8218b Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Mon, 23 Mar 2020 15:59:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BF=AE=E6=94=B9build?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/encodings.xml | 4 + .idea/forgeplus-react.iml | 11 + .idea/inspectionProfiles/Project_Default.xml | 6 + .idea/misc.xml | 7 + .idea/modules.xml | 8 + .idea/vcs.xml | 6 + .idea/workspace.xml | 253 ++++++++++++ package-lock.json | 408 ++++++++++++++----- package.json | 6 +- src/forge/Order/Tags.js | 2 +- src/forge/Order/newMilepost.js | 2 +- 11 files changed, 617 insertions(+), 96 deletions(-) create mode 100644 .idea/encodings.xml create mode 100644 .idea/forgeplus-react.iml create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 00000000..15a15b21 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/forgeplus-react.iml b/.idea/forgeplus-react.iml new file mode 100644 index 00000000..c3cd732c --- /dev/null +++ b/.idea/forgeplus-react.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 00000000..03d9549e --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..e95b9d03 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..956c9e82 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..94a25f7f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 00000000..5802641d --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,253 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -155,6 +160,7 @@ + @@ -165,24 +171,24 @@ - - + - - + + @@ -200,23 +206,32 @@ + + + - + - - + - + - + - - + + - + @@ -230,24 +245,81 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/forge/Main/CoderRootFileDetail.js b/src/forge/Main/CoderRootFileDetail.js index 50113010..7972526d 100644 --- a/src/forge/Main/CoderRootFileDetail.js +++ b/src/forge/Main/CoderRootFileDetail.js @@ -53,7 +53,7 @@ class CoderRootFileDetail extends Component{ const { projectsId } = this.props.match.params; const authorLogin = this.props.match.params.author; - const url = `/${author.login}/${projectsId}/contents/files/delete.json`; + const url = `/repositories/${projectsId}/delete_file.json`; axios.delete(url,{ params:{ filepath:detail.path, @@ -77,7 +77,7 @@ class CoderRootFileDetail extends Component{ const { author , branch , detail}= this.props; const { projectsId } = this.props.match.params; const { value } = this.state; - const url =`/${author.login}/${projectsId}/contents/files/update.json`; + const url =`/repositories/${projectsId}/update_file.json`; axios.put(url,{ filepath:detail.path, branch, diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js index 21efe431..66f8ddbe 100644 --- a/src/forge/Order/Detail.js +++ b/src/forge/Order/Detail.js @@ -431,7 +431,7 @@ class Detail extends Component{

{ data ? - 【{data.issue_classify === "issue" ? (data.tracker ? data.tracker : " 缺陷" ) : "合并请求"}】 + 【{data.issue_classify === "issue" ? (data.tracker ? data.tracker : "缺陷" ) : "合并请求"}】 : "" }