From d67862156ce768b2f96bfd79f3587fa916bb2073 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Mon, 2 Aug 2021 15:32:51 +0800 Subject: [PATCH 01/12] update issue --- src/forge/Merge/NewMerge.js | 6 ++++-- src/forge/Settings/Webhooks/New.jsx | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/forge/Merge/NewMerge.js b/src/forge/Merge/NewMerge.js index 3382590a..97df7fb1 100644 --- a/src/forge/Merge/NewMerge.js +++ b/src/forge/Merge/NewMerge.js @@ -42,9 +42,10 @@ class NewMerge extends Component { componentDidUpdate=(preProps)=>{ const { project } = this.props; + const { pull } = this.state; let oldProject = preProps.project; if(project && oldProject && (oldProject.id !== project.id)){ - this.compareProject(this.state.id,"master","master"); + this.compareProject(this.state.id,pull,"master"); } } // 页面销毁取消监听 @@ -78,7 +79,8 @@ class NewMerge extends Component { this.set_default_pull(result.data.branches); this.set_default_merge(result.data.merge_projects); } - this.compareProject(result.data.id,"master","master"); + const { pull } = this.state; + this.compareProject(result.data.id,pull||"master","master"); this.setState({isSpin: false}) }) .catch((error) => { diff --git a/src/forge/Settings/Webhooks/New.jsx b/src/forge/Settings/Webhooks/New.jsx index a8201f72..28ecd0b3 100644 --- a/src/forge/Settings/Webhooks/New.jsx +++ b/src/forge/Settings/Webhooks/New.jsx @@ -302,7 +302,7 @@ function New({ form , match , showNotification , history }) { 推送、创建，删除分支事件的分支白名单，使用 glob 模式匹配指定。若为空或 *，则将报告所有分支的事件。语法文档见github.com/gobwas/glob。示例：master,{'{'}master,release*{'}'}。} colon={false} style={{marginTop:'15px'}} > From dd1beb3116e768554a4ebc83a9cc4e57d5654746 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Tue, 3 Aug 2021 09:34:11 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=AF=B7=E6=B1=82-?= =?UTF-8?q?=E5=B7=B2=E6=8B=92=E7=BB=9D=E7=9A=84=E4=B8=8D=E8=83=BD=E7=BC=96?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Merge/MergeItem.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js index 5c08a61f..9b4ebe80 100644 --- a/src/forge/Merge/MergeItem.js +++ b/src/forge/Merge/MergeItem.js @@ -183,7 +183,7 @@ class MergeItem extends Component { ) : ( "" )} - {user_admin_or_member ? ( + {user_admin_or_member && item.pull_request_status !== 2 ? (
Date: Tue, 3 Aug 2021 10:38:39 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=E7=BA=BF=E5=BC=B9=E6=A1=86z-index?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/DevOps/Dispose/PipelineName.jsx | 4 ++-- src/forge/DevOps/ops.scss | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/forge/DevOps/Dispose/PipelineName.jsx b/src/forge/DevOps/Dispose/PipelineName.jsx index 3cf7f96a..4acaa206 100644 --- a/src/forge/DevOps/Dispose/PipelineName.jsx +++ b/src/forge/DevOps/Dispose/PipelineName.jsx @@ -42,7 +42,7 @@ function PipelineName({visible,onCancel,onOk,value ,branchList}){
触发条件: - setBranchValue(e)}> { branchList && branchList.length>0 && branchList.map((item,key)=>{ return( @@ -51,7 +51,7 @@ function PipelineName({visible,onCancel,onOk,value ,branchList}){ }) } - {console.log(e);setEventValue(e)}}> { EVENT.map((item,key)=>{ return( diff --git a/src/forge/DevOps/ops.scss b/src/forge/DevOps/ops.scss index 024d0aa6..94838095 100644 --- a/src/forge/DevOps/ops.scss +++ b/src/forge/DevOps/ops.scss @@ -391,6 +391,9 @@ } } } +.chooseCon.ant-select-dropdown{ + z-index: 100001; +} .choosenList{ display: flex; From 5140bfbe77d2ca72e3a366167089aa0586bcbb9a Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Tue, 3 Aug 2021 17:37:14 +0800 Subject: [PATCH 04/12] =?UTF-8?q?issue=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Component/Releases.jsx | 4 +-- src/forge/Main/CoderDepot.jsx | 30 ++++++++++++++++------- src/forge/Main/CoderRootBranch.js | 9 +++++-- src/forge/Main/CoderRootCommit.js | 11 +++++++-- src/forge/Main/CoderRootIndex.js | 5 ++++ src/forge/Merge/MergeItem.js | 2 +- src/forge/Order/Milepost.js | 8 +++--- src/forge/Order/UpdateMilepost.js | 4 +-- src/forge/Settings/CollaboratorMember.jsx | 8 ++++-- src/forge/Version/version.js | 9 +++++-- 10 files changed, 64 insertions(+), 26 deletions(-) diff --git a/src/forge/Component/Releases.jsx b/src/forge/Component/Releases.jsx index 501c6b63..44b8d2c9 100644 --- a/src/forge/Component/Releases.jsx +++ b/src/forge/Component/Releases.jsx @@ -2,7 +2,7 @@ import React from 'react'; import { AlignCenter , AlignTop , FlexAJ } from '../Component/layout'; import { Link } from 'react-router-dom'; -function Releases({owner,projectsId,releaseVersions}){ +function Releases({owner,projectsId,releaseVersions , baseOperate}){ return(
@@ -13,7 +13,7 @@ function Releases({owner,projectsId,releaseVersions}){ { releaseVersions && releaseVersions.total_count > 0 ? 全部 : - 新建 + baseOperate && 新建 } { diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index 32121077..93d99910 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -277,6 +277,7 @@ function CoderDepot(props){ const mdFlag = n && n.substring(n.length-3,n.length) === ".md"; const { current_user } = props; + const baseOperate = projectDetail && projectDetail.permission && projectDetail.permission !=="Reporter"; const fileOperate = type === "dir" && projectDetail && projectDetail.type !== 2 && ((projectDetail.permission && projectDetail.permission !=="Reporter") || (current_user && current_user.admin)); return( @@ -339,13 +340,16 @@ function CoderDepot(props){ - + { + baseOperate && + + } { fileOperate && @@ -370,7 +374,9 @@ function CoderDepot(props){ { hideBtn && changeHide(hide)}> } {lastCommit && lastCommit.time_from_now} - { commitCount ? {commitCount}次提交:"" } + { commitCount ? + {commitCount}次提交 + :"" }
}
- 创建合并请求 + { + (isManager || isDeveloper) && + 创建合并请求 + } @@ -70,6 +74,7 @@ export default ((props)=>{ TAR.GZ ) + return(
diff --git a/src/forge/Main/CoderRootCommit.js b/src/forge/Main/CoderRootCommit.js index 9b349938..b6ca0be6 100644 --- a/src/forge/Main/CoderRootCommit.js +++ b/src/forge/Main/CoderRootCommit.js @@ -9,6 +9,12 @@ import Nodata from '../Nodata'; import axios from 'axios'; import {Link} from "react-router-dom"; +function returnbar(str){ + if(str && str.length>0 && str.indexOf("%2F")>-1){ + return str.replaceAll('%2F','/'); + } + return str; +} class CoderRootCommit extends Component{ constructor(props){ super(props) @@ -57,11 +63,12 @@ class CoderRootCommit extends Component{ this.setState({ isSpining:true }) + console.log(returnbar(branch)); const { projectsId , owner } = this.props.match.params; const url = `/${owner}/${projectsId}/commits.json`; axios.get(url,{ params:{ - sha:branch, + sha:returnbar(branch), page, limit } @@ -106,7 +113,7 @@ class CoderRootCommit extends Component{ const { commitDatas , dataCount , limit , page , isSpining , branchList } = this.state; const { projectDetail, commit_class , defaultBranch } = this.props; const { projectsId , owner , branchName } = this.props.match.params; - let branch = branchName || defaultBranch; + let branch = returnbar(branchName || defaultBranch); return(
diff --git a/src/forge/Main/CoderRootIndex.js b/src/forge/Main/CoderRootIndex.js index ceff9d9f..84ab94d3 100644 --- a/src/forge/Main/CoderRootIndex.js +++ b/src/forge/Main/CoderRootIndex.js @@ -102,6 +102,11 @@ class CoderRootIndex extends Component{ (props) => () } > + () + } + > () diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js index 9b4ebe80..32f3f811 100644 --- a/src/forge/Merge/MergeItem.js +++ b/src/forge/Merge/MergeItem.js @@ -183,7 +183,7 @@ class MergeItem extends Component { ) : ( "" )} - {user_admin_or_member && item.pull_request_status !== 2 ? ( + {user_admin_or_member && item.pull_request_status === 0 ? (
- 到期日从近到远 - 到期日从远到近 - 完成度从低到高 - 完成度从高到低 + 到期日从近到远 + 到期日从远到近 + 完成度从低到高 + 完成度从高到低 任务从多到少 任务从少到多 diff --git a/src/forge/Order/UpdateMilepost.js b/src/forge/Order/UpdateMilepost.js index 49a2b8d3..88a73033 100644 --- a/src/forge/Order/UpdateMilepost.js +++ b/src/forge/Order/UpdateMilepost.js @@ -180,8 +180,8 @@ class UpdateMilepost extends Component { onTypeChange(e.target.value)} value={type}> - - + + diff --git a/src/forge/Settings/CollaboratorMember.jsx b/src/forge/Settings/CollaboratorMember.jsx index 86459d87..1104a864 100644 --- a/src/forge/Settings/CollaboratorMember.jsx +++ b/src/forge/Settings/CollaboratorMember.jsx @@ -58,8 +58,12 @@ function CollaboratorMember({projectsId,owner,project_id,author,showNotification }) .then((result) => { if (result) { - setListData(result.data.members); - setTotal(result.data.total_count); + if(page > 1 && ( listData && listData.length === 1)){ + setPage(page-1); + }else{ + setListData(result.data.members); + setTotal(result.data.total_count); + } setIsSpin(false); } }) diff --git a/src/forge/Version/version.js b/src/forge/Version/version.js index 99223e1d..e5d2f01e 100644 --- a/src/forge/Version/version.js +++ b/src/forge/Version/version.js @@ -58,6 +58,8 @@ class version extends Component { renderList = (releases) => { const { projectsId , owner } = this.props.match.params; + const { isManager , isDeveloper , isReporter } = this.props; + console.log(isDeveloper,isManager,isReporter); if (releases && releases.length > 0) { return ( releases.map((item, key) => { @@ -74,7 +76,10 @@ class version extends Component {
{item.name} - （编辑） + { + (isManager || isDeveloper) && + （编辑） + } this.showBody(key,item.bodyshow)}> @@ -100,7 +105,7 @@ class version extends Component { render() { const { projectsId ,owner } = this.props.match.params; - const { data , releases , isSpin } = this.state + const { data , releases , isSpin } = this.state; return (
From f944ebad6fce4d7c51f4cc1493f71e9995000a6c Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Wed, 4 Aug 2021 17:12:29 +0800 Subject: [PATCH 05/12] issue --- src/forge/Main/Detail.js | 2 +- src/forge/Merge/merge.js | 10 +++------- src/forge/Merge/merge_form.js | 26 ++++++++++++++------------ src/forge/Order/order_form.js | 4 ++-- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index f7820f10..f6dc83e0 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -442,7 +442,7 @@ class Detail extends Component { {project.author.name} } / - {project && project.name} + {projectDetail && projectDetail.name}
{ projectDetail && projectDetail.private && 私有} diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js index c0c7e5ce..90e35dcc 100644 --- a/src/forge/Merge/merge.js +++ b/src/forge/Merge/merge.js @@ -159,14 +159,10 @@ class merge extends Component { this.getOption(e, id, name)}> {name} - {array && - array.length > 0 && - array.map((item, key) => { + {array && array.length > 0 && array.map((item, key) => { return ( - this.getOption(e, id, item.name)} - > + ((!item.permission) || (item.permission && item.permission !== "Reporter")) && + this.getOption(e, id, item.name)}> {item.name} ); diff --git a/src/forge/Merge/merge_form.js b/src/forge/Merge/merge_form.js index 1c75a9f9..d5e4a1b8 100644 --- a/src/forge/Merge/merge_form.js +++ b/src/forge/Merge/merge_form.js @@ -346,18 +346,20 @@ class MergeForm extends Component { )} - - -
- 必须审查代码 -
-
- 合并后删除提交分支 -
-
- 合并后关闭提到的任务 -
- + + {getFieldDecorator("checkbox-group")( + +
+ 必须审查代码 +
+
+ 合并后删除提交分支 +
+
+ 合并后关闭提到的任务 +
+ + )}
diff --git a/src/forge/Order/order_form.js b/src/forge/Order/order_form.js index 45433631..b6f065b2 100644 --- a/src/forge/Order/order_form.js +++ b/src/forge/Order/order_form.js @@ -92,10 +92,10 @@ class order_form extends Component { const url = `/${owner}/${projectsId}/issues/new.json`; axios.get(url).then((result) => { - if (result) { + if (result && result.data) { this.setState({ issue_chosen: result.data.issue_chosen, - branches: result.data.branches, + branches: result.data.issue_chosen.branches, isSpin:false }); From 4bde5da97c9d16901f73f3a07470010c2458e0b8 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Thu, 5 Aug 2021 10:30:04 +0800 Subject: [PATCH 06/12] markdown-issue --- src/App.css | 9 +++++++-- src/forge/users/Index.scss | 1 + src/index.css | 3 --- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/App.css b/src/App.css index 205c64f7..8d916d39 100644 --- a/src/App.css +++ b/src/App.css @@ -60,12 +60,13 @@ body { .ant-progress-textno { color: #f5222d; } - +.CodeMirror pre.CodeMirror-line{ + font-size: 16px!important; +} /* md多空格 */ .markdown-body p { margin:10px 0px!important; font-size: 16px !important; - line-height: 2 !important; white-space: pre-wrap; } @@ -87,6 +88,10 @@ body { border-left: 1px solid rgb(221, 221, 221); /* 某些情况下，被cm盖住了 */ z-index: 99; + padding:8px 8px 50px; +} +.editormd-preview .markdown-body{ + padding:0px !important; } /* 图片点击放大的场景，隐藏图片链接 */ diff --git a/src/forge/users/Index.scss b/src/forge/users/Index.scss index b087fa2f..3595aa84 100644 --- a/src/forge/users/Index.scss +++ b/src/forge/users/Index.scss @@ -105,6 +105,7 @@ $flex:flex; word-break: break-all; text-align: justify; font-size: 16px; + text-align: center; } .focusBox,.infoBox{ width: 100%!important; diff --git a/src/index.css b/src/index.css index 658577e5..e58df61f 100644 --- a/src/index.css +++ b/src/index.css @@ -41,9 +41,6 @@ z-index: 1000 !important; } -.markdown-body p { - margin: 0 !important -} .markdown-body img{ cursor: pointer; } From de636eed6dcde0b4c40a08feca24ee0082875081 Mon Sep 17 00:00:00 2001 From: hc1913847458 <1422588487@qq.com> Date: Wed, 4 Aug 2021 14:42:08 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E9=99=90=E5=88=B6=E5=AD=97=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Main/sub/UpdateDescModal.jsx | 2 +- src/forge/Merge/merge_form.js | 2 +- src/forge/Order/newMilepost.js | 4 ++-- src/forge/Settings/new_tags.js | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/forge/Main/sub/UpdateDescModal.jsx b/src/forge/Main/sub/UpdateDescModal.jsx index 5039123a..63e14fcd 100644 --- a/src/forge/Main/sub/UpdateDescModal.jsx +++ b/src/forge/Main/sub/UpdateDescModal.jsx @@ -53,7 +53,7 @@ function UpdateDescModal({form , visible , onCancel , onOk,desc,website,lesson_u {getFieldDecorator("lesson_url",{ rules:[] })( - + )} diff --git a/src/forge/Merge/merge_form.js b/src/forge/Merge/merge_form.js index d5e4a1b8..3e395cc9 100644 --- a/src/forge/Merge/merge_form.js +++ b/src/forge/Merge/merge_form.js @@ -264,7 +264,7 @@ class MergeForm extends Component { }, ], initialValue: title, - })()} + })()} + )}
@@ -113,7 +113,7 @@ class NewMilepost extends Component { required: true, message: '请输入描述内容' }], })( -