-
-
- );
+ return ""
}
}
diff --git a/src/college/College.js b/src/college/College.js
index 85d43fb7..f7a3ab6c 100644
--- a/src/college/College.js
+++ b/src/college/College.js
@@ -195,7 +195,7 @@ class College extends Component {
align: 'center',
className: "edu-txt-center font-14 maxnamewidth105",
render: (text, record) => (
- {
diff --git a/src/college/colleagecss/colleage.css b/src/college/colleagecss/colleage.css
index 9220b8ac..65f32322 100644
--- a/src/college/colleagecss/colleage.css
+++ b/src/college/colleagecss/colleage.css
@@ -218,7 +218,7 @@ a:hover {
}
.color-blue {
- color: #4CACFF;
+ color: #2A61FF;
}
.color-huang {
diff --git a/src/common/DateUtil.js b/src/common/DateUtil.js
index f678f667..8c0a72ee 100644
--- a/src/common/DateUtil.js
+++ b/src/common/DateUtil.js
@@ -1,4 +1,5 @@
-import moment from "moment";
+import moment from "moment";
+import { number } from "prop-types";
// 处理整点 半点
// 取传入时间往后的第一个半点
@@ -93,8 +94,6 @@ export function formatDuring(s) {
return second + "秒";
}
-
-
/*
返回：多久以前
backDate：以前的某个日期
@@ -103,9 +102,14 @@ export function timeAgo(backDate) {
try {
moment(backDate);
} catch (e) {
- return;
+ return '刚刚';
}
- let time = new Date() - moment(backDate);
+ if(typeof backDate ==='number'){
+ backDate=backDate*1000
+ }else{
+ backDate= moment(backDate);
+ }
+ let time = new Date() - backDate;
var days = Math.floor(time / (1000 * 60 * 60 * 24));
var hours = Math.floor((time % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
var minutes = Math.floor((time % (1000 * 60 * 60)) / (1000 * 60));
@@ -125,4 +129,5 @@ export function timeAgo(backDate) {
if (seconds) {
return seconds + "秒前";
}
+ return "刚刚";
}
\ No newline at end of file
diff --git a/src/common/TextUtil.js b/src/common/TextUtil.js
index 4a1441fc..d1aa0e9c 100644
--- a/src/common/TextUtil.js
+++ b/src/common/TextUtil.js
@@ -68,8 +68,8 @@ export function appendFileSizeToUploadFile(item) {
return `${item.title}${uploadNameSizeSeperator}${item.filesize}`
}
export function appendFileSizeToUploadFileAll(fileList) {
- return fileList && fileList.map(item => {
- if (item.name.indexOf(uploadNameSizeSeperator) == -1) {
+ return fileList.map(item => {
+ if (item.name.indexOf(uploadNameSizeSeperator) === -1) {
return Object.assign({}, item, { name: `${item.name}${uploadNameSizeSeperator}${bytesToSize(item.size)}` })
}
return item
diff --git a/src/common/UrlTool.js b/src/common/UrlTool.js
index 175fb56b..86dc8506 100644
--- a/src/common/UrlTool.js
+++ b/src/common/UrlTool.js
@@ -16,7 +16,24 @@ export function getImageUrl(path) {
if (isDev) {
return `${local}/${path}`
}
- return `/${path}`;
+ return `${path}`;
+}
+
+export function numFormat(num, digits){
+ let d = digits || 1;
+ var si = [
+ { value: 1, symbol: "" },
+ { value: 1E3, symbol: "k" },
+ { value: 1E4, symbol: "W" }
+ ];
+ var rx = /\.0+$|(\.[0-9]*[1-9])0+$/;
+ var i;
+ for (i = si.length - 1; i > 0; i--) {
+ if (num >= si[i].value) {
+ break;
+ }
+ }
+ return (num / si[i].value).toFixed(d).replace(rx, "$1") + si[i].symbol;
}
export function getImage(path) {
@@ -187,28 +204,28 @@ export function getmyUrl(geturl) {
}
export function getUploadActionUrl(path, goTest) {
- return `${getUrl()}/api/attachments.json`;
+ return `${getUrl()}/api/attachments.json${isDev ?`${isDev ?`?debug=${window._debugType || 'admin'}` : ""}` : ""}`;
}
export function getUploadLogoActionUrl() {
- return `${getUrl()}/api/resumes/logo.json?debug=${window._debugType || 'admin'}`;
+ return `${getUrl()}/api/resumes/logo.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`;
}
export function getUploadActionUrltwo(id) {
- return `${getUrlmys()}/api/shixuns/${id}/upload_data_sets.json?debug=${window._debugType || 'admin'}`
+ return `${getUrlmys()}/api/shixuns/${id}/upload_data_sets.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
}
export function getUploadActionUrlthree() {
- return `${getUrlmys()}/api/jupyters/import_with_tpm.json?debug=${window._debugType || 'admin'}`
+ return `${getUrlmys()}/api/jupyters/import_with_tpm.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
}
export function getupload_git_file(id) {
- return `${getUrlmys()}/api/shixuns/${id}/upload_git_file.json?debug=${window._debugType || 'admin'}`
+ return `${getUrlmys()}/api/shixuns/${id}/upload_git_file.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
}
export function getUploadActionUrlOfAuth(id) {
- return `${getUrl()}/api/users/accounts/${id}/auth_attachment.json?debug=${window._debugType || 'admin'}`
+ return `${getUrl()}/api/users/accounts/${id}/auth_attachment.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
}
export function getRandomNumber(type) {
@@ -258,9 +275,40 @@ export function publicSearchs(Placeholder,onSearch,onInputs,onChanges,loadings)
allowClear={true}
>)
}
-
export function getUrlToken(name, str) {
const reg = new RegExp(`(^|&)${ name}=([^&]*)(&|$)`);
const r = str.substr(1).match(reg);
if (r != null) return decodeURIComponent(r[2]); return null;
+}
+
+
+export function turnbar(str){
+ let s = str;
+ if(s && s.length>0){
+ if(s.indexOf("%")>-1){
+ s = s.replaceAll('%','_25');
+ }
+ if(s.indexOf("#")>-1){
+ s = s.replaceAll('#','%23');
+ }
+ if(s.indexOf("/")>-1){
+ s = s.replaceAll('/','%2F');
+ }
+ }
+ return s;
+}
+export function returnbar(str){
+ let s = str;
+ if(s && s.length>0){
+ if(str.indexOf("_25")>-1){
+ s = s.replaceAll('_25','%');
+ }
+ if(s.indexOf("%23")>-1){
+ s = s.replaceAll('%23','#');
+ }
+ if(s.indexOf("%2F")>-1){
+ s = s.replaceAll('%2F','/');
+ }
+ }
+ return s;
}
\ No newline at end of file
diff --git a/src/common/components/comment/CommentItem.js b/src/common/components/comment/CommentItem.js
index 2d9f72c7..e577c3bc 100644
--- a/src/common/components/comment/CommentItem.js
+++ b/src/common/components/comment/CommentItem.js
@@ -64,7 +64,7 @@ function CommentItem({
const commentAvatar = (author) => (
-
-
- 项目简介
+
+ 项目概览
{ editOpration && !edit && 编辑 }
{
edit ?
-
+
:
-
+
{content ?
:
- {
+ //添加浏览器滚动监听事件
+ window.addEventListener('scroll', scrollListener);
+ //请求topics.json接口获取合作单位信息
+ axios.get(`/topics.json`, { params: { topic_type: "cooperator", limit: 20, group_size: 5}}).then(response=>{
+ response && setUnits(response.data.topics);
+ });
+ return ()=>window.removeEventListener('scroll', scrollListener);
+ },[])
+
+ function scrollListener(e){
+ const top = e.srcElement.scrollingElement.scrollTop;
+ //回到顶部时导航栏选中【关于我们】
+ top < 555 && setSelectTitle(1);
+ if (top > 2800 && top< 4000){
+ setFlush(true);
+ }else{
+ setFlush(false);
+ }
+ }
+
+ return(
+
diff --git a/src/forge/Activity/ActivityItem.js b/src/forge/Activity/ActivityItem.js
index 1baa2ce9..19ce1536 100644
--- a/src/forge/Activity/ActivityItem.js
+++ b/src/forge/Activity/ActivityItem.js
@@ -14,26 +14,26 @@ class ActivityItem extends Component {
{/* 如果是版本发布 */}
{item.trend_type === "VersionRelease" ?
暂无简介~
+ 暂无概览~
}
{attachments && attachments.length > 0 &&
+
+ )
+}
+export default TPMIndexHOC(AboutUs);
\ No newline at end of file
diff --git a/src/forge/AboutUs/AboutUs.scss b/src/forge/AboutUs/AboutUs.scss
new file mode 100644
index 00000000..2c775771
--- /dev/null
+++ b/src/forge/AboutUs/AboutUs.scss
@@ -0,0 +1,338 @@
+.aboutUs_body{
+ font-size: 16px;
+ color: #182332;
+ font-family: PingFangSC-Regular, PingFang SC;
+ & table{
+ text-align: center;
+ margin: 0 auto;
+ }
+ & .df{
+ display: flex;
+ justify-content: space-around;
+ align-items: center;
+ }
+ & .join_us_bg, .feature_function_bg, .feat_fun_img, .aboutUs_head{
+ background-size: cover;
+ background-repeat: no-repeat;
+ background-position: center;
+ }
+ & .mao{
+ position: relative;
+ top: -70px;
+ }
+}
+.aboutUs_head.df{
+ flex-direction: column;
+ justify-content: center;
+ height: 500px;
+ line-height: 500px;
+ background-image: url('./image/banner.png');
+ & p{
+ text-align: center;
+ }
+ & .head_title{
+ line-height: 50px;
+ font-size: 48px;
+ font-weight: 600;
+ background-image: -webkit-linear-gradient(bottom,#4CDBF5,#5AACFF);
+ -webkit-background-clip: text;
+ -webkit-text-fill-color: transparent;
+ }
+ & .head_cont{
+ line-height: 39px;
+ color: #FFFFFF;
+ opacity: 0.9;
+ }
+}
+.aboutUs_title{
+ width: 800px;
+ height: 62px;
+ margin: 0 auto;
+ &>table{
+ width: 800px;
+ font-weight: 400;
+ }
+ & a.active{
+ color: #466AFF;
+ height: 62px;
+ line-height: 62px;
+ border-bottom: 2px solid;
+ }
+}
+.aboutUs{
+ & .au_title{
+ font-size: 38px;
+ font-weight: 500;
+ color: #1E1E1E;
+ text-align: center;
+ padding-top: 50px;
+ // line-height: 53px;
+ }
+ & .subtitle{
+ font-size: 20px;
+ font-weight: bold;
+ color: #000000;
+ margin-bottom: 23px !important;
+ }
+}
+.about_us{
+ // 关于我们
+ & .au_cont.df{
+ justify-content: space-between;
+ }
+ & .au_bg{ background: linear-gradient(180deg, #F3F9FF 0%, rgba(255, 255, 255, 0) 100%);}
+ & .cont1_introduction{
+ width: 472px;
+ &>div{
+ line-height: 34px;
+ }
+ }
+ & .cont1_achievements{
+ width: 581px;
+ & .subtitle.ml0{margin-left: 0;}
+ &>div{
+ font-size: 15px;
+ line-height: 36px;
+ }
+ }
+ & .subtitleImg{
+ width: 650px;
+ height: 330px;
+ }
+ & .achievementsImg{
+ width: 507px;
+ height: 384px;
+ }
+ //时间轴
+ & .inherit_items{
+ position: relative;
+ & .quan1Img{
+ width: 140px;
+ height: 167px;
+ position: absolute;
+ left: -290px;
+ top: 90px;
+ }
+ & .quan2Img{
+ width: 100px;
+ height: 120px;
+ position: absolute;
+ right: -170px;
+ bottom: 80px;
+ }
+ }
+ .inherit{
+ & .icon-a-yuanquan2x{
+ color: #466aff;
+ }
+ & .ant-timeline-item-tail{
+ border-left: 2px solid rgba(108, 134, 172, 0.42);
+ height: calc(100% - -30px);
+ }
+ & .ant-timeline-item:last-child .ant-timeline-item-tail{
+ display: block;
+ height: calc(100% - 18px);
+ }
+ & .ant-timeline-item-content{
+ margin: 0 0 -15px 18px;
+ }
+ }
+ .timeline_cont{
+ margin-left: 35px;
+ &>p{
+ font-size: 20px;
+ font-weight: 500;
+ color: #466AFF;
+ margin: 45px 0 30px !important;
+ }
+ &>div{
+ width: 980px;
+ padding: 20px 35px;
+ background: #F5F7FA;
+ font-size: 15px;
+ font-weight: 400;
+ color: #182332;
+ line-height: 33px;
+ &:after,&:before{
+ content: "";
+ position: absolute;
+ left: 21px;
+ top: 100px;
+ border-top: 10px solid transparent;
+ border-bottom: 10px solid transparent;
+ border-right: 14px solid #F5F7FA;
+ }
+ }
+ }
+ //特色功能 确实给力
+ & .feature_function_bg{
+ position: relative;
+ height: 630px;
+ background-image: url(./image/funBg.png);
+ & .au_cont p.au_title{
+ font-size: 30px;
+ padding: 50px 0 70px;
+ color: #FFFFFF;
+ opacity: 0.9;
+ }
+ & table{
+ position: relative;
+ background: none;
+ width: 1200px;}
+ & .funBg2 {
+ width: 1600px;
+ left: 50%;
+ margin-left: -800px;
+ position: absolute;
+ bottom: -15px;
+ }
+ }
+
+ & .feat_func_cont{
+ width: 200px;
+ & .feat_fun_img{
+ height: 205px;
+ line-height: 205px;
+ background-image: url('./image/funBg3.png');
+ &:hover{background-image: url('./image/funBg4.png');}
+ }
+ & img{ width: 175px;}
+ & p{
+ font-size: 18px;
+ font-weight: 500;
+ color: #FFFFFF;
+ line-height: 28px;
+ background-image: -webkit-linear-gradient(bottom,#4FFDFF,#0183FF);
+ -webkit-background-clip: text;
+ -webkit-text-fill-color: transparent;
+ }
+ & div>div{
+ margin: 10px auto;
+ width: 142px;
+ font-size: 14px;
+ line-height: 28px;
+ color: #FFFFFF;
+ opacity: 0.76;
+ }
+ }
+
+ // 平台统计
+ &.statistics{
+ text-align: center;
+ background: linear-gradient(180deg, #ECF3FF 0%, #FFFFFF 100%);
+ height: 640px;
+ overflow: hidden;
+ position: relative;
+ & .statistics_cont{
+ width: 1014px;
+ height: 203px;
+ background: #FFFFFF;
+ opacity: 0.83;
+ position: absolute;
+ top: 230px;
+ left: 50%;
+ margin-left: -500px;
+ & span{
+ font-size: 48px;
+ font-weight: bold;
+ color: #1338D1;
+ }
+ & p{
+ width: 111px;
+ height: 38px;
+ line-height: 38px;
+ border: 1px solid #182332;
+ margin: 0 auto;
+ font-size: 22px;
+ color: #1E1E1E;
+ }
+ }
+ & .earthImg{
+ width: 1500px;
+ margin-top: -120px;
+ animation: moving 60s linear infinite;
+ }
+ @keyframes moving {
+ 0% { transform: rotate(0deg);}
+ 50% { transform: rotate(180deg);}
+ 100% { transform: rotate(360deg);}
+ }
+ }
+}
+// 加入我们
+.join_us_bg{
+ height: 710px;
+ margin-top: 40px;
+ background-image: url(./image/joinUs.png);
+ & .au_cont{position: relative;}
+ & .joinUsImg{
+ width: 260px;
+ height: 265px;
+ position: absolute;
+ top: 27px;
+ right: 10px;
+ }
+ & .df{
+ display: flex !important;
+ margin-top: 30px;
+ }
+ & .position{
+ width: 540px;
+ &.right{ margin-right: -30px;}
+ & p{
+ justify-content: flex-start;
+ height: 60px;
+ background: #253DA0;
+ line-height: 60px;
+ padding-left: 20px;
+ & img{width: 30px;}
+ & span{
+ font-weight: 500;
+ color: #FFFFFF;
+ line-height: 22px;
+ }
+ }
+ & div{
+ height: 306px;
+ font-size: 14px;
+ line-height: 34px;
+ padding: 20px;
+ background: #FFFFFF;}
+ }
+ & .ant-carousel .slick-dots-bottom{bottom: -30px;}
+ & .ant-carousel .slick-dots li button{
+ width: 12px;
+ height: 12px;
+ border-radius: 10px;
+ background: #466AFF;
+ }
+ & .delivery{
+ height: 60px;
+ line-height: 60px;
+ margin-left: 35px;
+ }
+}
+//合作单位
+.unit{
+ margin-bottom: 60px;
+ & table{
+ width: 1200px;
+ height: 550px;
+ margin-top: 15px;
+ border-collapse: separate;
+ border-spacing: 10px 10px;
+ & td{
+ width: 224px;
+ height: 122px;
+ box-shadow: 0px 1px 8px 1px rgba(0, 0, 0, 0.06);
+ border-radius: 6px;
+ border: 2px solid #FFFFFF;
+ &:hover{ border: 1px solid #466AFF;}
+ }
+ }
+}
+.au_cont{
+ width: 1200px;
+ margin: 50px auto;
+ &.pl30 .subtitle{ margin-left: -30px;}
+}
\ No newline at end of file
diff --git a/src/forge/AboutUs/image/achievements.png b/src/forge/AboutUs/image/achievements.png
new file mode 100644
index 00000000..5ffebdd3
Binary files /dev/null and b/src/forge/AboutUs/image/achievements.png differ
diff --git a/src/forge/AboutUs/image/banner.png b/src/forge/AboutUs/image/banner.png
new file mode 100644
index 00000000..817193ac
Binary files /dev/null and b/src/forge/AboutUs/image/banner.png differ
diff --git a/src/forge/AboutUs/image/computer.png b/src/forge/AboutUs/image/computer.png
new file mode 100644
index 00000000..eb16db56
Binary files /dev/null and b/src/forge/AboutUs/image/computer.png differ
diff --git a/src/forge/AboutUs/image/earth.png b/src/forge/AboutUs/image/earth.png
new file mode 100644
index 00000000..7cb766c1
Binary files /dev/null and b/src/forge/AboutUs/image/earth.png differ
diff --git a/src/forge/AboutUs/image/fun1.png b/src/forge/AboutUs/image/fun1.png
new file mode 100644
index 00000000..9fd10b59
Binary files /dev/null and b/src/forge/AboutUs/image/fun1.png differ
diff --git a/src/forge/AboutUs/image/fun2.png b/src/forge/AboutUs/image/fun2.png
new file mode 100644
index 00000000..68491bc1
Binary files /dev/null and b/src/forge/AboutUs/image/fun2.png differ
diff --git a/src/forge/AboutUs/image/fun3.png b/src/forge/AboutUs/image/fun3.png
new file mode 100644
index 00000000..5b72688b
Binary files /dev/null and b/src/forge/AboutUs/image/fun3.png differ
diff --git a/src/forge/AboutUs/image/fun4.png b/src/forge/AboutUs/image/fun4.png
new file mode 100644
index 00000000..f2a28719
Binary files /dev/null and b/src/forge/AboutUs/image/fun4.png differ
diff --git a/src/forge/AboutUs/image/fun5.png b/src/forge/AboutUs/image/fun5.png
new file mode 100644
index 00000000..a4903ff0
Binary files /dev/null and b/src/forge/AboutUs/image/fun5.png differ
diff --git a/src/forge/AboutUs/image/funBg.png b/src/forge/AboutUs/image/funBg.png
new file mode 100644
index 00000000..fcee9030
Binary files /dev/null and b/src/forge/AboutUs/image/funBg.png differ
diff --git a/src/forge/AboutUs/image/funBg3.png b/src/forge/AboutUs/image/funBg3.png
new file mode 100644
index 00000000..1fc88a6f
Binary files /dev/null and b/src/forge/AboutUs/image/funBg3.png differ
diff --git a/src/forge/AboutUs/image/funBg4.png b/src/forge/AboutUs/image/funBg4.png
new file mode 100644
index 00000000..8960a688
Binary files /dev/null and b/src/forge/AboutUs/image/funBg4.png differ
diff --git a/src/forge/AboutUs/image/joinUs.png b/src/forge/AboutUs/image/joinUs.png
new file mode 100644
index 00000000..a146c649
Binary files /dev/null and b/src/forge/AboutUs/image/joinUs.png differ
diff --git a/src/forge/AboutUs/image/position.png b/src/forge/AboutUs/image/position.png
new file mode 100644
index 00000000..6b318af2
Binary files /dev/null and b/src/forge/AboutUs/image/position.png differ
diff --git a/src/forge/AboutUs/image/quan1.png b/src/forge/AboutUs/image/quan1.png
new file mode 100644
index 00000000..e515c401
Binary files /dev/null and b/src/forge/AboutUs/image/quan1.png differ
diff --git a/src/forge/AboutUs/image/quan2.png b/src/forge/AboutUs/image/quan2.png
new file mode 100644
index 00000000..bd6a264e
Binary files /dev/null and b/src/forge/AboutUs/image/quan2.png differ
diff --git a/src/forge/AboutUs/image/subtitle.png b/src/forge/AboutUs/image/subtitle.png
new file mode 100644
index 00000000..46e8b4de
Binary files /dev/null and b/src/forge/AboutUs/image/subtitle.png differ
diff --git a/src/forge/Activity/Activity.js b/src/forge/Activity/Activity.js
index 163495bd..2f3a84e8 100644
--- a/src/forge/Activity/Activity.js
+++ b/src/forge/Activity/Activity.js
@@ -1,7 +1,7 @@
import React , { Component } from 'react';
import { Dropdown , Menu , Icon , Pagination , Spin } from 'antd';
import '../css/index.scss';
-import '../Branch/branch.css';
+import '../Branch/branch.scss';
import './activity.css';
import NoneData from '../Nodata';
@@ -10,6 +10,10 @@ import ActivityItem from './ActivityItem';
import axios from 'axios';
const LIMIT = 15;
const ARRAY = [
+ {
+ id:"",
+ name:'全部'
+ },
{
id:1,
name:'1天'
@@ -32,10 +36,15 @@ class Activity extends Component{
constructor(props){
super(props);
this.state={
- time:'30',
+ time:undefined,
type:undefined,
state:undefined,
page:1,
+ pr_count:undefined,
+ new_pr_count:undefined,
+ close_issues_count:undefined,
+ open_issues_count:undefined,
+ pr_all_count:undefined,issues_count:undefined,
data:undefined,
project_trends:undefined,
@@ -63,8 +72,15 @@ class Activity extends Component{
this.setState({
data:result.data,
project_trends:result.data.project_trends,
- isSpin:false
+ isSpin:false,
+ pr_count:result.data.pr_count,
+ new_pr_count:result.data.new_pr_count,
+ close_issues_count:result.data.close_issues_count,
+ open_issues_count:result.data.open_issues_count,
+ pr_all_count:result.data.pr_all_count,
+ issues_count:result.data.issues_count,
})
+ window.scrollTo(0,0);
}
}).catch(error=>{
console.log(error);
@@ -74,19 +90,19 @@ class Activity extends Component{
// 切换周期
changeTime=(e)=>{
this.setState({
- time:e.key,
+ time:e.key ==="item_0"?undefined:e.key,
isSpin:true
})
const { type,status,page } = this.state;
- this.getInfo(e.key,type,status,page);
+ this.getInfo(e.key ==="item_0"?undefined:e.key,type,status,page);
}
//筛选
changeTrends=(type,status)=>{
this.setState({
- type,status
+ type,status,page:1
})
- const {time,page}=this.state;
- this.getInfo(time,type,status,page);
+ const {time}=this.state;
+ this.getInfo(time,type,status,1);
}
// 分页
ChangePage=(page)=>{
@@ -108,12 +124,16 @@ class Activity extends Component{
)
render(){
- const { time , data , page , project_trends , isSpin } = this.state;
+ 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;
+ let name = time ? ARRAY.filter(item=>item.id === parseInt(time)) :[{name:"全部"}];
- let name = time && ARRAY.filter(item=>item.id === parseInt(time)) ;
- const second_per = (parseInt(data && data.close_issues_count)/parseInt(data && data.issues_count)*100)+'%';
- const third_per = (parseInt(data && data.close_issues_count)/parseInt(data && data.issues_count)*100)+'%';
- const fourth_per = (parseInt(data && data.open_issues_count)/parseInt(data && data.issues_count)*100)+'%';
+ const first_per = pr_all_count > 0 ? `${parseFloat(pr_count/pr_all_count).toFixed(2)*100}%` :"50%";
+ const second_per =pr_all_count > 0 ? `${parseFloat(new_pr_count/pr_all_count).toFixed(2)*100}%` :"50%";
+ 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%";
+
return(
+
+ GitLink 确实开源
+新一代开源创新服务平台，让您的创意在这里释放
+
+ setSelectTitle(1)}>关于我们
+ setSelectTitle(2)}>平台统计
+ setSelectTitle(3)}>加入我们
+ setSelectTitle(4)}>合作单位
+
+
+
+ {/* 关于我们 */}
+
+
+
+
+ {/* 平台统计 */}
+
+
+ {/* 加入我们 */}
+
+
+ {/* 确实开源 一脉传承 */}
+ 关于我们
+ {/* 简介 */}
+
+ 
+
+
+
+ 简介
+GitLink（确实开源）是CCF官方指定的开源创新服务平台，旨在以“为开源创新服务”为使命，以“成为开源创新的汇聚地”为愿景，秉承“创新、开放、协作、共享”的价值观，致力于为大规模开源开放协同创新助力赋能，打造创新成果孵化和新工科人才培养的开源创新生态！
+
+
+
+ {/* 特色功能 确实给力 */}
+ 确实开源 一脉传承
+本世纪以来，随着软件创新需求和应用规模的飞速增长，软件开发队伍、开发资源、可信评估呈现出规模化、开放化、持续化的新特点，软件开发活动面临协同难、复用难、评估难的制约，经典的工程化软件开发方法面临严峻挑战，严重影响了软件开发效率和质量的提升。在此背景下，国防科技大学联合国内多所知名高校、科研机构和软件企业，围绕开源创新开展了持续性探索，构建形成了以Trustie（确实）为代表的一系列开源创新服务基础设施。自2006年以来，Trustie经过三个阶段的演化发展，于2021年迎来全面升级：在中国计算机学会（CCF）的带领指导下，共同推进产学研用深度融合，共筑新一代开源创新服务平台GitLink！
+
+ 
+ 
+
+ }>
+
+ }>
+
+ }>
+
+
+
+
+
+ Trustie 1.0阶段（2006年-2014年）
+国防科技大学、北京大学、北京航空航天大学、中国科学院软件研究所等单位合作开展了基于网络的软件开发群体化方法与技术研究，揭示了以大众化协同开发、开放式资源共享、持续性可信评估为核心的互联网大规模协同机理，与软件开发工程化方法相结合，系统地提出了基于网络的软件开发群体化方法，并于2008年发布了可信的国家软件资源共享与协同生产环境（简称“Trustie v1.0”，中文简称“确实”），重点解决大规模软件协同开发、可信评估、运行监控和持续演化等问题。
+
+
+ Trustie 2.0阶段（2014年-2020年）
+在科技部项目的持续资助下，国防科技大学联合国内多所知名高校、科研机构和软件企业，致力于系统研究新型软件开发方法，为开源生态建设提供方法指导和实践指南，支撑科教领域原始创新成果的开源孵化和开源人才培养，并于2014年发布了面向软件创新和教育的开源社区Trustie v2.0，重点探索协作开发社区、知识分享社区、应用服务社区等“大外围”软件涉众的联接，以及基于开源大数据的智能化开发等技术。
+
+
+ Trustie 3.0阶段 (2020年至今)
+Trustie在已有的技术积累基础上，进一步联合国内高等院校、科研机构、产业企业和开源组织等，在中国计算机学会（CCF）的带领指导下，共同推进产学研用深度融合，致力于联接互联网海量群智资源，探索开源创新成果开放与共享、开源生态协作与共建的新模式和新方法，升级形成了新一代开源创新服务平台GitLink，力图破解软件开发群智范式背后的本质机理，建立面向“大外围”开放创新的群智激发与汇聚关键机制，实现面向大规模软件涉众的稳态群智激发与汇聚。
+
+
+
+ {/* 成果作用，确实有效 */}
+
+
+
+ 特色功能 确实给力
+|
+
+
+
+
+ 分布式协作开发 +支持在线文件编辑、
+ 分支管理、贡献统计、 仓库复刻、合并请求 |
+
+
+
+
+
+ 一站式过程管理 +支持疑修、里程碑、
+ 通知提醒、标签归档、Wiki文档、组织管理 |
+
+
+
+
+
+ 高效流水线运维 +提供轻量级工作流引擎
+ 并支持自定义配置、 静态扫描、制品构建 |
+
+
+
+
+
+ 多层次代码分析 +支持代码溯源分析、
+ 许可证风险分析、开源漏洞检测和加固建议 |
+
+
+
+
+
+ 多维度用户画像 +支持开发活动统计、
+ 贡献日历、能力建模、 角色与专业定位分析 |
+
+ 
+
+
+
+ 成果作用 确实有效
+GitLink（确实开源）为我国创新型软件产业发展提供了关键技术支撑和实践指南，为各类开源创新活动以及我国军地开源社区建设提供了有效支撑，为推动开源创新发展和创新人才培养发挥了重要作用。
通过10多年的发展，GitLink平台显著提升了大型软件企业软件生产能力，支持了我国航空、航天、国防等多个关键领域的可信软件生产，为包括新一代人工智能启智社区、ARM绿色计算社区、科技部云计算与大数据木兰社区、科技委可控开源创造行动红山社区等的建设提供关键技术支撑，为我国关键领域开源社区生态建设发挥了重要作用！
+ 通过10多年的发展，GitLink平台显著提升了大型软件企业软件生产能力，支持了我国航空、航天、国防等多个关键领域的可信软件生产，为包括新一代人工智能启智社区、ARM绿色计算社区、科技部云计算与大数据木兰社区、科技委可控开源创造行动红山社区等的建设提供关键技术支撑，为我国关键领域开源社区生态建设发挥了重要作用！
+
+
+
+ {/* 合作单位 */}
+
+
+ 
+ {/* 轮播图 */}
+
+
+
+ 加入我们
+ 探索你的未来
+GitLink团队在寻找新的小伙伴，期待着您的加入，让我们一起为开源创新贡献力量！
+
+
+
+
+ 前端开发工程师
+ 1、全日制本科及以上学历，5年以上Web前端开发经验，熟练使用Gulp、Webpack等构建工具；
+ 2、熟练掌握VUE或React编程；有前端模块化、组件化、自动化开发经验者优先；
+ 3、精通jQuery、Ajax、Json等技术，对VUE，NodeJs等技术有所涉及；
+ 4、熟悉前端开发技术(HTML5、JS、JSON、XHTML、CSS3、ES6)，了解各项技术的相关标准，并严格按照标准进行开发。
+
+ + 2、熟练掌握VUE或React编程；有前端模块化、组件化、自动化开发经验者优先；
+ 3、精通jQuery、Ajax、Json等技术，对VUE，NodeJs等技术有所涉及；
+ 4、熟悉前端开发技术(HTML5、JS、JSON、XHTML、CSS3、ES6)，了解各项技术的相关标准，并严格按照标准进行开发。
+
+
+ 后端开发工程师
+ 1、全日制本科及以上学历，计算机、软件工程相关专业者优先；
+ 2、3年以上Java开发相关经验，扎实的Java编程基础，参与过1个以上大/中型高并发、高性能系统架构设计、开发和调优；
+ 3、熟练掌握Spring、SpringBoot、Spring MVC、MyBatis等开源框架，掌握MVC框架模式及BS架构；
+ 4、精通SQL，熟练使用MySQL、Oracle等数据库，并具有一定的SQL优化能力；熟悉Redis、MongoDB等常用NoSQL解决方案，了解各自的优缺点以及使用场景者优先。
+
+ + 2、3年以上Java开发相关经验，扎实的Java编程基础，参与过1个以上大/中型高并发、高性能系统架构设计、开发和调优；
+ 3、熟练掌握Spring、SpringBoot、Spring MVC、MyBatis等开源框架，掌握MVC框架模式及BS架构；
+ 4、精通SQL，熟练使用MySQL、Oracle等数据库，并具有一定的SQL优化能力；熟悉Redis、MongoDB等常用NoSQL解决方案，了解各自的优缺点以及使用场景者优先。
+
+
+
+
+ 软件测试工程师
+ 1、熟悉主流开发技术框架，具备软件工程的基本知识；
+ 2、熟练掌握各种测试理论和测试技术，精通测试过程设计和用例设计方法；
+ 3、熟悉性能测试、自动化测试、安全测试其中一种或多种测试工具；（LoadRunner、Jmeter、Selenium、QTP、Robot、Firebug、AppScan，PyCharm等），熟练运用工具从事过相关测试工作；
+ 4、熟悉掌握一种编程语言（Java/Python/C++等）；
+ 5、熟悉Oracle/MySQL数据库，并能熟练编写SQL语句，熟练常用Linux命令；
+ 6、有整体质量意识，测试管理经验。
+
+ + 2、熟练掌握各种测试理论和测试技术，精通测试过程设计和用例设计方法；
+ 3、熟悉性能测试、自动化测试、安全测试其中一种或多种测试工具；（LoadRunner、Jmeter、Selenium、QTP、Robot、Firebug、AppScan，PyCharm等），熟练运用工具从事过相关测试工作；
+ 4、熟悉掌握一种编程语言（Java/Python/C++等）；
+ 5、熟悉Oracle/MySQL数据库，并能熟练编写SQL语句，熟练常用Linux命令；
+ 6、有整体质量意识，测试管理经验。
+
+
+ 产品经理
+ 1、计算机或相关专业本科以上学历；3年以上工作经验；
+ 2、熟悉开源软件项目的管理流程，了解软件需求的调研方法，具备需求分析能力；
+ 3、能以专业的方式向客户提供技术咨询，良好的方案设计能力和文字功底；
+ 4、具备良好的交流、沟通和表达能力，良好的方案演示和介绍技巧；
+ 5、了解互联网产品的基本思路及基础方法论，能够基于数据提出产品优化策略；
+ 6、承受较强的工作压力，强烈的团队合作意识与工作责任心；
+ 7、有良好人际交往能力，工作积极主动，自信心强，有较强的学习能力。
+
+ + 2、熟悉开源软件项目的管理流程，了解软件需求的调研方法，具备需求分析能力；
+ 3、能以专业的方式向客户提供技术咨询，良好的方案设计能力和文字功底；
+ 4、具备良好的交流、沟通和表达能力，良好的方案演示和介绍技巧；
+ 5、了解互联网产品的基本思路及基础方法论，能够基于数据提出产品优化策略；
+ 6、承受较强的工作压力，强烈的团队合作意识与工作责任心；
+ 7、有良好人际交往能力，工作积极主动，自信心强，有较强的学习能力。
+
简历投递邮箱：zengyt#csxjy.com.cn 曾先生 (用@符号替换#)
+
@@ -122,7 +142,7 @@ class Activity extends Component{
- {data && data.issues_count}任务
+ {data && data.issues_count}疑修
-
+
{data && data.pr_all_count}合并请求
@@ -132,25 +152,25 @@ class Activity extends Component{
- {data && data.pr_count} - this.changeTrends("PullRequest","close")}>已处理的合并请求 + this.changeTrends("PullRequest","delay")}>已处理的合并请求
- {data && data.new_pr_count} - this.changeTrends("PullRequest","create")}>未处理的合并请求 + this.changeTrends("PullRequest","not_delay")}>未处理的合并请求
- {data && data.close_issues_count} - this.changeTrends("Issue","close")}>已关闭的任务 + this.changeTrends("Issue","delay")}>已关闭的疑修
- {data && data.open_issues_count} - this.changeTrends("Issue","create")}>未处理的任务 + this.changeTrends("Issue","not_delay")}>未处理的疑修
- {item.name} + {item.name} {item.trend_type}
: // 如果是任务 item.trend_type === "Issue" ?- {item.name} + {item.name} {item.trend_type}
: // 如果是合并请求- {item.name} + {item.name} {item.trend_type}
}
-
-
+
+
{item.user_name}
{item.created_at && 创建于{item.created_at}}
diff --git a/src/forge/Activity/activity.css b/src/forge/Activity/activity.css
index 2fada3c0..60e9895a 100644
--- a/src/forge/Activity/activity.css
+++ b/src/forge/Activity/activity.css
@@ -107,6 +107,10 @@
color: black;
cursor: pointer;
}
+.change.active{
+ color: #466AFF !important;
+}
+
.change:hover{
- color: #4183c4;
+ color: #466AFF;
}
\ No newline at end of file
diff --git a/src/forge/Branch/CloneAddress.js b/src/forge/Branch/CloneAddress.js
index 0031407d..b3e31ccc 100644
--- a/src/forge/Branch/CloneAddress.js
+++ b/src/forge/Branch/CloneAddress.js
@@ -1,39 +1,27 @@
-import React, { Component } from 'react';
-import { Dropdown, Icon, Tooltip } from 'antd';
-import "./branch.css";
+import React, { useState } from 'react';
+import { Menu } from 'antd';
+import "./branch.scss";
+import CopyTool from '../Component/CopyTool';
-class CloneAddress extends Component {
- // 点击按钮复制功能
- jsCopy = () => {
- var e = document.getElementById("copy_rep_content");
- e.select();
- document.execCommand("Copy");
- }
-
- render() {
- const { http_url, downloadUrl } = this.props;
- return (
-
-
- this.jsCopy()}>
-
- {
- downloadUrl &&
-
-
-
-
-
- }
+function CloneAddress({http_url , ssh_url , zip_url , tar_url}) {
+ const [ key , setKey ] = useState("HTTP");
+ return (
+
+ {children}
+
+ )
+}
+export default Modals;
\ No newline at end of file
diff --git a/src/forge/Component/PublicModal/Index.scss b/src/forge/Component/PublicModal/Index.scss
new file mode 100644
index 00000000..1a0fbf31
--- /dev/null
+++ b/src/forge/Component/PublicModal/Index.scss
@@ -0,0 +1,75 @@
+.deleteBox{
+ z-index: 1033;
+ .ant-modal-close-x{
+ font-size: 17px!important;
+ }
+ .ant-modal-header{
+ background-color: #f8f8f8;
+ padding:10px 30px;
+ .ant-modal-title{
+ text-align: left;
+ font-size: 16px;
+ font-weight: bold;
+ }
+ }
+ .ant-modal-close{
+ top:0px !important;
+ font-size: 24px !important;
+ }
+ .ant-modal-body{
+ padding:30px 50px;
+ p{
+ font-size: 14px;
+ line-height: 26px;
+ color:#666;
+ word-break: break-all;
+ }
+ .desc{
+ .descMain{
+ align-items: center;
+ justify-content: center;
+ font-size: 20px;
+ margin-bottom: 10px;
+ i.red{
+ color:#DF0002;
+ }
+ }
+ }
+ }
+ .ant-modal-footer{
+ border-top: none;
+ text-align: center;
+ padding-bottom: 40px;
+ button,a{
+ width: 96px;
+ height: 32px;
+ margin:0px 20px;
+ font-weight: 400;
+ font-size: 14px;
+ &.ant-btn{
+ border-color: #D0D0D0;
+ color: #666;
+ &:hover,&:active,&:focus{
+ background: #f3f4f6;
+ }
+ }
+ &.ant-btn-danger{
+ background-color: #fff;
+ color: #DF0002;
+ border-color: #D0D0D0;
+ &:hover,&:active,&:focus{
+ border-color: #DF0002;
+ background-color: #fff;
+ }
+ }
+ &.ant-btn.ant-btn-primary{
+ background-color: #466AFF;
+ color: #fff;
+ border-color: #466AFF;
+ &:hover,&:focus,&:active{
+ background-color: rgba(70,106,255,0.85);
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/forge/Component/Releases.jsx b/src/forge/Component/Releases.jsx
new file mode 100644
index 00000000..260e6bd2
--- /dev/null
+++ b/src/forge/Component/Releases.jsx
@@ -0,0 +1,38 @@
+import React from 'react';
+import { AlignTop } from '../Component/layout';
+import { Link } from 'react-router-dom';
+
+function Releases({ owner, projectsId, releaseVersions, distribution }) {
+ return(
+
+
+ )
+}
+export default SiderBarShareModal;
\ No newline at end of file
diff --git a/src/forge/Component/Sort.jsx b/src/forge/Component/Sort.jsx
index 58f8a5d2..a15f04da 100644
--- a/src/forge/Component/Sort.jsx
+++ b/src/forge/Component/Sort.jsx
@@ -2,9 +2,9 @@ import React from 'react';
import {Popover} from 'antd';
import './Component.scss';
-export default (({menu , children})=>{
+export default (({menu , children, overlayClassName})=>{
return(
-
+
{children}
)
diff --git a/src/forge/Component/Title.jsx b/src/forge/Component/Title.jsx
index 9b3f8bf3..8ab6d7e4 100644
--- a/src/forge/Component/Title.jsx
+++ b/src/forge/Component/Title.jsx
@@ -5,7 +5,7 @@ const Nav = styled.div`{
background-color:#fff;
padding:20px 30px;
border-bottom:1px solid #eee;
- font-size:16px;
+ font-size:18px;
color:#333;
display:flex;
justify-content: space-between;
diff --git a/src/forge/Component/User.jsx b/src/forge/Component/User.jsx
index 1c6bf9a9..0d970173 100644
--- a/src/forge/Component/User.jsx
+++ b/src/forge/Component/User.jsx
@@ -1,10 +1,11 @@
import React from 'react';
import styled from 'styled-components';
+import { Link } from 'react-router-dom';
-
-export default ({ url , name , column })=>{
+export default ({ url , name , column , id , login })=>{
const Img = styled.span`
display:flex;
+ font-weight: bold;
${column && "flex-direction: column;text-align:center;"}
align-items: center;
& img{
@@ -19,8 +20,16 @@ export default ({ url , name , column })=>{
}
`;
return(
+ id?
+
+ ![]()
+ { url && 
}
+ {name}
+
+
+ :
![]()
-
+ { url && }
{name}
)
diff --git a/src/forge/Component/layout.jsx b/src/forge/Component/layout.jsx
index 443e9b36..dcc133e8 100644
--- a/src/forge/Component/layout.jsx
+++ b/src/forge/Component/layout.jsx
@@ -7,6 +7,8 @@ export const Banner = styled.div`{
border-bottom:1px solid #eee;
background-color:#fff;
border-radius:5px 5px 0px 0px;
+ justify-content: space-between;
+ display: flex;
}`
export const AlignCenterBetween = styled.div`{
display:flex;
@@ -24,18 +26,38 @@ export const AlignCenter = styled.div`{
display:flex;
align-items: center;
}`
+export const AlignTop = styled.div`{
+ display:flex;
+ align-items: flex-start;
+}`
+export const AlignAJBottom = styled.div`{
+ display:flex;
+ justify-content: space-between;
+ align-items: flex-end;
+}`
// 左右结构
export const Box = styled.div`{
display:flex;
- align-item:flex-start;
+ align-items:flex-start;
+}`
+export const LongWidth = styled.div`{
+ flex:1;
+ width:0;
+ border-radius:5px;
+ margin-bottom:30px;
}`
export const Long = styled.div`{
- width:72%;
+ width:78%;
+ border-radius:5px;
+ margin-bottom:30px;
+}`
+export const ShortWidth = styled.div`{
+ width:300px;
border-radius:5px;
margin-bottom:30px;
}`
export const Short = styled.div`{
- width:28%;
+ flex:1;
border-radius:5px;
margin-bottom:30px;
}`
diff --git a/src/forge/DevOps/About.jsx b/src/forge/DevOps/About.jsx
index b9b10dad..ec0a7f6d 100644
--- a/src/forge/DevOps/About.jsx
+++ b/src/forge/DevOps/About.jsx
@@ -36,8 +36,7 @@ function About(props, ref) {
const [ disabled, setDisabled ] = useState(false);
const [ typeFlag, setTypeFlag] = useState(false);
-
- const AuthorLogin = props.author && props.author.login;
+ const AuthorLogin = props.projectDetail && props.projectDetail.author && props.projectDetail.author.login;
const CurrentLogin = props.current_user && props.current_user.login;
useEffect(()=>{
if(CurrentLogin === AuthorLogin){
@@ -56,11 +55,6 @@ function About(props, ref) {
setIsSpining(false);
if(result && result.data ){
setStep(result.data.step);
- // setStep(0);
- // setFieldsValue({...result.data.cloud_account});
- // if(result.data.cloud_account){
- // setDisabled(true);
- // }
}
}).catch(error=>{
setIsSpining(false);
@@ -155,7 +149,7 @@ function About(props, ref) {
axios.post(url).then(result=>{
setIsSpining(false);
if(result && result.data.status === 0){
- props.history.push(`/projects/${owner}/${projectsId}/devops/dispose`);
+ props.history.push(`/${owner}/${projectsId}/devops`);
// 需要将顶部的open_devops修改
let { changeOpenDevops } = props;
changeOpenDevops && changeOpenDevops(true);
@@ -180,7 +174,7 @@ function About(props, ref) {
了解什么是DevOps？
- 如何使用DevOps？
+ 如何使用引擎（Engine）功能？
{
AuthorLogin === CurrentLogin ?
diff --git a/src/forge/DevOps/Dispose.jsx b/src/forge/DevOps/Dispose.jsx
index 88714d21..1e08cdab 100644
--- a/src/forge/DevOps/Dispose.jsx
+++ b/src/forge/DevOps/Dispose.jsx
@@ -45,9 +45,9 @@ function Dispose(props){
}).then(result=>{
if(result && result.data){
setList(result.data.pipelines);
- setSpining(false);
}
- }).catch(error=>{})
+ setSpining(false);
+ }).catch(error=>{setSpining(false);})
}
useEffect(()=>{
@@ -96,7 +96,7 @@ function Dispose(props){
setVisible(false);
if(result && result.data){
props.showNotification("流水线新增成功，请进行工作流配置！");
- props.history.push(`/projects/${owner}/${projectsId}/devops/dispose/${result.data.id}`);
+ props.history.push(`/${owner}/${projectsId}/devops/${result.data.id}`);
}else{
props.showNotification("流水线新增失败，请稍后再试！");
}
@@ -134,16 +134,20 @@ function Dispose(props){
// 模板管理
function toModalManage(){
- props.history.push(`/projects/${owner}/${projectsId}/devops/mould`);
+ props.history.push(`/${owner}/${projectsId}/devops/mould`);
+ }
+
+ // 参数管理
+ function toparameter(){
+ props.history.push(`/${owner}/${projectsId}/devops/params`);
}
const operate = current_user && (permission && permission !== "Reporter");
-
return(
setVisible(false)} onOk={onOk}/>
版本库地址已变更，请基于新地址提交代码
- { - http_url && HTTP - } - -
+
+ )
}
export default CloneAddress;
\ No newline at end of file
diff --git a/src/forge/Branch/Select.jsx b/src/forge/Branch/Select.jsx
index 4c10177a..a39f9556 100644
--- a/src/forge/Branch/Select.jsx
+++ b/src/forge/Branch/Select.jsx
@@ -1,115 +1,67 @@
-import React , { useState , useEffect } from 'react';
-import { Popover , Input , Spin } from 'antd';
-import './branch.css';
-import { getBranch , getTag } from '../GetData/getData';
-
+import React , { useState , useEffect , useRef } from 'react';
+import { Dropdown} from 'antd';
+import './branch.scss';
+import SelectOverlay from './SelectOverlay';
+import { findDOMNode } from 'react-dom';
+import { turnbar } from 'educoder';
export default (({ projectsId , branch , owner , changeBranch , branchList , tagflag = true })=>{
const [ showValue , setShowValue ] = useState(branch);
- const [ inputValue , setInputValue] = useState(undefined);
- const [ nav , setNav ] = useState(0);
- const [ isSpin , setIsSpin ] = useState(true);
- const [ flag , setFlag ] = useState(false);
+ const [ visible , setVisible ] = useState(false);
- const [ data , setData ] = useState(undefined);
- const [ datas , setDatas ] = useState(undefined);
+ const refFa = useRef(null);
+ const refBox = useRef(null);
+
+ useEffect(() => {
+ document.addEventListener('click', clickMe , false);
+ }, [])
+
+ const clickMe = ({ target }) => {
+ // 查找父组件
+ const faComponent = findDOMNode(refFa.current);
+ const boxComponent = findDOMNode(refBox.current);
+
+ if (faComponent && boxComponent) {
+ const isChild = faComponent.contains(target);
+ const isBox = boxComponent.contains(target);
+ if(!isChild && !isBox){
+ setVisible(false);
+ }
+ }
+ }
useEffect(()=>{
setShowValue(branch);
},[branch])
- useEffect(()=>{
- document.body.addEventListener('click', e => {
- let name = e.target.className;
- let turn = name === "ant-input OptionsInput" || name === "navli active"|| name === "navli" || name === "padding10 bor-bottom-greyE";
- if(turn){
- return;
- }else{
- setFlag(false);
- }
- })
- })
-
- useEffect(()=>{
- if(branchList){
- setData(branchList);
- setDatas(branchList);
- setIsSpin(false);
- }
- },[branchList])
-
-
- async function getBranchs(id,owner){
- let result = await getBranch(id,owner);
- setData(result);
- setDatas(result);
- setIsSpin(false);
+ function ChangeB(params) {
+ setVisible(false);
+ let en = turnbar(params);
+ changeBranch(en);
}
- async function getTags(id,owner){
- let result = await getTag(id,owner);
- setData(result);
- setDatas(result);
- setIsSpin(false);
- }
-
- function changeInputValue(e){
- setInputValue(e.target.value);
- let filter = e.target.value ? data && data.length>0 && data.filter(item=>item.name.indexOf(e.target.value)>-1) : data;
- setDatas(filter);
- }
-
- function changeNav(nav){
- setNav(nav);
- setIsSpin(true);
- if(nav === 0){
- getBranchs(projectsId,owner);
- }else{
- getTags(projectsId,owner);
- }
- }
- function chooseitem(value){
- // setShowValue(value);
- changeBranch(value);
- }
-
const menu = (
-
+
+
- )
- }
+
+
+
+
-
-
+ setFlag(!flag)} overlayClassName="branch-tagBox-list">
-
+ {renderTreeNodes(item.children)}
+
+ );
+ });
+ }
+
+ function onLoadData(tr){
+ return new Promise((resolve) => {
+ if (tr.props.children) {
+ resolve();
+ return;
+ }
+ let en = [];
+ const url = `/${owner}/${projectsId}/sub_entries.json`;
+ axios.get(url, {
+ params:{
+ filepath:tr.props.dataRef.path,
+ ref:branch,
+ type:"dir"
+ }
+ }).then((result) => {
+ if(result){
+ en = result.data.entries;
+ }
+ }).catch(error=>{})
+ setTimeout(() => {
+ tr.props.dataRef.children = en;
+ setTreeData([...treeData]);
+ resolve();
+ }, 2000);
+ });
+ }
+
+ function selectTree(keys,event){
+ let dataref = event.node.props.dataRef;
+ if(dataref.type==="file"){
+ onClose();
+ let value = turnbar(branch);
+ history.push(`/${owner}/${projectsId}/tree/${value}/${dataref.path}`);
+ }
+ }
+
+ return(
+
+
+
+ {treeData && renderTreeNodes(treeData)}
+
+
+
+ )
+}
+export default DrawerPanel;
diff --git a/src/forge/Component/EAccount.scss b/src/forge/Component/EAccount.scss
new file mode 100644
index 00000000..6fe44ab3
--- /dev/null
+++ b/src/forge/Component/EAccount.scss
@@ -0,0 +1,6 @@
+.ant-modal-mask{
+ z-index: 1031;
+}
+.ant-modal-wrap{
+ z-index: 1032;
+}
\ No newline at end of file
diff --git a/src/forge/Component/EducoderAccount.jsx b/src/forge/Component/EducoderAccount.jsx
new file mode 100644
index 00000000..51fe0ded
--- /dev/null
+++ b/src/forge/Component/EducoderAccount.jsx
@@ -0,0 +1,60 @@
+import React , {forwardRef, useEffect} from 'react';
+import { Modal , Form , Input , Button } from 'antd';
+import './EAccount.scss';
+
+function EducoderAccount({form , visible , onOk , email}){
+ const { getFieldDecorator, validateFields , setFieldsValue } = form;
+
+ useEffect(()=>{
+ if(email){
+ setFieldsValue({email})
+ }
+ },[email])
+
+ function onSure(){
+ validateFields((error,values)=>{
+ if(!error){
+ onOk(values);
+ }
+ })
+ }
+ const layout = {
+ labelCol: { span: 5 },
+ wrapperCol: { span: 18 },
+ };
+ return(
+ 确定
+ }
+ centered
+ >
+
+ )
+}
+export default Form.create()(forwardRef(EducoderAccount));
\ No newline at end of file
diff --git a/src/forge/Component/HeadSearch.jsx b/src/forge/Component/HeadSearch.jsx
new file mode 100644
index 00000000..0e44a2cd
--- /dev/null
+++ b/src/forge/Component/HeadSearch.jsx
@@ -0,0 +1,41 @@
+import React, { useState } from "react";
+import { Input ,notification} from "antd";
+
+const { Search } = Input;
+export default ({history}) => {
+ const [openSearch, setOpenSearch] = useState(false);
+
+ function onGlobalSearch(value) {
+ history.push('/search?value=' + value);
+ // window.location.href = `search?value=` + value;
+ // history.push({
+ // pathname:'/search',
+ // state:value
+ // })
+ }
+ return (
+
+ {
+ openSearch ?
+
+ )
+};
diff --git a/src/forge/Component/LanguagePower.jsx b/src/forge/Component/LanguagePower.jsx
new file mode 100644
index 00000000..b2fb174b
--- /dev/null
+++ b/src/forge/Component/LanguagePower.jsx
@@ -0,0 +1,78 @@
+import React, { useEffect, useState } from 'react';
+import { FlexAJ } from '../Component/layout';
+import { Divider } from 'antd';
+import axios from 'axios';
+
+function LanguagePower({owner,projectsId}){
+ const [ array , setArray ] = useState(undefined);
+
+
+ useEffect(()=>{
+ getData();
+ },[])
+
+ function getData(){
+ const url = `/${owner}/${projectsId}/languages.json`;
+ axios.get(url).then(result=>{
+ if(result){
+ let languages = result.data;
+ if(languages){
+ let arr = [];
+ Object.keys(languages).map((item,key)=>{
+ arr.push({name:item,percent:languages[item],color:getColor()});
+ })
+ setArray(arr);
+ }
+ }
+ }).catch(error=>{})
+ }
+
+ // useEffect(()=>{
+ // if(languages){
+ // let arr = [];
+ // Object.keys(languages).map((item,key)=>{
+ // arr.push({name:item,percent:languages[item],color:getColor()});
+ // })
+ // setArray(arr);
+ // }
+ // },[languages])
+
+ function getColor(){
+ let str = "#";
+ let arr = ["1","2","3","4","4","5","6","7","8","9","a","b","c","d","e","f"];
+ for(var i=0;i<6;i++){
+ let num = parseInt(Math.random() * 16);
+ str+=arr[num];
+ }
+ return str;
+ }
+ return(
+ (array && array.length > 0) ?
+
+
+ {props.contentTitle}
+ }
+ />
+ } else if (type === 'confirm') {
+ return
+ {cancelText}
+ ,
+ ,
+ ]}
+ >
+
+ )
+}
diff --git a/src/forge/Component/ModalFun/index.scss b/src/forge/Component/ModalFun/index.scss
new file mode 100644
index 00000000..24f7b021
--- /dev/null
+++ b/src/forge/Component/ModalFun/index.scss
@@ -0,0 +1,63 @@
+.myself-modal {
+ .ant-modal-header {
+ padding: 9px 24px;
+ background: #f8f8f8;
+ border-bottom: 1px solid #eee;
+ }
+ .ant-modal-title {
+ text-align: left;
+ }
+ .ant-modal-close {
+ top: 0px !important;
+ }
+ .ant-modal-close-x {
+ font-size: 24px;
+ }
+ .ant-modal-body {
+ text-align: center;
+ }
+ .content-title {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ margin: 2rem 0 1rem !important;
+ font-size: 16px;
+ color: #333;
+ letter-spacing: 0;
+ line-height: 29px;
+ font-weight: 400;
+ }
+ .red-circle {
+ align-self: flex-start;
+ color: #ca0002;
+ font-size: 1.5rem !important;
+ }
+ .content-descibe {
+ font-size: 14px;
+ color: #666;
+ line-height: 33px;
+ font-weight: 400;
+ }
+ .ant-modal-footer {
+ padding: 2rem 0;
+ text-align: center;
+ border: 0;
+ .ant-btn {
+ width: 6rem;
+ }
+ }
+ .foot-submit {
+ margin-left: 3rem;
+ color: #df0002;
+ &:hover {
+ border-color: #df0002;
+ }
+ }
+ .ant-btn-default:hover,
+ .ant-btn-default:active,
+ .ant-btn-default:focus {
+ background: #f3f4f6;
+ color: #333;
+ border-color: #d0d0d0;
+ }
+}
\ No newline at end of file
diff --git a/src/forge/Component/Monaco.jsx b/src/forge/Component/Monaco.jsx
new file mode 100644
index 00000000..aa70d803
--- /dev/null
+++ b/src/forge/Component/Monaco.jsx
@@ -0,0 +1,62 @@
+import React, {useEffect, useRef, useState} from 'react';
+import * as monaco from 'monaco-editor/esm/vs/editor/editor.api.js';
+import './Component.scss';
+
+function Monaco(props) {
+ const {
+ style = { // dom节点样式
+ height: '400px',
+ },
+ value = '', // 代码文本
+ onChange = () => { // 改变的事件
+ },
+ fontSize = 14, // 代码字体大小
+ monacoOptions = {
+ scrollBeyondLastLine: false,
+ lineNumbers: "off",
+ wordWrap: true,
+ overviewRulerBorder: true,
+ lineHeight: 24,
+ readOnly:true
+ }, // monaco 自定义属性
+ language = 'html', // 语言 支持 js ts sql css json html等
+ } = props;
+ const editOrRef = useRef();
+ const ThisEditor = useRef();
+ useEffect(() => {
+ ThisEditor.current = monaco.editor.create(editOrRef.current, {
+ value: value || '',
+ language,
+ theme: "vs-grey",
+ fontSize: fontSize + 'px',
+ minimap: { // 关闭代码缩略图
+ enabled: false,
+ },
+ ...monacoOptions,
+ });
+
+ ThisEditor.current.onDidChangeModelContent((e) => {
+ let newValue = ThisEditor.current.getValue();
+ onChange(newValue);
+ });
+ return () => {
+ ThisEditor.current.dispose();
+ ThisEditor.current = undefined; // 清除编辑器对象
+ }
+ }, []);
+ useEffect(() => {
+ if (ThisEditor.current) {
+ ThisEditor.current.updateOptions({
+ fontSize: fontSize + 'px',
+ })
+ }
+ }, [fontSize]);
+
+ return (
+
+
+ )
+}
+export default SystemNotice;
\ No newline at end of file
diff --git a/src/forge/Component/NoticeModal/bg.png b/src/forge/Component/NoticeModal/bg.png
new file mode 100644
index 00000000..625b3c31
Binary files /dev/null and b/src/forge/Component/NoticeModal/bg.png differ
diff --git a/src/forge/Component/ProfileModal/Index.jsx b/src/forge/Component/ProfileModal/Index.jsx
new file mode 100644
index 00000000..7cead761
--- /dev/null
+++ b/src/forge/Component/ProfileModal/Index.jsx
@@ -0,0 +1,72 @@
+import React , { useEffect , useState } from 'react';
+import Modals from '../PublicModal/Index';
+import { Button } from 'antd';
+import axios from 'axios';
+
+import ProfileImg from './images/profile.png';
+import './Index.scss';
+
+function ProfileModal({visible,onCancel,history}) {
+ const [ modalVis , setModalVis ] = useState(visible);
+ const [ addMemberCheck , setAddMemberCheck ] = useState(false);
+
+ useEffect(()=>{
+ axios.interceptors.response.use((response) => {
+ if (response && (response.data.status === 411 || response.data.status === 412)) {
+ setModalVis(true);
+ if(response.data.status === 412){
+ setAddMemberCheck(true);
+ }
+ }
+ return response;
+ }, (error) => {
+ });
+ },[])
+
+ useEffect(()=>{
+ setModalVis(visible);
+ },[visible])
+
+ function onOk(){
+ onCancel();
+ setModalVis(false);
+ setTimeout(function(){
+ window.open(`/settings/profile`,"_blank");
+ },200)
+ }
+
+ function onNo() {
+ onCancel();
+ setModalVis(false);
+ }
+
+ return(
+
+
+
+ :
+
-
-
- -
-
- changeNav(0)}>分支列表 - { tagflag &&
- changeNav(1)}>标签列表 } -
-
- {
- datas && datas.length>0 ?
- datas.map((item,key)=>{
- return(
-
- chooseitem(item.name)}>{item.name} - ) - }): -
暂无{inputValue}{nav === 0 ?"分支":"标签"}~
- } -
+
);
return(
-
- {nav === 0 ?"分支":"标签"}:
-
+
+
)
})
\ No newline at end of file
diff --git a/src/forge/Branch/SelectOverlay.jsx b/src/forge/Branch/SelectOverlay.jsx
new file mode 100644
index 00000000..0be56732
--- /dev/null
+++ b/src/forge/Branch/SelectOverlay.jsx
@@ -0,0 +1,90 @@
+import React , { useState , useEffect } from 'react';
+import { Input , Spin , Menu } from 'antd';
+import { getBranch , getTag } from '../GetData/getData';
+
+function SelectOverlay({ changeBranch , tagflag , projectsId , owner , visible }) {
+ const [ inputValue , setInputValue] = useState(undefined);
+ const [ nav , setNav ] = useState(0);
+ const [ isSpin , setIsSpin ] = useState(true);
+
+ const [ data , setData ] = useState(undefined);
+ const [ datas , setDatas ] = useState(undefined);
+ const [ keys ,setKeys] = useState("branch");
+
+ useEffect(()=>{
+ if(visible){
+ setKeys("branch");
+ getBranchs(projectsId,owner);
+ setIsSpin(true);
+ }
+ },[visible])
+
+ async function getBranchs(id,owner){
+ let result = await getBranch(id,owner);
+ setData(result);
+ setDatas(result);
+ setIsSpin(false);
+ }
+ async function getTags(id,owner){
+ let result = await getTag(id,owner);
+ setData(result);
+ setDatas(result);
+ setIsSpin(false);
+ }
+ function chooseitem(value){
+ changeBranch(value);
+ }
+ function changeInputValue(e){
+ setInputValue(e.target.value);
+ let filter = e.target.value ? data && data.length>0 && data.filter(item=>item.name.indexOf(e.target.value)>-1) : data;
+ setDatas(filter);
+ }
+
+ function changeNav(e){
+ setKeys(e.key);
+ setIsSpin(true);
+ if(e.key === "branch"){
+ getBranchs(projectsId,owner);
+ setNav(0);
+ }else{
+ getTags(projectsId,owner);
+ setNav(1);
+ }
+ }
+
+ return(
+
+
+
+ })
+
+
+
+
+
+ {data.projects_count}
+ 项目数
+
+
+ {data.followers_count}
+ 粉丝数
+
+
+ {data.following_count}
+ 关注数
+
+
+
+ )
+ setMenu(ele);
+ }
+ }
+
+ function FocusFunc(flag,login){
+ axios({
+ method: flag ? 'post' : 'delete',
+ url: `/watchers/${flag ? 'follow' : 'unfollow'}.json`,
+ params: {target_type: "user",id:login}
+ }).then(result => {
+ if (result && (result.data.status === 0 || result.data.status === 2)) {
+ let a = menuList && menuList.filter(i=>i.login === login);
+ if(a){
+ a[0].is_watch = flag;
+ }
+ setMenusFunc(a[0]);
+ }
+ })
+ .catch(error => {
+ console.log(error);
+ });
+ }
+
+ function renderArray(array){
+ let str = "";
+ for(var i = 0;i{substr} )
+ }
+
+ function setVisibleFunc(flag,l,index){
+ if(l !== login){
+ setLogin(l);
+ }
+ var lx = list.concat();
+ lx.map(i=>i.visible =false);
+ if(flag){
+ lx[index].visible = flag;
+ }
+ lx.splice();
+ setList(lx);
+ }
+
+ return(
+ total > 0 ?
+ { setTitle(beforeText) }}
+ >
+
+
+ );
+}
+
+
+export default memo(CopyTool);
\ No newline at end of file
diff --git a/src/forge/Component/DeleteModal/Index.jsx b/src/forge/Component/DeleteModal/Index.jsx
new file mode 100644
index 00000000..c3c13689
--- /dev/null
+++ b/src/forge/Component/DeleteModal/Index.jsx
@@ -0,0 +1,33 @@
+import React from 'react';
+import { AlignCenter } from '../layout';
+import { Button } from 'antd';
+import Modals from '../PublicModal/Index';
+
+function DeleteBox({
+ visible ,
+ onCancel ,
+ onSuccess ,
+ title ,
+ subTitle,
+ content
+}) {
+ return(
+
+
+
+
+ }
+ onCancel={onCancel}
+ visible={visible}
+ >
+ setVisible(visible ? false : true)}>
+ {/* {nav === 0 ?"分支":"标签"} */}
+
+
{showValue}
-
-
+
+
-
+
+
+
+
+ )
+}
+export default SelectOverlay;
\ No newline at end of file
diff --git a/src/forge/Branch/branch.css b/src/forge/Branch/branch.css
deleted file mode 100644
index ff65db54..00000000
--- a/src/forge/Branch/branch.css
+++ /dev/null
@@ -1,84 +0,0 @@
-.branchDropdown{
- border:1px solid #eee;
- border-radius: 4px;
- display: flex;
- justify-content: center;
- height: 40px;
- line-height: 40px;
- min-width: 220px;
-}
-.branchDropdown .ant-dropdown-trigger{
- width: 100%;
- padding:0px 15px;
- display: flex;
- justify-content: space-between;
- align-items: center;
- cursor: pointer;
-}
-.branchOptions{
- width: 220px;
- box-shadow: 0px 0px 3px 1px rgba(134, 134, 134, 0.4);
- border-radius: 3px;
- background: #fff;
- max-height: 300px;
-}
-.OptionsUl{
- max-height: 220px;
- overflow-y: auto;
-}
-.OptionsUl li{
- height: 35px;
- line-height: 35px;
- cursor: pointer;
- padding:0px 10px;
-}
-.OptionsUl li:hover{
- background-color: #F0F0F0;
-}
-.OptionsUl li a{
- display: block;
-}
-.OptionsInput{
- height: 32px;
- padding-left: 4px;
- line-height: 32px;
- width: 100%;
-}
-.branch-tagBox{
- border:1px solid #eee;
- border-radius: 3px;
- height: 40px;
- display: flex;
- align-items: center;
- cursor: pointer;
- min-width: 240px;
-}
-.branch-tagBox-list .ant-popover-arrow{
- display: none;
-}
-.branch-tagBox-list.ant-popover.ant-popover-placement-bottom{
- padding-top:0px;
-}
-.branch-tagBox .ant-dropdown-link{
- display: block;
- flex:1;
-}
-.branch-tagBox-list .ant-popover-inner-content{
- padding:0px;
-}
-.navUl{
- display: flex;
- justify-content: space-between;
- align-items: center;
- margin-top: 5px;
-}
-.navUl li{
- cursor: pointer;
-}
-.navUl li.active{
- color:#5091FF;
-}
-.listTips{
- padding:20px 0px;
- text-align: center;
-}
\ No newline at end of file
diff --git a/src/forge/Branch/branch.scss b/src/forge/Branch/branch.scss
new file mode 100644
index 00000000..030b05cd
--- /dev/null
+++ b/src/forge/Branch/branch.scss
@@ -0,0 +1,129 @@
+.branchDropdown{
+ border:1px solid #eee;
+ border-radius: 4px;
+ display: flex;
+ justify-content: center;
+ height: 40px;
+ line-height: 40px;
+ min-width: 220px;
+}
+.branchDropdown .ant-dropdown-trigger{
+ width: 100%;
+ padding:0px 15px;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ cursor: pointer;
+}
+.branchOptions{
+ width: 220px;
+ box-shadow: 0px 0px 3px 1px rgba(134, 134, 134, 0.4);
+ border-radius: 3px;
+ background: #fff;
+ max-height: 300px;
+}
+.OptionsUl{
+ min-height: 50px;
+ max-height: 220px;
+ overflow-y: auto;
+}
+.OptionsUl li{
+ height: 30px;
+ line-height: 30px;
+ cursor: pointer;
+ padding:0px 20px;
+ margin:5px 0px;
+}
+.OptionsUl li:hover{
+ background-color: #F0F0F0;
+}
+.OptionsUl li a{
+ display: block;
+}
+.OptionsInput{
+ height: 32px;
+ padding-left: 4px;
+ line-height: 32px;
+ width: 100%;
+}
+.branch-tagBox{
+ border:1px solid #D0D0D0;
+ border-radius: 3px;
+ height: 32px;
+ display: flex;
+ align-items: center;
+ cursor: pointer;
+ min-width: 104px;
+}
+.branch-tagBox:hover{
+ background-color: #F3F4F6;
+}
+.branch-tagBox-list{
+ background: #FFFFFF;
+ box-shadow: 0px 4px 8px 2px rgba(212, 212, 212, 0.5);
+ border-radius: 4px;
+ .ant-popover-arrow{
+ display: none;
+ }
+ &.ant-popover.ant-popover-placement-bottom{
+ padding-top:0px;
+ }
+ .branch-tagBox .ant-dropdown-link{
+ display: block;
+ flex:1;
+ max-width: 105px;
+ }
+ .ant-popover-inner-content{
+ padding:0px;
+ }
+}
+.overlayBranch{
+ width: 325px;
+ .navUl{
+ margin-top: 8px;
+ height: 30px;
+ line-height: 30px;
+ li{
+ height: 30px;
+ line-height: 30px;
+ padding:0px 5px;
+ margin-left: 20px!important;
+ &.ant-menu-item-selected{
+ border-color:#466aff!important;
+ color:#466aff!important;
+ }
+ &.ant-menu-item-active{
+ border-color:transparent ;
+ }
+ }
+ }
+}
+.listTips{
+ padding:20px 0px;
+ text-align: center;
+}
+
+.urlMenu{
+ line-height: 30px;
+ margin-bottom: 10px;
+ padding:15px 20px 0px 20px;
+ border-bottom: none;
+ li.ant-menu-item{
+ height: 30px;
+ line-height: 30px;
+ padding:0px 5px;
+ margin-right: 20px!important;
+ &.ant-menu-item-selected,&.ant-menu-item-active{
+ color: #333;
+ }
+ &.ant-menu-item-selected{
+ border-color:#466aff!important;
+ }
+ &.ant-menu-item-active{
+ border-color:transparent ;
+ }
+ }
+}
+.copytool{
+ margin:0px 10px;
+}
\ No newline at end of file
diff --git a/src/forge/Component/AddGroup.jsx b/src/forge/Component/AddGroup.jsx
index 656175d5..feff6f37 100644
--- a/src/forge/Component/AddGroup.jsx
+++ b/src/forge/Component/AddGroup.jsx
@@ -55,6 +55,7 @@ function AddGroup({organizeId,getGroupID}){
function addCollaborator(){
getGroupID && getGroupID(id);
+ setID(undefined);
}
return(
diff --git a/src/forge/Component/AddMember.jsx b/src/forge/Component/AddMember.jsx
index a4188229..f453be05 100644
--- a/src/forge/Component/AddMember.jsx
+++ b/src/forge/Component/AddMember.jsx
@@ -4,7 +4,7 @@ import axios from 'axios';
import { getImageUrl } from 'educoder';
const { Option } = AutoComplete;
-function AddMember({getID,login}){
+function AddMember({getID,login,showNotification}){
const [ id , setID ] = useState(undefined);
const [ source , setSource ] = useState(undefined);
const [ searchKey , setSearchKey ] = useState(undefined);
@@ -42,10 +42,10 @@ function AddMember({getID,login}){
className="user_img radius"
width="28"
height="28"
- src={getImageUrl(`images/${item && item.image_url}`)}
+ src={getImageUrl(`/${item && item.image_url}`)}
alt=""
/>
-
+
{item.username}
({item.login})
@@ -66,7 +66,13 @@ function AddMember({getID,login}){
};
function addCollaborator(){
- getID && getID(id);
+ if(source && source.length>0&&searchKey){
+ getID && getID(id);
+ setSearchKey(undefined);
+ setID(undefined)
+ }else{
+ showNotification("请选择存在的用户!");
+ }
}
return(
diff --git a/src/forge/Component/Cards.jsx b/src/forge/Component/Cards.jsx
index 1c9706c3..f9a3d52e 100644
--- a/src/forge/Component/Cards.jsx
+++ b/src/forge/Component/Cards.jsx
@@ -3,10 +3,10 @@ import { getImageUrl } from 'educoder';
import { Link } from 'react-router-dom';
import './Component.scss';
-function Cards({img , title, desc , rightBtn , src}){
+function Cards({img , title, desc , rightBtn , src , bottomInfos}){
return(
+ }
+ placeholder={`请输入分支${tagflag ? "或标签" :""}名称搜索`}
+ autocomplete="off" className="OptionsInput"
+ value={inputValue}
+ onChange={changeInputValue}
+ />
+
+
+ -
+ {
+ datas && datas.length>0 &&
+ datas.map((item,key)=>{
+ return(
+
- chooseitem(item.name)}>{item.name} + ) + }) + + } + { + datas && datas.length === 0 && +
暂无{inputValue}{nav === 0 ?"分支":"标签"}~
+ } +
- {img &&})
}
+ {img &&})
}
)
diff --git a/src/forge/Component/Component.scss b/src/forge/Component/Component.scss
index 6dbe53b8..da292d23 100644
--- a/src/forge/Component/Component.scss
+++ b/src/forge/Component/Component.scss
@@ -20,6 +20,7 @@ li.ant-menu-item{
background-color: #fff;
margin-bottom:18px;
min-height: 130px;
+ border:1px solid #eee;
.img{
margin-right: 20px;
width: 190px;
@@ -61,6 +62,7 @@ li.ant-menu-item{
}
// Tabs
.tabsStyle{
+ border:1px solid #eee;
.ant-tabs-bar.ant-tabs-top-bar{
padding-left: 35px;
margin-bottom: 0px;
@@ -110,6 +112,16 @@ li.ant-menu-item{
right:240px;
z-index: 10000;
}
+.laterest{
+ background-color: #EF3131;
+ color: #fff;
+ font-size: 12px;
+ margin-left: 10px;
+ padding:0px 5px;
+ border-radius: 2px;
+ height: 18px;
+ line-height: 18px;
+}
@media screen and (max-width: 1800px){
.handleBox{
@@ -135,4 +147,316 @@ li.ant-menu-item{
.handleBox{
right:0px;
}
-}
\ No newline at end of file
+}
+.ant-drawer{
+ z-index: 10000!important;
+}
+.ant-drawer-body{
+ padding:0px!important;
+ .drawerHead{
+ background-color: #333;
+ color: #fff;
+ padding:15px 20px;
+ }
+ .ant-tree{
+ margin:0px 20px!important;
+ }
+}
+.hoverA{
+ display:flex;
+ align-items: center;
+ max-width: 78px;
+ &:hover a{
+ color:#2A61FF !important ;
+ }
+}
+.menuPanels{
+ width: 295px;
+ .leftline{
+ position: relative;
+ color: #666;
+ height: 16px;
+ margin-left: 14px;
+ font-size: 12px;
+ &::before{
+ position: absolute;
+ left: -7px;
+ top:3px;
+ height: 12px;
+ width: 1px;
+ background-color: #999;
+ content: "";
+ }
+ }
+ .ant-btn{
+ height: 36px;
+ line-height: 34px;
+ width: 83px;
+ text-align: center;
+ padding:0px ;
+ font-weight: 500;
+ font-size: 14px;
+ &.currentBtn{
+ cursor: default;
+ color: #333;
+ &:hover{
+ color: #333;
+ border-color: #d0d0d0;
+ }
+ }
+ }
+ .ant-btn-default{
+ color: #333;
+ border-color: #d0d0d0;
+ &:hover{
+ background: #F3F4F6;
+ }
+ }
+ .ant-btn{
+ width: 102px;
+ height: 32px;
+ line-height: 30px;
+ }
+ .ant-btn-primary{
+ color: #fff;
+ background-color: #466AFF;
+ border:none;
+ &:hover{
+ background-color: rgba(70,106,255,0.85);
+ }
+ }
+ .focusPanelHeadInfo{
+ padding:14px 16px;
+ border-bottom: 1px solid #eee;
+ }
+ .ant-popover-content,.ant-popover-inner{
+ height: 100%;
+ width: 100%;
+ }
+ .ant-popover-inner-content{
+ padding:0px;
+ }
+}
+.halfs{
+ margin-top: 24px;
+ padding:24px 0px 0px 0px;
+ border-top: 1px solid #e8e8e8;
+}
+.aboutSubTitle{
+ display: flex;
+ align-items: center;
+}
+.menuMaininfos{
+ padding:10px 16px 14px;
+ border-bottom: 1px solid #eee;
+}
+.menuinfos{
+ padding:10px 20px 16px;
+ &>a{
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ flex: 1;
+ & >span:first-child{
+ font-size: 16px;
+ font-weight: 500;
+ color: #333;
+ line-height: 22px;
+ }
+ & >span:last-child{
+ color: #666;
+ font-weight: 400;
+ line-height: 20px;
+ margin-top: 6px;
+ }
+ }
+}
+
+/*-------------------个人主页：右侧提示区域--------------------------*/
+.-task-sidebar {
+ position: fixed;
+ width: 40px;
+ right: 0;
+ bottom: 80px;
+ z-index: 10;
+}
+
+@media screen and (max-width: 1920px){
+ .-task-sidebar{
+ right:220px;
+ }
+}
+@media screen and (max-width: 1750px){
+ .-task-sidebar{
+ right:160px;
+ }
+}
+@media screen and (max-width: 1650px){
+ .-task-sidebar{
+ right:115px;
+ }
+}
+@media screen and (max-width: 1550px){
+ .-task-sidebar{
+ right:90px;
+ }
+}
+@media screen and (max-width: 1450px){
+ .-task-sidebar{
+ right:45px;
+ }
+}
+@media screen and (max-width: 1200px){
+ .-task-sidebar{
+ right:0px;
+ display: none;
+ }
+}
+.-task-sidebar>div {
+ height: 48px;
+ line-height: 48px;
+ box-sizing: border-box;
+ width: 48px;
+ color: #999;
+ font-size: 20px;
+ text-align: center;
+ margin-bottom: 20px;
+ border-radius: 50%;
+ background: #FFFFFF;
+ box-shadow: 0px 0px 12px 5px rgba(208, 208, 208, 0.2);
+}
+
+.-task-sidebar>div i {
+ color: #999;
+}
+
+.-task-sidebar>div:hover i {
+ color: #fff !important;
+}
+.-task-sidebar>div:hover{
+ background: #466AFF;
+ box-shadow: 0px 0px 10px 2px #B6D0FC;
+}
+.helpBox{
+ width: 260px;
+ z-index: 103;
+ &.shareContent{
+ width: 160px;
+ }
+ .ant-popover-title{
+ font-size: 16px;
+ }
+ .ant-popover-inner-content{
+ padding:0px;
+ }
+ p.titlecontent{
+ font-size: 16px;
+ color: #333;
+ line-height: 20px;
+ padding:15px 20px;
+ }
+ .faqUl{
+ padding:10px 15px;
+ max-height: 230px;
+ overflow-y: auto;
+ font-size: 13px;
+ li{
+ background: #F5F5F5;
+ border-radius: 20px;
+ padding:0px 15px;
+ color: #333;
+ height: 30px;
+ line-height: 30px;
+ margin-bottom: 3px !important;
+ a{
+ display: block;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
+ &:hover{
+ background-color: #D1E9FF;
+ a{
+ color: #333!important;
+ }
+ }
+ }
+ }
+ .shareUl{
+ display: flex;
+ align-items: center;
+ li > i{
+ font-size: 32px!important;
+ }
+ }
+}
+// tooltip样式
+.tooltipBox .ant-tooltip-inner{
+ padding: 8px 12px;
+ font-size: 15px;
+}
+
+.-task-desc {
+ background: #494949;
+ width: 90px;
+ line-height: 36px;
+ text-align: center;
+ position: absolute;
+ color: #fff;
+ font-size: 13px;
+ z-index: 999999;
+ opacity: 0;
+}
+
+.-task-desc div {
+ position: absolute;
+ top: 10px;
+ right: -7px;
+ height: 13px;
+}
+
+.-task-desc div img {
+ float: left
+}
+
+.-task-sidebar .scan_ewm {
+ position: absolute !important;
+ right: 45px !important;
+ bottom: 0px !important;
+ background-color: #494949 !important;
+ -webkit-box-sizing: border-box !important;
+ box-sizing: border-box !important;
+ font-size: 14px !important;
+ line-height: 16px !important;
+ display: none;
+ height: 213px !important;
+}
+
+.trangle_right {
+ position: absolute;
+ right: -5px;
+ bottom: 15px;
+ width: 0;
+ height: 0px;
+ border-top: 6px solid transparent;
+ border-left: 5px solid #494949;
+ border-bottom: 6px solid transparent
+}
+//头部输入框样式
+.headSerach{
+ background: rgba(255, 255, 255, 0.1);
+ border-radius: 4px;
+ padding-left: 20px;
+ //修改antd输入框默认样式
+ .ant-input,.ant-input:focus{
+ border: none !important;
+ background-color: rgba(255, 255, 255, 0) !important;
+ }
+ &:hover{
+ padding: 2px 20px 2px 20px;
+ background: #FFF;
+ & i{
+ color: #333;
+ }
+ }
+}
diff --git a/src/forge/Component/Contributors.jsx b/src/forge/Component/Contributors.jsx
new file mode 100644
index 00000000..f6dade6a
--- /dev/null
+++ b/src/forge/Component/Contributors.jsx
@@ -0,0 +1,180 @@
+import React, { useEffect, useState } from 'react';
+import { AlignCenter , FlexAJ } from '../Component/layout';
+import { Link } from 'react-router-dom';
+import { Popover , Spin , Button } from 'antd';
+import { getImageUrl } from 'educoder';
+import './Component.scss';
+import { getUser } from '../GetData/getData';
+import axios from 'axios';
+
+function Contributors({owner,projectsId,currentLogin}){
+ const [ menuList ,setMenuList ]= useState([]);
+ const [ list , setList ]= useState(undefined);
+ const [ total , setTotal ]= useState(0);
+ const [ menu , setMenu ] = useState("");
+ const [ login , setLogin ] = useState(undefined);
+ const [ isSpin , setIsSpin ] = useState(false);
+
+ useEffect(()=>{
+ getData();
+ },[])
+
+ function getData(){
+ const url = `/${owner}/${projectsId}/contributors.json`;
+ axios.get(url).then(result=>{
+ if(result){
+ setTotal(result.data.total_count);
+ setList(result.data.list);
+ }
+ }).catch(error=>{})
+ }
+
+ useEffect(()=>{
+ if(login){
+ getUsers(login);
+ }else{
+ setMenu(undefined);
+ }
+ },[login])
+
+ async function getUsers(login){
+ setIsSpin(true);
+ let a = menuList && menuList.filter(i=>i.login === login);
+ if(a.length === 0){
+ let result = await getUser(login);
+ let arr = menuList;
+ arr.push({...result});
+ setMenuList(arr);
+ setMenusFunc(result);
+ setIsSpin(false);
+ }else{
+ setMenusFunc(a[0]);
+ setIsSpin(false);
+ }
+ }
+
+ function renderOrganize(list) {
+ let str = "";
+ list.map(i=>{
+ str = str+i.name + "、";
+ })
+ return str && str.substr(0,str.length - 1);
+ }
+
+ function setMenusFunc(data){
+ if(data){
+ let ele = (
+ {title} @@ -15,6 +15,7 @@ function Cards({img , title, desc , rightBtn , src}){
{desc}
+ {bottomInfos}
+ {data.name}
+ { data.location && {data.location} }
+ {
+ data.organizations && data.organizations.length>0&&
+
+ + 所属组织：{renderOrganize(data.organizations)} +
+ } +
+ {
+ currentLogin && (currentLogin === data.login)
+ ?
+
+ :
+ data.is_watch ?
+
+ :
+
+ }
+
+
+
+ 贡献者
+ { total > 0 && {total}}
+
+
:""
+ )
+}
+export default Contributors;
\ No newline at end of file
diff --git a/src/forge/Component/CopyTool.jsx b/src/forge/Component/CopyTool.jsx
new file mode 100644
index 00000000..36ed1d8c
--- /dev/null
+++ b/src/forge/Component/CopyTool.jsx
@@ -0,0 +1,51 @@
+import React, { useState, useCallback, memo } from 'react';
+import { Tooltip } from 'antd';
+
+CopyTool.defaultProps = {
+ beforeText: '复制链接', //浮动过去显示的文字
+ afterText: '复制成功', //点击后显示的文字
+ className: '', //传给svg的class
+ inputId: 'copyText', //要复制的文本的ID
+ timeOut:true, //复制后将浮动的文字改为beforeText
+};
+
+
+function CopyTool({ beforeText, afterText, className , inputId , timeOut }) {
+ const [title, setTitle] = useState(() => {
+ return beforeText;
+ });
+
+ // 复制链接
+ const copyUrl = useCallback(() => {
+ const copyEle = document.querySelector(`#${inputId}`); // 获取要复制的节点
+ if (!copyEle) {
+ console.error("您的CopyTool未设置正确的inputId");
+ return;
+ }
+ copyEle.select(); // 执行选中元素
+ if (document.execCommand('copy')) {
+ document.execCommand('copy');
+ }
+ document.getSelection().removeAllRanges();
+
+ setTitle(afterText);
+ if(timeOut){
+ setTimeout(function(){
+ setTitle(beforeText);
+ },1500)
+ }
+ }, []);
+
+ return (
+ setVisibleFunc(false)}>
+ {
+ list && list.length>0 && list.map((item,key)=>{
+ return(
+
+
+ })
setVisibleFunc(true,item.login,key)}/>
+
+
+ )
+ })
+ }
+
+
+ {content}
+
+
+ )
+}
+export default DeleteBox;
\ No newline at end of file
diff --git a/src/forge/Component/DrawerPanel.jsx b/src/forge/Component/DrawerPanel.jsx
new file mode 100644
index 00000000..28847fda
--- /dev/null
+++ b/src/forge/Component/DrawerPanel.jsx
@@ -0,0 +1,101 @@
+import React, { useEffect, useState } from 'react';
+import { Drawer , Tree , Spin } from 'antd';
+import { turnbar} from 'educoder';
+import './Component.scss';
+import axios from 'axios';
+const { TreeNode , DirectoryTree } = Tree;
+
+function DrawerPanel({visible,onClose,branch,owner,projectsId,history, name , list}){
+ const [ treeData , setTreeData ] = useState(undefined);
+ const [ isSpin , setIsSpin ] = useState(true);
+ const [first , setFirst ] = useState(true);
+ useEffect(()=>{
+ if(visible && first){
+ if(list){
+ setTreeData(list);
+ setIsSpin(false);
+ }else{
+ getMenulist();
+ }
+ setFirst(false);
+ }
+ },[visible])
+
+ function getMenulist(){
+ const url = `/${owner}/${projectsId}/entries.json`;
+ axios.get(url,{ params: { ref: branch } }).then(result=>{
+ if(result){
+ setTreeData(result.data.entries);
+ }
+ setIsSpin(false);
+ }).catch(error=>{})
+ }
+
+ function renderTreeNodes(data) {
+ return data && data.length > 0 && data.map((item) => {
+ return (
+ {subTitle}
+
+
+ {name}
+{branch}
+
+
+ + 为确保您能正常使用平台功能，请确认以下信息: +
+ + {
+ setTimeout(() => {
+ setOpenSearch(false)
+ }, 500)
+ }}
+ >
+
+ :
+ {
+ setOpenSearch(true)
+ }} />
+ }
+
+
+ {
+ array.map((item,key)=>{
+ return(
+ {item.name}{item.percent}
+ )
+ })
+ }
+
+ }
+
:""
+ )
+}
+export default LanguagePower;
\ No newline at end of file
diff --git a/src/forge/Component/MemberCards.jsx b/src/forge/Component/MemberCards.jsx
index c0bd12c1..48d90e13 100644
--- a/src/forge/Component/MemberCards.jsx
+++ b/src/forge/Component/MemberCards.jsx
@@ -45,15 +45,15 @@ const Div = styled.div`{
export default (({ user , img, name, time, focusStatus, is_current_user, login , successFunc }) => {
return (
开发语言
+
+ {
+ array && array.map((item,key)=>{
+ return(
+
+ )
+ })
+ }
+
+ {
+ array && array.length > 0 &&
+
-
+
diff --git a/src/forge/Component/ModalFun/index.jsx b/src/forge/Component/ModalFun/index.jsx
new file mode 100644
index 00000000..8fee2c73
--- /dev/null
+++ b/src/forge/Component/ModalFun/index.jsx
@@ -0,0 +1,125 @@
+/* eslint-disable react/jsx-no-duplicate-props */
+import React, { useState } from 'react';
+import * as ReactDOM from 'react-dom';
+import { Modal, Button } from 'antd';
+import './index.scss';
+
+// 函数式调用删除、通知等模态框
+
+InitModal.defaultProps = {
+ okText: '确认', //确定按钮的文字
+ cancelText: '取消', //取消按钮的文字
+ className: '', //传入的模态框类名
+ inputId: 'copyText', //要复制的文本的ID
+ onCancel:()=>{}, //取消的回调
+ onOk:()=>{}, //确认的回调
+ title:'提示', //模态框名字
+ contentTitle:'', //内容标题
+ content:'', //详细内容
+ afterClose:()=>{}, //关闭模态框以后的回调
+};
+
+// 使用函数调用删除组件
+export default function DelModal(props) {
+ renderModal({ ...props, type: 'delete' })
+}
+
+// 使用函数调用选择模态框组件
+export function Confirm(props) {
+ renderModal({ ...props, type: 'confirm' })
+}
+
+function renderModal(props) {
+ const { type, afterClose } = props;
+ const div = document.createElement('div');
+ document.body.appendChild(div);
+
+ function destroy() {
+ afterClose && afterClose();
+ const unmountResult = ReactDOM.unmountComponentAtNode(div);
+ if (unmountResult && div.parentNode) {
+ div.parentNode.removeChild(div);
+ }
+ }
+
+ function modalType(type) {
+ if (type === 'delete') {
+ return
- {name}
+ {name}
{
is_current_user ?
:
-
+
}
+ {contentTitle &&
+ {contentTitle}
} +{content}
+
+
+
+ );
+}
+
+export default Monaco;
\ No newline at end of file
diff --git a/src/forge/Component/NoticeModal/Index.scss b/src/forge/Component/NoticeModal/Index.scss
new file mode 100644
index 00000000..ab83ea14
--- /dev/null
+++ b/src/forge/Component/NoticeModal/Index.scss
@@ -0,0 +1,90 @@
+.systemBox{
+ .ant-modal-body{
+ padding:1px 0px 0px 0px;
+ .sysBox{
+ background-image: url('./bg.png');
+ background-repeat: no-repeat;
+ background-size: 100% 334px;
+ margin-top: -55px;
+ }
+ .sysnoticeBox{
+ width: 100%;
+ padding:80px 0px 34px;
+ display: flex;
+ flex-direction: column;
+ width: 780px;
+ margin: 0px auto;
+ p.ntitle{
+ height: 33px;
+ font-size: 24px;
+ font-weight: 500;
+ color: #31FFF7;
+ line-height: 33px;
+ text-align: center;
+ }
+ p.nSubtitle{
+ height: 25px;
+ line-height: 25px;
+ font-size: 18px;
+ font-weight: 500;
+ color: #FFFFFF;
+ margin-top: 60px;
+ }
+ .markdown-body{
+ box-shadow: 0px 0px 17px rgba(0,0,0,0.2);
+ border-radius: 4px;
+ margin-top: 17px!important;
+ color: white;
+ }
+ .nContent{
+ padding:20px 34px;
+ background-color: #fff;
+ line-height: 30px;
+ font-size: 15px;
+ font-weight: 400;
+ color: #333;
+ .realmName{
+ margin-top: 20px;
+ display: flex;
+ ul{
+ width: 50%;
+ padding-left: 0px!important;
+ li{
+ font-size: 15px;
+ font-weight: 500;
+ line-height: 32px;
+ text-align: left;
+ color: #000;
+ list-style-type: none!important;
+ &:first-child{
+ color: #E65714;
+ }
+ }
+ }
+ }
+ .nSubdesc{
+ font-size: 15px;
+ font-weight: 400;
+ color: #000000;
+ line-height: 31px;
+ margin-top: 20px;
+ }
+ .nInfo{
+ font-size: 14px;
+ font-weight: 400;
+ color: #333333;
+ text-align: right;
+ margin-top: 25px;
+ p{
+ height: 20px;
+ line-height: 20px;
+ }
+ }
+ }
+ .nBtn{
+ text-align: center;
+ margin-top: 33px;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/forge/Component/NoticeModal/SystemNotice.jsx b/src/forge/Component/NoticeModal/SystemNotice.jsx
new file mode 100644
index 00000000..c95a8030
--- /dev/null
+++ b/src/forge/Component/NoticeModal/SystemNotice.jsx
@@ -0,0 +1,92 @@
+import React , { useEffect , useState } from 'react';
+import { Modal , Button } from 'antd';
+import './Index.scss';
+import '../../css/index.scss';
+import RenderHtml from '../../../components/render-html';
+// import cookie from 'react-cookies';
+import axios from 'axios';
+
+function SystemNotice({showNotice,system_notification,history,login,hideSystemNotice}){
+ const [ visible , setVisible ] = useState(false);
+
+ useEffect(()=>{
+
+ if(system_notification && !system_notification.is_read && showNotice && login){
+ setVisible(true);
+ }
+ },[system_notification,login])
+
+ function sureContinue() {
+ if(login && ( system_notification && system_notification.id )){
+ const url = `/users/${login}/system_notification_histories.json`;
+ axios.post(url,{
+ system_notification_id:system_notification.id
+ }).then(result=>{
+ if(result){
+ setVisible(false);
+ hideSystemNotice();
+ }
+ }).catch(error=>{})
+ }else{
+ setVisible(false);
+ hideSystemNotice();
+ }
+ // cookie.remove('notice_stage');
+
+ // let inFifteenMinutes = new Date(new Date().getTime() + 24 * 3600 * 1000);//一天
+ // // let inFifteenMinutes = new Date(new Date().getTime() + 60 * 1000);//一分钟
+ // cookie.save('notice_stage', true,{ expires: inFifteenMinutes,path:"/" });
+
+ // setVisible(false);
+ }
+
+ return (
+
+
+
+
+
+ {system_notification && system_notification.subject}
+{system_notification && system_notification.sub_subject}
+ {/*
+
*/}
+
+ 为了给用户提供更加稳定、优质的服务，我们即将对平台门户首页、平台名称、平台域名进行一次全面升级与变更。原平台名称：Trustie（中文名：确实）将于2021年10月xx日统一更改为Gitlink（中文名：确实开源）。届时平台域名将统一进行更换，更换规则如下
+
+
+
+ -
+
- 原域名： +
- 官网顶级域名https://www.trustie.net +
- 版本库子域名https://forgeplus.trustie.net +
- 论坛子域名https://forum.trustie.net/forums +
-
+
- 更换后域名： +
- 官网顶级域名https://www.gitlink.org.cn +
- 版本库子域名https://www.git.gitlink.org.cn +
- 论坛子域名https://forum.gitlink.org.cn +
+ 自2021年10月xx日起，旧域名将停止访问。因平台名称与域名变更给您带来的不便，我们深表歉意!非常感谢您一直以来对本平台的信任与支持，我们将一如既往地为您提供优质的服务。 特此通知!
+
+
+
+ Gitlink运营团队
+2021年10月xx日
+
+
+
+
+
+
+
+ }
+ >
+
+ 
+ {
+ addMemberCheck ?
+
+
+ )
+}
+export default ProfileModal;
\ No newline at end of file
diff --git a/src/forge/Component/ProfileModal/Index.scss b/src/forge/Component/ProfileModal/Index.scss
new file mode 100644
index 00000000..cf13121e
--- /dev/null
+++ b/src/forge/Component/ProfileModal/Index.scss
@@ -0,0 +1,18 @@
+.contents{
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin:10px auto 0px;
+ img{
+ margin-right: 13px;
+ width: 44px;
+ }
+ p{
+ line-height: 29px;
+ max-width: 327px;
+ font-size: 16px!important;
+ }
+}
+.font-44{
+ font-size: 44px!important;
+}
\ No newline at end of file
diff --git a/src/forge/Component/ProfileModal/Profile.jsx b/src/forge/Component/ProfileModal/Profile.jsx
new file mode 100644
index 00000000..e63c1286
--- /dev/null
+++ b/src/forge/Component/ProfileModal/Profile.jsx
@@ -0,0 +1,17 @@
+import React from 'react';
+
+function Profile({children,sureFunc,showCompeleteDialog , completeProfile, className}) {
+
+ function checkProfile() {
+ if(!completeProfile){
+ showCompeleteDialog && showCompeleteDialog();
+ }else{
+ sureFunc();
+ }
+ }
+
+ return(
+ {children}
+ )
+}
+export default Profile;
\ No newline at end of file
diff --git a/src/forge/Component/ProfileModal/images/profile.png b/src/forge/Component/ProfileModal/images/profile.png
new file mode 100644
index 00000000..6dbed21f
Binary files /dev/null and b/src/forge/Component/ProfileModal/images/profile.png differ
diff --git a/src/forge/Component/PublicModal/Index.jsx b/src/forge/Component/PublicModal/Index.jsx
new file mode 100644
index 00000000..c12e12b1
--- /dev/null
+++ b/src/forge/Component/PublicModal/Index.jsx
@@ -0,0 +1,20 @@
+import React from 'react';
+import { Modal } from 'antd';
+import './Index.scss';
+
+function Modals({title,children,btn,onCancel,visible}) {
+ return(
+ 目标用户个人资料不完整，需提醒目标用户补充资料后以进行后续操作
+ : +您目前的个人资料不完整，需要补充资料以进行后续操作。是否前往补充个人信息？
+ } +
+
+ 发行版
+ { releaseVersions && releaseVersions.total_count > 0 && {releaseVersions.total_count}}
+
+ {
+ releaseVersions && releaseVersions.total_count>0 ?
+ releaseVersions.list.map((item,key)=>{
+ return(
+ key === 0 &&
+
+ )
+ })
+ :
+
+ )
+}
+export default Releases;
\ No newline at end of file
diff --git a/src/forge/Component/SearchUser.jsx b/src/forge/Component/SearchUser.jsx
index 43b45e85..79d23fb6 100644
--- a/src/forge/Component/SearchUser.jsx
+++ b/src/forge/Component/SearchUser.jsx
@@ -1,50 +1,54 @@
-import React , { useState } from 'react';
+import React , { useState , useEffect } from 'react';
import { AutoComplete } from 'antd';
import { getImageUrl } from "educoder";
import axios from 'axios';
const Option = AutoComplete.Option;
-export default ({ getUser })=>{
+export default ({ getUser , placeholder, width ,value })=>{
+ const [ source , setSource ] = useState(undefined);
const [ searchKey , setSearchKey ] = useState(undefined);
- const [ userDataSource , setUserDataSource ] = useState(undefined);
+
+ useEffect(()=>{
+ if(!value){
+ setSearchKey(undefined);
+ }
+ },[value])
+
+ useEffect(()=>{
+ getUserList();
+ },[searchKey])
function getUserList(e){
const url = `/users/list.json`;
axios.get(url, {
params: {
- search: e,
+ search: searchKey,
},
- })
- .then((result) => {
+ }).then((result) => {
if (result) {
- setUserDataSource(result.data.users);
+ sourceOptions(result.data.users);
}
})
.catch((error) => {
console.log(error);
});
};
-
- function changeInputUser(value){
- setSearchKey(value);
- getUserList(value);
- }
- function selectInputUser(id, option){
- setSearchKey(option.props.value);
- getUserList(option.props.value);
- getUser && getUser(id);
- }
- const source =
- userDataSource && userDataSource.map((item, key) => {
+ function sourceOptions(userDataSource){
+ const s = userDataSource && userDataSource.map((item, key) => {
return (
-
);
});
+ setSource(s);
+ }
+
+ function changeInputUser(e){
+ setSearchKey(e);
+ };
+
+ // 选择用户
+ function selectInputUser(e, option){
+ setSearchKey(option.props.name);
+ getUser(option.props.login);
+ };
+
return(
-
+
+ + {/* 如果是点击最新则发行版列表页只展示最新的一个 */} + {item.name} + 最新 +
+{item.created_at}
+
+ 您暂未发布任何版本
+ {distribution && 创建新版本}
+
+ }
+
+
+ trigger.parentNode}
+ dataSource={source}
+ value={searchKey}
+ style={{ width: width || 300 }}
+ onChange={changeInputUser}
+ onSelect={selectInputUser}
+ placeholder={placeholder || "搜索需要添加的用户..."}
+ allowClear
+ />
+
)
}
\ No newline at end of file
diff --git a/src/forge/Component/SiderBar.js b/src/forge/Component/SiderBar.js
new file mode 100644
index 00000000..a5c4836d
--- /dev/null
+++ b/src/forge/Component/SiderBar.js
@@ -0,0 +1,120 @@
+import React, { useEffect, useState } from 'react';
+import { Popover , Tooltip } from 'antd';
+import './Component.scss';
+import axios from 'axios';
+import ShareModal from './SiderBarShareModal';
+
+const $ = window.$;
+
+$(window).scroll(function () {
+ if ($(".gotop").length > 0) {
+ if ($(document).scrollTop() > 0) {
+ $(".-task-sidebar .gotop").show();
+ $(".gotop").click(function () {
+ $("html,body").scrollTop(0);
+ });
+ }
+ if ($(document).scrollTop() === 0) {
+ $(".-task-sidebar .gotop").hide();
+ }
+ }
+});
+
+function SiderBar() {
+ const [ data , setData ] = useState([]);
+ const [ visible , setVisible ] = useState(false);
+ const [ login , setLogin ]= useState(false);
+
+ useEffect(()=>{
+ getFAQ();
+ getCurrentUser();
+ //页面加载完成之后隐藏回到顶点
+ $(".-task-sidebar .gotop").hide();
+ },[])
+
+ function getFAQ(){
+ const url = `/faqs.json`;
+ axios.get(url).then(result=>{
+ if(result && result.data){
+ setData(result.data);
+ }
+ }).catch(error=>{})
+ }
+
+ //获取当前登录账号信息->用于建议反馈
+ function getCurrentUser(){
+ let url = `/users/get_user_info.json`;
+ axios.get(url).then((response) => {
+ if (response && response.data && response.data.login) {
+ setLogin(response.data.login);
+ }
+ }).catch(error=>{})
+ }
+
+ function content(list){
+ return
+
+ }
+
+ function shareContent(){
+ return -
+ {
+ list && list.map((i,k)=>{
+ return(
+
- {i.question} + ) + }) + } +
+
+ }
+
+ return (
+ -
+
- setVisible(true)}> +
分享到
+
+ {/* 平台反馈 */}
+
+
+
+ {/* 帮助 */}
+ {
+ data && data.length > 0 && (data[0] && data[0].question) ?
+
+
+ :""
+ }
+
+ {/* 分享 */}
+ {/* setVisible(false)}/>
+
+
+
+ {/* 返回顶部 */}
+
+
+
+
+ )
+}
+
+export default SiderBar;
diff --git a/src/forge/Component/SiderBarShareModal.jsx b/src/forge/Component/SiderBarShareModal.jsx
new file mode 100644
index 00000000..cf911503
--- /dev/null
+++ b/src/forge/Component/SiderBarShareModal.jsx
@@ -0,0 +1,27 @@
+import React from 'react';
+import { Modal } from 'antd';
+import QRCode from 'qrcode.react';
+
+function SiderBarShareModal({visible,urlValue,onCancel}) {
+ return(
+
+
+
+
+
+
+
+
+
+
+
*/}
+
+
+
+
+ {urlValue &&
+ 打开微信“扫一扫”，点击右上角菜单，即可将网页分享至朋友圈
+
-
+
{ operate && addNew(undefined,undefined)}>新增流水线 }
diff --git a/src/forge/DevOps/Dispose/List.jsx b/src/forge/DevOps/Dispose/List.jsx
index 32bf5d8d..80a53372 100644
--- a/src/forge/DevOps/Dispose/List.jsx
+++ b/src/forge/DevOps/Dispose/List.jsx
@@ -1,17 +1,52 @@
import React from 'react';
import { Table , Popconfirm } from 'antd';
import { Link } from 'react-router-dom';
+import { turnbar } from "educoder";
-const STATUS = {
- running:"运行中",
- failure:"未通过",
- error:"未通过",
- success:"已通过",
- killed:"已撤销",
- pending:"准备中"
+// const STATUS = {
+// running:"运行中",
+// failure:"未通过",
+// error:"未通过",
+// success:"已通过",
+// killed:"已撤销",
+// pending:"准备中"
+// }
+function renderTableStatus(status) {
+ switch (status) {
+ case "running":
+ return (
+
+ 运行中
+
+ );
+ case "failure": case 'error':
+ return (
+
+ 未通过
+
+ );
+ case "success":
+ return (
+
+ 已通过
+
+ );
+ case 'killed':
+ return (
+
+ 已撤销
+
+ );
+ default :
+ return (
+
+ 准备中
+
+ );
+ }
}
function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
-
+
const columns = [
{
title:"流水线名称",
@@ -31,8 +66,9 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
width:"15%",
ellipsis:true,
render:(value,item)=>{
+ let v = turnbar(item.branch);
return(
- {value}
+ {value}
)
}
},
@@ -61,10 +97,10 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
title:"最近构建状态",
dataIndex:"pipeline_status",
key:1,
- width:"10%",
+ width:"12%",
ellipsis:true,
render:(txt)=>{
- return(STATUS[txt])
+ return renderTableStatus(txt)
}
},
{
@@ -76,7 +112,7 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
return(
{ operate ?
-
+
编辑 :""
}
{ operate ?
@@ -84,7 +120,7 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
删除
:""
}
- 查看运行记录
+ 查看运行记录
)
}
diff --git a/src/forge/DevOps/Dispose/PipelineName.jsx b/src/forge/DevOps/Dispose/PipelineName.jsx
index 3cf7f96a..63ee5437 100644
--- a/src/forge/DevOps/Dispose/PipelineName.jsx
+++ b/src/forge/DevOps/Dispose/PipelineName.jsx
@@ -42,7 +42,7 @@ function PipelineName({visible,onCancel,onOk,value ,branchList}){
触发条件:
-