"); const el = useRef(); function onAncherHandler(e) { diff --git a/src/forge/Activity/Activity.js b/src/forge/Activity/Activity.js index aa19a891..7e84e418 100644 --- a/src/forge/Activity/Activity.js +++ b/src/forge/Activity/Activity.js @@ -1,6 +1,6 @@ import React , { Component } from 'react'; import { Dropdown , Menu , Icon , Pagination , Spin } from 'antd'; -import '../css/index.css'; +import '../css/index.scss'; import '../Branch/branch.css'; import './activity.css'; import NoneData from '../Nodata'; @@ -27,7 +27,6 @@ const ARRAY = [ name:'1个月' } ] -// const dataformat="YYYY-MM-DD HH:mm"; class Activity extends Component{ constructor(props){ @@ -97,27 +96,22 @@ class Activity extends Component{ const { time,type,status } = this.state; this.getInfo(time,type,status,page); } + menu =()=> ( + + ) render(){ const { time , data , page , project_trends , isSpin } = this.state; - const menu = ( - - ); - let name = time && ARRAY.filter(item=>item.id === parseInt(time)) ; - // console.log(name); - - 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)+'%'; return( @@ -162,7 +156,7 @@ class Activity extends Component{ ) } } diff --git a/src/forge/Branch/CloneAddress.js b/src/forge/Branch/CloneAddress.js index 9010c2f7..0031407d 100644 --- a/src/forge/Branch/CloneAddress.js +++ b/src/forge/Branch/CloneAddress.js @@ -14,6 +14,7 @@ class CloneAddress extends Component { const { http_url, downloadUrl } = this.props; return (
+
+ {
+ fork || fork ===0 ? fork({fork}) :""
+ }
+ {
+ parise || parise ===0?点赞({parise}) :""
+ }
+
+ )
+})
\ No newline at end of file
diff --git a/src/forge/Component/MemberCards.jsx b/src/forge/Component/MemberCards.jsx
new file mode 100644
index 00000000..78dd78d0
--- /dev/null
+++ b/src/forge/Component/MemberCards.jsx
@@ -0,0 +1,74 @@
+import React from 'react';
+import './Component.scss';
+import styled from 'styled-components';
+
+const Img = styled.img`{
+ border-radius:50%;
+ width:50px;
+ height:50px;
+ margin-right:14px;
+}`
+const Name = styled.div`{
+ color:#5091FF;
+ font-size:16px;
+ height:22px;
+ line-height:22px;
+ margin-bottom:7px;
+}`
+const Time = styled.div`{
+ color:#888;
+ font-size:12px;
+ height:16px;
+ line-height:16px;
+ margin-bottom:9px;
+ display:flex;
+ align-item:center;
+}`
+const I = styled.i`{
+ font-size:13px!important;
+ color:#60B25E;
+ margin-right:2px;
+}`
+const FocusBtn = styled.a`{
+ display:inline-block;
+ height:30px;
+ line-height:26px;
+ padding:0px 12px;
+ background-color:#fafafa;
+ border:1px solid #eee;
+ border-radius:2px;
+ color:#888!important;
+}`
+const Ifocused = styled.i`{
+ font-size:16px!important;
+ color:#FFA802;
+ margin-right:4px;
+}`
+const Ifocus = styled.i`{
+ font-size:16px!important;
+ color:#BBBBBB;
+ margin-right:4px;
+}`
+const Div = styled.div`{
+ margin-bottom: 18px;
+ padding:20px 16px;
+ display: flex;
+ align-items: center;
+ border:1px solid #eee;
+}`
+export default (({img,name,time, focusStatus})=>{
+ return(
+
+ {
+ nav.map((item,key)=>{
+ return(
+ {children}
+ )
+ })
+ }
+ :""
+ )
+})
\ No newline at end of file
diff --git a/src/forge/Component/Title.jsx b/src/forge/Component/Title.jsx
new file mode 100644
index 00000000..9b3f8bf3
--- /dev/null
+++ b/src/forge/Component/Title.jsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import styled from 'styled-components';
+
+const Nav = styled.div`{
+ background-color:#fff;
+ padding:20px 30px;
+ border-bottom:1px solid #eee;
+ font-size:16px;
+ color:#333;
+ display:flex;
+ justify-content: space-between;
+ align-items:center;
+}`
+
+export default (({children})=>{
+ return(
+
+ )
+})
\ No newline at end of file
diff --git a/src/forge/Component/layout.jsx b/src/forge/Component/layout.jsx
new file mode 100644
index 00000000..f59a8e34
--- /dev/null
+++ b/src/forge/Component/layout.jsx
@@ -0,0 +1,156 @@
+import styled from 'styled-components';
+
+export const Banner = styled.div`{
+ padding:20px 25px;
+ color:#333;
+ font-size:18px;
+ border-bottom:1px solid #eee;
+ background-color:#fff;
+ border-radius:5px 5px 0px 0px;
+}`
+export const AlignCenterBetween = styled.div`{
+ display:flex;
+ align-items: center;
+ padding: 14px 14px 14px 20px;
+ justify-content: space-between;
+ border-bottom:1px solid #eee;
+}`
+export const FlexAJ = styled.div`{
+ display:flex;
+ align-items: center;
+ justify-content: space-between;
+}`
+export const AlignCenter = styled.div`{
+ display:flex;
+ align-items: center;
+}`
+// 左右结构
+export const Box = styled.div`{
+ display:flex;
+ align-item:flex-start;
+}`
+export const Long = styled.div`{
+ width:72%;
+ border-radius:5px;
+ margin-bottom:30px;
+}`
+export const Short = styled.div`{
+ width:28%;
+ border-radius:5px;
+ margin-bottom:30px;
+}`
+export const Gap = styled.div`{
+ padding-left:20px;
+ box-sizing:border-box;
+}`
+export const WhiteBack = styled.div`{
+ background-color:#fff;
+ border-radius:5px;
+}`
+export const Blueline = styled.a`{
+ height:30px;
+ line-height:28px;
+ border-radius:2px;
+ border:1px solid rgba(80,145,255,1);
+ color:rgba(80,145,255,1);
+ padding:0px 12px;
+ display:inline-block;
+}`
+export const Redline = styled.a`{
+ height:30px;
+ line-height:28px;
+ border-radius:2px;
+ border:1px solid #F73030;
+ color:#F73030;
+ padding:0px 12px;
+ display:inline-block;
+ min-width:80px;
+ text-align:center;
+}`
+export const Greenline = styled.a`{
+ height:30px;
+ line-height:28px;
+ border-radius:2px;
+ border:1px solid #28BD6C;
+ color:#28BD6C;
+ padding:0px 12px;
+ display:inline-block;
+ min-width:80px;
+ text-align:center;
+}`
+export const Greenback = styled.a`{
+ height:30px;
+ line-height:30px;
+ border-radius:2px;
+ background-color:#28BD6C;
+ color:#fff;
+ padding:0px 12px;
+ display:inline-block;
+ min-width:80px;
+ text-align:center;
+}`
+export const Blueback = styled.a`{
+ height:30px;
+ line-height:30px;
+ border-radius:2px;
+ background-color:rgba(80,145,255,1);
+ color:#fff;
+ padding:0px 12px;
+ display:inline-block;
+ min-width:80px;
+ text-align:center;
+}`
+export const Redback = styled.a`{
+ height:30px;
+ line-height:30px;
+ border-radius:2px;
+ background-color:#F73030;
+ color:#fff;
+ padding:0px 12px;
+ display:inline-block;
+ min-width:80px;
+ text-align:center;
+}`
+export const NumUl = styled.ul`{
+ padding-left: 20px;
+ & > li{
+ list-style-type: decimal;
+ color:#888;
+ height:24px;
+ line-height:24px;
+ }
+}`
+export const GreenUnder = styled.a`{
+ color:#28BD6C!important;
+ position:relative;
+ &:after{
+ position:absolute;
+ bottom:-2px;
+ left:0px;
+ width:100%;
+ height:1px;
+ content:'';
+ background:#28BD6C;
+ }
+}`
+export const Cancel = styled.a`{
+ height:32px;
+ line-height:32px;
+ border-radius:2px;
+ background-color:#BBBBBB;
+ color:#fff;
+ padding:0px 12px;
+ display:inline-block;
+ min-width:64px;
+ text-align:center;
+ letter-spacing: 4px;
+}`
+export const Content = styled.div`{
+ width:1200px;
+ margin:20px auto;
+ text-align:center;
+ display:flex;
+ align-Items:center;
+ background-color:#fff;
+ justify-content: center;
+}`
diff --git a/src/forge/DevOps/About.jsx b/src/forge/DevOps/About.jsx
new file mode 100644
index 00000000..5c1fd202
--- /dev/null
+++ b/src/forge/DevOps/About.jsx
@@ -0,0 +1,78 @@
+import React , { forwardRef , useCallback } from 'react';
+import activate from '../Images/activate.png';
+import { Blueback } from '../Component/layout';
+import styled from 'styled-components';
+import { Link } from 'react-router-dom';
+import { Form , Input } from 'antd';
+import axios from 'axios';
+
+const P = styled.p`{
+ width:200px;
+ line-height:30px;
+ font-size:16px;
+ color:#333;
+ text-align:center;
+ margin-top:30px;
+ margin-bottom:30px!important;
+}`;
+function About( props , ref){
+ const { form: { getFieldDecorator , validateFields } } = props;
+ const helper = useCallback(
+ (label, name, rules, widget, isRequired) => (
+
+ {label}
+
+ {getFieldDecorator(name, { rules, validateFirst: true })(widget)}
+
+
+ ),
+ []
+ );
+
+ function startActive(){
+ console.log(props);
+ validateFields((error,values)=>{
+ if(!error){
+ const url = `/dev_ops/cloud_accounts.json`;
+ axios.post(url,{
+ ...values,
+ }).then(result=>{
+ if(result){
+
+ }
+ }).catch(error=>{
+ console.log(error);
+ })
+ }
+ })
+ }
+ return(
+
+ {label}
+
+ {getFieldDecorator(name, { rules, validateFirst: true })(widget)}
+
+
+ ),
+ []
+ )
+ // 修改文件内容
+ function changeEditor(value){
+ setYmlValue(value);
+ }
+
+ // 切换语言
+ function select_language(value){
+ setFileLanguage(value);
+ }
+
+ // 确定提交
+ function submit(){
+ validateFields((error,value)=>{
+ if(!error){
+ console.log(value);
+ }
+ })
+ }
+ return(
+
+ setVisible(flag)}>
+
+
+ )
+ })
+)
\ No newline at end of file
diff --git a/src/forge/DevOps/DisposeModal.jsx b/src/forge/DevOps/DisposeModal.jsx
new file mode 100644
index 00000000..7514c319
--- /dev/null
+++ b/src/forge/DevOps/DisposeModal.jsx
@@ -0,0 +1,28 @@
+import React from 'react';
+import styled from 'styled-components';
+import { Modal ,Button } from 'antd';
+
+const Div = styled.div`{
+ height:130px;
+ line-height:130px;
+ text-align:center;
+ color:#333;
+}`
+export default (({visible , closeFunc})=>{
+ return(
+
+
+
+
+ }
+ onCancel={()=>closeFunc(false)}
+ >
+ 版本库地址已变更，请基于新地址提交代码
{ http_url && HTTP } diff --git a/src/forge/Branch/SelectBranch.js b/src/forge/Branch/SelectBranch.js deleted file mode 100644 index d31532bd..00000000 --- a/src/forge/Branch/SelectBranch.js +++ /dev/null @@ -1,172 +0,0 @@ -import React , { Component } from 'react'; -import { Dropdown , Icon , Input } from 'antd'; -import { getBranch } from '../GetData/getData'; -import "./branch.css" -import axios from 'axios'; -const $ = window.$; -class SelectBranch extends Component{ - constructor(props){ - super(props); - this.state={ - visible:false, - value:undefined, - search:"branch", - tags:undefined, - branchsFilter:undefined, - data:undefined - } - } - componentDidMount() { - this.getTagList(); - - document.body.addEventListener('click', e => { - let v= this.state.visible; - if(e.target.className && e.target.className.animVal!=undefined) return; - - let s = e.target && e.target.className && e.target.className.indexOf('showtag')> -1; - let classF =e.target && e.target.className && e.target.className.indexOf("downobject") > -1 || e.target.className==="ant-input OptionsInput"; - if(e.target && e.target.className === "ant-dropdown-trigger" || s){ - this.setState({ - visible:!v, - value:undefined - }) - if(!v){ - this.getBranchs(); - } - return; - }else if (classF) { - return; - } else{ - this.setState({ - visible:false, - value:undefined - }) - } - }); - } - componentDidUpdate=(prevProps)=>{ - if(this.props.repo_id && this.props.repo_id!=prevProps.repo_id){ - this.getTagList(); - } - } - // 获取分支 - getBranchs=()=>{ - debugger; - const { projectsId } = this.props; - let result = getBranch(projectsId); - if(result){ - this.setState({ - data:result.data - }) - if(result.data && result.data.length>0){ - this.setState({ - search:"branch" - }) - } - } - } - getTagList=()=>{ - const { repo_id } = this.props; - if(repo_id){ - const url = `/repositories/${repo_id}/tags.json`; - axios.get(url).then((result)=>{ - if(result){ - this.setState({ - tags:result.data - }) - } - }).catch(error=>{ - console.log(error); - }) - } - } - - InputClick=(e)=>{ - this.stopPropagations(e); - } - - stopPropagations=(e)=>{ - e.stopPropagation(); - } - - // 输入搜索内容 - changeValue=(e)=>{ - this.setState({ - value:e.target.value - }) - let { branchs } = this.props; - const { tags } = this.state; - let array = branchs; - if(search === "tag" && tags.length>0){ - array = tags; - } - let branchsFilter = e.target.value ? (array && array.length>0 && array.filter(item=>item.name.indexOf(e.target.value)>-1)) : array; - this.setState({ - branchsFilter - }) - } - - // 选择分支 - changeBranchs=(e,value)=>{ - e.stopPropagation(); - this.setState({ - visible:false, - value - }) - const { changeBranch } = this.props; - changeBranch && changeBranch(value); - } - - // 切换搜索的列表 - changeSearch=(search)=>{ - this.setState({ - search - }) - } - - render(){ - const { visible , value , search , tags , branchsFilter , data } = this.state; - const { branchs , branch } = this.props; - - - console.log(data); - const menu = ( -
-
- );
- return(
-
-
-
-
- -
- {
- data && data.length> 0 ? data.map((item,key)=>{
- return(
-
- this.changeBranchs(e,`${item.name}`)}>{item.name} - ) - }) - : -
暂无{value}{search === "tag" ?"标签":"分支"}~
- } -
-
-
-
- {search ==="branch"?"分支":"标签"}:
-
- {branch}
-
-
-
-
-
-
- )
- }
-}
-export default SelectBranch;
\ No newline at end of file
diff --git a/src/forge/Component/Cards.jsx b/src/forge/Component/Cards.jsx
new file mode 100644
index 00000000..f35d890a
--- /dev/null
+++ b/src/forge/Component/Cards.jsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import './Component.scss';
+
+export default (({img , title, desc , rightBtn})=>{
+ return(
+
+ 
+
+ )
+})
\ No newline at end of file
diff --git a/src/forge/Component/Component.scss b/src/forge/Component/Component.scss
index 99e9f7fc..9a58f5a2 100644
--- a/src/forge/Component/Component.scss
+++ b/src/forge/Component/Component.scss
@@ -1,10 +1,122 @@
- ul.ant-menu{
- border-right: none;
+ul.ant-menu{
+ border-right: none;
+}
+ul.ant-menu li:last-child{
+ border-bottom: none;
+}
+li.ant-menu-item{
+ margin:0px!important;
+ border-bottom: 1px solid #eee;
+}
+// Cards
+.cards{
+ display: flex;
+ align-items: center;
+ padding:20px 34px;
+ background-color: #fff;
+ margin-bottom:18px;
+ .img{
+ margin-right: 20px;
+ width: 190px;
+ height: 90px;
+ border:1px solid rgba(238,238,238,1);
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ img{
+ max-width: 100%;
+ }
}
- ul.ant-menu li:last-child{
- border-bottom: none;
+ .content{
+ flex:1;
+ width: 0;
+ .titles{
+ display: flex;
+ justify-content: space-between;
+ margin-bottom: 10px!important;
+ align-items: center;
+ &>span{
+ font-size:18px ;
+ color: #333;
+ }
+ }
+ .desc{
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
+ }
}
- li.ant-menu-item{
- margin:0px!important;
- border-bottom: 1px solid #eee;
- }
\ No newline at end of file
+}
+// Tabs
+.tabsStyle{
+ .ant-tabs-bar.ant-tabs-top-bar{
+ padding-left: 35px;
+ margin-bottom: 0px;
+ }
+ .ant-tabs-nav .ant-tabs-tab{
+ padding:19px 0px;
+ margin-right: 40px;
+ }
+ .ant-tabs-ink-bar{
+ width:25px!important;
+ bottom: 10px;
+ }
+}
+.statusColor{
+ display: inline-block;
+ padding:0px 10px;
+ height:20px;
+ line-height: 20px;
+ border-radius:11px;
+ color: #fff;
+ margin-left: 5px;
+ &.running{
+ background:#5091FF;
+ color: #F1F8FF;
+ }
+ &.Preparing{
+ background:rgba(255,110,33,1);
+ color:rgba(255,248,244,1);
+ }
+ &.pass{
+ background:#28BD6C;
+ color: #EEFDF5;
+ }
+ &.failed{
+ background:#F73030;
+ color:#FCEEEE ;
+ }
+}
+.handleBox{
+ position: fixed;
+ top:45%;
+ right:240px;
+ z-index: 10000;
+}
+@media screen and (max-width: 1800px){
+ .handleBox{
+ right:190px;
+ }
+}
+@media screen and (max-width: 1700px){
+ .handleBox{
+ right:140px;
+ }
+}
+@media screen and (max-width: 1600px){
+ .handleBox{
+ right:90px;
+ }
+}
+@media screen and (max-width: 1450px){
+ .handleBox{
+ right:10px;
+ }
+}
+@media screen and (max-width: 1380px){
+ .handleBox{
+ right:0px;
+ }
+}
\ No newline at end of file
diff --git a/src/forge/Component/FileLanguage.jsx b/src/forge/Component/FileLanguage.jsx
new file mode 100644
index 00000000..bd531909
--- /dev/null
+++ b/src/forge/Component/FileLanguage.jsx
@@ -0,0 +1,66 @@
+import React from 'react';
+import { Select } from 'antd';
+
+const Option = Select.Option;
+const LANGUAGE = [
+ "apex",
+ "azcli",
+ "bat",
+ "clojure",
+ "coffee",
+ "cpp",
+ "csharp",
+ "csp",
+ "css",
+ "dockerfile",
+ "fsharp",
+ "go",
+ "handlebars",
+ "html",
+ "ini",
+ "java",
+ "javascript",
+ "json",
+ "less",
+ "lua",
+ "markdown",
+ "msdax",
+ "mysql",
+ "objective",
+ "perl",
+ "pgsql",
+ "php",
+ "postiats",
+ "powerquery",
+ "powershell",
+ "pug",
+ "python",
+ "r",
+ "razor",
+ "redis",
+ "redshift",
+ "ruby",
+ "rust",
+ "sb",
+ "scheme",
+ "scss",
+ "shell",
+ "solidity",
+ "sql",
+ "st",
+ "swift",
+ "typescript",
+ "vb",
+ "xml",
+ "yaml",
+];
+export default (({ language , select_language })=>{
+ return(
+
+ )
+})
\ No newline at end of file
diff --git a/src/forge/Component/Handbook.jsx b/src/forge/Component/Handbook.jsx
new file mode 100644
index 00000000..bcb38187
--- /dev/null
+++ b/src/forge/Component/Handbook.jsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import Handbook from '../Images/handbook.png';
+import './Component.scss';
+
+export default (()=>{
+ return(
+
+
+ + {title} + {rightBtn} +
+
+ {desc}
+
+
+
+ 
+
+
+ )
+})
\ No newline at end of file
diff --git a/src/forge/Component/ListCount.jsx b/src/forge/Component/ListCount.jsx
new file mode 100644
index 00000000..5a88dd43
--- /dev/null
+++ b/src/forge/Component/ListCount.jsx
@@ -0,0 +1,41 @@
+import React from 'react';
+import styled from 'styled-components';
+
+export default (({fork,parise})=>{
+ const DivStyle = styled.div`{
+ display:flex;
+ align-item:center;
+ }`;
+ const SpanStylefork = styled.span`{
+ display:flex;
+ align-item:center;
+ margin-left:30px;
+ padding:0px 12px;
+ border-radius:13px;
+ background-color:#EBF4FE;
+ height:24px;
+ line-height:24px;
+ font-size:12px;
+ }`;
+ const SpanStyleparise = styled.span`{
+ display:flex;
+ align-item:center;
+ margin-left:30px;
+ padding:0px 12px;
+ border-radius:13px;
+ background-color:#FFF3DC;
+ height:24px;
+ line-height:24px;
+ font-size:12px;
+ }`;
+ return(
+
+ 
+
+ )
+})
\ No newline at end of file
diff --git a/src/forge/Component/OpsStatus.jsx b/src/forge/Component/OpsStatus.jsx
new file mode 100644
index 00000000..02883bd6
--- /dev/null
+++ b/src/forge/Component/OpsStatus.jsx
@@ -0,0 +1,44 @@
+import React from 'react';
+import './Component.scss';
+
+export const Tags = (status)=>{
+ switch(status){
+ case 1:
+ return(
+ 运行中
+ );
+ case 2:
+ return (
+ 未通过
+ );
+ case 3:
+ return (
+ 已通过
+ );
+ default:
+ return (
+ 准备中
+ );
+ }
+}
+
+export const TagsLine = (status)=>{
+ switch(status){
+ case 1:
+ return(
+ 运行中
+ );
+ case 2:
+ return (
+ 未通过
+ );
+ case 3:
+ return (
+ 已通过
+ );
+ default:
+ return (
+ 准备中
+ );
+ }
+}
\ No newline at end of file
diff --git a/src/forge/Component/SearchUser.jsx b/src/forge/Component/SearchUser.jsx
new file mode 100644
index 00000000..1df7ec64
--- /dev/null
+++ b/src/forge/Component/SearchUser.jsx
@@ -0,0 +1,70 @@
+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 })=>{
+ const [ searchKey , setSearchKey ] = useState(undefined);
+ const [ userDataSource , setUserDataSource ] = useState(undefined);
+
+ function getUserList(e){
+ const url = `/users/list.json`;
+ axios.get(url, {
+ params: {
+ search: e,
+ },
+ })
+ .then((result) => {
+ if (result) {
+ setUserDataSource(result.data.users);
+ }
+ })
+ .catch((error) => {
+ console.log(error);
+ });
+ };
+
+ function changeInputUser(value){
+ setSearchKey(value);
+ getUserList(value);
+ }
+
+ function selectInputUser(id, option){
+ setSearchKey(option.props.searchValue);
+ getUserList(option.props.searchValue);
+ getUser && getUser(id);
+ }
+ const source =
+ userDataSource && userDataSource.map((item, key) => {
+ return (
+
+ );
+ });
+ return(
+
+ {name}
+
+ {
+ focusStatus ?
+
+ -
+ {header}
+ {
+ nav && nav.list && nav.list.length>0 ?
+ nav.list.map((item,key)=>{
+ return(
+
-
+
+ + {item.name} + +
+
+ )
+ })
+ :""
+ }
+
+ 
+ 开始激活
+
+ )
+}
+export default Form.create()(forwardRef(About));
\ No newline at end of file
diff --git a/src/forge/DevOps/Dispose.jsx b/src/forge/DevOps/Dispose.jsx
new file mode 100644
index 00000000..ec6e0bd4
--- /dev/null
+++ b/src/forge/DevOps/Dispose.jsx
@@ -0,0 +1,91 @@
+import React , { forwardRef , useCallback , useState } from 'react';
+import { Form , AutoComplete } from 'antd';
+import { Blueback } from '../Component/layout';
+import Editor from "react-monaco-editor";
+import Modals from './DisposeModal';
+import FileLanguage from '../Component/FileLanguage';
+
+import docker from '../Images/docker.png';
+import gradle from '../Images/gradle.png';
+import java from '../Images/java.png';
+import js from '../Images/js.png';
+import php from '../Images/php.png';
+import python from '../Images/python.png';
+
+
+const Option = AutoComplete.Option;
+export default Form.create()(
+ forwardRef(({ form })=>{
+ const [ visible , setVisible ] = useState(false);
+ const [ ymlValue , setYmlValue ] = useState("class Main 1111");
+ const [ fileLanguage , setFileLanguage ] = useState(undefined);
+
+ const { getFieldDecorator , validateFields } = form;
+
+ const helper = useCallback(
+ (label, name, rules, widget, isRequired = false) => (
+ 定义DevOps工作流，帮助您检测bug、发布代码…
+ 了解什么是DevOps？ + +工作流配置完成，您的DevOps之旅即刻开启！
+
+ )
+})
diff --git a/src/forge/DevOps/Index.jsx b/src/forge/DevOps/Index.jsx
new file mode 100644
index 00000000..8ccc61c8
--- /dev/null
+++ b/src/forge/DevOps/Index.jsx
@@ -0,0 +1,39 @@
+import React from 'react';
+import { WhiteBack } from '../Component/layout';
+import './ops.scss';
+
+import { Route, Switch } from 'react-router-dom';
+import Loadable from 'react-loadable';
+import Loading from '../../Loading';
+
+const About = Loadable({
+ loader: () => import('./About'),
+ loading: Loading,
+})
+const Infos = Loadable({
+ loader: () => import('./Infos'),
+ loading: Loading,
+})
+export default ((props)=>{
+ return(
+
+
+ 工作流配置
+ { menu ? 构建列表:""}
+
+
+ )
+})
\ No newline at end of file
diff --git a/src/forge/DevOps/OpsDetailLeftpanel.jsx b/src/forge/DevOps/OpsDetailLeftpanel.jsx
new file mode 100644
index 00000000..427f0c99
--- /dev/null
+++ b/src/forge/DevOps/OpsDetailLeftpanel.jsx
@@ -0,0 +1,42 @@
+import React from 'react';
+import { FlexAJ , Blueline , AlignCenter } from '../Component/layout';
+import styled from 'styled-components';
+import { Menu } from 'antd';
+import { TagsLine } from '../Component/OpsStatus';
+
+const SubMenu = Menu.SubMenu;
+const Img = styled.img`{
+ width:25px;
+ height:25px;
+ border-radius:50%;
+ margin-right:10px;
+}`
+export default (()=>{
+ return(
+
+ {
+ menu ?
+
+
+
+
+ 
+ 开始时间：2020.07.10 15:30
+ 运行时间：20s
+
+ 重新创建
+
+
}>
+
+ 开始时间：2020.07.10 15:30
+ 运行时间：20s
+
+
+
+ 分支：
+ master
+ 8b3476f5
+
+
+
+
+ )
+})
\ No newline at end of file
diff --git a/src/forge/DevOps/Structure.jsx b/src/forge/DevOps/Structure.jsx
new file mode 100644
index 00000000..dddd9845
--- /dev/null
+++ b/src/forge/DevOps/Structure.jsx
@@ -0,0 +1,204 @@
+import React , { useState } from 'react';
+import { FlexAJ , Blueback } from '../Component/layout';
+import { Table , Pagination } from 'antd';
+import styled from 'styled-components';
+const STATUS = [
+ {name:"所有",value:"1"},
+ {name:"准备中",value:"2"},
+ {name:"运行中",value:"3"},
+ {name:"已完成",value:"4"}
+]
+const LIMIT = 15;
+const datasource = [
+ {
+ status:2,
+ author:"caishi",
+ message:{
+ branch:"master",
+ sha:"8b3476f5",
+ image:"https://dss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=2034740944,4251903193&fm=26&gp=0.jpg",
+ message:"将分支“ 221063-improve-buy-ci-minutes-link”"
+ },
+ begin:"2020-07-08",
+ run:"20s"
+ },
+ {
+ status:1,
+ author:"caishi",
+ message:{
+ branch:"master",
+ sha:"8b3476f5",
+ image:"https://dss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=2034740944,4251903193&fm=26&gp=0.jpg",
+ message:"将分支“ 221063-improve-buy-ci-minutes-link”"
+ },
+ begin:"2020-07-08",
+ run:""
+ }
+];
+
+const Img = styled.img`{
+ border-radius:50%;
+ margin-rigth:10px;
+ width:25px;
+ height:25px;
+}`
+export default (()=>{
+ const [ status ,setStatus ] = useState("1");
+ const [ page ,setPage ] = useState(1);
+ const [ total ,setTotal ] = useState(10);
+
+
+ function ChangeStatus(value){
+ setStatus(value)
+ }
+ // 切换分页
+ function ChangePage(page){
+ setPage(page)
+ }
+ function renderStatus() {
+ return(
+
+
+ Build setup 01
+ 20
+
+
+
+
+
+
+ -
+ {
+ STATUS.map((item,key)=>{
+ return
- ChangeStatus(item.value)} className={ status === item.value ? "active":""}>{item.name} + }) + } +
+ { meg.branch && 分支{meg.branch}}
+ { meg.sha && {meg.sha}}
+
+ {meg.message}
+
+
+ {renderStatus()}
+
+ 手动创建
+ 分支
+ 标签
+
+
+
+ {
+ total > LIMIT ?
+
+ )
+})
\ No newline at end of file
diff --git a/src/forge/DevOps/ops.scss b/src/forge/DevOps/ops.scss
new file mode 100644
index 00000000..b9dcafcc
--- /dev/null
+++ b/src/forge/DevOps/ops.scss
@@ -0,0 +1,267 @@
+.opsPanel
+{
+ margin:20px auto;
+ width: 1200px;
+ // 开始激活页面
+ .activatePanel{
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ padding:60px 0px;
+ }
+ .disposePanel{
+ .language{
+ display: flex;
+ li{
+ margin-right: 20px;
+ }
+ }
+ .editorBody{
+ border:1px solid #ddd;
+ margin:20px 0px;
+ .editorHead{
+ background-color: #F1F8FF;
+ height: 48px;
+ line-height: 48px;
+ display: flex;
+ justify-content: space-between;
+ padding:0px 20px;
+ border-bottom: 1px solid #ddd;
+ }
+ .monaco-editor{
+ width:1138px!important;
+ }
+ }
+ .ant-modal-close{
+ top:7px;
+ }
+ .listPart{
+ .listNav{
+ display: flex;
+ li{
+ background-color: #fafafa;
+ border:1px solid #eee;
+ border-radius: 5px;
+ height: 38px;
+ line-height:38px;
+ padding:0px 20px;
+ color: #333;
+ margin-right: 20px;
+ cursor: pointer;
+ &:last-child{
+ margin-right: 0px;
+ }
+ &.active{
+ border:1px solid #5091FF;
+ color: #5091FF;
+ background-color: #fff;
+ }
+ }
+ }
+ .normalTable{
+ margin-top: 20px;
+ .ant-table-thead > tr > th, .ant-table-tbody > tr > td{
+ padding:10px 5px;
+ color:#333;
+ }
+ .ant-table-thead{
+ border:1px solid rgba(238,238,238,1)
+ }
+ }
+ }
+ }
+ // 列表
+ .listPart{
+ .statusTag{
+ display: flex;
+ padding:0px 16px;
+ height: 32px;
+ line-height: 32px;
+ border-radius:20px;
+ float: left;
+ i{
+ font-size: 20px!important;
+ margin-right: 7px;
+ }
+ &.running{
+ background:#F1F8FF;
+ border:1px solid #5091FF;
+ color: #5091FF;
+ }
+ &.Preparing{
+ background:rgba(255,248,244,1);
+ border:1px solid rgba(255,110,33,1);
+ color:rgba(255,110,33,1) ;
+ }
+ &.pass{
+ background:#EEFDF5;
+ border:1px solid #28BD6C;
+ color:#28BD6C ;
+ }
+ &.failed{
+ background:#FCEEEE;
+ border:1px solid #F73030;
+ color:#F73030 ;
+ }
+ }
+
+ }
+
+}
+// ops详情
+.opsDetailPanel{
+ height: 100vh;
+ background-color: #114879;
+ .opsInfos{
+ height: 60px;
+ background-color: #114879;
+ color:#fff;
+ padding:0px 20px;
+ }
+ .opsSection{
+ height:calc( 100% - 60px );
+ background-color: #fff;
+ display: flex;
+ section{
+ height: 100%;
+ float: left;
+ &.leftSection{
+ width:100%;
+ .leftheader{
+ background-color: #F1F8FF;
+ padding:10px 20px;
+ .nest{
+ color: #888888;
+ margin-right: 18px;
+ &>span{
+ color: #333;
+ }
+ }
+ }
+ .leftMainContent{
+ padding:14px 20px;
+ .contentBranch{
+ border:1px solid #eee;
+ background-color: #fafafa;
+ padding:0px 18px;
+ height: 40px;
+ border-radius: 3px;
+ color:#888;
+ i{
+ font-size: 16px;
+ color:#BBB;
+ margin-right: 10px;
+ }
+ .branchname{
+ color:#333;
+ margin-right: 15px;
+ }
+ .branchsha{
+ color:#FF6E21;
+ }
+ }
+ }
+ .leftMenu{
+ li.ant-menu-item,.ant-menu-submenu{
+ padding:0px 13px 0px 20px!important;
+ position: relative;
+ color: #333;
+ }
+ .ant-menu-submenu-title{
+ margin:0px;
+ padding:0px 0px 0px 20px!important
+ }
+ .ant-menu-submenu-arrow{
+ position: absolute;
+ left: 2px;
+ }
+ .ant-menu.ant-menu-sub{
+ .ant-menu-item:hover{
+ background-color: #F1F8FF;
+ }
+ }
+ }
+ .statuslineColor{
+ display: inline-block;
+ height: 20px;
+ line-height: 20px;
+ padding:0px 10px;
+ border-radius: 11px;
+ font-size: 12px;
+ margin-left: 6px;
+ &.pass{
+ border:1px solid rgba(40,189,108,1);
+ color:rgba(40,189,108,1);
+ }
+ &.failed{
+ border:1px solid #F73030;
+ color:#F73030;
+ }
+ &.running{
+ border:1px solid #5091FF;
+ color:#5091FF;
+ }
+ &.Preparing{
+ border:1px solid rgba(255,110,33,1);
+ color:rgba(255,110,33,1);
+ }
+ }
+ }
+ &.rightSection{
+ width:100%;
+ background-color: #081930;
+ .rightMainContent{
+ padding:24px 30px;
+ & > div{
+ margin-bottom: 12px;
+ .items{
+ height: 45px;
+ line-height: 45px;
+ padding:0px 24px;
+ background:rgba(24,41,62,1);
+ border-radius:5px;
+ color:#fff;
+ cursor: pointer;
+ i{
+ font-size: 13px;
+ margin-left: 10px;
+ }
+ }
+ }
+ }
+ }
+ }
+ .Resizer.vertical{
+ position: relative;
+ }
+ .Resizer.vertical:hover:before{
+ background: #eee;
+ }
+ .Resizer.vertical:before {
+ content: "";
+ border-radius: 50%;
+ background: hsla(0,0%,92.2%,.3);
+ width: 24px;
+ height: 24px;
+ position: absolute;
+ z-index: 999;
+ top: 50%;
+ margin-top: -12px;
+ right: -12px;
+ }
+ .Resizer.vertical::after{
+ position: absolute;
+ content: "\e712";
+ font-family: iconfont;
+ font-size: 10px;
+ transform: scale(.8);
+ top: 50%;
+ margin-top: -10px;
+ color: #666;
+ right: -12px;
+ opacity: .3;
+ z-index: 1000;
+ cursor: col-resize;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/forge/DevOps/opsDetail.jsx b/src/forge/DevOps/opsDetail.jsx
new file mode 100644
index 00000000..efb6f846
--- /dev/null
+++ b/src/forge/DevOps/opsDetail.jsx
@@ -0,0 +1,33 @@
+import React from 'react';
+import './ops.scss';
+import { FlexAJ, AlignCenter } from '../Component/layout';
+import { Tags } from '../Component/OpsStatus';
+import SplitPane from 'react-split-pane';
+import LeftPanel from './OpsDetailLeftpanel';
+import RightPanel from './OpsDetailRightpanel';
+
+
+export default (()=>{
+ return(
+
+
:""
+ }
+
+
+
+ #1
+ 将分支“221063-improve-buy-ci-minutes-link”合并到“221063-improve-buy-ci-minutes-link"
+ {Tags(1)}
+
+ 退出
+
+
+ )
+});
\ No newline at end of file
diff --git a/src/forge/GetData/getData.jsx b/src/forge/GetData/getData.jsx
index 75e661f8..e0474a33 100644
--- a/src/forge/GetData/getData.jsx
+++ b/src/forge/GetData/getData.jsx
@@ -1,9 +1,13 @@
import axios from 'axios';
-
+// 获取分支列表
export const getBranch = async (id)=>{
return (await axios.get(`/projects/${id}/branches.json`)).data;
}
-
+// 获取标签列表
export const getTag = async (id)=>{
return (await axios.get(`/repositories/${id}/tags.json`)).data;
+}
+// 获取hooks（仓库设置-管理web钩子）列表
+export const getHooks = async (id,params)=>{
+ return (await axios.get(`/projects/${id}/hooks.json`,{params})).data;
}
\ No newline at end of file
diff --git a/src/forge/Images/activate.png b/src/forge/Images/activate.png
new file mode 100644
index 00000000..25c12227
Binary files /dev/null and b/src/forge/Images/activate.png differ
diff --git a/src/forge/Images/docker.png b/src/forge/Images/docker.png
new file mode 100644
index 00000000..28975cfb
Binary files /dev/null and b/src/forge/Images/docker.png differ
diff --git a/src/forge/Images/gradle.png b/src/forge/Images/gradle.png
new file mode 100644
index 00000000..e39a041b
Binary files /dev/null and b/src/forge/Images/gradle.png differ
diff --git a/src/forge/Images/handbook.png b/src/forge/Images/handbook.png
new file mode 100644
index 00000000..93903a6d
Binary files /dev/null and b/src/forge/Images/handbook.png differ
diff --git a/src/forge/Images/java.png b/src/forge/Images/java.png
new file mode 100644
index 00000000..2711832a
Binary files /dev/null and b/src/forge/Images/java.png differ
diff --git a/src/forge/Images/js.png b/src/forge/Images/js.png
new file mode 100644
index 00000000..4471dbec
Binary files /dev/null and b/src/forge/Images/js.png differ
diff --git a/src/forge/Images/php.png b/src/forge/Images/php.png
new file mode 100644
index 00000000..8c33aed3
Binary files /dev/null and b/src/forge/Images/php.png differ
diff --git a/src/forge/Images/python.png b/src/forge/Images/python.png
new file mode 100644
index 00000000..87da5706
Binary files /dev/null and b/src/forge/Images/python.png differ
diff --git a/src/forge/Index.js b/src/forge/Index.js
index 9c4a90c5..20eabd5c 100644
--- a/src/forge/Index.js
+++ b/src/forge/Index.js
@@ -6,15 +6,15 @@ import { withRouter } from "react-router";
import { SnackbarHOC } from "educoder";
import { CNotificationHOC } from "../modules/courses/common/CNotificationHOC";
import { TPMIndexHOC } from "../modules/tpm/TPMIndexHOC";
-
-import "./css/index.css";
+import Handbook from './Component/Handbook';
+import "./css/index.scss";
import Loadable from "react-loadable";
import Loading from "../Loading";
import { ImageLayerOfCommentHOC } from "../modules/page/layers/ImageLayerOfCommentHOC";
const ProjectNew = Loadable({
- loader: () => import("./New/Index"),
+ loader: () => import("./New/Index"),
loading: Loading,
});
const ProjectIndex = Loadable({
@@ -27,42 +27,47 @@ const ProjectDetail = Loadable({
loading: Loading,
});
+const Infos = Loadable({
+ loader: () => import("./users/Infos"),
+ loading: Loading,
+});
class Index extends Component {
+
render() {
return (
+
+
+
+
+
+
+
+
+
(
-
(
-
(
-
(
-
);
diff --git a/src/forge/Main/CoderRootCommit.js b/src/forge/Main/CoderRootCommit.js
index 9452eaba..7eb4fe7d 100644
--- a/src/forge/Main/CoderRootCommit.js
+++ b/src/forge/Main/CoderRootCommit.js
@@ -1,8 +1,9 @@
import React , { Component } from 'react';
-import { Spin } from 'antd';
+import { Spin , Pagination } from 'antd';
import { getImageUrl } from 'educoder';
import { truncateCommitId } from '../common/util'
import SelectBranch from '../Branch/Select';
+import Nodata from '../Nodata';
import axios from 'axios';
import {Link} from "react-router-dom";
@@ -12,23 +13,26 @@ class CoderRootCommit extends Component{
super(props)
this.state={
branch:"master",
- data:undefined,
+ commitDatas:undefined,
dataCount:undefined,
- limit:50,
+ limit:20,
page:1,
- isSpin:false
+ isSpining:false
}
}
componentDidMount=()=>{
const { branch , page , limit } = this.state;
this.setState({
- isSpin:true
+ isSpining:true
})
this.getCommitList( branch , page , limit );
}
getCommitList=(branch , page , limit)=>{
+ this.setState({
+ isSpining:true
+ })
const { projectsId } = this.props.match.params;
const url = `/repositories/${projectsId}/commits.json`;
axios.get(url,{
@@ -38,9 +42,12 @@ class CoderRootCommit extends Component{
limit
}
}).then((result)=>{
- if(result){
+ if(result && result.data){
+ this.setState({
+ isSpining:false
+ })
const array = [];
- result.data && result.data.commits.length > 0 && result.data.commits.map((item,key)=>{
+ result.data.commits && result.data.commits.length > 0 && result.data.commits.map((item,key)=>{
array.push({
name:item.author && item.author.name,
login: item.author && item.author.login,
@@ -51,9 +58,9 @@ class CoderRootCommit extends Component{
})
})
this.setState({
- data:array,
+ commitDatas:array,
dataCount:result.data.total_count,
- isSpin:false
+ isSpining:false
})
}
}).catch((error)=>{console.log(error)})
@@ -62,42 +69,28 @@ class CoderRootCommit extends Component{
// 切换分支 search:tag为根据标签搜索
changeBranch=(value)=>{
const { page , limit } = this.state;
+ const { getTopCount } = this.props;
this.setState({
- isSpin:true,
+ isSpining:true,
branch:value,
})
this.getCommitList(value , page , limit);
+ getTopCount && getTopCount(value);
}
ChangePage=(page)=>{
+
const { branch , limit } = this.state;
this.getCommitList(branch , page , limit);
}
-
render(){
- const { branch , data , dataCount , limit , page , isSpin } = this.state;
- const { branchs , projectDetail } = this.props;
+ const { branch , commitDatas , dataCount , limit , page , isSpining } = this.state;
+ const { branchs , projectDetail, commit_class } = this.props;
const { projectsId } = this.props.match.params;
- const title =()=>{
- return(
-
- {dataCount}次提交代码({branch})
-
- )
- }
- const Pagination =()=> {
- if(dataCount > limit){
- return(
-
-
- )
- }
- }
return(
+
+
diff --git a/src/forge/Main/CoderRootDirectory.js b/src/forge/Main/CoderRootDirectory.js
index a67b0689..75234365 100644
--- a/src/forge/Main/CoderRootDirectory.js
+++ b/src/forge/Main/CoderRootDirectory.js
@@ -42,7 +42,9 @@ class CoderRootDirectory extends Component {
readOnly: true,
zip_url:undefined,
tar_url:undefined,
- chooseType:undefined
+ chooseType:undefined,
+
+ md:false
}
}
changeAddress = (address) => {
@@ -90,6 +92,9 @@ class CoderRootDirectory extends Component {
// 页面地址返回到主目录
returnMain = (branch) => {
const { projectsId } = this.props.match.params;
+ this.setState({
+ readOnly:true
+ })
this.props.history.push(`/projects/${projectsId}/coders`);
this.getProjectRoot(branch);
};
@@ -114,11 +119,9 @@ class CoderRootDirectory extends Component {
isSpin: false,
branchLastCommit: last_commit && last_commit.commit,
lastCommitAuthor:
- last_commit &&
- (last_commit.author ||
- (last_commit.commit && last_commit.commit.author)),
+ last_commit && (last_commit.author || (last_commit.commit && last_commit.commit.author)),
zip_url: result.data.zip_url,
- tar_url: result.data.tar_url,
+ tar_url: result.data.tar_url
});
if (entries && entries.length > 0) {
this.renderData(entries);
@@ -138,6 +141,7 @@ class CoderRootDirectory extends Component {
this.props.history.push(`/projects/${projectsId}/coders?url=${arr.path}`);
this.setState({
readOnly: readOnly,
+ chooseType:"file"
});
};
@@ -231,7 +235,7 @@ class CoderRootDirectory extends Component {
message: item.commit && item.commit.message,
...item,
});
- if (item.name === "README.md") {
+ if (item.is_readme_file) {
readMeContent.push({ ...item });
readMeFile.push({ ...item });
}
@@ -244,12 +248,21 @@ class CoderRootDirectory extends Component {
};
// 点击跳转到子目录
- goToSubRoot=(path,type)=>{
+ goToSubRoot=(path,type,filename)=>{
this.setState({
chooseType:type
})
const { projectsId } = this.props.match.params;
this.props.history.push(`/projects/${projectsId}/coders?url=${path}`);
+ if(filename.substring(filename.length - 3) === ".md"){
+ this.setState({
+ md:true
+ })
+ }else{
+ this.setState({
+ md:false
+ })
+ }
};
// readme文件内容
@@ -263,7 +276,7 @@ class CoderRootDirectory extends Component {
- {title()}
+
+ {dataCount}次提交代码({branch})
+
{
- data && data.length > 0 && data.map((item,key)=>{
+ commitDatas && commitDatas.length > 0 ? commitDatas.map((item,k)=>{
return(
-
- { Pagination() }
+ {
+ dataCount > limit ?
+
-
+
+
)
- })
+ }):{truncateCommitId(`${item.sha}`)} {item.message} - {/* 浏览代码 */}
{item.image_url?:""}
-
+
+ :""
+ }
-
+
{readMeContent[0].name}
@@ -273,7 +286,7 @@ class CoderRootDirectory extends Component {
onClick={() => this.ChangeFile(readMeFile[0], false)}
className="ml20 pull-right"
>
-
+
) : (
""
@@ -299,7 +312,11 @@ class CoderRootDirectory extends Component {
this.setState({
branch: value,
isSpin: true,
+ readOnly:true
});
+ const { getTopCount } = this.props;
+ getTopCount && getTopCount(value);
+
let { search } = this.props.history.location;
if (search && search.indexOf("?url=") > -1) {
let url = search.split("?url=")[1];
@@ -315,101 +332,21 @@ class CoderRootDirectory extends Component {
// 子目录路径返回链接
returnUlr=(url)=>{
this.setState({
- chooseType:"dir"
+ chooseType:"dir",
+ readOnly:true
})
const { projectsId } = this.props.match.params;
this.props.history.push(`/projects/${projectsId}/coders?url=${url}`);
}
- render(){
- const { branchLastCommit , lastCommitAuthor , rootList , branch ,filePath , fileDetail , subFileType , readMeContent, isSpin , zip_url , tar_url} = this.state;
- const { isManager , isDeveloper , projectDetail } = this.props;
- const { projectsId } = this.props.match.params;
- const columns = [
- {
- dataIndex: 'name',
- width:"30%",
- render: (text,item) => (
- this.goToSubRoot(item.path,item.type)} className="ml12">
- {text}
-
- ),
- },
- {
- dataIndex: "commit",
- width: "60%",
- render: (text, item) =>
- item.commit && item.commit.message ? (
-
- {item.commit.message}
-
- ) : (
- ""
- ),
- },
- {
- dataIndex: "commit",
- width: "10%",
- className: "edu-txt-right",
- render: (text, item) =>
- item.commit && item.commit.time_from_now ? (
-
- {item.commit.time_from_now}
-
- ) : (
- ""
- ),
- },
- ];
- const title = () => {
- if (branchLastCommit) {
- return (
-
- {lastCommitAuthor ? (
-
- {lastCommitAuthor.login ? (
-
- })
- {lastCommitAuthor.name}
-
- ) : (
- {lastCommitAuthor.name}
- )}
-
- ) : (
- ""
- )}
-
- {branchLastCommit.message}
-
- {branchLastCommit.time_from_now}
-
- {truncateCommitId(branchLastCommit.sha)}
-
-
- );
- } else {
- return undefined;
- }
- };
+ onEdit=(readOnly)=>{
+ this.setState({
+ readOnly
+ })
+ }
- const downloadUrl = () => (
+ downloadUrl = (zip_url,tar_url) => {
+ return(
- );
+ )
+ }
+
+ title = (branchLastCommit,lastCommitAuthor) => {
+ console.log(branchLastCommit)
+ if (branchLastCommit) {
+ return (
+
+ {lastCommitAuthor ? (
+
+ {lastCommitAuthor.login ? (
+
+
+ {lastCommitAuthor.name}
+
+ ) : (
+ {lastCommitAuthor.name}
+ )}
+
+ ) : (
+ ""
+ )}
+
+ {branchLastCommit.message}
+
+ {branchLastCommit.time_from_now}
+
+ {truncateCommitId(branchLastCommit.sha)}
+
+
+ );
+ }else{
+ return false;
+ }
+ }
+
+ render(){
+ const { branchLastCommit , lastCommitAuthor , rootList , branch ,filePath , fileDetail , subFileType , readMeContent, isSpin , zip_url , tar_url} = this.state;
+ const { isManager , isDeveloper , projectDetail } = this.props;
+ const { projectsId } = this.props.match.params;
+
+ const columns = [
+ {
+ dataIndex: 'name',
+ width:"30%",
+ render: (text,item) => (
+ this.goToSubRoot(item.path,item.type,text)} className="ml12 task-hide" style={{ display: "block", maxWidth: "345px" }}>
+ {text}
+
+ ),
+ },
+ {
+ dataIndex: "commit",
+ width: "60%",
+ render: (text, item) =>
+ item.commit && item.commit.message ?
+
+ {item.commit.message}
+
+ : ""
+ },
+ {
+ dataIndex: "commit",
+ width: "10%",
+ className: "edu-txt-right",
+ render: (text, item) =>
+ item.commit && item.commit.time_from_now ?
+
+ {item.commit.time_from_now}
+
+ :""
+ },
+ ];
const urlRoot = filePath === undefined ? "" : `/${filePath}`;
let array = filePath && filePath.split("/");
@@ -431,11 +449,11 @@ class CoderRootDirectory extends Component {
-
- {subFileType && (isManager || isDeveloper) && (
+ {subFileType && (projectDetail && parseInt(projectDetail.type)) !== 2 && (isManager || isDeveloper) && (
)}
@@ -495,7 +513,7 @@ class CoderRootDirectory extends Component {
title()}
+ title={() => this.title(branchLastCommit,lastCommitAuthor)}
>
)}
{/* 子目录列表、文件 */}
@@ -505,6 +523,7 @@ class CoderRootDirectory extends Component {
{...this.props}
{...this.state}
readOnly={this.state.readOnly}
+ onEdit={this.onEdit}
>
)}
{/* readme.txt (isManager || isDeveloper)*/}
diff --git a/src/forge/Main/CoderRootFileDetail.js b/src/forge/Main/CoderRootFileDetail.js
index abc47bb5..1ba64db0 100644
--- a/src/forge/Main/CoderRootFileDetail.js
+++ b/src/forge/Main/CoderRootFileDetail.js
@@ -1,8 +1,11 @@
import React, { Component } from "react";
-import { Popconfirm, Select } from "antd";
+import { Popconfirm, Select } from "antd";
import "./list.css";
import axios from "axios";
import Meditor from "../Newfile/m_editor";
+import MDEditor from "../../modules/tpm/challengesnew/tpm-md-editor";
+import RenderHtml from "../../components/render-html";
+
function bytesToSize(bytes) {
if (bytes === 0) return "0 B";
@@ -15,34 +18,98 @@ class CoderRootFileDetail extends Component {
constructor(props) {
super(props);
this.state = {
- readOnly: true,
value: undefined,
- language: undefined
+ language: undefined,
+ languages: undefined,
+ description:props.detail.content
};
}
componentDidMount = () => {
- const { detail, readOnly } = this.props;
-
+ const { detail } = this.props;
this.setState({
value: detail.content,
- readOnly: readOnly,
});
+ this.languages_total();
};
+
+ languages_total = () => {
+ const { detail } = this.props;
+ const file_name = detail.path.split("/").pop().split(".").pop();
+ let languages = [];
+ let default_language = "javascript";
+ let all_languages = {
+ apex: ["apex", "apxc"],
+ azcli: ["azcli"],
+ bat: ["bat"],
+ clojure: ["clj"],
+ coffee: ["coffee"],
+ cpp: ["cpp"],
+ csharp: ["cs"],
+ csp: ["csp"],
+ css: ["css"],
+ dockerfile: ["dockerfile", "docker", "yml"],
+ fsharp: ["fs"],
+ go: ["go"],
+ html: ["html", "htm", "erb"],
+ ini: ["ini"],
+ java: ["java", "class"],
+ javascript: ["js"],
+ json: ["json"],
+ less: ["less"],
+ lua: ["lua"],
+ markdown: ["markdown", "md", "rmd"],
+ msdax: ["dax"],
+ mysql: ["sql"],
+ objective: ["m", "mm", "o", "out"],
+ perl: ["perl"],
+ pgsql: ["sql"],
+ php: ["php"],
+ postiats: ["postiats"],
+ powerquery: [""],
+ powershell: ["ps1"],
+ pug: ["pug"],
+ python: ["py"],
+ r: ["r"],
+ razor: ["cshtml"],
+ redis: ["rdb"],
+ ruby: ["rb"],
+ rust: ["rs"],
+ sb: ["sb"],
+ scheme: ["scm", "ss"],
+ scss: ["scss"],
+ shell: ["sh"],
+ solidity: ["sol"],
+ sql: ["sql"],
+ st: ["st"],
+ swift: ["swift"],
+ typescript: ["ts"],
+ vb: ["vbp", "frm", "frx", "bas", "cls"],
+ xml: ["xml"],
+ yaml: ["yml"],
+ };
+ for (var item in all_languages) {
+ languages.push(item);
+ let item_values = all_languages[item];
+ if (item_values.indexOf(file_name) !== -1) {
+ default_language = item;
+ }
+ }
+ this.state.languages = languages;
+ this.state.language = default_language;
+ };
+
select_language = (e) => {
this.setState({
language: e,
});
};
- EditFile = () => {
- this.setState({
- readOnly: false,
- });
- };
- CancelEdit = () => {
- this.setState({
- readOnly: true,
- });
+ EditFile = (flag) => {
+ const { onEdit } = this.props;
+ onEdit && onEdit(flag);
+ // this.setState({
+ // readOnly: false,
+ // });
};
// 编辑文件
@@ -77,81 +144,44 @@ class CoderRootFileDetail extends Component {
});
};
-
updateCode = (value) => {
this.setState({
value,
});
};
+ onContentChange = (value) => {
+ this.setState({
+ description: value,
+ });
+ };
+
render() {
- const { detail, current_user, isManager, isDeveloper } = this.props;
- const { readOnly, language } = this.state;
+ const {
+ readOnly,
+ detail,
+ current_user,
+ isManager,
+ isDeveloper,
+ md
+ } = this.props;
+ const { language, languages , description } = this.state;
let flag = current_user && current_user.login && (isManager || isDeveloper);
const Option = Select.Option;
- const languages = [
- "apex",
- "azcli",
- "bat",
- "clojure",
- "coffee",
- "cpp",
- "csharp",
- "csp",
- "css",
- "dockerfile",
- "fsharp",
- "go",
- "handlebars",
- "html",
- "ini",
- "java",
- "javascript",
- "json",
- "less",
- "lua",
- "markdown",
- "msdax",
- "mysql",
- "objective",
- "perl",
- "pgsql",
- "php",
- "postiats",
- "powerquery",
- "powershell",
- "pug",
- "python",
- "r",
- "razor",
- "redis",
- "redshift",
- "ruby",
- "rust",
- "sb",
- "scheme",
- "scss",
- "shell",
- "solidity",
- "sql",
- "st",
- "swift",
- "typescript",
- "vb",
- "xml",
- "yaml",
- ];
+
return (
- {bytesToSize(detail && detail.size)}
+
+ {bytesToSize(detail && detail.size)}
+
{flag && (
{readOnly ? (
-
+ this.EditFile(false)} className="ml20">
) : (
@@ -164,14 +194,19 @@ class CoderRootFileDetail extends Component {
onChange={this.select_language}
>
- {languages.map((item, key) => {
- return ;
- })}
+ {languages &&
+ languages.map((item, key) => {
+ return (
+
+ );
+ })}
@@ -191,22 +226,29 @@ class CoderRootFileDetail extends Component {
)}
- {
- detail.image_type && detail.direct_download ?
-
-
- 下载原始文件
-
-
:""
- }
- {detail.image_type && detail.direct_download ? (
+ {detail.image_type ? (
import('../Newfile/Index'),
+ loading: Loading,
+})
+const UploadFile = Loadable({
+ loader: () => import('../Newfile/upload_file'),
+ loading: Loading,
+})
const CoderRootDirectory = Loadable({
loader: () => import('./CoderRootDirectory'),
loading: Loading,
@@ -40,58 +47,102 @@ const Diff = Loadable({
})
class CoderRootIndex extends Component{
-
+ constructor(props){
+ super(props);
+ this.state={
+ coderCount:undefined
+ }
+ }
+
+ componentDidMount=()=>{
+ let { search } = this.props.history.location;
+ let branchName = undefined;
+ if (search && search.indexOf("?branch=") > -1) {
+ branchName = search.split("?branch=")[1];
+ }
+ this.getTopCount(branchName);
+ }
+
+ getTopCount=(branch)=>{
+ const { projectsId } = this.props.match.params;
+ const url = `/repositories/${projectsId}/top_counts.json`;
+ axios.get(url,{params:{
+ ref:branch
+ }}).then(result=>{
+ if(result){
+ this.setState({
+ coderCount:result.data
+ })
+ }
+ }).catch(error=>{console.log(error);})
+ }
render(){
return(
+ {/* 新建文件 */}
+ (
+ (
+ (
(
{/* diff */}
(
(
(
-
+
(
(
(
(
(
@@ -99,4 +150,4 @@ class CoderRootIndex extends Component{
)
}
}
-export default CoderRootIndex;
\ No newline at end of file
+export default CoderRootIndex;
diff --git a/src/forge/Main/CoderRootTag.js b/src/forge/Main/CoderRootTag.js
index 583d1d28..e015310f 100644
--- a/src/forge/Main/CoderRootTag.js
+++ b/src/forge/Main/CoderRootTag.js
@@ -35,7 +35,6 @@ export default ({
- 
+
+
+ ) : detail.direct_download ? (
+
) : (
+ md && readOnly ?
+
+
+ :
- 标签名 - {/* 描述 */} 提交信息 下载 @@ -49,10 +48,8 @@ export default ({ {item.name} - {/* 坎坎坷坷死二无一额坎坎坷坷死二无一额坎坎坷坷死二无一额 */} {truncateCommitId(`${item.id}`)} - {/* 2020-05-18 16:30 */} TAR diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index c37b1d92..88f20638 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -1,8 +1,8 @@ import React, { Component } from 'react'; import { Spin, Tooltip } from 'antd'; -import { Link, Route, Switch, withRouter } from 'react-router-dom'; - -import '../css/index.css' +import { Link, Route, Switch } from 'react-router-dom'; +import { Content } from '../Component/layout'; +import '../css/index.scss' import './list.css'; import Loadable from 'react-loadable'; @@ -21,14 +21,6 @@ import img_parised from '../Images/parised.png'; import img_focused from '../Images/focused.png'; import img_fork from '../Images/fork.png'; import img_milepost from '../Images/milepost.png'; -const FileNew = Loadable({ - loader: () => import('../Newfile/Index'), - loading: Loading, -}) -const UploadFile = Loadable({ - loader: () => import('../Newfile/upload_file'), - loading: Loading, -}) const Setting = Loadable({ loader: () => import('../Settings/Index'), loading: Loading, @@ -94,21 +86,26 @@ const MessageCount = Loadable({ loading: Loading, }) +const UpdateMerge = Loadable({ + loader: () => import('../Merge/UpdateMerge'), + loading: Loading, +}) + const MilepostDetail = Loadable({ loader: () => import('../Order/MilepostDetail'), loading: Loading, }) const WatchUsers = Loadable({ - loader: () => import('../UsersList/watch_users'), - loading: Loading, + loader: () => import('../UsersList/watch_users'), + loading: Loading, }) const PraiseUsers = Loadable({ - loader: () => import('../UsersList/praise_users'), - loading: Loading, + loader: () => import('../UsersList/praise_users'), + loading: Loading, }) const ForkUsers = Loadable({ - loader: () => import('../UsersList/fork_users'), - loading: Loading, + loader: () => import('../UsersList/fork_users'), + loading: Loading, }) @@ -117,6 +114,10 @@ const TrendsIndex = Loadable({ loading: Loading, }) +const DevIndex = Loadable({ + loader: () => import('../DevOps/Index'), + loading: Loading, +}) /** * permission：Manager:管理员，Reporter：报告人员(只有读取权限)，Developer：开发人员（除不能设置仓库信息外） */ @@ -125,7 +126,6 @@ class Detail extends Component { constructor(props) { super(props); this.state = { - isSpin: true, projectDetail: undefined, isManager: false, isReporter: false, @@ -140,19 +140,78 @@ class Detail extends Component { author: undefined, branchs: undefined, branchList: undefined, + project: null, + firstSync:false, + secondSync:false, } } componentDidMount = () => { - this.getDetail(); + this.getProject(); } componentDidUpdate = (prevState) => { if ((prevState.match.params.projectsId !== this.props.match.params.projectsId)) { - this.getDetail(); + this.getProject(); } } + getProject = (num) => { + const { projectsId } = this.props.match.params; + const url = `/projects/${projectsId}/simple.json`; + axios.get(url).then((result) => { + if (result && result.data) { + this.setState({ + project: result.data + }) + if (result.data.type !== 0 && result.data.mirror_status === 1) { + console.log("--------start channel --------"); + // 是镜像项目，且未完成迁移 + this.canvasChannel(); + if(num){ + this.setState({ + secondSync:true, + firsrtSync:false + }) + }else{ + this.setState({ + firstSync:true, + secondSync:false + }) + } + }else{ + this.getDetail(); + this.setState({ + firsrtSync:false, + secondSync:false + }) + } + } + }) + } + canvasChannel = () => { + const name = window.location.hostname === "localhost" ? "testforgeplus.trustie.net" : window.location.hostname; + const actioncable = require("actioncable"); + var project = this.state.project; + var cable = actioncable.createConsumer(`wss://${name}/cable`); + this.canvasChannel1 = cable.subscriptions.create({ + channel: `MirrorProjectChannel`, + id: project && project.identifier + }, { + connected: () => { + console.log("###### channel connected! ######"); + }, + disconnected: () => { }, + received: data => { + console.log(`###### ---received data--- ######`); + console.log(data); + if (data) { + this.getDetail(); + cable.subscriptions.consumer.disconnect(); + } + } + }) + } getDetail = () => { const { projectsId } = this.props.match.params; @@ -172,7 +231,6 @@ class Detail extends Component { watchers_count: result.data.watchers_count, praises_count: result.data.praises_count, forked_count: result.data.forked_count, - isSpin:false }) } }).catch((error) => { }) @@ -181,23 +239,23 @@ class Detail extends Component { // 关注和取消关注 focusFunc = (flag) => { const { project_id } = this.state; - - axios({ - method: flag? 'delete' : 'post', - url: `/watchers/${flag? 'unfollow' : 'follow'}.json`, + + axios({ + method: flag ? 'delete' : 'post', + url: `/watchers/${flag ? 'unfollow' : 'follow'}.json`, params: { target_type: "project", id: project_id } - }) - .then(result => { - if(result && result.data.status === 0){ - this.setWatchersCount(result.data.watchers_count, result.data.watched); - } - }) - .catch(error => { - console.log(error); - }); + }) + .then(result => { + if (result && result.data.status === 0) { + this.setWatchersCount(result.data.watchers_count, result.data.watched); + } + }) + .catch(error => { + console.log(error); + }); } // 点赞和取消点赞 @@ -233,13 +291,6 @@ class Detail extends Component { // fork项目 forkFunc = () => { - // if (!checkIfLogin) { - // this.props.showLoginDialog(); - // return; - // } - this.setState({ - isSpin: true - }) const { project_id } = this.state; const url = `/projects/${project_id}/forks.json`; axios.post(url).then(result => { @@ -247,61 +298,29 @@ class Detail extends Component { this.props.history.push(`/projects/${result.data.id}/coders`); this.props.showNotification(result.data.message); } - this.setState({ - isSpin: false - }) }).catch(error => { - this.setState({ - isSpin: false - }) console.log(error); }) } - // 获取分支列表 - getBranch = (id) => { - const url = `/projects/${id}/branches.json`; - axios.get(url).then((result) => { - if (result && result.data.length > 0) { - const branchs = []; - result.data.map((item, key) => { - branchs.push({ - index: key, - name: item.name - }) - }) - this.setState({ - branchList: result.data, - branchs, - }) - } - }).catch((error) => { }) - } + // 同步镜像 - synchronismMirror=()=>{ + synchronismMirror = () => { const { repo_id } = this.state.projectDetail; - this.setState({ - isSpin:true - }) - const url = `/repositories/${repo_id}/sync_mirror.json`; - axios.post(url).then(result=>{ - if(result && result.data && result.data.status === 0){ - this.props.showNotification("镜像同步成功!"); - this.getDetail(); - }else{ + const url = `/repositories/${repo_id}/sync_mirror.json`; + axios.post(url).then(result => { + if (result && result.data && result.data.status === 0) { + this.getProject(2); + } else { this.props.showNotification("镜像同步失败!"); - this.setState({ - isSpin:false - }) } - - }).catch(error=>{ + }).catch(error => { console.log(error); }) } render() { - const { projectDetail, watchers_count, praises_count, forked_count, isSpin, isManager, watched, praised } = this.state; + const { projectDetail, watchers_count, praises_count, forked_count, firstSync , secondSync , isManager, watched, praised, project } = this.state; const url = this.props.history.location.pathname; const urlArr = url.split("/"); const urlFlag = (urlArr.length === 3); @@ -321,58 +340,58 @@ class Detail extends Component { : "" ); - const mirror = ( -
- -1 || urlFlag) ? "active" : ""}>
代码库 - { projectDetail && projectDetail.commits_count ? {projectDetail.commits_count}:""} - +
- - -1 && !(url.indexOf("Milepost") > 0 || url.indexOf("meilpost") > 0 || url.indexOf("tags") > 0)) ? "active" : ""}> +
- -1 && !(url.indexOf("Milepost") > 0 || url.indexOf("meilpost") > 0 || url.indexOf("tags") > 0)) ? "active" : ""}>
任务 - { projectDetail && projectDetail.issues_count ? {projectDetail.issues_count} :""} - -
- - -1 ? "active" : ""}>
-
-
合并请求 - { projectDetail && projectDetail.pull_requests_count ? {projectDetail.issues_count} : "" } - -
- - -1 || url.indexOf("meilpost") > -1) ? "active" : ""}>
-
-
里程碑 - {projectDetail && projectDetail.version_count && {projectDetail.version_count}} - -
- - -1 ? "active" : ""}>
-
-
动态 + {projectDetail && projectDetail.issues_count ? {projectDetail.issues_count} : ""}
+ {
+ projectDetail && parseInt(projectDetail.type) !== 2 &&
+ - -1 ? "active" : ""}>
+
+
+ }
+ {/*
- -1 ? "active" : ""}> + + 工作流 + {projectDetail && projectDetail.ops_count ? {projectDetail.ops_count} : ""} + + */} +
- -1 || url.indexOf("meilpost") > -1) ? "active" : ""}>
+
+
+
- -1 ? "active" : ""}>
+
+
{
isManager &&
-
- 0 ? "active" : ""}>
仓库设置
+ - 0 ? "active" : ""}>
}
- {item.priority}
- {this.set_issue_tags(item.issue_tags)} - {/*
- {item.issue_type || "--"} */} -
- {item.version || "--"}
- {item.assign_user_name ? ( +
- {item.version || "--"} +
-
- +{item.journals_count ? ( - + {item.journals_count} ) : ( diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js index 4b0e335a..7a84d2e3 100644 --- a/src/forge/Merge/MessageCount.js +++ b/src/forge/Merge/MessageCount.js @@ -6,22 +6,19 @@ import { getImageUrl } from "educoder"; import { Form, Input, - Pagination, Spin, Dropdown, Icon, Menu, Select, Tag, + Button, + Alert, } from "antd"; -import Attachments from "../Upload/attachment"; import "./merge.css"; -import MergeSubmit from "./MergeSubmit"; -import AmplifyImg from "../Order/AmplifyImg"; -// import MDEditor from "../../modules/tpm/challengesnew/tpm-md-editor"; import RenderHtml from "../../components/render-html"; -import Comments from "../comments/comments"; import "../Order/order.css"; +import MergeFooter from "./merge_footer"; const Option = Select.Option; const TextArea = Input.TextArea; @@ -31,50 +28,21 @@ class MessageCount extends Component { super(props); this.state = { data: undefined, - isShow: false, - imgsrc: "", - journalsdata: undefined, - //图片区域是否显示 none 隐藏 block 显示 - display: "none", - titledisplay: "none", - countvalue: "", - //是否需要编辑 - isedit: undefined, - fileList: undefined, - limit: 10, - page: 1, - search_count: undefined, isSpin: false, - showFiles: true, - ismesrge: "none", + ismesrge: false, buttonshow: "none", mergename: "合并请求", mergekey: "merge", title: "", body: "", - commentsContent: undefined, - quillFlag: false, SpinFlag: true, - editMerge: false, - issue_tag_ids: undefined, - issue_chosen: undefined, - fixed_version_id: undefined, - assigned_to_id: undefined, - imageUrl: undefined, - visible: false, SpinMerge: false, - journal_spin: false, edit_spin: false, + pr_status: undefined, }; } componentDidMount = () => { - const url = this.props.history.location.pathname; - if (url.indexOf("updatemerge") > -1) { - this.setState({ - editMerge: true, - }); - } this.setState({ SpinFlag: true, }); @@ -91,8 +59,10 @@ class MessageCount extends Component { this.setState({ data: result.data, SpinFlag: false, + pr_status: result.data.pull_request.status, }); - // this.getjournalslist(); + } else { + this.setState({ SpinFlag: false }); } }) .catch((error) => { @@ -103,121 +73,29 @@ class MessageCount extends Component { }); }; - handleok = () => { - this.setState({ - isShow: false, - }); - }; - handleCancel = () => { - this.setState({ - isShow: false, - }); - }; - - imgshow = () => { - this.setState({ - isShow: true, - }); - }; - - //添加评论 - // addjournals = () => { - // const { data, page, limit, fileList, commentsContent } = this.state; - // this.setState({ - // journal_spin: true, - // }); - // if (!commentsContent) { - // this.setState({ - // quillFlag: true, - // }); - // return; - // } - // this.props.form.validateFieldsAndScroll((err, values) => { - // if (!err) { - // const url = `/issues/${data.issue.id}/journals.json`; - // axios - // .post(url, { - // ...values, - // content: commentsContent, - // issue_id: data.id, - // attachment_ids: fileList, - // }) - // .then((result) => { - // if (result) { - // this.props.form.setFieldsValue({ - // content: "", - // attachments_ids: undefined, - // }); - // this.setState({ - // showFiles: false, - // quillFlag: false, - // commentsContent: "", - // journal_spin: false, - // }); - // this.getjournalslist(page, limit); - // this.props.showNotification("评论成功！"); - // } - // }) - // .catch((error) => { - // this.setState({ - // journal_spin: false, - // }); - // console.log(error); - // }); - // } else { - // this.setState({ - // journal_spin: false, - // }); - // } - // }); - // }; - // //获取评论信息 - // getjournalslist = (page, limit) => { - // const { data } = this.state; - // const url = `/issues/${data.issue.id}/journals.json`; - // let id = data.id; - // axios - // .get(url, { - // params: { - // id, - // page, - // limit, - // }, - // }) - // .then((result) => { - // if (result) { - // this.setState({ - // journalsdata: result.data, - // search_count: result.data.journals_count, - // isSpin: false, - // fileList: undefined, - // showFiles: true, - // SpinFlag: false, - // }); - // } - // }) - // .catch((error) => { - // console.log(error); - // }); - // }; - //关闭任务 - closedetail = (id) => { - const { projectsId, orderId } = this.props.match.params; - const { data } = this.state; - const url = `/projects/${projectsId}/issues/${data.issue.id}/close_issue.json`; + closedetail = () => { + this.setState({ isSpin: true }); + const { projectsId, mergeId } = this.props.match.params; + const url = `/projects/${projectsId}/pull_requests/${mergeId}/refuse_merge.json`; axios - .post(url, { - project_id: projectsId, - id: orderId, - status_id: id, - }) + .post(url) .then((result) => { if (result) { - this.getDetail(); + this.setState({ + isSpin: false, + pr_status: 2, + }); + } else { + this.setState({ + isSpin: false, + }); } }) .catch((error) => { + this.setState({ + isSpin: false, + }); console.log(error); }); }; @@ -228,7 +106,7 @@ class MessageCount extends Component { SpinMerge: true, }); const { projectsId } = this.props.match.params; - const { data, title, body, mergekey } = this.state; + const { data, title, body, mergekey, pr_status } = this.state; const url = `/projects/${projectsId}/pull_requests/${data.pull_request.id}/pr_merge.json`; axios .post(url, { @@ -240,10 +118,12 @@ class MessageCount extends Component { }) .then((result) => { if (result) { - this.getDetail(); this.setState({ SpinMerge: false, + pr_status: 1, }); + } else { + this.setState({ SpinMerge: false }); } }) .catch((error) => { @@ -254,70 +134,6 @@ class MessageCount extends Component { }); }; - //修改评论 - // updatedetail = (id) => { - // this.setState({ - // edit_spin: true, - // }); - // const { page, limit, data } = this.state; - // const { orderId } = this.props.match.params; - // const url = `/issues/${data.issue.id}/journals/${id}.json`; - // axios - // .put(url, { - // issue_id: orderId, - // id: id, - // content: this.state.countvalue, - // }) - // .then((result) => { - // if (result) { - // this.setState({ - // isedit: undefined, - // edit_spin: false, - // }); - // this.getjournalslist(page, limit); - // } - // }) - // .catch((error) => { - // this.setState({ - // edit_spin: false, - // }); - // console.log(error); - // }); - // }; - // 获取上传后的文件id数组 - UploadFunc = (fileList) => { - this.setState({ - fileList, - }); - }; - - //删除评论 - // deleteorder = (id) => { - // const { orderId } = this.props.match.params; - // const { page, limit, data } = this.state; - // const url = `/issues/${data.issue.id}/journals/${id}.json`; - // axios - // .delete(url, { - // data: { - // issue_id: orderId, - // id: id, - // }, - // }) - // .then((result) => { - // if (result) { - // this.getjournalslist(page, limit); - // } - // }) - // .catch((error) => { - // console.log(error); - // }); - // }; - - changmodelname = (value) => { - this.setState({ - countvalue: value, - }); - }; changtitlepr = (e) => { this.setState({ title: e.target.value, @@ -329,126 +145,28 @@ class MessageCount extends Component { body: e.target.value, }); }; - editdetail = (count, status) => { - this.setState({ - countvalue: count, - isedit: status, - }); - }; + submitmerge = () => { if (this.state.mergekey === "rebase") { this.setState({ buttonshow: "block", - ismesrge: "none", + ismesrge: true, }); } else { this.setState({ ismesrge: "block", - buttonshow: "block", + buttonshow: false, }); } }; nonemerge = () => { this.setState({ - ismesrge: "none", + ismesrge: false, buttonshow: "none", }); }; - renderJournalList = (list) => { - if (list && list.length > 0) { - return list.map((item, key) => { - return ( -- {item.detail}： - - {item.old_value && item.old_value.length > 0 ? "更新为" : "新增"} - - - {item.value && item.value.length > 0 ? ( - item.detail === "标签" ? ( - - {item.value[0].name} - - ) : ( - item.value - ) - ) : ( - "无" - )} - -- ); - }); - } else { - return ( -- 没有评论~ -- ); - } - }; - - handleSubmit = () => { - this.props.form.validateFieldsAndScroll((err, values) => { - if (!err) { - const { projectsId, mergeId } = this.props.match.params; - const url = `/projects/${projectsId}/pull_requests/${mergeId}/simple_update.json`; - - if (values.issue_tag_ids === "") { - values.issue_tag_ids = []; - } else { - values.issue_tag_ids = [parseInt(values.issue_tag_ids)]; - } - - if (values.assigned_to_id === 0) { - values.assigned_to_id = ""; - } - axios - .post(url, { - ...values, - }) - .then((result) => { - if (result.data.status === 0) { - this.setState({ - editMerge: false, - }); - this.getDetail(); - this.props.showNotification(result.data.message); - } - }) - .catch((error) => { - console.log(error); - }); - } - }); - }; - - renderSelect = (list) => { - if (list && list.length > 0) { - return list.map((item, key) => { - return ( - - ); - }); - } - }; - - // 翻页 - // ChangePage = (page) => { - // this.setState({ - // page, - // isSpin: true, - // }); - // const { limit } = this.state; - // this.getjournalslist(page, limit); - // }; getOption = (e) => { if (e.key === "rebase") { this.setState({ @@ -464,171 +182,34 @@ class MessageCount extends Component { mergekey: e.key, title: "", body: "", - ismesrge: "block", + ismesrge: true, buttonshow: "block", }); } }; - changeComments = (value) => { - this.setState({ - commentsContent: value, - }); - if (value) { - this.setState({ - quillFlag: false, - }); - } - }; cancelSubmit = () => { this.setState({ editMerge: false, }); }; - change_to_edit = () => { - const { projectsId, mergeId } = this.props.match.params; - const url = `/projects/${projectsId}/pull_requests/${mergeId}/edit.json`; - axios - .get(url) - .then((result) => { - if (result) { - this.setState({ - issue_chosen: result.data.issue.issue_chosen, - issue_tag_ids: - result.data.issue.issue_tags && - result.data.issue.issue_tags[0].id, - fixed_version_id: result.data.issue.fixed_version_id, - assigned_to_id: result.data.issue.assigned_to_id, - editMerge: true, - }); - } - }) - .catch((error) => { - console.log(error); - }); - }; - commentCtx = (v) => { return
; }; - handleShowImage = (value) => { - this.setState({ - imageUrl: value, - visible: true, - }); - }; - setVisible = (flag) => { - this.setState({ - visible: flag, - }); - }; render() { const { projectsId, mergeId } = this.props.match.params; + const { data, - journalsdata, - page, - limit, - search_count, - isSpin, - isedit, - showFiles, - commentsContent, - quillFlag, - editMerge, - issue_tag_ids, - issue_chosen, - fixed_version_id, - assigned_to_id, - visible, - imageUrl, SpinMerge, - journal_spin, - edit_spin, + pr_status, + isSpin, + ismesrge, + SpinFlag, } = this.state; - const { getFieldDecorator } = this.props.form; - const { current_user } = this.props; - const url = this.props.history.location.pathname; - - const get_color = (type) => { - if (type === 0) { - return "#21ba45"; - } else if (type === 1) { - return "#a333c8"; - } else { - return "#e60b0b"; - } - }; - - const editMergeForm = () => { - return ( - - -- ); - }; - + const { current_user, projectDetail } = this.props; const menu = ( ); - const Paginations = ( -- {search_count > limit ? ( - -+ return ( + + {data ? ( ++) : ( "" )} - - ); - - return ( -++ ++++++++ + + {data.issue.subject} + + + + {data.pull_request && ( ++ { ++ {pr_status === 1 + ? "已合并" + : pr_status === 2 + ? "已拒绝" + : "开启的"} + + )} +++ } + ++ + {data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}:{data.pull_request.head} + + + + + ++ + {/* {data.pull_request.is_fork ? data.pull_request.base : `${data.pull_request.pull_request_user}:${data.pull_request.base}`} */} + {data.issue.project_author_name}:{data.pull_request.base} + + ++ +++ + + 由 + + {data.issue.author_name} + + + {pr_status === 0 + ? "创建于" + : pr_status === 1 + ? "合并于" + : "更新于"} + + {data.pr_time} + + 审查人员： + {data.issue.assign_user_name ? ( + + {data.issue.assign_user_name} + + ) : ( + "--" + )} + + + 里程碑： + + {data.issue.version ? data.issue.version : "--"} + + + + 标签： + + {data.issue.issue_tags && + data.issue.issue_tags.length > 0 + ? data.issue.issue_tags[0].name + : "--"} + + + + 优先级： + + {data.issue.priority ? data.issue.priority : "--"} + + + +
+++ {current_user && projectDetail && + pr_status !== 2 && + projectDetail.permission !=="Reporter" && ( + + )} + {projectDetail && projectDetail.permission !=="Reporter" && pr_status === 0 && ( + + )} +++ {data.issue.description && + data.issue.description.length > 0 ? ( + this.commentCtx(data.issue.description) + ) : ( + 没有描述 + )} +++ {pr_status === 2 && ( +++ )} + {pr_status === 1 && ( + + )} + {pr_status === 0 && projectDetail && projectDetail.permission !=="Reporter" && ( + + + )} ++++
+} + > + {this.state.mergename} + + + +++ + +++
++ + + +++ - {visible && ( -); } diff --git a/src/forge/Merge/NewMerge.js b/src/forge/Merge/NewMerge.js index 5d8ba113..1a7bb2c3 100644 --- a/src/forge/Merge/NewMerge.js +++ b/src/forge/Merge/NewMerge.js @@ -1,431 +1,292 @@ -import React, { Component } from 'react'; -import { Link } from 'react-router-dom'; -import { Radio, Form, Menu, Dropdown, Input, Select, Table, Spin } from 'antd'; -import axios from 'axios'; -import UploadComponent from '../Upload/Index'; -import { getImageUrl } from 'educoder'; -import '../Order/order.css'; -import MDEditor from '../../modules/tpm/challengesnew/tpm-md-editor'; - - -const { Button } = Radio; +import React, { Component } from "react"; +import { Input, Select, Button, Spin, Alert } from "antd"; +import axios from "axios"; +import "../Order/order.css"; +import "./merge.css"; +import MergeForm from "./merge_form"; +import MergeFooter from "./merge_footer"; const Option = Select.Option; - -const options = [ - ['bold', 'italic', 'underline'], - [{ header: [1, 2, 3, false] }], - ['blockquote', 'code-block'], - ['link', 'image'], - ['formula'] -]; class NewMerge extends Component { constructor(props) { super(props); this.state = { data: undefined, - //合并 拉取 - merge: undefined, - pull: undefined, - //判断 是否显示创建合并请求的页面 - desc: undefined, - iscreatemerge: 'none', - issue_tag_ids: "", - fixed_version_id: "", - assigned_to_id: "", - titledata: undefined, - dataCount: undefined, - limit: 50, - page: 1, + branches: undefined, + merge_branches: undefined, + merge_projects: undefined, + merge: "master", + pull: "master", + is_fork: false, + projects_names: undefined, isSpin: false, - mergedata: undefined, - } + show_message: true, + merge_head: false, // 是否向fork后的源项目发起合并请求 + default_message: "必须选择不同的分支", + project_id: undefined, // 当前项目的id，也即开始发送合并请求的源项目id + merge_project_user: undefined + }; } componentDidMount = () => { - this.getmergelist(); - this.InitData(); - } - InitData = () => { - this.props.form.setFieldsValue({ - ...this.state - }); - } - - - onPanelChange = (time, mode) => { - this.setState({ - value: time - }); - } - - onSelect = (time) => { - this.setState({ - value: time, - selectedValue: time, - }); - } - - getOption = (name, id) => { - - if (id === 'branches') { - this.ischeckmerge(name, this.state.pull) - this.setState({ - merge: name - }) - } else { - if (this.state.iscreatemerge === 'block') { - if (this.state.merge === name) { - } else { - const { page, limit } = this.state; - this.getCommitList(name, page, limit); - } - } else { - - } - this.ischeckmerge(this.state.merge, name) - this.setState({ - pull: name - }) - } - } - - ismerge = () => { - this.setState({ - iscreatemerge: 'block' - }) - const { page, limit } = this.state; - this.getCommitList(this.state.pull, page, limit); - } + const { projectsId } = this.props.match.params; + this.getmergelist(projectsId); + }; //获取新建分枝数据 - getmergelist = () => { - const { projectsId } = this.props.match.params; + getmergelist = (projectsId) => { + this.setState({isSpin: true}) const url = `/projects/${projectsId}/pull_requests/new.json`; - axios.get(url).then((result) => { - if (result) { - this.setState({ - data: result.data, - merge: result.data.branches[0], - pull: result.data.branches[0], - }) - } - }).catch((error) => { - console.log(error); - }) - } - - renderMenu = (array, id) => { - return ( - - ) - } + this.setState({isSpin: false}) + }) + .catch((error) => { + this.setState({isSpin: false}) + console.log(error); + }); + }; - renderSelect = (list) => { - if (list && list.length > 0) { - return ( - list.map((item, key) => { - return ( - - ) - }) - ) + set_default_pull = () => { + const {branches} = this.state; + let default_pull = branches.filter((e) => e.name === "master") + if (default_pull.length > 0){ + this.state.pull = default_pull[0].name + }else{ + this.state.pull = "master" } } - //创建合并请求 + set_default_merge = () => { + const {merge_branches} = this.state; + let default_merge = merge_branches.filter((e) => e.name === "master") + if (default_merge.length > 0){ + this.state.merge = default_merge[0].name + }else{ + this.state.merge = "master" + } + this.ischeckmerge(); + } - submit = () => { - this.setState({ - isSpin: true - }) - this.props.form.validateFieldsAndScroll((err, values) => { - if (!err) { - const { projectsId } = this.props.match.params; - const url = `/projects/${projectsId}/pull_requests.json`; - - if (values.issue_tag_ids.length > 0) { - values.issue_tag_ids = [parseInt(values.issue_tag_ids)] - } else { - values.issue_tag_ids = [] - } - const { desc } = this.state; - axios.post(url, { - ...values, - body: JSON.stringify(desc), - project_id: projectsId, - head: this.state.merge, - base: this.state.pull, - - }).then(result => { - if (result) { - this.setState({ - isSpin: false - }) - this.props.history.push(`/projects/${projectsId}/merge`); - const { getDetail } = this.props; - getDetail && getDetail(); - } - }).catch(error => { + newMergelist = (projectsId) => { + this.setState({isSpin: true}) + const url = `/projects/${projectsId}/pull_requests/get_branches.json`; + axios + .get(url) + .then((result) => { + if (result) { this.setState({ - isSpin: false + merge_branches: result.data }) - console.log(error); - }) - } else { - this.setState({ - isSpin: false - }) + this.set_default_merge() + } + this.setState({isSpin: false}) + }) + .catch((error) => { + this.setState({isSpin: false}) + console.log(error); + }); + }; + + selectBrach = (type, value) => { + this.state[type] = value; + this.ischeckmerge(); + }; + + selectProjectName = (value) => { + const { project_id, projects_names } = this.state; + + let is_fork_id = parseInt(value) !== parseInt(project_id) + this.setState({ + isSpin: true, + merge_head: is_fork_id, + data: { + is_original: is_fork_id, + fork_project_id: is_fork_id ? project_id : "", + merge_user_login: is_fork_id ? projects_names[0].project_user_login : undefined } }) - } - - //获取提交列表 - getCommitList = (branch, page, limit) => { - const { projectsId } = this.props.match.params; - const url = `/repositories/${projectsId}/commits.json`; - axios.get(url, { - params: { - sha: branch, - page, - limit - } - }).then((result) => { - if (result) { - const array = []; - result.data && result.data.commits.length > 0 && result.data.commits.map((item, key) => { - array.push({ - name: item.author && item.author.name, - login: item.author && item.author.login, - image_url: item.author && item.author.image_url, - sha: item.sha, - time_from_now: item.time_from_now, - message: item.message - }) - }) - this.setState({ - titledata: array, - dataCount: result.data.total_count, - isSpin: false - }) - } - }).catch((error) => { console.log(error) }) - } + this.props.history.push(`/projects/${value}/merge/new`); + this.newMergelist(value); + + }; //判断2分支是否可以合并 - ischeckmerge = (head, base) => { + ischeckmerge = () => { + this.setState({ isSpin: true }); const { projectsId } = this.props.match.params; + const { pull, merge, project_id, merge_head } = this.state; const url = `/projects/${projectsId}/pull_requests/check_can_merge.json`; - axios.post(url, { - project_id: projectsId, - head: head, - base: base, - - }).then(result => { - if (result) { - this.setState({ - mergedata: result.data - }) - } - - }).catch(error => { - console.log(error); - }) - - } - - onContentChange = (value) => { - this.setState({ - desc: value - }) - } - + axios + .post(url, { + head: pull, + base: merge, + is_original: merge_head, + fork_project_id: merge_head ? project_id : undefined + }) + .then((result) => { + if (result) { + if (result.data.status === 0) { + this.setState({ + isSpin: false, + show_message: false, + }); + } else { + this.setState({ + isSpin: false, + show_message: true, + default_message: result.data.message, + }); + } + } else { + this.setState({ + isSpin: false, + show_message: true, + default_message: "出现错误了", + }); + } + }) + .catch((error) => { + this.setState({ isSpin: false, show_message: true }); + console.log(error); + }); + }; render() { - const { getFieldDecorator } = this.props.form; + const { + data, + branches, + merge_branches, + merge_projects, + pull, + merge, + isSpin, + show_message, + default_message, + merge_head, + projects_names, + } = this.state; const { projectsId } = this.props.match.params; - const { current_user } = this.props; - const { issue_tag_ids, fixed_version_id, assigned_to_id, data, titledata, desc, isSpin } = this.state; - - - const columns = [{ - title: "作者", - dataIndex: 'name', - width: "10%", - render: (text, item) => ( - - -- )} - ---- {url.indexOf("Messagecount") > 0 || url.indexOf("updatemerge") > 0 ? ( -- -- {data && data.attachments.length > 0 ? ( ---- - 【合并请求 】 - - {data && data.issue.subject} - - - - {data && data.pull_request && ( --- {data.pull_request.status === 0 - ? "开启中" - : (data.pull_request.status === 1 - ? "已合并" - : "已拒绝")} - - )} -- 由 - - {data && data.issue.author_name} - - - 添加于 {data && data.issue.created_at} - - - 请求从 {data && data.pull_request.head} - 分支合并到 - {data && data.pull_request.base} - 分支 - - {data && data.issue.user_permission ? ( - - - this.closedetail( - data && data.issue.issue_status === "关闭" ? 2 : 5 - ) - } - > - {data && data.issue.issue_status === "关闭" - ? "点击开启" - : "关闭"} - - - 编辑 - - - ) : ( - "" - )} ---- ) : ( - "" - )} - -- -----
-
- 0 ? "active" : ""} - > - - 对话内容 - - -
- 0 ? "active" : ""} - > - - 代码提交 - - -
- - ) : ( ---- {data && data.issue.user_permission ? ( ---- ) : ( - "" - )} - { - data && data.issue && -- --- {data && data.issue.issue_status !== "关闭" && ( ---- )} -该合并请求可以进行自动合并操作
--
-} - > - {this.state.mergename} - - - - ---
-- this.prmerge()} - > - 合并请求 - - - 取消 - - -- } - - -- - )} -- - {editMerge ? ( -- {editMergeForm()} -- ) : ( --- )} -- 标签: - - {data && data.issue.issue_tags ? ( - - - {data.issue.issue_tags[0].name} - - ) : ( - "--" - )} - -
- -- 里程碑: - - {data && data.issue.version ? data.issue.version : "--"} - -
- -- 指派给: - - {data && data.issue.assign_user_name - ? data.issue.assign_user_name - : "--"} - -
-- - - - ), - }, { - title: "SHA", - dataIndex: 'sha', - render: (text) => ( - {text} - ) - }, { - title: "备注", - dataIndex: 'message', - render: (text) => ( - {text} - ) - }, { - title: "提交时间", - className: "edu-txt-right", - dataIndex: 'time_from_now', - render: (text) => ( - {text} - ) - }] - - const title = () => { - return ( -
- 提交列表 -- ) - } - - const pull = () => { - if (this.state.mergedata && this.state.mergedata.status === -2) { - return ( -- 在这些分支直接合并请求已经存在：{this.state.mergedata && this.state.mergedata.pull_request_name} -- ) - } else { - return ( -- {this.state.mergedata && this.state.mergedata.status === 0 ? : "分支内容相同，无需创建合并请求"} -- ) + const renderBrances = (list, type) => { + if (list && list.length > 0) { + return list.map((item, key) => { + return ( + + ); + }); } - } + }; + const renderProjectNames = (list) => { + if (list && list.length > 0) { + return list.map((item, key) => { + return ( + + ); + }); + } + }; + const withHtml = (html) => { + return ; + }; return ( -- -创建合并请求
-选择合并的目标分支和源分支
-------- - - ... -- - ---- {pull()} ---
-
-
-
-
+
+
+
+ :
+
+
+ {/* 工作流 */}
+ (
+ {/* 标签列表 */}
+ (
+ {/* 仓库设置 */}
+ (
+ {/* 任务详情 */}
+ (
+ {/* 里程碑 */}
+ (
+ {/* 新建里程碑 */}
+ (
+ {/*里程碑详情*/}
+ (
+ {/*修改里程碑*/}
+ (
+ {/* 里程碑页面新建任务 */}
+ (
+ {/* 新建任务 */}
+ (
+ {/* 修改详情 */}
+ (
+ {/* 复制详情 */}
+ (
+ {/* 动态 */}
+ (
+ {/* 代码Index */}
+ (
+ (
+ (
+ (
+ (
-
- {/* 新建文件 */}
- (
- (
- (
-
- {/* 标签列表 */}
- (
- {/* 仓库设置 */}
- (
- {/* 任务详情 */}
- (
- {/* 里程碑 */}
- (
- {/* 新建里程碑 */}
- (
- {/*里程碑详情*/}
- (
- {/*修改里程碑*/}
- (
-
-
- {/* 里程碑页面新建任务 */}
- (
- {/* 新建任务 */}
- (
-
- {/* 修改详情 */}
- (
-
- {/* 复制详情 */}
- (
-
- {/* 动态 */}
- (
-
-
- {/* 代码Index */}
- (
-
- (
-
- (
-
- (
-
- (
-
- (
- (
- (
- (
- (
- (
- (
-
-
+ (
+ (
+ (
+ (
+ (
+ (
+ (
+
+
+ }
)
}
}
-export default withRouter(Detail);
+export default Detail;
diff --git a/src/forge/Main/DetailTop.js b/src/forge/Main/DetailTop.js
index 4d4d584f..6d2d1732 100644
--- a/src/forge/Main/DetailTop.js
+++ b/src/forge/Main/DetailTop.js
@@ -3,34 +3,30 @@ import { Link } from 'react-router-dom';
class DetailTop extends Component {
render() {
- const { projectDetail } = this.props;
+ const { coderCount } = this.props;
const { projectsId } = this.props.match.params;
const { pathname } = this.props.location;
return (
-
+ {
+ firstSync ?
+ - {projectDetail && projectDetail.author && - - {projectDetail.author.name} - +
+
+
+
-
+ }
+
+
+ :
+
+
+
+ :""
+ }
+
+
+ {
+ firstSync ? "":
{
projectDetail && projectDetail.type && projectDetail.type === 2 ?
- 同步镜像:""
+ 同步镜像 : ""
}
this.focusFunc(watched)}>
{watched ? '取消关注' : '关注'}
-
+
{watchers_count}
@@ -381,228 +400,225 @@ class Detail extends Component {
{praised ? '取消点赞' : '点赞'}
-
+
{praises_count}
-
+
- 
Fork
-
+ Fork
+
{forked_count}
-
+
-
-
+ {project && project.author &&
+
+ {project.author.name}
+
+ }
+ /
+
+ {project && project.name}
+ {
+ projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
+
+ }
+
+ {
+ firstSync ? "" :
+ 0 ? "active" : ""}> - {projectDetail && projectDetail.commits_count}个提交 + {(coderCount && coderCount.commits_count) || 0}个提交 0 ? "active" : ""}> - {projectDetail && projectDetail.branches_count}个分支 + {(coderCount && coderCount.branches_count) || 0}个分支 0 ? "active" : ""}> - {projectDetail && projectDetail.issue_tags_count}个标签 + {(coderCount && coderCount.tags_count) || 0}个标签 0 ? "active" : ""}> - {projectDetail && projectDetail.version_releasesed_count}个发行版 + {(coderCount && coderCount.version_releasesed_count) || 0}个发行版 - {/* 0 ? "active" : ""}> - - {projectDetail && projectDetail.contributor_users_count}位贡献者 - */} - 仓库 {projectDetail && projectDetail.size} + 仓库 {(coderCount && coderCount.size) || 0}
) diff --git a/src/forge/Main/Diff.jsx b/src/forge/Main/Diff.jsx index 639f2d30..28abe420 100644 --- a/src/forge/Main/Diff.jsx +++ b/src/forge/Main/Diff.jsx @@ -50,7 +50,7 @@ const DetailP = styled.p` `; export default ({ projectDetail, match }) => { - const [data, setData] = useState(undefined); + const [data, setData] = useState({undefined}); const [commit, setCommit] = useState(undefined); const [files, setFiles] = useState(undefined); const [parents, setParents] = useState(undefined); diff --git a/src/forge/Main/Index.js b/src/forge/Main/Index.js index f37179c4..dd19e925 100644 --- a/src/forge/Main/Index.js +++ b/src/forge/Main/Index.js @@ -1,7 +1,7 @@ import React, { Component } from 'react'; import { Link } from 'react-router-dom'; import { Menu, Input , Spin, Pagination , Popover } from 'antd'; -import '../css/index.css' +import '../css/index.scss' import './list.css'; import ListItem from './IndexItem' import axios from 'axios'; @@ -196,7 +196,7 @@ class Index extends Component { const pagination = ( total && total > limit ? -
+
:
@@ -44,16 +44,12 @@ class IndexItem extends Component {
:""
}
- {
- item.is_public ? "" :
- 私有
- }
赞 ({item.praises_count})
fork ({item.forked_count})
- {item.description}
+{item.description}
@@ -69,7 +65,7 @@ class IndexItem extends Component {
}) : ""
)
return (
-
+
{renderList}
)
diff --git a/src/forge/Main/RootTable.js b/src/forge/Main/RootTable.js
index 708f0f0b..deaacfce 100644
--- a/src/forge/Main/RootTable.js
+++ b/src/forge/Main/RootTable.js
@@ -11,7 +11,7 @@ class RootTable extends Component{
showHeader={false}
size="small"
pagination={false}
- title={() => title()}
+ title={title}
/>
)
}
diff --git a/src/forge/Main/list.css b/src/forge/Main/list.css
index a022bb31..66146ccd 100644
--- a/src/forge/Main/list.css
+++ b/src/forge/Main/list.css
@@ -23,61 +23,7 @@
background: #fff;
padding:10px;
}
-.list-l-Menu{
- margin-bottom: 12px;
- border-radius:2px;
- border:1px solid rgba(221,221,221,1);
- background-color: #fff;
-}
-.list-l-Menu>li{
- font-size: 1rem;
- padding:0px 0px 0px 20px;
- box-sizing: border-box;
- color: #333;
- position: relative;
-}
-.list-l-Menu>li > p{
- height: 62px;
- line-height: 62px;
- width: 100%;
- border-bottom: 1px solid #eee;
- display: flex;
- justify-content: space-between;
- cursor: pointer;
- padding-right: 20px;
-}
-.list-l-Menu>li:last-child > p{
- border-bottom: none;
-}
-.list-l-Menu li p span:last-child{
- color: #999;
-}
-.list-l-Menu .MenuTitle{
- font-size: 16px;
- background-size: 100% 100%;
- color: #333!important;
- height: 62px;
- line-height: 62px;
- border-bottom: 1px solid #E0E0E0;
- font-weight: 400;
-}
-.list-l-Menu > li:not(.MenuTitle):hover{
- background-color: #fafafa;
-}
-/* 左侧menu */
-.list-l-Menu .ant-menu-inline{
- border:none;
-}
-.list-l-Menu .ant-menu-inline .ant-menu-item{
- width:100%!important;
-}
-.list-l-Menu .ant-menu-item-group-title{
- padding:0px;
-}
-.list-l-Menu li.active{
- background-color: #fafafa;
-}
/* 首页列表的新建和排序的下拉列表 */
.ant-menu-inline, .ant-menu-vertical, .ant-menu-vertical-left{
@@ -95,16 +41,6 @@
}
-
-.list-l-Menu li.active::before{
- position: absolute;
- left: 0px;
- top: 10px;
- width: 6px;
- content: '';
- height: 33px;
- background: #4CACFF;
-}
.list-r-operation{
display: flex;
justify-content: space-between;
@@ -137,6 +73,12 @@
.project-list{
padding:0px 30px;
}
+.border-top-grey{
+ border-top: 1px solid rgba(238,238,238,1);
+}
+.p-r-Item:last-child{
+ border-bottom: none !important;
+}
.p-r-Item{
display: flex;
border-bottom:1px solid rgba(238,238,238,1);
@@ -256,10 +198,15 @@
margin-top: 8px;
color: #666;
}
-
+.spincontent{
+ height:400px;
+}
+.spinstyle .ant-spin-text{
+ margin-top:30px;
+ color: #888;
+}
/* -----------详情------------ */
.detailHeader-wrapper{
- height: 125px;
background:linear-gradient(82deg,rgba(82,91,215,1) 0%,rgba(34,24,171,1) 100%);
}
.headerMenu-wrapper{
@@ -305,6 +252,9 @@
align-items: center;
margin-left: 30px
}
+.ant-tooltip {
+ max-width: fit-content!important;
+}
.detail_tag_btn_name{
padding:0px 10px;
display: flex;
@@ -325,6 +275,10 @@
/* color: #1C91FF !important; */
background: rgba(255,255,255,0.5);
}
+.files-md{
+ border:1px solid #eee;
+ padding:20px;
+}
/* 详情-代码 */
.branch-wrapper{
border:1px solid #eee;
@@ -378,6 +332,7 @@
border:1px solid #eee;
background: #fff;
margin-left: 20px;
+ position: relative;
}
.gitAddressClone > span{
display: flex;
@@ -387,6 +342,53 @@
cursor: pointer;
align-items: center;
}
+.addressTips{
+ position: absolute;
+ font-size: 12px;
+ color: #FF6E21;
+ top:-34px;
+ left: 30px;
+ background-color: #fff;
+ border:1px solid #FE881D;
+ padding:0px 5px;
+ height: 28px;
+ line-height: 28px;
+}
+.addressTips>span{position: relative;display: block;}
+.addressTips>span::before{
+ box-sizing: content-box;
+ width: 0px;
+ height: 0px;
+ position: absolute;
+ top: 25px;
+ left:50%;
+ margin-left: -4px;
+ padding:0;
+ border-top:8px solid #FFFFFF;
+ border-bottom:8px solid transparent;
+ border-left:8px solid transparent;
+ border-right:8px solid transparent;
+ display: block;
+ content:'';
+ z-index: 12;
+}
+.addressTips>span::after{
+ box-sizing: content-box;
+ width: 0px;
+ height: 0px;
+ position: absolute;
+ top: 26px;
+ left:50%;
+ margin-left: -4px;
+ padding:0;
+ border-top:8px solid #FE881D;
+ border-bottom:8px solid transparent;
+ border-left:8px solid transparent;
+ border-right:8px solid transparent;
+ display: block;
+ content:'';
+ z-index: 11;
+}
.gitAddressClone > span.addressType{
color: #4CACFF;
}
diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js
index dd9eb809..74e46cd3 100644
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@@ -1,6 +1,8 @@
import React, { Component } from "react";
import { Link } from "react-router-dom";
-import { Popconfirm } from "antd";
+import { Popconfirm, Tag } from "antd";
+import { getImageUrl } from "educoder";
+import "./merge.css";
class MergeItem extends Component {
constructor(props) {
@@ -29,7 +31,7 @@ class MergeItem extends Component {
if (issue_tags && issue_tags.length > 0) {
return issue_tags.map((item, key) => {
return (
-
+
{item.name}
);
@@ -40,7 +42,7 @@ class MergeItem extends Component {
};
render() {
- const { issues, search_count, page, limit } = this.props;
+ const { issues, project_name, project_author_name } = this.props;
const { projectsId } = this.props.match.params;
const { current_user } = this.props;
const renderList = () => {
@@ -49,34 +51,82 @@ class MergeItem extends Component {
return (
-
- - # {search_count - (key + (page - 1) * limit)} - +
{item.name}
+
- {item.format_time}
- 发布
- {item.updated_at === item.format_time ? (
- ""
- ) : (
-
- {item.updated_at}
- 更新
+
+
+
+
+
+
+ {item && item.author_name}
+
+
+ {item.pull_request_staus === "open"
+ ? "创建于"
+ : item.pull_request_staus === "merged"
+ ? "合并于"
+ : "更新于"}
- )}
+ {item.pr_time}
+
+
- this.onMouseMove(item.id)}
onMouseOut={() => this.onMouseOut()}
>
+