From d65f771b6bd164c847428f35230636b4b2f7ab66 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 1 Apr 2020 18:23:57 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 436 +++++++++++++++-------------- src/forge/Branch/branch.css | 10 +- src/forge/Main/Detail.js | 7 +- src/forge/Merge/MergeDetail.js | 15 +- src/forge/Merge/MergeItem.js | 35 ++- src/forge/Merge/MessageCount.js | 4 +- src/forge/Order/Detail.js | 4 +- src/forge/Order/OrderItem.js | 6 +- src/forge/Order/order.css | 9 + src/forge/Settings/Collaborator.js | 21 +- src/forge/Settings/setting.css | 2 +- 11 files changed, 305 insertions(+), 244 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index aba950566..f01b417b0 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,7 +1,19 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -23,67 +65,19 @@ - + - - - - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -94,8 +88,8 @@ - - + + @@ -106,8 +100,8 @@ - - + + @@ -116,13 +110,10 @@ - + - - - - - + + @@ -131,16 +122,6 @@ - Educoder - title - textcount - forks - commentCtx - 上传文件 - subFileType - .ide - .idea - deleteUser axios.delete style= width75f @@ -157,10 +138,20 @@ 创建工单 可读权限 sub_entries - 可读 - icon-bianji - readOnly isRe + icon-bianji + 可读 + journals_count > + readOnly + Fork + forked + .OptionsUl + deletedetail + tyle= + overflo + orderid + <span className="span_title">里程碑</span> + <span className="span_title">里程碑 $PROJECT_DIR$ @@ -179,7 +170,6 @@ + - @@ -223,35 +218,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - @@ -272,12 +222,12 @@ - + - @@ -296,7 +246,7 @@ - + @@ -429,17 +379,6 @@ - - - - - - - - - - - @@ -605,19 +544,6 @@ - - - - - - - - - - - - - @@ -637,16 +563,6 @@ - - - - - - - - - - @@ -684,16 +600,6 @@ - - - - - - - - - - @@ -732,16 +638,6 @@ - - - - - - - - - - @@ -752,16 +648,6 @@ - - - - - - - - - - @@ -783,10 +669,70 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -795,20 +741,20 @@ - - + + - + - - + + - + diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js index b7bea6e03..553a4a6d7 100644 --- a/src/forge/Merge/MergeItem.js +++ b/src/forge/Merge/MergeItem.js @@ -63,7 +63,7 @@ class MergeItem extends Component{ }

-
    +
      this.onMouseMove(item.id)} onMouseOut={()=>this.onMouseOut()}>
    • {this.set_issue_tags(item.issue_tags)}
      • {/*
    • {item.issue_type || "--"}
      • */}
    • {item.version || "--"}
      • diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js index ed7cf0354..2ea07020c 100644 --- a/src/forge/Merge/MessageCount.js +++ b/src/forge/Merge/MessageCount.js @@ -502,11 +502,13 @@ class MessageCount extends Component{ }

      {data&&data.issue.issue_status==="关闭"?"关闭中":data&&data.pull_request.status===0?"开启中":"已合并"} - - 请求从{data && data.pull_request.head}分支合并到{data && data.pull_request.base}分支 - - {/* 由 { data && data.issue.author_name} 于 { data && data.issue.created_at }创建{ data && data.issue.journals_count && data.issue.journals_count > 0 ?` · ${data.issue.journals_count} 条评论`:""} */} + + 由 { data && data.issue.author_name} 于 { data && data.issue.created_at }创建{ data && data.issue.journals_count && data.issue.journals_count > 0 ?` · ${data.issue.journals_count} 条评论`:""} + + + 请求从 {data && data.pull_request.head} 分支合并到 {data && data.pull_request.base} 分支 + { data && data.issue.user_permission ? diff --git a/src/forge/Version/NewVersion.js b/src/forge/Version/NewVersion.js index 350a929a4..6cda959cb 100644 --- a/src/forge/Version/NewVersion.js +++ b/src/forge/Version/NewVersion.js @@ -145,7 +145,7 @@ class NewVersion extends Component{

      版本发布组织项目的版本。
      - +
      @
      @@ -161,7 +161,7 @@ class NewVersion extends Component{ required: true, message: '请输入标题' }], })( - + )}
      From 3cfb5a037030195b7c9471a2cab1863fa79674af Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Wed, 1 Apr 2020 19:08:52 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 98 +++++++++++++++++++----------- src/forge/Version/UpdateVersion.js | 2 +- 2 files changed, 62 insertions(+), 38 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 51fa0abde..86b49613c 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,9 +2,7 @@ - - - + @@ -166,7 +189,7 @@ - + + )} From aae855bda50f312cb23e54de84a0974d2c416fc4 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Thu, 2 Apr 2020 10:09:38 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 88 ++++++++++++++++++++------------- src/forge/Branch/branch.css | 2 +- src/forge/Merge/MessageCount.js | 2 +- 3 files changed, 57 insertions(+), 35 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 86b49613c..e1e91cf60 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,8 @@ - + + @@ -141,7 +163,6 @@ @@ -189,7 +211,7 @@ - + -
      - -
      - {/*