From 0e643287f9c8438eea8f7f07f17fab38670cdc5a Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 21 Jan 2022 15:29:14 +0800 Subject: [PATCH 01/12] =?UTF-8?q?issue=E5=88=97=E8=A1=A8=EF=BC=9A=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E6=B8=85=E9=99=A4=E6=8C=89=E9=92=AE=E3=80=81=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E6=97=B6=E6=B8=85=E9=99=A4=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Order/order.js | 65 ++++++++++++++++++++++++++++++++-------- 1 file changed, 53 insertions(+), 12 deletions(-) diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js index 19babaab..5728872b 100644 --- a/src/forge/Order/order.js +++ b/src/forge/Order/order.js @@ -220,9 +220,6 @@ class order extends Component { const { status_type } = this.state; this.getIssueList(status_type); }) - // this.state.select_params.order_name = key_name[0]; - // this.state.select_params.order_type = e.item.props.value; - // this.state.select_params.page = 1; }; getOption = (e, id, name, toGet) => { @@ -283,15 +280,15 @@ class order extends Component { // 翻页 ChangePage = (page) => { window.scrollTo(0,0); + const { status_type } = this.state; this.setState({ isSpin: true, checkedValue: [], - all: false + all: false, + },()=>{ + this.state.select_params.page=page; + this.getIssueList(status_type); }); - - const { status_type } = this.state; - this.state.select_params.page = page; - this.getIssueList(status_type); }; // 搜索 @@ -346,12 +343,12 @@ class order extends Component { ChangeAssign = (type) => { const { current_user } = this.props; this.setState({ - isSpin: true, + isSpin: true }); if (type) { if (!current_user) { this.setState({ - isSpin: false, + isSpin: false }); return; } @@ -385,7 +382,7 @@ class order extends Component { this.state.select_params.author_id = undefined; } const { status_type } = this.state; - + this.state.select_params.page = 1; this.getIssueList(status_type); }; @@ -563,6 +560,49 @@ class order extends Component { } }) } + + clearSelectParams=()=>{ + this.setState({ + status_type: "1", // 默认显示开启中的 + issue_tag_ids: "标记", + tracker_ids: "类型", + author_ids: "发布人", + assigned_to_ids: "负责人", + fixed_version_ids: "里程碑", + status_ids: "状态", + done_ratios: "完成度", + paix: "排序", + update_author_ids: "更换负责人", + update_fixed_version_ids: '更换里程碑', + update_status_ids: "修改状态", + begin: '', + end: '', + checkedValue: [], + allValue: [], + all: false, + search:undefined, + select_params: { + assigned_to_id: undefined, // 负责人 + author_id: undefined, // 发布人 + issue_tag_id: undefined, // 标记 + tracker_id: undefined, //类型 + done_ratio: undefined, // 完成度 + status_id: undefined, // 优先级 + fixed_version_id: undefined,//里程碑 + order_name: undefined, + order_type: undefined, + search: undefined, + update_author_id: undefined, + update_fixed_version_id: undefined, + update_status_id: undefined, + page: 1, + limit: 15, + } + },()=>{ + this.getIssueList("1"); + }) + } + menu =()=> ( this.getMenu(e)}> @@ -634,6 +674,7 @@ class order extends Component { />
+ 清除筛选条件 Date: Mon, 24 Jan 2022 15:57:11 +0800 Subject: [PATCH 02/12] cursor --- src/forge/Main/CoderDepot.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index 004c46f2..949f031c 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -533,7 +533,7 @@ function CoderDepot(props){ 关于 { projectDetail.permission && (projectDetail.permission==="Admin" || projectDetail.permission==="Owner" || projectDetail.permission==="Manager") && - setOpenModal(true)} className="iconfont icon-a-shezhi color-grey-9 font-15"> + setOpenModal(true)} className="iconfont icon-a-shezhi color-grey-9 font-15 pointer"> } {desc &&

{desc}

} From 5e337cb94f701bc2ccac524fa642e53f7f1902b9 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Wed, 26 Jan 2022 11:35:36 +0800 Subject: [PATCH 03/12] =?UTF-8?q?issue=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E6=97=B6=E5=85=B6=E5=AE=83=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=B8=8D=E8=B5=B7=E4=BD=9C=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Order/order.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js index 5728872b..f698f3be 100644 --- a/src/forge/Order/order.js +++ b/src/forge/Order/order.js @@ -210,8 +210,10 @@ class order extends Component { }); } } + const { select_params } = this.state; this.setState({ select_params:{ + ...select_params, order_name:key_name[0], order_type:e.item.props.value, page:1 From d8384ab4bdcec926f54cfda906b8b7d57e6aa44c Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Thu, 10 Feb 2022 16:00:54 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E5=BC=95=E6=93=8E-=E6=9D=83=E9=99=90-?= =?UTF-8?q?=E9=9D=9E=E6=8A=A5=E5=91=8A=E8=80=85=E5=8D=B3=E5=8F=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/DevOps/About.jsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/forge/DevOps/About.jsx b/src/forge/DevOps/About.jsx index ec0a7f6d..4831f73b 100644 --- a/src/forge/DevOps/About.jsx +++ b/src/forge/DevOps/About.jsx @@ -36,15 +36,15 @@ function About(props, ref) { const [ disabled, setDisabled ] = useState(false); const [ typeFlag, setTypeFlag] = useState(false); - const AuthorLogin = props.projectDetail && props.projectDetail.author && props.projectDetail.author.login; + const isPermission = props.projectDetail && props.projectDetail.permission && props.projectDetail.permission!=="Reporter"; const CurrentLogin = props.current_user && props.current_user.login; useEffect(()=>{ - if(CurrentLogin === AuthorLogin){ + if(isPermission){ auth('get'); }else{ setIsSpining(false); } - },[AuthorLogin,CurrentLogin]) + },[isPermission,CurrentLogin]) function auth(type){ const url = `/${owner}/${projectsId}/ci_authorize.json`; @@ -167,7 +167,7 @@ function About(props, ref) {

定义DevOps工作流，帮助您检测bug、发布代码…

{ - CurrentLogin !== AuthorLogin ? + !isPermission ?
DevOps开启功能暂未对项目创建者以外的角色开放，可以联系项目创建者进行开启，开启后便可查看构建信息。
:"" } @@ -177,7 +177,7 @@ function About(props, ref) { 如何使用引擎（Engine）功能？ { - AuthorLogin === CurrentLogin ? + isPermission ? { step === 0 && !typeFlag ? From c13c7025dd2c10b12724a6c9f9735b8d258d4f89 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 11 Feb 2022 09:56:06 +0800 Subject: [PATCH 05/12] =?UTF-8?q?webhook-=E6=96=B0=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Settings/Webhooks/New.jsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/forge/Settings/Webhooks/New.jsx b/src/forge/Settings/Webhooks/New.jsx index d05a261e..d6068490 100644 --- a/src/forge/Settings/Webhooks/New.jsx +++ b/src/forge/Settings/Webhooks/New.jsx @@ -180,9 +180,11 @@ function New({ form , match , showNotification , history }) { subTitle={`删除后未来事件将不会推送至此Webhook地址：${data && data.url}`} /> - Webhooks - - {id ? "更新" : "添加"}Webhook + + + Webhooks + + {/* {id ? "更新" : "添加"}Webhook */}

当webhook被触发时，我们将向以下URL发送通知，包括已选择事件的详细信息。更多信息可查阅webhooks指南。

From 9db4f1b18c2a920afbe3da0d5e0647dc840dbcb4 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Wed, 16 Feb 2022 10:37:24 +0800 Subject: [PATCH 06/12] 0216-issue --- src/forge/Component/DeleteModal/Index.jsx | 2 +- src/forge/Settings/Webhooks/New.jsx | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/forge/Component/DeleteModal/Index.jsx b/src/forge/Component/DeleteModal/Index.jsx index c3c13689..f12b8ea8 100644 --- a/src/forge/Component/DeleteModal/Index.jsx +++ b/src/forge/Component/DeleteModal/Index.jsx @@ -25,7 +25,7 @@ function DeleteBox({ >
{content} -

{subTitle}

+

删除后未来事件将不会推送至此Webhook地址：{subTitle}

) diff --git a/src/forge/Settings/Webhooks/New.jsx b/src/forge/Settings/Webhooks/New.jsx index d6068490..fbc6e8c4 100644 --- a/src/forge/Settings/Webhooks/New.jsx +++ b/src/forge/Settings/Webhooks/New.jsx @@ -177,14 +177,14 @@ function New({ form , match , showNotification , history }) { onSuccess={onSuccess} title="删除Webhook" content="您确定要删除此Webhook吗？" - subTitle={`删除后未来事件将不会推送至此Webhook地址：${data && data.url}`} + subTitle={`${data && data.url}`} /> - Webhooks + + {id ? "更新" : "添加"}Webhook - {/* {id ? "更新" : "添加"}Webhook */}

当webhook被触发时，我们将向以下URL发送通知，包括已选择事件的详细信息。更多信息可查阅webhooks指南。

@@ -199,7 +199,7 @@ function New({ form , match , showNotification , history }) { } ] })( - + )} From b82e7d9d691ef074cf2f7e9b779e43734e2c3697 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Tue, 22 Feb 2022 11:39:53 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=88=90=E5=91=98-?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0page=E3=80=81limit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Team/TeamMember.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/forge/Team/TeamMember.jsx b/src/forge/Team/TeamMember.jsx index d21d514f..b76d8eeb 100644 --- a/src/forge/Team/TeamMember.jsx +++ b/src/forge/Team/TeamMember.jsx @@ -24,7 +24,7 @@ function TeamMember({organizeDetail,current_user,history,match}){ setIsSpin(true); const url = `/organizations/${organizeDetail.id}/organization_users.json`; axios.get(url,{ - page,limit + params:{page,limit} }).then(result=>{ if(result && result.data){ setList(result.data.organization_users); @@ -76,7 +76,7 @@ function TeamMember({organizeDetail,current_user,history,match}){ { total >limit &&
- setPage(page)}/> + setPage(p)}/>
} From 9527f6948637c37eb120d238aa1840a1e61521f6 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Thu, 24 Feb 2022 14:22:09 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=88=90=E5=91=98-?= =?UTF-8?q?=E6=AF=8F=E9=A1=B5=E6=9D=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Team/TeamMember.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/forge/Team/TeamMember.jsx b/src/forge/Team/TeamMember.jsx index b76d8eeb..7bffb65d 100644 --- a/src/forge/Team/TeamMember.jsx +++ b/src/forge/Team/TeamMember.jsx @@ -6,7 +6,7 @@ import Nodata from '../Nodata'; import { Pagination , Spin } from 'antd'; import AddMemberBox from './Component/AddMemberBox'; -const limit = 15; +const limit = 16; function TeamMember({organizeDetail,current_user,history,match}){ const OIdentifier = match.params.OIdentifier; const [ page , setPage ] = useState(1); From fb633779968554086d56a6e05e410feeacf190fd Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Wed, 2 Mar 2022 10:27:22 +0800 Subject: [PATCH 09/12] =?UTF-8?q?login=E9=A1=B5=E9=9D=A2logo=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/loginRegister/LoginRegisterPage.jsx | 2 +- src/modules/loginRegister/img/logo.svg | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 src/modules/loginRegister/img/logo.svg diff --git a/src/modules/loginRegister/LoginRegisterPage.jsx b/src/modules/loginRegister/LoginRegisterPage.jsx index 200aba0b..788bbf40 100644 --- a/src/modules/loginRegister/LoginRegisterPage.jsx +++ b/src/modules/loginRegister/LoginRegisterPage.jsx @@ -2,7 +2,7 @@ import React from "react"; import Login from "./Login"; import Register from "./Register"; import ResetPassword from "./ResetPassword"; -import logo from './img/logo.png'; +import logo from './img/logo.svg'; import banner from './img/banner.png'; import ball from './img/ball.png'; import img1 from './img/img1.png'; diff --git a/src/modules/loginRegister/img/logo.svg b/src/modules/loginRegister/img/logo.svg new file mode 100644 index 00000000..35501c2b --- /dev/null +++ b/src/modules/loginRegister/img/logo.svg @@ -0,0 +1,15 @@ + + + + + + + + + From 3ae928449457ee168084622695bb2c5abca6fdc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= Date: Wed, 2 Mar 2022 14:10:23 +0800 Subject: [PATCH 10/12] 0304-issue --- src/forge/Main/Index.js | 2 +- src/forge/Settings/Webhooks/New.jsx | 4 ++-- src/forge/Team/Setting/TeamSettingCommon.jsx | 2 +- src/forge/users/InfosUser.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/forge/Main/Index.js b/src/forge/Main/Index.js index c3268739..48d113d6 100644 --- a/src/forge/Main/Index.js +++ b/src/forge/Main/Index.js @@ -244,7 +244,7 @@ class Index extends Component { 更新时间排序 创建时间排序 - fork数据排序 + fork数量排序 点赞数量排序 ) diff --git a/src/forge/Settings/Webhooks/New.jsx b/src/forge/Settings/Webhooks/New.jsx index fbc6e8c4..2fee3bf0 100644 --- a/src/forge/Settings/Webhooks/New.jsx +++ b/src/forge/Settings/Webhooks/New.jsx @@ -260,11 +260,11 @@ function New({ form , match , showNotification , history }) { */} 创建 - 创建分支或标记 + 创建分支或标签 删除 - 删除分支或标记 + 删除分支或标签

合并请求事件

diff --git a/src/forge/Team/Setting/TeamSettingCommon.jsx b/src/forge/Team/Setting/TeamSettingCommon.jsx index 6e98183f..72f01504 100644 --- a/src/forge/Team/Setting/TeamSettingCommon.jsx +++ b/src/forge/Team/Setting/TeamSettingCommon.jsx @@ -176,7 +176,7 @@ export default Form.create()( '最大仓库数：', "max_repo_creation", [], - ,false,false, + ,false,false, "当输入栏为空时，默认数量无限制" )}

选择头像:

diff --git a/src/forge/users/InfosUser.js b/src/forge/users/InfosUser.js index fff3685e..4a5c7d9b 100644 --- a/src/forge/users/InfosUser.js +++ b/src/forge/users/InfosUser.js @@ -108,7 +108,7 @@ class InfosUser extends Component { 更新时间排序 创建时间排序 - fork数据排序 + fork数量排序 点赞数量排序 ); From 15b2ce6ea96740d2edced74bd6d7c30ff246c8ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <1261960504@qq.com> Date: Wed, 2 Mar 2022 15:10:18 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E5=9B=BE=E7=89=87issue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Team/Setting/TeamSettingCommon.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/forge/Team/Setting/TeamSettingCommon.jsx b/src/forge/Team/Setting/TeamSettingCommon.jsx index 72f01504..3e0389e3 100644 --- a/src/forge/Team/Setting/TeamSettingCommon.jsx +++ b/src/forge/Team/Setting/TeamSettingCommon.jsx @@ -74,6 +74,7 @@ export default Form.create()( function getImage(image){ setImageFlag(true); setImage(image); + console.log(image); } // 删除组织 @@ -107,6 +108,7 @@ export default Form.create()( } callback(); } + return(
@@ -180,7 +182,7 @@ export default Form.create()( "当输入栏为空时，默认数量无限制" )}

选择头像:

- +
From 4264c127d9782d374c666c62930851a352fc597b Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 3 Mar 2022 09:53:27 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1->?= =?UTF-8?q?=E4=B8=93=E4=B8=9A=E5=AE=9A=E4=BD=8D=E4=B8=8D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/users/Statistics/Index.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/forge/users/Statistics/Index.jsx b/src/forge/users/Statistics/Index.jsx index 64986c52..21d6d0bd 100644 --- a/src/forge/users/Statistics/Index.jsx +++ b/src/forge/users/Statistics/Index.jsx @@ -121,7 +121,7 @@ function Index(props) { } }).then(result=>{ if(result && result.data){ - setCloudData({categories:[]}); + setCloudData(result.data || []); } }).catch(error=>{}) } @@ -202,7 +202,7 @@ function Index(props) {

展示你擅长、关注、感兴趣的专业范围，通过你参与项目、收藏项目、关注项目、复刻项目等数据来统计。

{ - cloudData && cloudData.length >0? + cloudData && cloudData.categories && cloudData.categories.length > 0? :