[TOC]
", getTocContent()) cleanToc() } + // 循环匹配所有emoji let matchStr = str.match(strRegexSub); if(matchStr && matchStr.length>0){ for(var i=0;i < matchStr.length;i++){ diff --git a/src/forge/Account/Index.jsx b/src/forge/Account/Index.jsx new file mode 100644 index 000000000..18087d324 --- /dev/null +++ b/src/forge/Account/Index.jsx @@ -0,0 +1,38 @@ +import React , { useState } from 'react'; +import './index.scss'; +import logo from './image/logo.png'; +import { Menu } from 'antd'; +import Bind from './bind'; +import UnBind from './unbind'; + +function Index(props){ + const [ key , setKey ] = useState("0"); + + // 选择menu + function chooseMenuFunc(e){ + setKey(e.key) + } + return( +
+
+ )
+}
+export default Index;
\ No newline at end of file
diff --git a/src/forge/Account/bind.jsx b/src/forge/Account/bind.jsx
new file mode 100644
index 000000000..983c781b2
--- /dev/null
+++ b/src/forge/Account/bind.jsx
@@ -0,0 +1,103 @@
+import React ,{ useState } from 'react';
+import { Form , Input , Button } from 'antd';
+import phone from './image/phone.svg';
+import lock from "./image/lock.png";
+import axios from 'axios';
+import cookie from 'react-cookies';
+
+
+const phonereg = /^([1][3456789])\d{9}$/
+const emailreg = /^[a-zA-Z0-9]+([.\-_\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/
+function Bind(props){
+ const { form } = props;
+
+ const { getFieldDecorator , getFieldsValue } = form;
+ const [ bindFlag , setBindFlag] = useState(true);
+ const type = props.match.params.type;
+ // 绑定登录
+ function bindloginFunc(){
+ const {username, password } = getFieldsValue();
+ if(username && password){
+ var url = '/bind_user.json';
+ axios.post(url,{
+ username,password,type
+ }).then(result=>{
+ if(result && result.data.status === 0){
+ cookie.save("supplyphone",true);
+ cookie.save("login",result.data.login);
+ window.location.href = "/"+result.data.login;
+ }else{
+ props.showNotification(result.data.message);
+ }
+ })
+ }
+ }
+
+ function accountConfirm(r,v,c){
+ if(v){
+ const {password } = getFieldsValue();
+ if(!(phonereg.test(v) || emailreg.test(v))){
+ setBindFlag(true);
+ c(`请输入正确的手机号或邮箱地址`);
+ }else if(password){
+ setBindFlag(false);
+ }
+ }else{
+ c();
+ setBindFlag(true);
+ }
+ }
+ function psdConfirm(r,v,c){
+ if(v){
+ const { username } = getFieldsValue();
+ if(phonereg.test(username) || emailreg.test(username)){
+ setBindFlag(false);
+ }else{
+ setBindFlag(true);
+ }
+ }else{
+ c();
+ setBindFlag(true);
+ }
+ }
+ return(
+
+ 
+
+
+
+ 关联账号
+
+
+ {
+ key === "0" ?
+
+
+
+
+ )
+}
+export default Form.create({ name: 'Bind' })(Bind);
\ No newline at end of file
diff --git a/src/forge/Account/image/lock.png b/src/forge/Account/image/lock.png
new file mode 100644
index 000000000..4d5d27c2f
Binary files /dev/null and b/src/forge/Account/image/lock.png differ
diff --git a/src/forge/Account/image/logo.png b/src/forge/Account/image/logo.png
new file mode 100644
index 000000000..d474b79d2
Binary files /dev/null and b/src/forge/Account/image/logo.png differ
diff --git a/src/forge/Account/image/phone.svg b/src/forge/Account/image/phone.svg
new file mode 100644
index 000000000..a33d110a9
--- /dev/null
+++ b/src/forge/Account/image/phone.svg
@@ -0,0 +1,3 @@
+
diff --git a/src/forge/Account/image/shield.png b/src/forge/Account/image/shield.png
new file mode 100644
index 000000000..475867bf3
Binary files /dev/null and b/src/forge/Account/image/shield.png differ
diff --git a/src/forge/Account/image/user.png b/src/forge/Account/image/user.png
new file mode 100644
index 000000000..4f03d6c71
Binary files /dev/null and b/src/forge/Account/image/user.png differ
diff --git a/src/forge/Account/index.scss b/src/forge/Account/index.scss
new file mode 100644
index 000000000..1c9de9ccd
--- /dev/null
+++ b/src/forge/Account/index.scss
@@ -0,0 +1,85 @@
+.bodies{
+ height: 100vh;
+ width: 100%;
+ background-color: rgba(245, 248, 255, 1);
+ .logo{
+ width: 100%;
+ background-color: #fff;
+ padding:7px 26px;
+ }
+ .content{
+ padding-top: 50px;
+ margin:0px auto;
+ width: 570px;
+ &>p{
+ height:42px;
+ line-height:42px;
+ font-weight:400;
+ color:#000000;
+ font-size:30px;
+ margin-bottom: 32px!important;
+ text-align: center;
+ }
+ .panels{
+ background-color: #fff;
+ border-radius:6.6px;
+ padding:32px 42px;
+ .panelsMenu{
+ border-bottom: none!important;
+ margin-bottom: 36px!important;
+ .ant-menu-item{
+ padding: 0px;
+ margin-right: 60px!important;
+ }
+ }
+ .bind_form{
+ padding-bottom: 48px;
+ .has-error .ant-input:focus,.has-error .ant-input, .has-error .ant-input:hover{
+ border-color: #ff4d4f!important;
+ }
+ .ant-btn-primary[disabled]{
+ background-color:rgba(70, 106, 255,0.55);
+ color: #fff;
+ border:none
+ }
+ .ant-input-group-addon{
+ background-color: transparent;
+ }
+ .ant-input{
+ border-left: none;
+ background-color: #fff!important;
+ }
+ .ant-input:focus,.ant-input:hover{
+ border-right: 1px solid #ddd!important;
+ border-color: #ddd!important;
+ border-left: none!important;
+ }
+ .codeBut{
+ border:1px solid rgba(70, 106, 255, 1)!important;
+ span{
+ color: rgba(70, 106, 255, 1);
+ }
+ }
+ .codeBut.disable{
+ border:1px solid #ddd!important;
+ span{
+ color: #ddd;
+ }
+ }
+ .login_register_head{
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ &>span:first-child{
+ font-size: 1.5em;
+ font-weight: 600;
+ color: #000000;
+ line-height: 1.5;
+ }
+ //注册页面的获取验证码输入框
+ .ant-btn{margin-left: 15px; }
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/forge/Account/unbind.jsx b/src/forge/Account/unbind.jsx
new file mode 100644
index 000000000..84232eaa1
--- /dev/null
+++ b/src/forge/Account/unbind.jsx
@@ -0,0 +1,320 @@
+import React ,{ useState , useRef } from 'react';
+import { Form , Input , Button , message } from 'antd';
+import user from "./image/user.png";
+import lock from "./image/lock.png";
+import shield from './image/shield.png';
+import phone from './image/phone.svg';
+import axios from 'axios';
+import cookie from 'react-cookies';
+import { setmiyah } from 'educoder';
+
+const phonereg = /^([1][3456789])\d{9}$/
+const emailreg = /^[a-zA-Z0-9]+([.\-_\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/
+function Bind(props){
+ const { form } = props;
+ const seconds = useRef();
+ let interval = undefined;
+ const { getFieldDecorator , getFieldsValue } = form;
+ const [ bindFlag , setBindFlag] = useState(true);
+ const [ captchaFlag , setCaptchaFlag ] = useState(true);
+ const [secondsStr, setSecondsStr] = useState(60);
+ const [ getCaptchaBut , setGetCaptchaBut ] = useState(true);
+
+ const type = props.match.params.type;
+
+ //判断用户名（username）是否注册
+ function usernameConfirm(rule, value, callback){
+ value ? axios.post(`/accounts/check.json`, {
+ value: value,
+ type: 1
+ }).then(response => {
+ if(response){
+ if (response.data.status === -1) {
+ callback('该名称已经被使用');
+ } else {
+ const { captcha , password , confirm_password,username} = getFieldsValue();
+ if( captcha && password && confirm_password && (password === confirm_password) &&(phonereg.test(username) || emailreg.test(username)) ){
+ setBindFlag(false);
+ }
+ }
+ }
+ callback();
+ }):callback();
+ }
+
+ function accountConfirm(rule, value, callback){
+ if(value){
+ const { captcha , password , confirm_password,register_username} = getFieldsValue();
+ if(!(phonereg.test(value) || emailreg.test(value))){
+ setCaptchaFlag(true);
+ callback(`请输入正确的手机号或邮箱地址`);
+ }else{
+ axios.get(`/accounts/valid_email_and_phone.json`, {
+ params: {
+ login: value,
+ type: 1
+ }
+ }).then(response => {
+ if(response){
+ if (response.data.status === -2) {
+ callback(response.data.message);
+ } else {
+ setCaptchaFlag(false);
+ if(captcha && password && confirm_password && (password === confirm_password) && register_username){
+ setBindFlag(false);
+ }
+ }
+ callback();
+ }
+ })
+ }
+ }else{
+ setBindFlag(true);
+ callback();
+ }
+ }
+ function psdConfirm(r,v,c){
+ if(!v){
+ setBindFlag(true);
+ c('请输入登录密码');
+ }else if(/(?!.*\s)(?!^[\u4e00-\u9fa5]+$)^.{8,16}$/.test(v)){
+ const { username , captcha , confirm_password , register_username } = getFieldsValue();
+ if(register_username && (phonereg.test(username) || emailreg.test(username)) && captcha && confirm_password && (v=== confirm_password) ){
+ setBindFlag(false);
+ }else{
+ setBindFlag(true);
+ }
+ c()
+ }else{
+ if(v.length<8 || v.length>16){
+ setBindFlag(true);
+ c('密码长度为8-16个字符');
+ }else{
+ setBindFlag(true);
+ c('密码不能使用空格');
+ }
+ }
+ }
+ function captchaConfirm(r,v,c){
+ if(v){
+ const { username , password , confirm_password , register_username } = getFieldsValue();
+ if(register_username && (phonereg.test(username) || emailreg.test(username)) && password && confirm_password && (password ===confirm_password) ){
+ setBindFlag(false);
+ }else{
+ setBindFlag(true);
+ }
+ c();
+ }else{
+ c();
+ setBindFlag(true);
+ }
+ }
+ function repsdConfirm(r,v,c){
+ if(!v){
+ setBindFlag(true);
+ c("请重复输入登录密码");
+ }else if(/(?!.*\s)(?!^[\u4e00-\u9fa5]+$)^.{8,16}$/.test(v)){
+ const { username , password , register_username , captcha} = getFieldsValue();
+ if(v !== password){
+ c("两次输入的密码不一样");
+ }else if((phonereg.test(username) || emailreg.test(username)) && password && register_username && captcha){
+ setBindFlag(false);
+ }else{
+ setBindFlag(true);
+ }
+ c();
+ }else{
+ if(v.length<8 || v.length>16){
+ setBindFlag(true);
+ c('密码长度为8-16个字符');
+ }else{
+ setBindFlag(true);
+ c('密码不能使用空格');
+ }
+ }
+ if(v){
+ const { username , password , register_username , captcha} = getFieldsValue();
+ if(v !== password){
+ c("两次输入的密码不一样");
+ }else{
+ c();
+ }
+ if((phonereg.test(username) || emailreg.test(username)) && password && register_username && captcha){
+ setBindFlag(false);
+ }else{
+ setBindFlag(true);
+ }
+ c();
+ }else{
+ c();
+ }
+ }
+
+ //获取验证码
+ function getCaptcha() {
+ const { username }= getFieldsValue();
+ if (username) {
+ // 倒计时开始
+ setCaptchaFlag(true);
+ setGetCaptchaBut(false);
+ seconds.current = 60;
+ setSecondsStr(60);
+ !interval && clearInterval(interval);
+ interval = setInterval(() => {
+ if (seconds.current > 1) {
+ let oldSeconds = seconds.current;
+ seconds.current = oldSeconds - 1;
+ setSecondsStr(oldSeconds - 1);
+ } else {
+ clearInterval(interval);
+ //倒计时结束->可以获取验证码
+ setCaptchaFlag(false);
+ setGetCaptchaBut(true);
+ }
+ }, 1000)
+
+ //请求获取验证码接口
+ axios.get(`/accounts/get_verification_code.json`, {
+ params: {
+ login: username,
+ type: 1,
+ smscode: setmiyah(username),
+ }
+ }).then(response => {
+ if (response.data && response.data.status === 0) {
+ //验证码发送成功
+ setGetCaptchaBut(false);
+ }
+ })
+ }
+ }
+ // 绑定登录
+ function bindRegFunc(){
+ form.validateFields((err, values) => {
+ if (!err) {
+ var url = '/accounts/register.json';
+ axios.post(url,{
+ namespace: values.register_username,
+ login: values.username,
+ password: values.password,
+ password_confirmation: values.confirm_password,
+ code: values.captcha,
+ type
+ }).then(response=>{
+ if(response.data && response.data.status === -6){
+ //验证码不正确
+ form.setFields({captcha: {value:values.captcha,errors:[new Error('验证码错误，请重新输入')]}});
+
+ }else if(response.data && response.data.status === 0){
+ //注册成功，页面跳转即可，注册后登录流程forge处理了
+ cookie.save("supplyphone",true);
+ cookie.save("login",response.data.login);
+ window.location.href = "/"+values.register_username;
+ }
+ })
+ }
+ })
+ }
+ return(
+
+
+
+ )
+}
+export default Form.create({ name: 'Bind' })(Bind);
\ No newline at end of file
diff --git a/src/forge/Activity/Activity.js b/src/forge/Activity/Activity.js
index 5f04acfcc..8e28c1fbc 100644
--- a/src/forge/Activity/Activity.js
+++ b/src/forge/Activity/Activity.js
@@ -1,5 +1,6 @@
import React , { Component } from 'react';
-import { Dropdown , Menu , Icon , Pagination , Spin } from 'antd';
+import { Dropdown , Menu , Icon , Pagination , Spin , Tooltip } from 'antd';
+import { getImageUrl } from 'educoder';
import '../css/index.scss';
import '../Branch/branch.scss';
import './activity.css';
@@ -49,6 +50,8 @@ class Activity extends Component{
data:undefined,
project_trends:undefined,
+ codeStatus:undefined,
+
isSpin:false
}
}
@@ -59,6 +62,19 @@ class Activity extends Component{
isSpin:true
})
this.getInfo(time,type,status,page);
+ this.getCodeInfo();
+ }
+
+ getCodeInfo(){
+ const { projectsId , owner } = this.props.match.params;
+ const url = `/v1/${owner}/${projectsId}/code_stats.json`;
+ axios.get(url).then(result=>{
+ if(result){
+ this.setState({
+ codeStatus:result.data
+ })
+ }
+ }).catch(error=>{})
}
componentDidUpdate(){
@@ -140,7 +156,7 @@ class Activity extends Component{
render(){
const { time , data , page , project_trends , isSpin ,
pr_count , new_pr_count , close_issues_count , open_issues_count , pr_all_count ,issues_count,
- type,status } = this.state;
+ type,status , codeStatus } = this.state;
let name = time ? ARRAY.filter(item=>item.id === parseInt(time)) :[{name:"全部"}];
const first_per = pr_all_count > 0 ? `${parseFloat(pr_count/pr_all_count).toFixed(2)*100}%` :"50%";
@@ -148,6 +164,7 @@ class Activity extends Component{
const third_per =issues_count > 0 ?`${parseFloat(close_issues_count/issues_count).toFixed(2)*100}%` :"50%";
const fourth_per =issues_count > 0 ?`${parseFloat(open_issues_count/issues_count).toFixed(2)*100}%` :"50%";
+ const {projectDetail} = this.props;
return(
@@ -187,6 +204,41 @@ class Activity extends Component{
this.changeTrends("Issue","not_delay")}>未处理的疑修
+ {
+ codeStatus &&
+
+
+ }
排除合并，
+ {codeStatus.author_count} 作者 已经推送 {codeStatus.commit_count} 提交 到
+ {codeStatus.commit_count_in_all_branches && codeStatus.commit_count_in_all_branches>0? {projectDetail && projectDetail.default_branch} 和 {codeStatus.commit_count_in_all_branches} 提交 到所有分支:""}。 在 {projectDetail && projectDetail.default_branch} 上，
+ {codeStatus.change_files && codeStatus.change_files >0 ? {codeStatus.change_files} 文件 已经改变 而且:""}
+ {codeStatus.additions && codeStatus.additions >0 ?新增 {codeStatus.additions} 行:""}
+ {(codeStatus.additions && codeStatus.additions >0) &&(codeStatus.deletions && codeStatus.deletions >0) ? 和:""}
+ {codeStatus.deletions && codeStatus.deletions >0 ? 删除 {codeStatus.deletions} 行:""}.
+ {
+ codeStatus.authors && codeStatus.authors.length > 0 &&
+ -
+ {
+ codeStatus.authors.map((i,v)=>{
+ return(
+ i.author ?
+ !i.author.id ?
+
+
diff --git a/src/forge/Activity/activity.css b/src/forge/Activity/activity.css
index 60e9895a2..d53c52490 100644
--- a/src/forge/Activity/activity.css
+++ b/src/forge/Activity/activity.css
@@ -60,6 +60,48 @@
.percentBox > li:last-child{
border-right: none;
}
+.prMsg{
+ padding:0px 20px;
+ border-top: 1px solid #f4f4f4;
+}
+.prMsg > div{
+ padding:20px 20px 20px 0px;
+ line-height: 22px;
+ border-right:1px solid #f4f4f4;
+ width: 50%;
+}
+.prMsg > div span.fontbold{
+ font-weight: 500;
+}
+.prMsg > div span.fontbold.greencount{
+ color: green;
+}
+.prMsg > div span.fontbold.redcount{
+ color: red;
+}
+.prAuthor{
+ padding-bottom: 20px;
+ display: flex;
+ border-right:1px solid #f4f4f4;
+ width: 50%;
+ flex-wrap: wrap;
+}
+.prAuthor a,.prAuthor> span{
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ width: 78px;
+}
+.prAuthor a img,.prAuthor> span img{
+ border-radius: 50%;
+}
+.prAuthor a span,.prAuthor> span span{
+ display: block;
+ max-width: 78px;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+}
.activity_list .activity_item{
border-bottom: 1px solid #f4f4f4;
padding:15px 0px;
diff --git a/src/forge/Main/CoderDepotReadme.jsx b/src/forge/Main/CoderDepotReadme.jsx
index 93d8b04c2..5e8bc3532 100644
--- a/src/forge/Main/CoderDepotReadme.jsx
+++ b/src/forge/Main/CoderDepotReadme.jsx
@@ -19,7 +19,6 @@ function CoderDepotReadme({ operate , history , readme , ChangeFile }){
},[readme])
useEffect(()=>{
- let path = history.location.pathname;
const items = $.map($("#readme").find("h1,h2,h3,h4,h5,h6"), function (el, _) {
const anchor = el.id;
const level = el.tagName.replace("H", "");
diff --git a/src/forge/Main/CoderRootCommit.js b/src/forge/Main/CoderRootCommit.js
index 3df0bfef8..063afa407 100644
--- a/src/forge/Main/CoderRootCommit.js
+++ b/src/forge/Main/CoderRootCommit.js
@@ -1,5 +1,5 @@
import React , { Component } from 'react';
-import { Spin , Pagination, Timeline } from 'antd';
+import { Spin , Pagination, Timeline , Tooltip } from 'antd';
import { getImageUrl , returnbar } from 'educoder';
import { truncateCommitId ,timeFormat } from '../common/util';
import { AlignTop } from '../Component/layout';
@@ -200,7 +200,9 @@ class CoderRootCommit extends Component{
-
+ 附件大小说明
- 单个附件不能超过 100M（GVP 项目200M），每个仓库总附件不可超过 - 1G（推荐项目不可超过 5G；GVP 项目不可超过 - 20G）。附件总容量统计包括仓库附件和发行版附件。 + 单个附件不能超过 100M，每个仓库总附件不可超过 + 1G。附件总容量统计包括仓库附件和发行版附件。