diff --git a/src/forge/Component/DeleteModal/Index.jsx b/src/forge/Component/DeleteModal/Index.jsx index c3c136899..f12b8ea86 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/DevOps/About.jsx b/src/forge/DevOps/About.jsx index ec0a7f6d5..4831f73bc 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 ? diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index 004c46f21..949f031c6 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}

} diff --git a/src/forge/Main/Index.js b/src/forge/Main/Index.js index c9419b83c..25b710b20 100644 --- a/src/forge/Main/Index.js +++ b/src/forge/Main/Index.js @@ -255,7 +255,7 @@ class Index extends Component { 更新时间排序 创建时间排序 - fork数据排序 + fork数量排序 点赞数量排序 ) diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js index 6b9611f29..1dcc80bde 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 @@ -220,9 +222,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 +282,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 +345,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 +384,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 +562,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 +676,7 @@ class order extends Component { />
+ 清除筛选条件 @@ -199,7 +199,7 @@ function New({ form , match , showNotification , history }) { } ] })( - + )} @@ -260,7 +260,7 @@ function New({ form , match , showNotification , history }) { */} 创建 - 删除分支或标签 + 创建分支或标签 删除 diff --git a/src/forge/Team/Setting/TeamSettingCommon.jsx b/src/forge/Team/Setting/TeamSettingCommon.jsx index 6e98183f8..3e0389e36 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(
@@ -176,11 +178,11 @@ export default Form.create()( '最大仓库数：', "max_repo_creation", [], - ,false,false, + ,false,false, "当输入栏为空时，默认数量无限制" )}

选择头像:

- +
diff --git a/src/forge/Team/TeamMember.jsx b/src/forge/Team/TeamMember.jsx index d21d514f3..7bffb65d2 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); @@ -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)}/>
} diff --git a/src/forge/users/InfosUser.js b/src/forge/users/InfosUser.js index fff3685e7..4a5c7d9bc 100644 --- a/src/forge/users/InfosUser.js +++ b/src/forge/users/InfosUser.js @@ -108,7 +108,7 @@ class InfosUser extends Component { 更新时间排序 创建时间排序 - fork数据排序 + fork数量排序 点赞数量排序 ); diff --git a/src/forge/users/Statistics/Index.jsx b/src/forge/users/Statistics/Index.jsx index 3e91cedb3..21d6d0bd0 100644 --- a/src/forge/users/Statistics/Index.jsx +++ b/src/forge/users/Statistics/Index.jsx @@ -202,7 +202,7 @@ function Index(props) {

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

{ - cloudData && cloudData.categories && cloudData.categories.length >0 ? + cloudData && cloudData.categories && cloudData.categories.length > 0? : diff --git a/src/modules/loginRegister/LoginRegisterPage.jsx b/src/modules/loginRegister/LoginRegisterPage.jsx index 200aba0b1..788bbf40c 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 000000000..35501c2ba --- /dev/null +++ b/src/modules/loginRegister/img/logo.svg @@ -0,0 +1,15 @@ + + + + + + + + +