-
{
projectsType && projectsType === "mirror" &&
}
{
@@ -406,10 +440,32 @@ class Index extends Component {
需要授权验证
- 如果导入项目为私有仓库，则必须填写相应平台正确的用户名和密码
+
+ 如果导入项目为私有仓库，{gitHubUrl ? `则需输入目标平台用户token进行授权，`:"则必须填写相应平台正确的用户名和密码"}
+ {gitHubUrl && 如何获取token？}
+
{
- mirrorCheck &&
+ mirrorCheck && gitHubUrl &&
+
+ Token
+
+
+ {getFieldDecorator('auth_token')(
+
+ )}
+
+
+ { checkToken === false && }
+ { checkToken === true && }
+
+
+ }
+ {
+ mirrorCheck && !gitHubUrl &&
用户名
@@ -447,19 +503,26 @@ class Index extends Component {
{getFieldDecorator('user_id', {
rules: [{
required: true, message: '请选择拥有者'
- },{
- validator:(rule, value, callback) => this.checkId(rule, value, callback, OwnerList, '拥有者')
}],
})(
-
this.ChangePlatform(value, e, 'owners', OwnerList)}
className="plateAutoComplete"
- onBlur={(value) => this.blurCategory(value, OwnerList, "owners")}
+ optionFilterProp="children"
+ filterOption={(input, option) =>
+ option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+ }
>
- {owners_list}
-
+ {OwnerList && OwnerList.length > 0 &&
+ OwnerList.map((i,k)=>{
+ return(
+
+ )
+ })
+ }
+
)}
/
@@ -681,4 +744,6 @@ class Index extends Component {
}
}
const WrappedIndexForm = Form.create({ name: 'NewWorkForm' })(Index);
-export default WrappedIndexForm;
\ No newline at end of file
+export default WrappedIndexForm;
+
+
diff --git a/src/forge/New/new.scss b/src/forge/New/new.scss
index 15aca70b2..8432cecdf 100644
--- a/src/forge/New/new.scss
+++ b/src/forge/New/new.scss
@@ -11,6 +11,12 @@
font-size: 1.6em;
border-bottom: 1px solid #f0f0f0
}
+.token_box{
+ align-items: center;
+}
+.token_box .ant-form-explain{
+ position: absolute;
+}
.newPanel_content{
padding:2rem;
}
@@ -25,7 +31,7 @@
min-width: 280px;
}
.newPanel_content .ant-select-selection{
- height: 37px;
+ height: 35px;
}
.newPanel_content .ant-select-selection__rendered,.newPanel_content input{
height: 35px;
diff --git a/src/forge/Newfile/m_editor.js b/src/forge/Newfile/m_editor.js
index 125d7c362..ae2ad19be 100644
--- a/src/forge/Newfile/m_editor.js
+++ b/src/forge/Newfile/m_editor.js
@@ -34,7 +34,6 @@ class m_editor extends Component {
render() {
const { editorValue, changeValue } = this.state;
- console.log("editorValue:",editorValue)
const { readOnly, editorType,onEmpty,filename,empty, currentBranch, descName, checkName, detail, match: { params },filepath,ideTheme } = this.props;
const editor_options = {
lineNumbers: "on",
diff --git a/src/forge/SecuritySetting/Index.jsx b/src/forge/SecuritySetting/Index.jsx
index c20196954..beb45b42f 100644
--- a/src/forge/SecuritySetting/Index.jsx
+++ b/src/forge/SecuritySetting/Index.jsx
@@ -25,7 +25,10 @@ const NoticeManager = Loadable({
loader: () => import("./notice/manager/Index"),
loading: Loading,
});
-
+const CLAList = Loadable({
+ loader: () => import("./cla/Index"),
+ loading: Loading,
+});
const SSHNew = Loadable({
loader: () => import("./sub/New"),
loading: Loading,
@@ -116,6 +119,7 @@ function Index(props){
- 安全设置
- -1 ?"active":""}>SSH密钥
+ - -1 ?"active":""}>我的CLA
- Bot开发
@@ -138,6 +142,12 @@ function Index(props){
)}
>
+ (
+
+ )}
+ >
(
diff --git a/src/forge/SecuritySetting/cla/DeleteBox.jsx b/src/forge/SecuritySetting/cla/DeleteBox.jsx
new file mode 100644
index 000000000..d6ae99032
--- /dev/null
+++ b/src/forge/SecuritySetting/cla/DeleteBox.jsx
@@ -0,0 +1,27 @@
+import React from 'react';
+import { AlignCenter } from '../../Component/layout';
+import Modals from '../../Component/PublicModal/Index';
+import { Button } from 'antd';
+
+function DeleteBox({visible , onCancel,onSuccess,pr_need}){
+ return(
+
+
+
+
+ }
+ >
+
+
+ 确定解除协议吗？
+ { pr_need &&
您解除协议后，提交的合并请求对项目成员将不再可见（已存在的开启的合并请求也将被隐藏）
}
+
+
+ )
+}
+export default DeleteBox;
\ No newline at end of file
diff --git a/src/forge/SecuritySetting/cla/Index.jsx b/src/forge/SecuritySetting/cla/Index.jsx
new file mode 100644
index 000000000..7a98fa6c1
--- /dev/null
+++ b/src/forge/SecuritySetting/cla/Index.jsx
@@ -0,0 +1,87 @@
+import React,{useEffect,useState} from 'react';
+import './index.scss';
+import logo from '../img/icon.svg';
+import { Link } from 'react-router-dom';
+import { Button , Spin } from 'antd';
+import Nodata from '../../Nodata';
+import DeleteBox from './DeleteBox';
+import axios from 'axios';
+
+function Index(props){
+ const { current_user } = props;
+ const[ lists, setLists] = useState(undefined);
+ const[ isSpin, setIsSpin] = useState(false);
+ const [ visible , setVisible ] = useState(false);
+ const [ cancelKey , setCancelKey ] = useState(undefined);
+ const [ pr_need , setPr_need ] = useState(true);
+ useEffect(()=>{
+ document.title = "我的CLA";
+ },[])
+
+ useEffect(()=>{
+ if(current_user && current_user.user_id){
+ setIsSpin(true);
+ getClaLists();
+ }
+ },[current_user])
+
+ function getClaLists(){
+ const url = `/users/${current_user.user_id}/clas.json`;
+ axios.get(url).then(response=>{
+ if(response && response.data){
+ setLists(response.data.user_clas);
+ setIsSpin(false);
+ }
+ }).catch(error=>{})
+ }
+
+ function onSuccess(){
+ if(cancelKey && (current_user && current_user.user_id)){
+ const url = `/users/${current_user && current_user.user_id}/clas/${cancelKey}.json`;
+ axios.delete(url).then(response=>{
+ if(response){
+ setVisible(false);
+ props.showNotification("协议解除成功！");
+ getClaLists();
+ }
+ }).catch(error=>{})
+ }
+ }
+ return(
+
+
{setVisible(false);setCancelKey(undefined)}} onSuccess={onSuccess}/>
+ 我签署的CLA（开源贡献者协议）
+ {
+ lists && lists.length>0 &&
+
+ {
+ lists.map((i,k)=>{
+ return(
+ -
+
+
+
{i.cla && i.cla.name}
+ {i.state &&
签署状态{i.state === "signed" ? "生效中" : "已解除"} }
+
签署邮箱{i.email}
+
签署时间{i.created_at}
+
+
+ { i.state === "signed" && }
+
+
+ )
+ })
+ }
+
+ }
+ {
+ lists && lists.length === 0 &&
+ }
+ {
+ !lists &&
+ }
+
+ )
+}
+export default Index;
\ No newline at end of file
diff --git a/src/forge/SecuritySetting/cla/index.scss b/src/forge/SecuritySetting/cla/index.scss
new file mode 100644
index 000000000..a6f66a78f
--- /dev/null
+++ b/src/forge/SecuritySetting/cla/index.scss
@@ -0,0 +1,75 @@
+.default_head{
+ height: 65px;
+ line-height: 64px;
+ border-bottom: 1px solid rgba(224, 230, 245, 1);
+ color:#151d40;
+ font-size:17px;
+ padding-bottom:20px;
+}
+.cla_lists{
+ display: flex;
+ flex-wrap: wrap;
+ li{
+ width: 478px;
+ margin-right: 26px;
+ border:1px solid;
+ border-color:rgba(153, 153, 153, 0.3);
+ border-radius:6px;
+ padding:30px 26px;
+ box-sizing: border-box;
+ display: flex;
+ align-items: flex-start;
+ margin-top: 25px;
+ &>img{
+ width: 65px;
+ margin-right: 20px;
+ }
+ &>div{
+ flex:1;
+ width: 0;
+ display: flex;
+ flex-direction: column;
+ &>span{
+ color:rgba(76, 88, 118, 1);
+ height: 20px;
+ line-height: 20px;
+ margin-bottom: 10px!important;
+ }
+ .agree_status{
+ >span{
+ margin-left: 20px;
+ position: relative;
+ color:#8a94a2 ;
+ &::before{
+ position: absolute;
+ height: 6px;
+ width: 6px;
+ border-radius: 50%;
+ left: -11px;
+ content: "";
+ background-color: #8a94a2;
+ top:50%;
+ margin-top: -3px;
+ }
+ &.green_tip{
+ color: #009b28;
+ }
+ &.green_tip::before{
+ background-color: #009b28;
+ }
+ }
+ }
+ .agree_name{
+ color:#151d40;
+ font-size:16px;
+ margin-bottom: 10px;
+ display: block;
+ height: 22px;
+ line-height: 22px;
+ }
+ }
+ &:nth-child(2n){
+ margin-right: 0px;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/forge/SecuritySetting/img/cla-logo.png b/src/forge/SecuritySetting/img/cla-logo.png
new file mode 100644
index 000000000..d9a35de0b
Binary files /dev/null and b/src/forge/SecuritySetting/img/cla-logo.png differ
diff --git a/src/forge/SecuritySetting/img/icon.svg b/src/forge/SecuritySetting/img/icon.svg
new file mode 100644
index 000000000..121d52f4d
--- /dev/null
+++ b/src/forge/SecuritySetting/img/icon.svg
@@ -0,0 +1,13 @@
+
diff --git a/src/forge/Team/Index.jsx b/src/forge/Team/Index.jsx
index 6d9ade0a1..81266ca64 100644
--- a/src/forge/Team/Index.jsx
+++ b/src/forge/Team/Index.jsx
@@ -14,6 +14,10 @@ const GroupNew = Loadable({
loader: () => import("./Group/GroupNew"),
loading: Loading,
});
+const CLAinfos = Loadable({
+ loader: () => import("./Setting/cla/CLAinfos"),
+ loading: Loading,
+});
const New = Loadable({
loader: () => import("./New"),
loading: Loading,
@@ -40,6 +44,13 @@ export default withRouter(CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(
return (
+ {/* 协议详情+签署协议 */}
+ (
+
+ )}
+ >
{/* 新建组织 */}
}}
>
-
{/* 组织详情（包含组织设置） */}
{
if(result && result.data){
showNotification("组织创建成功！");
@@ -121,7 +121,7 @@ export default Form.create()(
[],
,false
)}
- {helper(
+ {/* {helper(
'可见性',
"visibility",
[{ required: true, message: "请选择可见性" }],
@@ -130,7 +130,7 @@ export default Form.create()(
受限（仅对登录用户可见）
私有（仅对组织成员可见）
- )}
+ )} */}
选择头像
diff --git a/src/forge/Team/RightBox.jsx b/src/forge/Team/RightBox.jsx
index 4e75fe666..6a05d6214 100644
--- a/src/forge/Team/RightBox.jsx
+++ b/src/forge/Team/RightBox.jsx
@@ -27,6 +27,10 @@ const ListName = styled.div`{
margin-bottom:8px;
height:18px;
line-height:18px;
+ width:210px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}`;
const ColorListName = styled.div`{
color:rgba(31, 35, 41, 1);
@@ -34,6 +38,10 @@ const ColorListName = styled.div`{
margin-bottom:8px;
height:18px;
line-height:18px;
+ width:230px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}`
const Img = styled.img`{
border-radius:50%;
diff --git a/src/forge/Team/Setting/TeamSettingCommon.jsx b/src/forge/Team/Setting/TeamSettingCommon.jsx
index 6cd649626..d1ff67c0f 100644
--- a/src/forge/Team/Setting/TeamSettingCommon.jsx
+++ b/src/forge/Team/Setting/TeamSettingCommon.jsx
@@ -58,7 +58,7 @@ export default Form.create()(
if(!error){
const url = `/organizations/${organizeDetail.id}.json`;
axios.patch(url,{
- ...values,image:imageFlag ? image : undefined
+ ...values,image:imageFlag ? image : undefined,visibility:"common"
}).then(result=>{
if(result && result.data){
showNotification("组织信息更新成功！");
@@ -122,7 +122,7 @@ export default Form.create()(
})
}
return(
-
+
基本设置
setPrivacyVisible(false)}>
@@ -172,7 +172,7 @@ export default Form.create()(
[],
)}
- {helper(
+ {/* {helper(
'可见性：',
"visibility",
[],
@@ -181,7 +181,7 @@ export default Form.create()(
受限（仅对登录用户可见）
私有（仅对组织成员可见）
- )}
+ )} */}
{helper(
'权限：',
"repo_admin_change_team_access",
diff --git a/src/forge/Team/Setting/TeamSettingGroup.jsx b/src/forge/Team/Setting/TeamSettingGroup.jsx
index 8ebdb4af3..15a9ff247 100644
--- a/src/forge/Team/Setting/TeamSettingGroup.jsx
+++ b/src/forge/Team/Setting/TeamSettingGroup.jsx
@@ -5,7 +5,7 @@ import GroupItems from '../TeamGroupItems';
const limit = 8;
function TeamSettingGroup({organizeDetail,history,current_user}){
return(
-
+
组织团队管理
diff --git a/src/forge/Team/Setting/TeamSettingIndex.jsx b/src/forge/Team/Setting/TeamSettingIndex.jsx
index b5f4f368c..91db1156b 100644
--- a/src/forge/Team/Setting/TeamSettingIndex.jsx
+++ b/src/forge/Team/Setting/TeamSettingIndex.jsx
@@ -2,10 +2,12 @@ import React , { useEffect , useState } from 'react';
import { Box , Long , Short , Gap } from '../../Component/layout';
import Title from '../../Component/Title';
import Setnav from '../../Component/Setnav';
+import './teamSetting.scss';
import { Route, Switch } from "react-router-dom";
import Loadable from "react-loadable";
import Loading from "../../../Loading";
+import claIcon from '../images/cla-icon.png';
const Group = Loadable({
@@ -28,11 +30,18 @@ const Hooks = Loadable({
loader: () => import("./TeamSettingHooks"),
loading: Loading,
});
+const CLA = Loadable({
+ loader: () => import("./cla/TeamSettingCLA"),
+ loading: Loading,
+});
+const CLANew = Loadable({
+ loader: () => import("./cla/TeamSettingCLAEdit"),
+ loading: Loading,
+});
export default (( props )=>{
const pathname = props.location.pathname;
const OIdentifier = props.match.params.OIdentifier;
const {organizeDetail} = props;
-
useEffect(()=>{
if(organizeDetail){
const {nickname} = organizeDetail;
@@ -48,7 +57,9 @@ export default (( props )=>{
a = 1;
}else if(pathname === `/${OIdentifier}/setting/group`){
a = 3;
- }else if(pathname === `/${OIdentifier}/setting/hooks`){
+ // }else if(pathname === `/${OIdentifier}/setting/hooks`){
+ // a = 4;
+ }else if(pathname.indexOf(`/${OIdentifier}/setting/agreement`)>-1){
a = 4;
}
return a;
@@ -60,6 +71,7 @@ export default (( props )=>{
{name:'组织成员管理',icon:"icon-zuzhichengyuan",href:`/${OIdentifier}/setting/member`},
{name:'组织团队管理',icon:"icon-zuzhixiangmu",href:`/${OIdentifier}/setting/group`},
// {name:'管理web钩子',icon:"icon-zhongqingdianxinicon10",href:`/${OIdentifier}/setting/hooks`}
+ {name:'CLA管理',img:claIcon,href:`/${OIdentifier}/setting/agreement`,hide:organizeDetail && !organizeDetail.enabling_cla}
],
active
}
@@ -70,8 +82,29 @@ export default (( props )=>{
-
+
+ {organizeDetail && organizeDetail.enabling_cla &&
+ (
+
+ )}
+ >
+ }
+ {organizeDetail && organizeDetail.enabling_cla && (
+
+ )}
+ >}
+ {organizeDetail && organizeDetail.enabling_cla && (
+
+ )}
+ >
+ }
(
diff --git a/src/forge/Team/Setting/TeamSettingMember.jsx b/src/forge/Team/Setting/TeamSettingMember.jsx
index 9124390f6..1b83b7b4f 100644
--- a/src/forge/Team/Setting/TeamSettingMember.jsx
+++ b/src/forge/Team/Setting/TeamSettingMember.jsx
@@ -111,7 +111,7 @@ export default (({organizeDetail,history,match})=>{
}).catch(error=>{})
}
return(
-
+
<span>组织成员管理</span>
{/* <AlignCenter>
diff --git a/src/forge/Team/Setting/TeamSettingPage.jsx b/src/forge/Team/Setting/TeamSettingPage.jsx
index b2600d16f..9246a1a95 100644
--- a/src/forge/Team/Setting/TeamSettingPage.jsx
+++ b/src/forge/Team/Setting/TeamSettingPage.jsx
@@ -51,7 +51,7 @@ export default Form.create()(forwardRef((props)=>{
})
}
return(
- <div>
+ <div style={{border:"1px solid #eee"}}>
<Title>
<span>组织首页管理</span>
diff --git a/src/forge/Team/Setting/cla/CLAinfos.jsx b/src/forge/Team/Setting/cla/CLAinfos.jsx
new file mode 100644
index 000000000..3896f0cf2
--- /dev/null
+++ b/src/forge/Team/Setting/cla/CLAinfos.jsx
@@ -0,0 +1,114 @@
+import React,{ forwardRef, useState , useEffect } from 'react';
+import '../teamSetting.scss';
+import RenderHtml from '../../../../components/render-html';
+import { Button , Form , Input , Spin } from 'antd';
+import { getImageUrl } from 'educoder';
+import axios from 'axios';
+
+
+function CLAinfos(props){
+ const { form , current_user , showLoginDialog } = props;
+ const { getFieldDecorator , validateFields , setFieldsValue , getFieldsValue} = form;
+
+ const OIdentifier = props.match.params.OIdentifier;
+ const claid = props.match.params.claid;
+
+ const [ details, setDetails ] = useState(undefined);
+
+ useEffect(()=>{
+ if(current_user && current_user.email){
+ setFieldsValue({
+ email:current_user.email
+ })
+ }
+ },[current_user,details])
+
+ useEffect(()=>{
+ if(current_user &&!current_user.login){
+ props.history.push(`/login?go_page=/${OIdentifier}/cla/${claid}`);
+ }
+ },[current_user])
+
+ useEffect(()=>{
+ if(claid){
+ getDetails();
+ }
+ },[claid])
+
+ function getDetails(){
+ const url = `/organizations/${OIdentifier}/clas/${claid}.json`;
+ axios.get(url).then(response=>{
+ if(response && response.data){
+ setDetails(response.data);
+ document.title = `${response.data.name}`;
+ }
+ }).catch(error=>{})
+ }
+
+ function agreeFunc(){
+ validateFields((error,values)=>{
+ if(!error){
+ const url = `/users/${current_user && current_user.user_id}/clas.json`;
+ axios.post(url,{
+ ...values,
+ cla_id:details && details.id,
+ email:(current_user && current_user.email) || values.email
+ }).then(response=>{
+ if(response && response.data){
+ props.showNotification('协议签署成功！');
+ window.scrollTo(0,0);
+ getDetails();
+ }
+ }).catch(error=>{})
+ }
+ })
+ }
+
+ return(
+ details ?
+
+
+
+
+
+
{details.name}
+
{details.organization && details.organization.nickname}
+ {details.is_sign && details.cla_sign_email &&
签署邮箱{details.cla_sign_email}
}
+
+
+
+
+ {details.is_sign &&
您已签署协议，可在“个人设置 > 我的 CLA”中查看和管理本协议
}
+
+ {
+ !details.is_sign && !details.is_member &&
+
+ }
+
+
+ )
+}
+export default Form.create()(forwardRef(CLAinfos))
\ No newline at end of file
diff --git a/src/forge/Team/Setting/cla/TeamSettingCLA.jsx b/src/forge/Team/Setting/cla/TeamSettingCLA.jsx
new file mode 100644
index 000000000..a207f0c81
--- /dev/null
+++ b/src/forge/Team/Setting/cla/TeamSettingCLA.jsx
@@ -0,0 +1,63 @@
+import React,{ useState , useEffect } from 'react';
+import Title from '../../../Component/Title';
+import defaultimg from '../../images/cla-icon-big.png';
+import Logo from '../../images/icon.svg';
+import { Button, Spin } from 'antd';
+import axios from 'axios';
+
+function TeamSettingCLA(props){
+ const OIdentifier = props.match.params.OIdentifier;
+ const [ list , setList ] = useState(undefined);
+ const [ isSpin , setisSpin ] = useState(false);
+
+ useEffect(()=>{
+ if(OIdentifier){
+ setisSpin(true);
+ getList();
+ }
+ },[OIdentifier])
+
+ function getList(){
+ const url = `/organizations/${OIdentifier}/clas.json`;
+ axios.get(url).then(response=>{
+ if(response){
+ let l = {...response.data};
+ setList(l);
+ setisSpin(false);
+ }
+ }).catch(error=>{})
+ }
+
+ return(
+
+
CLA管理
+ {
+ (list && list.id) &&
+
+ -
+
+
+
{list.name}
+
签署人数{list.count || 0}
+
+
+
+
+
+
+ }
+ {
+ (list && !list.id) &&
+
+
+
CLA（ Contributor License Agreement）指开源贡献者许可协议。您可以为本组织配置CLA，当非组织用户作为贡献者在组织仓库提交合并请求之前，需要签署CLA后才可正常提交合并请求
+
+
+ }
+ { list === undefined &&
}
+
+
+ {
+ claid ?
+
<span><Link to={`/${OIdentifier}/setting/agreement`} className="color-blue mr3">CLA管理</Link>><span className="ml2">编辑协议</span></span>
+ :
创建CLA
+ }
+
+
+
课题信息（{index+1}/5)
{index>0 && }
-
+
})}
{taskCount && taskCount.length<5 &&
diff --git a/src/glcc/apply/taskApply.jsx b/src/glcc/apply/taskApply.jsx
index a263f9bd2..86ed6c5f0 100644
--- a/src/glcc/apply/taskApply.jsx
+++ b/src/glcc/apply/taskApply.jsx
@@ -4,7 +4,7 @@ import TextArea from 'antd/lib/input/TextArea';
const Option = Select.Option;
// 课题信息编辑
function TaskApply(props) {
- const {helper, disabled, taskKey, phonereg, emailreg} = props;
+ const {helper, disabled, taskKey, phonereg, emailreg, getFieldDecorator} = props;
// 低、中、高
const difficultyList = [
{id: 1, name: "低"},
@@ -26,6 +26,9 @@ function TaskApply(props) {
return(