anph
/
forgeplus-react
forked from Gitlink/forgeplus-react
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

issue

This commit is contained in:
caicai8 2020-03-27 18:29:00 +08:00
parent 2da3c827b2
commit 97a9734bf7
12 changed files with 85 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/forge/Activity/Activity.js
View File

@ -1,10 +1,10 @@
import React , { Component } from 'react';
import { Dropdown , Menu , Icon , Pagination} from 'antd';
import { Link } from 'react-router-dom';
import moment from 'moment';
import '../css/index.css';
import '../Branch/branch.css';
import './activity.css';
import NoneData from '../Nodata';
import ActivityItem from './ActivityItem';
import axios from 'axios';
@ -155,23 +155,29 @@ class Activity extends Component{
</div>
<div className="df trendsTop mt20">
<div className="branchDropdown f-wrap-alignCenter">
<span className="color-grey-9 mr3">周期:</span>
<Dropdown overlay={menu} trigger={['click']} placement="bottomLeft">
<a className="ant-dropdown-link">
<span className="color-grey-9 mr3">周期:</span>
{name && name.length>0 && name[0].name} <Icon type="down" />
</a>
</Dropdown>
</div>
</div>
<div className="activity_list">
{
project_trends && project_trends.map((item,key)=>{
return(
<ActivityItem item={item} {...this.props} ></ActivityItem>
)
})
}
</div>
{
project_trends && project_trends.length > 0 ?
<div className="activity_list">
{
project_trends && project_trends.map((item,key)=>{
return(
<ActivityItem item={item} {...this.props} ></ActivityItem>
)
})
}
</div>
:
<NoneData _html="暂时还没有相关数据哦!" />
}
{
data && data.project_trends_size > 0 && data.project_trends_size > LIMIT &&
<div className="pageDIV">

BIN
src/forge/Images/nodata.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.7 KiB

49
src/forge/Main/CoderRootFileDetail.js
View File

@ -1,20 +1,15 @@
import React , { Component } from "react";
// import Editor from "react-monaco-editor";
import {UnControlled as CodeMirror} from 'react-codemirror2';
import 'codemirror/mode/cmake/cmake';
import 'codemirror/mode/sql/sql';
import 'codemirror/mode/xml/xml';
import 'codemirror/mode/clike/clike';
import 'codemirror/mode/javascript/javascript';
import 'codemirror/addon/hint/show-hint.css';
import 'codemirror/addon/hint/show-hint.js';
import { Popconfirm, Result } from 'antd';
import './list.css';
import axios from 'axios';
import CodeMirror from 'react-codeMirror';
require('codemirror/lib/codemirror.css');
require('codemirror/mode/javascript/javascript');
require('codemirror/mode/xml/xml');
require('codemirror/mode/markdown/markdown');
function bytesToSize(bytes) {
if (bytes === 0) return '0 B';
let k = 1024,
@ -104,12 +99,22 @@ class CoderRootFileDetail extends Component{
console.log(error);
})
}
updateCode=(value)=> {
this.setState({
value,
});
}
render(){
const { detail , current_user , isManager , isReporter , isDeveloper } = this.props;
const { readOnly ,value } = this.state;
let flag = current_user && current_user.login && (isManager || isReporter);
var options = {
lineNumbers: true,
mode: 'javascript',
readOnly:readOnly?'nocursor':false,
autofocus:readOnly?false:true
};
return(
<div>
<div className="branchTable">
@ -144,23 +149,7 @@ class CoderRootFileDetail extends Component{
<a href={detail.download_url} className="color-blue font-15">下载原始文件</a>
</div>
:
<CodeMirror
value={value}
options={{
// mode: 'xml',
theme: 'default',
lineNumbers: true,
// extraKeys: {"Ctrl-Q": "autocomplete"}, // 快捷键
indentUnit: 4, //代码缩进为一个tab的距离
matchBrackets: true,
autoRefresh: true,
smartIndent: true,//智能换行
styleActiveLine: true,
lint: true,
readOnly: readOnly?"nocursor":false
}}
onChange={this.changeMmirror}
/>
<CodeMirror ref="editor" value={detail.content} onChange={this.updateCode} options={options} />
// <Editor
// height="300px"
// theme={"vs-dark"}

4
src/forge/Merge/MergeDetail.js
View File

@ -6,7 +6,7 @@ import Nav from '../Order/Nav';
import UploadComponent from '../Upload/Index';
import{ Modal,Col,Form,Input,Tooltip,Popconfirm } from 'antd'
import NoneData from '../../modules/courses/coursesPublic/NoneData';
import NoneData from '../Nodata';
const TextArea = Input.TextArea;
@ -226,7 +226,7 @@ class MergeDetail extends Component{
)
}else{
return(
<NoneData />
<NoneData _html="暂时还没有相关数据哦!" />
)
}
}

6
src/forge/Merge/merge.js
View File

@ -3,7 +3,7 @@ import {Link} from 'react-router-dom';
import { Input ,Dropdown , Menu , Icon , Pagination , Spin } from 'antd';
import './merge.css';
import NoneData from '../../modules/courses/coursesPublic/NoneData';
import NoneData from '../Nodata';
import Nav from '../Order/Nav';
import OrderItem from './MergeItem';
@ -304,7 +304,7 @@ class merge extends Component{
</div>
{
search_count === 0 ?
<NoneData></NoneData>
<NoneData _html="暂时还没有相关数据哦!"></NoneData>
:
<OrderItem issues={issues} search_count={search_count} page={page} limit={limit} {...this.props} {...this.state}></OrderItem>
}
@ -312,7 +312,7 @@ class merge extends Component{
</Spin>
</div>
:
<NoneData/>
<NoneData _html="暂时还没有相关数据哦!"/>
}
</div>

18
src/forge/Nodata.js Normal file
View File

@ -0,0 +1,18 @@
import React , { Component } from 'react';
import nodata from './Images/nodata.png';
class Nodata extends Component{
render(){
const { _html } = this.props;
return(
<div className="none_panels">
<div>
<img src={nodata} alt="" />
<div className="none_p_title">{_html}</div>
</div>
</div>
)
}
}
export default Nodata;

4
src/forge/Order/Milepost.js
View File

@ -2,7 +2,7 @@ import React , {Component} from 'react';
import { Link } from 'react-router-dom';
import { Dropdown , Icon , Menu , Pagination,Typography,Popconfirm} from 'antd';
import Nav from './Nav';
import NoneData from '../../modules/courses/coursesPublic/NoneData';
import NoneData from '../Nodata';
import axios from 'axios';
const { Text } = Typography;
@ -270,7 +270,7 @@ class Milepost extends Component{
)
}else{
return(
<NoneData />
<NoneData _html="暂时还没有相关数据哦!" />
)
}
}

4
src/forge/Order/MilepostDetail.js
View File

@ -3,7 +3,7 @@ import {Link} from 'react-router-dom';
import { Dropdown , Menu , Icon , Pagination , Spin } from 'antd';
import './order.css';
import NoneData from '../../modules/courses/coursesPublic/NoneData';
import NoneData from '../Nodata';
import OrderItem from './OrderItem';
@ -362,7 +362,7 @@ class MilepostDetail extends Component{
</div>
{
search_count === 0 ?
<NoneData></NoneData>
<NoneData _html="暂时还没有相关数据哦!"/>
:
<OrderItem issues={issues} search_count={search_count} page={page} limit={limit} {...this.props} {...this.state}></OrderItem>
}

4
src/forge/Order/Tags.js
View File

@ -2,7 +2,7 @@ import React , {Component} from 'react';
import { Dropdown , Icon , Menu , Pagination, Modal,Input,Popconfirm,Form } from 'antd';
import { Link } from 'react-router-dom';
import Nav from './Nav';
import NoneData from '../../modules/courses/coursesPublic/NoneData';
import NoneData from '../Nodata';
import { SketchPicker } from 'react-color'
import reactCSS from 'reactcss'
import axios from 'axios';
@ -323,7 +323,7 @@ class Tags extends Component{
)
}else{
return(
<NoneData />
<NoneData _html="暂时还没有相关数据哦!" />
)
}
}

4
src/forge/Order/order.js
View File

@ -3,7 +3,7 @@ import {Link} from 'react-router-dom';
import { Input ,Dropdown , Menu , Icon , Pagination , Spin } from 'antd';
import './order.css';
import NoneData from '../../modules/courses/coursesPublic/NoneData';
import NoneData from '../Nodata';
import Nav from './Nav';
import OrderItem from './OrderItem';
@ -422,7 +422,7 @@ class order extends Component{
</div>
{
search_count === 0 ?
<NoneData></NoneData>
<NoneData _html="暂时还没有相关数据哦!" />
:
<OrderItem issues={issues} search_count={search_count} page={page} limit={limit} {...this.props} {...this.state}></OrderItem>
}

9
src/forge/Version/version.js
View File

@ -1,14 +1,11 @@
import React , { Component } from "react";
import {Link} from 'react-router-dom';
import { Input ,Dropdown , Menu , Icon , Pagination , Spin, Divider } from 'antd';
import NoneData from '../../modules/courses/coursesPublic/NoneData';
import Nav from '../Order/Nav';
import { Input } from 'antd';
import NoneData from '../Nodata';
import './version.css';
import axios from 'axios';
const Search = Input.Search;
/**
* issue_chosen:下拉的筛选列表,
* data:列表接口返回的所有数据,
@ -134,7 +131,7 @@ class version extends Component{
)
}else{
return(
<NoneData />
<NoneData _html="暂时还没有相关数据哦!" />
)
}
}

14
src/forge/css/index.css
View File

@ -71,6 +71,20 @@
background-color: #f4f4f4;
line-height: 18px;
}
.none_panels{
text-align: center;
height: 400px;
display: flex;
justify-content: center;
align-items: center;
}
.none_panels img{
margin-bottom: 15px;
}
.none_p_title{
font-size: 16px;
color: #999;
}
@media screen and (max-width: 1000px){
.main{
width: 750px;