From 099fd1727efc0bc2ccc2e068f1cd6da10587ddf3 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Mon, 27 Mar 2023 17:03:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BA=93=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E8=A7=84=E8=8C=83=E8=B0=83=E6=95=B4=20#2532?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/About/Index.jsx | 13 ++-- src/forge/About/index.scss | 17 +++- src/forge/Activity/Activity.js | 133 ++++++++++++++++---------------- src/forge/Activity/activity.css | 18 ++++- src/forge/Issues/index.scss | 18 +---- src/forge/Main/CoderDepot.jsx | 2 +- src/forge/Merge/Index.scss | 8 ++ src/forge/Merge/merge.js | 17 ++-- src/forge/Merge/no_data.js | 15 +++- src/forge/Order/index.scss | 2 +- src/forge/css/index.scss | 35 +++++++-- 11 files changed, 163 insertions(+), 115 deletions(-) diff --git a/src/forge/About/Index.jsx b/src/forge/About/Index.jsx index 0546278f5..7f1222de1 100644 --- a/src/forge/About/Index.jsx +++ b/src/forge/About/Index.jsx @@ -68,13 +68,14 @@ function Index(props){ return(
- - 项目概览 - { editOpration && !edit && 编辑 } - +
+ 项目概览 + { editOpration && !edit && + 编辑 } +
{ edit ? -
+
: -
+
{content ? : diff --git a/src/forge/About/index.scss b/src/forge/About/index.scss index 2ddb21a47..a009b45de 100644 --- a/src/forge/About/index.scss +++ b/src/forge/About/index.scss @@ -3,10 +3,25 @@ margin:0px auto; .aboutContent{ border-radius: 2px; - border: 1px solid #EEEEEE; + // border: 1px solid #EEEEEE; width:100%; background-color: #fff; margin-top:20px; margin-bottom: 30px; + .aboutTitle{ + height: 50px; + background-color: #fafcff; + border: 1px solid; + border-color: rgba(42, 97, 255, 0.23); + border-radius: 4px 4px 0px 0px; + display: flex; + align-items: center; + justify-content: space-between; + padding:0px 20px; + } + .boies{ + border: 1px solid #d0d0d0; + border-top: none; + } } } \ No newline at end of file diff --git a/src/forge/Activity/Activity.js b/src/forge/Activity/Activity.js index cab46d96e..616c94511 100644 --- a/src/forge/Activity/Activity.js +++ b/src/forge/Activity/Activity.js @@ -186,75 +186,76 @@ class Activity extends Component{
概览
- -
-
-
-

-

+
+
+
+
+

+

+
+ {data && data.pr_all_count}合并请求
- {data && data.pr_all_count}合并请求 -
-
-
-

-

+
+
+

+

+
+ {data && data.issues_count}疑修
- {data && data.issues_count}疑修
+
    +
  • + {data && data.pr_count} + this.changeTrends("PullRequest","delay")}>已处理的合并请求 +
    • +
  • + {data && data.new_pr_count} + this.changeTrends("PullRequest","not_delay")}>未处理的合并请求 +
    • +
  • + {data && data.close_issues_count} + this.changeTrends("Issue","delay")}>已关闭的疑修 +
    • +
  • + {data && data.open_issues_count} + this.changeTrends("Issue","not_delay")}>未处理的疑修 +
    • +
+ { + codeStatus && +
+
{codeStatus.author_count}位作者 已经推送 {codeStatus.commit_count}次提交 到 + {codeStatus.commit_count_in_all_branches && codeStatus.commit_count_in_all_branches>0? {projectDetail && projectDetail.default_branch}分支 和 {codeStatus.commit_count_in_all_branches}次提交 到所有分支:""}。 在 {projectDetail && projectDetail.default_branch}分支上， + {codeStatus.change_files && codeStatus.change_files >0 ? {codeStatus.change_files} 个文件 已经改变 而且:""} + {codeStatus.additions && codeStatus.additions >0 ?新增 {codeStatus.additions} 行代码:""} + {(codeStatus.additions && codeStatus.additions >0) &&(codeStatus.deletions && codeStatus.deletions >0) ? 和:""} + {codeStatus.deletions && codeStatus.deletions >0 ? 删除 {codeStatus.deletions} 行代码:""}.
+ {/* { + codeStatus.authors && codeStatus.authors.length > 0 && +
    + { + codeStatus.authors.map((i,v)=>{ + return( + i.author ? + !i.author.id ? + + + {i.author && i.author.name} + + : + + + {i.author && i.author.name} + + :"" + ) + }) + } +
+ } */} +
+ }
-
    -
  • - {data && data.pr_count} - this.changeTrends("PullRequest","delay")}>已处理的合并请求 -
    • -
  • - {data && data.new_pr_count} - this.changeTrends("PullRequest","not_delay")}>未处理的合并请求 -
    • -
  • - {data && data.close_issues_count} - this.changeTrends("Issue","delay")}>已关闭的疑修 -
    • -
  • - {data && data.open_issues_count} - this.changeTrends("Issue","not_delay")}>未处理的疑修 -
    • -
- { - codeStatus && -
-
{codeStatus.author_count}位作者 已经推送 {codeStatus.commit_count}次提交 到 - {codeStatus.commit_count_in_all_branches && codeStatus.commit_count_in_all_branches>0? {projectDetail && projectDetail.default_branch}分支 和 {codeStatus.commit_count_in_all_branches}次提交 到所有分支:""}。 在 {projectDetail && projectDetail.default_branch}分支上， - {codeStatus.change_files && codeStatus.change_files >0 ? {codeStatus.change_files} 个文件 已经改变 而且:""} - {codeStatus.additions && codeStatus.additions >0 ?新增 {codeStatus.additions} 行代码:""} - {(codeStatus.additions && codeStatus.additions >0) &&(codeStatus.deletions && codeStatus.deletions >0) ? 和:""} - {codeStatus.deletions && codeStatus.deletions >0 ? 删除 {codeStatus.deletions} 行代码:""}.
- {/* { - codeStatus.authors && codeStatus.authors.length > 0 && -
    - { - codeStatus.authors.map((i,v)=>{ - return( - i.author ? - !i.author.id ? - - - {i.author && i.author.name} - - : - - - {i.author && i.author.name} - - :"" - ) - }) - } -
- } */} -
- }
{ ai_shang_v1_url && @@ -280,7 +281,7 @@ class Activity extends Component{ }
- 疑修/合并请求记录 + 疑修/合并请求记录
diff --git a/src/forge/Activity/activity.css b/src/forge/Activity/activity.css index 2f497a561..c5d323224 100644 --- a/src/forge/Activity/activity.css +++ b/src/forge/Activity/activity.css @@ -1,7 +1,9 @@ .trendsTop{ - padding:15px; - border-bottom:1px solid #ddd; - background-color: #f4f4f4; + background-color: #fafcff; + border: 1px solid; + border-color: rgba(42, 97, 255, 0.23); + border-radius: 4px 4px 0px 0px; + padding: 10px 20px; display: flex; align-items: center; justify-content: space-between; @@ -29,6 +31,10 @@ display: flex; justify-content: space-between; } +.boxpart{ + border: 1px solid #d0d0d0; + border-top: none; +} .orderInfo > div{ width: 45%; } @@ -95,7 +101,7 @@ } .commentsBox{ border-radius: 4px; - border: 1px solid #ddd; + /* border: 1px solid #ddd; */ margin: 20px 0px 20px 0px; } .prMsg{ @@ -140,6 +146,10 @@ white-space: nowrap; text-overflow: ellipsis; } +.activity_list{ + border:1px solid #d0d0d0; + border-top: none; +} .activity_list .activity_item{ border-bottom: 1px solid #f4f4f4; padding:15px; diff --git a/src/forge/Issues/index.scss b/src/forge/Issues/index.scss index 799a068c6..1283e3a8e 100644 --- a/src/forge/Issues/index.scss +++ b/src/forge/Issues/index.scss @@ -47,22 +47,6 @@ background-color: #f3f4f6; } } -// 操作按钮-蓝色 -.operateButton{ - padding:0px 15px; - height:32px; - color: #fff!important; - cursor: pointer; - line-height: 30px; - background-color:rgba(70, 106, 255, 1); - border:1px solid rgba(70, 106, 255, 1); - border-radius: 4px; - display: block; - &:hover{ - background-color:#708cff; - border-color:#708cff; - } -} // flex-左右，上下居中 .between{ display: flex; @@ -808,7 +792,7 @@ } } li{ - width: 100px; + width: 98px; height:32px; line-height:30px; text-align: center; diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index d59423710..25ee08357 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -63,7 +63,7 @@ function CoderDepot(props){ const details = props.projectDetail; let pathname = props.history.location.pathname; //distribution：判断此用户是否可以创建发行版 - const distribution = details && details.type != 2 && (details.permission === "Admin" || details.permission === "Owner" || details.permission === "Manager"); + const distribution = details && details.type !== 2 && ( details.permission && details.permission !== "Reporter"); const { bannerList } = props; useEffect(()=>{ if(bannerList && bannerList.length>0){ diff --git a/src/forge/Merge/Index.scss b/src/forge/Merge/Index.scss index ea8b6b7eb..e0460902e 100644 --- a/src/forge/Merge/Index.scss +++ b/src/forge/Merge/Index.scss @@ -100,4 +100,12 @@ } } } +} +.empBtn{ + display: flex; + align-items: center; + justify-content: center; + margin-top: 60px; + padding-top: 20px; + border-top: 1px solid #F3F4F6; } \ No newline at end of file diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js index e901e628f..794ae9138 100644 --- a/src/forge/Merge/merge.js +++ b/src/forge/Merge/merge.js @@ -11,7 +11,7 @@ import { turnbar } from "educoder"; import axios from "axios"; import CheckProfile from '../Component/ProfileModal/Profile'; -const Search = Input.Search; +const { Search } = Input; /** * issue_chosen:下拉的筛选列表, * data:列表接口返回的所有数据, @@ -268,17 +268,14 @@ class merge extends Component { return (
-
- -
+ { data && data.user_admin_or_developer && - this.checkOperation()}> + this.checkOperation()}> + 新建合并请求 } diff --git a/src/forge/Merge/no_data.js b/src/forge/Merge/no_data.js index e41e1dfa1..c54e4bda4 100644 --- a/src/forge/Merge/no_data.js +++ b/src/forge/Merge/no_data.js @@ -1,5 +1,6 @@ import React , { Component } from 'react'; import { Link } from "react-router-dom"; +import None from '../Images/emp.png' class Nodata extends Component{ render(){ const { _html, projectsId , owner , user_admin_or_developer , defaultBranch} = this.props; @@ -7,13 +8,19 @@ class Nodata extends Component{
- + {/* */} +
-

欢迎使用合并请求！

+

欢迎使用合并请求！

-
- 合并请求可以帮助您与他人协作编写代码。{ user_admin_or_developer && 在使用之前，请先创建一个 合并请求 } +
+ 合并请求可以帮助您与他人协作编写代码。请先创建一个合并请求
+ { user_admin_or_developer && +
+ 合并请求 +
+ }
) diff --git a/src/forge/Order/index.scss b/src/forge/Order/index.scss index e721713ca..617423312 100644 --- a/src/forge/Order/index.scss +++ b/src/forge/Order/index.scss @@ -1,5 +1,5 @@ .screenWrap{ - background:rgba(250,250,250,1); + background:#fafcff; border-top:1px solid rgba(221,221,221,1); border-bottom:1px solid rgba(221,221,221,1); padding-left: 20px; diff --git a/src/forge/css/index.scss b/src/forge/css/index.scss index 51d252060..bd48b868c 100644 --- a/src/forge/css/index.scss +++ b/src/forge/css/index.scss @@ -146,16 +146,23 @@ ul,ol,dl{ .normalBox{ border-radius: 4px; - border:1px solid #ddd; + // border:1px solid #ddd; } .normalBox-title{ - padding:10px; - background-color: #f4f4f4; - line-height: 18px; + background-color: #fafcff; + border: 1px solid; + border-color: rgba(42, 97, 255, 0.23); + border-radius: 4px 4px 0px 0px; + padding:0px 20px; + height: 48px; + display: flex; + align-items: center; + font-size: 16px; } .none_panels{ text-align: center; - height: 400px; + min-height: 320px; + padding:40px 0px; display: flex; justify-content: center; align-items: center; @@ -409,4 +416,22 @@ button.btngrey{ .newTab .newBtnImg { right: -19px; } +} + + +// 操作按钮-蓝色 +.operateButton{ + padding:0px 15px; + height:32px; + color: #fff!important; + cursor: pointer; + line-height: 30px; + background-color:rgba(70, 106, 255, 1); + border:1px solid rgba(70, 106, 255, 1); + border-radius: 4px; + display: block; + &:hover{ + background-color:#708cff; + border-color:#708cff; + } } \ No newline at end of file