m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

版本请求页面的修改

Browse Source
dev_forge
dingyongkang 5 years ago
parent ced3adae7b
commit b8b47c6117
6 changed files with 190 additions and 51 deletions
Show Stats Download Patch File Download Diff File

15
public/react/src/forge/Order/Milepost.js
Unescape View File

@ -3,7 +3,6 @@ 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 reactCSS from 'reactcss'
import axios from 'axios';
const { Text } = Typography;
@ -201,18 +200,20 @@ class Milepost extends Component{
</div>
<div className="milepostleft">
<p style={{width:20}}>
<i className="iconfont icon-bianji3 font-12 mr3"></i>
<i className="iconfont icon-bianji3 font-12 mr3"><Link to={`/projects/${projectsId}/orders/${item.id}/meilpost`} ></Link></i>
</p>
<p><Link to={`/projects/${projectsId}/orders/${item.id}/meilpost`} >编辑</Link></p>
<p style={{width:20}}>
<a><Link to={`/projects/${projectsId}/orders/${item.id}/meilpost`} >编辑</Link></a>
<p style={{width:20}} onClick={()=>this.updatestatusemile(this.state.status==="closed"?"open":"closed",item)}>
<i className="iconfont icon-yiguanbi1 font-12 mr3"></i>
</p>
<p onClick={()=>this.updatestatusemile(this.state.status==="closed"?"open":"closed",item)}>{this.state.status==="closed"?"开启":"关闭"}</p>
<a onClick={()=>this.updatestatusemile(this.state.status==="closed"?"open":"closed",item)}>{this.state.status==="closed"?"开启":"关闭"}</a>
<p style={{width:20}}>
<i className="iconfont icon-lajitong font-12 mr3"></i>
<Popconfirm placement="bottom" title={'是否删除里程碑？'} okText="是" cancelText="否" onConfirm={()=>this.closemile(item)}>
<i className="iconfont icon-lajitong font-12 mr3" ></i>
</Popconfirm>
</p>
<Popconfirm placement="bottom" title={'是否删除里程碑？'} okText="是" cancelText="否" onConfirm={()=>this.closemile(item)}>
<p>删除</p>
<a>删除</a>
</Popconfirm>
</div>

8
public/react/src/forge/Order/MilepostDetail.js
Unescape View File

@ -1,16 +1,14 @@
import React , { Component } from "react";
import {Link, NavLink} from 'react-router-dom';
import { Input ,Dropdown , Menu , Icon , Pagination , Spin } from 'antd';
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 Nav from './Nav';
import OrderItem from './OrderItem';
import axios from 'axios';
const Search = Input.Search;
/**
* issue_chosen:下拉的筛选列表,
* data:列表接口返回的所有数据,
@ -197,7 +195,7 @@ class MilepostDetail extends Component{
render(){
const { issue_chosen , issues , limit , page , search_count , data , miledata , author_id , isSpin,openselect,closeselect } = this.state;
const { issue_chosen , issues , limit , page , search_count , data , miledata , isSpin,openselect,closeselect } = this.state;
const { projectsId,meilid } = this.props.match.params;
const Paginations = (

92
public/react/src/forge/Order/order.js
Unescape View File

@ -1,5 +1,5 @@
import React , { Component } from "react";
import {Link, NavLink} from 'react-router-dom';
import {Link} from 'react-router-dom';
import { Input ,Dropdown , Menu , Icon , Pagination , Spin } from 'antd';
import './order.css';
@ -43,7 +43,15 @@ class order extends Component{
status_type:'1',
//设置选择高亮
openselect:1,
closeselect:undefined
closeselect:undefined,
issue_tag_ids:'标签',
tracker_ids:'所有分类',
author_ids:'发布人',
assigned_to_ids:'指派人',
priority_ids:'优先度',
done_ratios:'完成度',
paix:'排序'
}
}
@ -93,8 +101,70 @@ class order extends Component{
getOption=(e,id,name)=>{
console.log("get_optin", e.key)
if(id+'s'==="issue_tag_ids"){
this.setState({
[id]:e.key,
issue_tag_ids:name
})
}
if(id+'s'==="tracker_ids"){
this.setState({
[id]:e.key,
tracker_ids:name
})
}
if(id+'s'==="author_ids"){
this.setState({
[id]:e.key,
author_ids:name
})
}
if(id+'s'==="assigned_to_ids"){
this.setState({
[id]:e.key,
assigned_to_ids:name
})
}
if(id+'s'==="priority_ids"){
this.setState({
[id]:e.key,
priority_ids:name
})
}
if(id+'s'==="done_ratios"){
this.setState({
[id]:e.key,
done_ratios:name
})
}
if(e.key==="created_on"){
if(e.item.props.value==="desc"){
this.setState({
[id]:e.key,
paix:'最新创建'
})
}else{
this.setState({
[id]:e.key,
paix:'最早创建'
})
}
}else{
if(e.item.props.value==="desc"){
this.setState({
[id]:e.key,
paix:'最新更新'
})
}else{
this.setState({
[id]:e.key,
paix:'最早更新'
})
}
}
this.setState({
[id]:e.key
[id]:e.key,
})
const { page,limit,search,author_id,assigned_to_id } = this.state;
if(e.key==="all"){
@ -173,7 +243,7 @@ class order extends Component{
// 筛选：全部、指派给我、由我创建
ChangeAssign=(type)=>{
const { limit, search, status_type} = this.state;
const { limit, search} = this.state;
this.setState({
isSpin:true
})
@ -261,7 +331,7 @@ class order extends Component{
<ul className="topWrapper_select">
<li>
<Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.issue_tag,'标签','issue_tag_id')} trigger={['click']} placement="bottomCenter">
<span>标签<Icon type="caret-down" className="ml5" /></span>
<span>{this.state.issue_tag_ids}<Icon type="caret-down" className="ml5" /></span>
</Dropdown>
</li>
{/*<li>*/}
@ -271,32 +341,32 @@ class order extends Component{
{/*</li>*/}
<li>
<Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.tracker,'所有分类','tracker_id')} trigger={['click']} placement="bottomCenter">
<span>所有分类<Icon type="caret-down" className="ml5" /></span>
<span>{this.state.tracker_ids}<Icon type="caret-down" className="ml5" /></span>
</Dropdown>
</li>
<li>
<Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.assign_user,'发布人','author_id')} trigger={['click']} placement="bottomCenter">
<span>发布人<Icon type="caret-down" className="ml5" /></span>
<span>{this.state.author_ids}<Icon type="caret-down" className="ml5" /></span>
</Dropdown>
</li>
<li>
<Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.assign_user,'指派人','assigned_to_id')} trigger={['click']} placement="bottomCenter">
<span>指派人<Icon type="caret-down" className="ml5" /></span>
<span>{this.state.assigned_to_ids}<Icon type="caret-down" className="ml5" /></span>
</Dropdown>
</li>
<li>
<Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.priority,'优先度','priority_id')} trigger={['click']} placement="bottomCenter">
<span>优先度<Icon type="caret-down" className="ml5"/></span>
<span>{this.state.priority_ids}<Icon type="caret-down" className="ml5"/></span>
</Dropdown>
</li>
<li>
<Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.done_ratio,'完成度','done_ratio')} trigger={['click']} placement="bottomCenter">
<span>完成度<Icon type="caret-down" className="ml5" /></span>
<span>{this.state.done_ratios}<Icon type="caret-down" className="ml5" /></span>
</Dropdown>
</li>
<li>
<Dropdown className="topWrapperSelect" overlay={menu} trigger={['click']} placement="bottomCenter">
<span>排序<Icon type="caret-down" className="ml5" /></span>
<span>{this.state.paix}<Icon type="caret-down" className="ml5" /></span>
</Dropdown>
</li>
</ul>

4
public/react/src/forge/Version/NewVersion.js
Unescape View File

@ -2,7 +2,6 @@ import React , { Component } from "react";
import { Form , Input , Select,Divider,Button,Checkbox,Dropdown,Menu} from 'antd';
import {Link} from 'react-router-dom';
import UploadComponent from '../Upload/Index';
import '../Order/order.css';
import './version.css';
@ -70,7 +69,7 @@ class NewVersion extends Component{
this.props.form.validateFieldsAndScroll((err, values) => {
if(!err){
const { projectsId } = this.props.match.params;
const { pull,tag_name,ischeck,fileList} = this.state;
const { pull,tag_name,ischeck} = this.state;
const url = `/projects/${projectsId}/version_releases.json`;
// if(values.issue_type==="普通"){
// values.issue_type="1"
@ -137,7 +136,6 @@ class NewVersion extends Component{
render(){
const { getFieldDecorator } = this.props.form;
const { current_user } = this.props;
const {branches,pull,tag_name} = this.state;
return(

55
public/react/src/forge/Version/version.css
Unescape View File

@ -25,7 +25,6 @@
.versionrighe{
flex: 2;
height: 20px;
}
.versionleft{
flex: 1;
@ -34,10 +33,22 @@
justify-content: right;
}
.version_line{
/* .version_line{
display: flex;
height: 60px;
width: 2%;
height: 30px;
margin: auto;
border-left:1px solid #eee;
} */
.version_line_one{
display: flex;
height: 45px;
margin: auto;
border-left:1px solid #eee;
}
.version_line_tpw{
display: flex;
height: 80px;
margin: auto;
border-left:1px solid #eee;
}
@ -45,3 +56,39 @@
.versiondiv{
display: flex;
}
.verwinth{
width: 80%;
}
/*开启中 关闭中*/
.opendversionetail{
display: inline-block;
background: #21ba45;
color: #ffffff!important;
padding:0px 5px;
text-align: center;
height: 25px;
/*width: 110px;*/
border-radius: 4px;
line-height: 25px;
}
.closedversionetail{
display: inline-block;
background: #e60b0b;
color: #ffffff!important;
padding:0px 5px;
text-align: center;
height: 25px;
/*width: 110px;*/
border-radius: 4px;
line-height: 25px;
}
.versionrectangle {
width: 8px;
height: 8px;
border-radius: 100%;
margin-top: 15px;
margin-left: -4px;
margin-bottom: 10px;
background: rgb(83, 81, 81);
}

61
public/react/src/forge/Version/version.js
Unescape View File

@ -1,9 +1,9 @@
import React , { Component } from "react";
import {Link} from 'react-router-dom';
import { Input ,Dropdown , Menu , Icon , Pagination , Spin } from 'antd';
import { Input ,Dropdown , Menu , Icon , Pagination , Spin, Divider } from 'antd';
import NoneData from '../../modules/courses/coursesPublic/NoneData';
import Nav from '../Order/Nav';
import './version.css';
import axios from 'axios';
@ -70,32 +70,57 @@ class version extends Component{
const renderList =()=>{
if(data && data.releases && data.releases.length>0 ){
return(
<div className="tagList">
{
<div>{
data.releases.map((item,key)=>{
return(
<div style={{display:'block'}}>
<div className="milepostdiv" style={{marginTop:5}}>
<span className={item&&item.draft==="稳定"?"opendetail":"closedetail"}>{item.draft} </span>
<span style={{marginLeft:30}}> {item.name}<Link to={`/projects/${projectsId}/version/${item.version_id}/upversion`} style={{color:'blue',marginLeft:15}}>(编辑)</Link> </span>
<div>
<div style={{display:'flex'}}>
<div className="versionleft">
  <div className="versionrighe"></div><span  className={item&&item.draft==="稳定"?"opendversionetail":"closedversionetail"} style={{marginTop:5,margin:'auto',marginRight:15}}>{item.draft} </span>
</div>
<div className="version_line_one">
<p className="versionrectangle"> </p>
</div>
<div className="milepostdiv"style={{marginTop:5}}>
{item.body}
<div className="versionrighe">
<h1 style={{marginLeft:15,marginTop:5}}>{item.name}<Link to={`/projects/${projectsId}/version/${item.version_id}/upversion`} style={{color:'blue',fontSize:10,marginLeft:5}}>(编辑)</Link> </h1>
</div>
</div>
<div style={{display:'flex'}}>
<div className="versionleft">
 <span style={{marginTop:5,margin:'auto',marginRight:15}}>{item.tag_name} </span>
</div>
<div className="milepostdiv"style={{marginTop:5}}>
<div className="milepostrighe">
<div className="version_line_one">
<p style={{width:4}}> </p>
</div>
<div className="milepostleft">
<a href={item.zipball_url} download="源代码(ZIP)" style={{color:'blue',marginLeft:15}}>源代码(ZIP)</a>
<div className="versionrighe">
<h5 style={{marginLeft:15,marginTop:10}}>{item.body} </h5>
</div>
</div>
<div style={{display:'flex'}}>
<div className="versionleft">
 <span style={{marginTop:5,marginRight:15}}></span>
</div>
<div className="milepostdiv"style={{marginTop:5}}>
<div className="milepostrighe">
<div className="version_line_tpw">
<p style={{width:4}}> </p>
</div>
<div className="milepostleft">
<a href={item.tarball_url} download="源文件(TAR.GZ)" style={{color:'blue',marginLeft:15}}>源文件(TAR.GZ)</a>
<div className="versionrighe">
<h1 style={{marginLeft:15,marginTop:10}}>下载附件 
</h1>
  <a href={item.zipball_url} download="源代码(ZIP)" style={{color:'blue',marginLeft:15}}>源代码(ZIP)</a>
<a href={item.tarball_url} download="源文件(TAR.GZ)" style={{color:'blue',marginLeft:15}}>源文件(TAR.GZ)</a>
</div>
</div>
<div style={{display:'flex'}}>
<div className="versionleft">
 <span style={{marginTop:5,marginRight:15}}></span>
</div>
<div className="version_line_tpw">
<p style={{width:4}}> </p>
</div>
<div className="versionrighe">
</div>
</div>
</div>
)
})

Write Preview
Loading…
Cancel
Save