From b59409e2fccebb496735409bd3b42d4f4f2147ac Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Mon, 25 Apr 2022 14:38:33 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BB=8E=E5=90=84=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=AF=B7=E6=B1=82=E7=82=B9=E5=87=BB=E6=97=B6?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E7=9A=84=E9=93=BE=E6=8E=A5=E8=A6=81=E6=98=AF?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Main/CoderDepot.jsx | 2 +- src/forge/Main/tree/Index.jsx | 6 +++--- src/forge/Merge/CreateMerge.js | 6 ++++-- src/forge/Merge/merge.js | 8 +++++--- src/forge/Merge/no_data.js | 4 ++-- src/forge/Settings/Branch.js | 15 ++++----------- 6 files changed, 19 insertions(+), 22 deletions(-) diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index 6d45159b..4183131b 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -436,7 +436,7 @@ function CoderDepot(props){
{ baseOperate && - urlLink(`/${owner}/${projectsId}/compare/master...${turnbar(branchName || defaultBranch)}`)} >+ 合并请求 + urlLink(`/${owner}/${projectsId}/compare/${turnbar(branchName || defaultBranch)}...${turnbar(branchName || defaultBranch)}`)} >+ 合并请求 } { issuesFlag && diff --git a/src/forge/Main/tree/Index.jsx b/src/forge/Main/tree/Index.jsx index 2829331b..f7aa7bd8 100644 --- a/src/forge/Main/tree/Index.jsx +++ b/src/forge/Main/tree/Index.jsx @@ -14,8 +14,8 @@ function Index(props) { const [ isSpin , setIsSpin ] = useState(true); const { projectsId , owner } = props.match.params; - const { isManager , isDeveloper , projectDetail } = props; - + const { isManager , isDeveloper , projectDetail , defaultBranch } = props; + useEffect(()=>{ getList(); },[]) @@ -85,7 +85,7 @@ function Index(props) {
{ (isManager || isDeveloper) && (projectDetail && projectDetail.type!==2) && - + 合并请求 + + 合并请求 } 下载 diff --git a/src/forge/Merge/CreateMerge.js b/src/forge/Merge/CreateMerge.js index e6d0d037..3aeaa4a2 100644 --- a/src/forge/Merge/CreateMerge.js +++ b/src/forge/Merge/CreateMerge.js @@ -291,14 +291,16 @@ class CreateMerge extends Component { }); // 加上是否需要切换url判断 if(isChangeProject){ + const { defaultBranch } = this.props; + let branch = turnbar(defaultBranch) || "master"; if (login === pullOwner) { // 如果切换后, 仓库与源仓库一致了 this.props.history.push( - `/${login}/${identifier}/compare/master...${turnbar(pullBranch)}` + `/${login}/${identifier}/compare/${branch}...${turnbar(pullBranch)}` ); } else { this.props.history.push( - `/${login}/${identifier}/compare/master...${pullOwner}:${turnbar(pullBranch)}` + `/${login}/${identifier}/compare/${branch}...${pullOwner}:${turnbar(pullBranch)}` ); } } diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js index 0f6f1ac8..769d2d47 100644 --- a/src/forge/Merge/merge.js +++ b/src/forge/Merge/merge.js @@ -6,6 +6,7 @@ import "../Order/index.scss"; import NoneData from "./no_data"; import MergeItem from "./MergeItem"; import './Index.scss'; +import { turnbar } from "educoder"; import axios from "axios"; import CheckProfile from '../Component/ProfileModal/Profile'; @@ -210,10 +211,11 @@ class merge extends Component { this.getIssueList(); }; - checkOperation() { + const { defaultBranch } = this.props; const { projectsId,owner } = this.props.match.params; - this.props.history.push(`/${owner}/${projectsId}/compare/master...master`); + let branch = turnbar(defaultBranch) || "master"; + this.props.history.push(`/${owner}/${projectsId}/compare/${branch}...${branch}`); } render() { const { projectsId , owner } = this.props.match.params; @@ -414,7 +416,7 @@ class merge extends Component { ) : ( "" )} - { data && data.issues && data.issues.length === 0 ? :""} + { data && data.issues && data.issues.length === 0 ? :""}
diff --git a/src/forge/Merge/no_data.js b/src/forge/Merge/no_data.js index 76258f8c..e41e1dfa 100644 --- a/src/forge/Merge/no_data.js +++ b/src/forge/Merge/no_data.js @@ -2,7 +2,7 @@ import React , { Component } from 'react'; import { Link } from "react-router-dom"; class Nodata extends Component{ render(){ - const { _html, projectsId , owner , user_admin_or_developer} = this.props; + const { _html, projectsId , owner , user_admin_or_developer , defaultBranch} = this.props; return(
@@ -12,7 +12,7 @@ class Nodata extends Component{

欢迎使用合并请求！

- 合并请求可以帮助您与他人协作编写代码。{ user_admin_or_developer && 在使用之前，请先创建一个 合并请求 } + 合并请求可以帮助您与他人协作编写代码。{ user_admin_or_developer && 在使用之前，请先创建一个 合并请求 }
diff --git a/src/forge/Settings/Branch.js b/src/forge/Settings/Branch.js index 3e19f37e..f7e83101 100644 --- a/src/forge/Settings/Branch.js +++ b/src/forge/Settings/Branch.js @@ -21,24 +21,17 @@ export default ((props)=>{ const [ count , setCount ] = useState(0); const [ page , setPage ] = useState(1); - let defaultBranch = props.defaultBranch; - useEffect(()=>{ - if(defaultBranch){ - setBranch(defaultBranch); - setProtectBranch(defaultBranch); + if(props.defaultBranch){ + setBranch(props.defaultBranch); + setProtectBranch(props.defaultBranch); } - },[defaultBranch]); + },[props.defaultBranch]); const { projectsId , owner } = props.match.params; const projectDetail = props.projectDetail; - useEffect(()=>{ - if(defaultBranch){ - setBranch(defaultBranch); - } - },[defaultBranch]); useEffect(()=>{ if(owner){ From 4cd25cffc7bc254971c84bc0e980f01060a44ee6 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Tue, 26 Apr 2022 17:48:21 +0800 Subject: [PATCH 02/10] =?UTF-8?q?issue/pr=E5=90=84=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=90=9C=E7=B4=A2=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Merge/CreateMerge.js | 24 ++++++++++++++++++ src/forge/Merge/merge.css | 3 +++ src/forge/Merge/merge_form.js | 23 ++++++++++++++++- src/forge/Order/order.css | 6 ++++- src/forge/Order/order_form.js | 45 +++++++++++++++++++++++++++++++--- 5 files changed, 95 insertions(+), 6 deletions(-) diff --git a/src/forge/Merge/CreateMerge.js b/src/forge/Merge/CreateMerge.js index 3aeaa4a2..81400f22 100644 --- a/src/forge/Merge/CreateMerge.js +++ b/src/forge/Merge/CreateMerge.js @@ -338,6 +338,28 @@ class CreateMerge extends Component { return
; }; + // 源分支-分支搜索 + changePullValue=(value,cate)=>{ + const branchParams = getBranchParams(this.props.location.pathname); + const { pullOwner , projectId } = branchParams; + const url = `/${pullOwner}/${projectId}/pulls/new.json`; + axios.get(url,{ + params:{branch_name:value || undefined} + }).then(result=>{ + if(result){ + if(cate === "pull"){ + this.setState({ + pullBranch:result.data.branches + }) + }else{ + this.setState({ + mergeBranch:result.data.branches + }) + } + } + }).catch(error=>{}) + } + render() { const { data, @@ -380,6 +402,7 @@ class CreateMerge extends Component { className="merge-flex1 flex1 matchwidth" dropdownMatchSelectWidth={false} dropdownClassName="overlihide" + onSearch={(e)=>this.changePullValue(e,"pull")} > {this.renderBrances(pullBranches)} @@ -408,6 +431,7 @@ class CreateMerge extends Component { className="merge-flex1 flex1 matchwidth" dropdownMatchSelectWidth={false} dropdownClassName="overlihide" + onSearch={(e)=>this.changePullValue(e,"merge")} > {this.renderBrances(mergeBranches)} diff --git a/src/forge/Merge/merge.css b/src/forge/Merge/merge.css index 0ac43c7d..0fc5effb 100644 --- a/src/forge/Merge/merge.css +++ b/src/forge/Merge/merge.css @@ -226,4 +226,7 @@ form .ant-cascader-picker, form .ant-select { /* 距离底部加大 @列表被遮挡 */ .updateMerge{ margin: 30px auto 60px; + } + .searchIcon .ant-select-arrow{ + margin-top:-9px } \ No newline at end of file diff --git a/src/forge/Merge/merge_form.js b/src/forge/Merge/merge_form.js index c6de9638..f9ab0f3b 100644 --- a/src/forge/Merge/merge_form.js +++ b/src/forge/Merge/merge_form.js @@ -315,7 +315,16 @@ class MergeForm extends Component { {getFieldDecorator("assigned_to_id", { initialValue: assigned_to_id, })( - } + optionFilterProp="children" + filterOption={(input, option) => + option.props.value && option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0 + } + > {this.renderSelect(members)} @@ -330,6 +339,12 @@ class MergeForm extends Component { issue_versions && issue_versions.length > 0? "未选择里程碑": "请添加里程碑" } showSearch + className="searchIcon" + suffixIcon={} + optionFilterProp="children" + filterOption={(input, option) => + option.props.value && option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0 + } > {this.renderSelect(issue_versions)} @@ -345,6 +360,12 @@ class MergeForm extends Component { issue_tags && issue_tags.length > 0 ? "未选择标记" : "请在仓库设置里添加标记" } showSearch + className="searchIcon" + suffixIcon={} + optionFilterProp="children" + filterOption={(input, option) => + option.props.value && option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0 + } > {this.renderSelect(issue_tags)} diff --git a/src/forge/Order/order.css b/src/forge/Order/order.css index 40adc855..f763903f 100644 --- a/src/forge/Order/order.css +++ b/src/forge/Order/order.css @@ -710,4 +710,8 @@ a.issue-type-button.active:hover { .boder-4{border-radius: 4px;} .pbt20{padding: 20px 0;} .inline-block{display: inline-block;} -.pd10{padding: 10px;} \ No newline at end of file +.pd10{padding: 10px;} + +.searchIcon .ant-select-arrow{ + margin-top:-9px +} \ No newline at end of file diff --git a/src/forge/Order/order_form.js b/src/forge/Order/order_form.js index e3a2eb91..c6502cb9 100644 --- a/src/forge/Order/order_form.js +++ b/src/forge/Order/order_form.js @@ -437,7 +437,17 @@ class order_form extends Component {
{getFieldDecorator("assigned_to_id", {rules: []})( - } + optionFilterProp="children" + filterOption={(input, option) => + option.props.children[1] && option.props.children[1].toLowerCase().indexOf(input.toLowerCase()) >= 0 + } + placeholder="搜索成员" + > {this.renderSelect( issue_chosen && issue_chosen.assign_user @@ -485,7 +495,16 @@ class order_form extends Component { {getFieldDecorator("fixed_version_id", {rules: []})( - } + optionFilterProp="children" + filterOption={(input, option) => + option.props.children[1] && option.props.children[1].toLowerCase().indexOf(input.toLowerCase()) >= 0 + } + > {getFieldDecorator("issue_tag_ids", {rules: []})( - } + optionFilterProp="children" + filterOption={(input, option) => + option.props.children[1] && option.props.children[1].toLowerCase().indexOf(input.toLowerCase()) >= 0 + } + > {branches && branches.length > 0 && branches.map((item, key) => { return ( From 51d028336fed28d23d72a73b9d7f98e820cf9ce0 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 29 Apr 2022 09:24:05 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E8=AF=B7=E6=B1=82-=E5=88=86=E6=94=AF=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Merge/CreateMerge.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/forge/Merge/CreateMerge.js b/src/forge/Merge/CreateMerge.js index 81400f22..2f080bca 100644 --- a/src/forge/Merge/CreateMerge.js +++ b/src/forge/Merge/CreateMerge.js @@ -349,11 +349,11 @@ class CreateMerge extends Component { if(result){ if(cate === "pull"){ this.setState({ - pullBranch:result.data.branches + pullBranches:result.data.branches }) }else{ this.setState({ - mergeBranch:result.data.branches + mergeBranches:result.data.branches }) } } @@ -403,6 +403,7 @@ class CreateMerge extends Component { dropdownMatchSelectWidth={false} dropdownClassName="overlihide" onSearch={(e)=>this.changePullValue(e,"pull")} + filterOption={(input,option)=>option} > {this.renderBrances(pullBranches)} @@ -432,6 +433,7 @@ class CreateMerge extends Component { dropdownMatchSelectWidth={false} dropdownClassName="overlihide" onSearch={(e)=>this.changePullValue(e,"merge")} + filterOption={(input,option)=>option} > {this.renderBrances(mergeBranches)} From 68f209272c7181cd5d6dd47b10da787a182c97c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= Date: Thu, 5 May 2022 14:47:03 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=80=E6=BA=90?= =?UTF-8?q?=E5=A4=8F=E4=BB=A4=E8=90=A5=E5=B8=AE=E5=8A=A9=E4=B8=AD=E5=BF=83?= =?UTF-8?q?wiki=E4=BB=93=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/glcc/help/index.jsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/glcc/help/index.jsx b/src/glcc/help/index.jsx index f135501e..9a9d3aa8 100644 --- a/src/glcc/help/index.jsx +++ b/src/glcc/help/index.jsx @@ -14,9 +14,9 @@ function Help(props) { // 获取仓库wiki列表 useEffect(()=>{ wikiPages({ - owner: locationStatus ? 'GLCC' : 'forgetest2', - repo: locationStatus ? 'glcc2022' : 'wiki1', - projectId: locationStatus ? '1403785' : '546103' + owner: locationStatus ? 'CCF-GLCC' : 'forgetest2', + repo: locationStatus ? 'glcc-help' : 'wiki1', + projectId: locationStatus ? '1403908' : '546103' }).then(res => { if (res && res.message === "200" && Array.isArray(res.data)) { setFileArrInit(res.data); @@ -32,10 +32,10 @@ function Help(props) { // 获取选择wiki详情 useEffect(() => { checkItem.name && getWiki({ - owner: locationStatus ? 'GLCC' : 'forgetest2', - repo: locationStatus ? 'glcc2022' : 'wiki1', + owner: locationStatus ? 'CCF-GLCC' : 'forgetest2', + repo: locationStatus ? 'glcc-help' : 'wiki1', pagename: checkItem.name, - projectId: locationStatus ? '1403785' : '546103' + projectId: locationStatus ? '1403908' : '546103' }).then(res => { if (res && res.message === "200") { setItemDetail(res.data); From 872ca88ae8e934bbafe996fa6a4710ce1ea7a6fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= Date: Thu, 5 May 2022 15:50:17 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E5=BC=80=E6=BA=90=E5=A4=8F=E4=BB=A4?= =?UTF-8?q?=E8=90=A5=E5=B8=AE=E5=8A=A9=E4=B8=AD=E5=BF=83=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E9=99=90=E5=88=B6=E6=9C=80=E5=A4=A7=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/glcc/help/index.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/glcc/help/index.scss b/src/glcc/help/index.scss index d25e1669..7522fc05 100644 --- a/src/glcc/help/index.scss +++ b/src/glcc/help/index.scss @@ -31,5 +31,8 @@ width: 100%; top: 0; } + div img{ + max-width: 100%; + } } } \ No newline at end of file From 7fd94060db6bd0d037f274c8f80645699a013484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= Date: Thu, 5 May 2022 17:34:49 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9Wiki=E9=AB=98=E5=BA=A6?= =?UTF-8?q?=E5=8F=8A=E8=A7=86=E9=A2=91=E7=AD=89=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Upload/attachment.js | 2 +- src/forge/Wiki/Index.scss | 2 +- src/home/Footnav.jsx | 2 +- src/home/Index.jsx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/forge/Upload/attachment.js b/src/forge/Upload/attachment.js index 677b48ee..fe21fbc1 100644 --- a/src/forge/Upload/attachment.js +++ b/src/forge/Upload/attachment.js @@ -52,7 +52,7 @@ class Attachment extends Component { show_video: status === "preview", video_url: status === "preview" - ? "https://forgeplus.trustie.net" + result.data.url + ? "https://www.gitlink.org.cn" + result.data.url : undefined, move_spin: false, }); diff --git a/src/forge/Wiki/Index.scss b/src/forge/Wiki/Index.scss index e40de299..9a54795f 100644 --- a/src/forge/Wiki/Index.scss +++ b/src/forge/Wiki/Index.scss @@ -10,7 +10,7 @@ body { .wiki-main { width: 1200px; min-height: 400px; - margin: 20px auto; + margin: 20px auto 60px; .ant-btn-primary { background-color: $wikiColor; diff --git a/src/home/Footnav.jsx b/src/home/Footnav.jsx index b3940405..dd79f412 100644 --- a/src/home/Footnav.jsx +++ b/src/home/Footnav.jsx @@ -19,7 +19,7 @@ function Footnav() {