- {item.name}
+ {item.name}
{ item.forked_count ? { item.forked_count}:"" }
{ item.praises_count }
diff --git a/public/react/src/forge/Merge/MergeItem.js b/public/react/src/forge/Merge/MergeItem.js
new file mode 100644
index 000000000..f9f5663bb
--- /dev/null
+++ b/public/react/src/forge/Merge/MergeItem.js
@@ -0,0 +1,47 @@
+import React , { Component } from 'react';
+import { Link } from 'react-router-dom';
+
+class MergeItem extends Component{
+ render(){
+ const { issues , search_count , page , limit } = this.props;
+ const { projectsId } = this.props.match.params;
+ const renderList =()=>{
+ if(issues && issues.length > 0){
+ return(
+ issues.map((item,key)=>{
+ return(
+
+ {
+ search_count > limit ?
+
+ )
+ return(
+
+
+ );
+
+ const listItems = numbers.map((numbers) =>
+
+
+ );
+
return(
+
+ )
+ })
+ )
+ }
+ }
+ return(
+
+
+ + # {search_count - (key + (page-1) * limit)} + {item.name} +
++ {item.created_at} + { item.journals_count ? {item.journals_count} : "" } +
+-
+
- {item.issue_tags || "--"} +
- {item.issue_type || "--"} +
- {item.tracker || "--"} +
- {item.author_name || "--"} +
- {item.assign_user_name || "--"} +
- {item.priority || "--"} +
- {item.done_ratio || "--"} +
+ {renderList()}
+
+ )
+ }
+}
+
+export default MergeItem;
\ No newline at end of file
diff --git a/public/react/src/forge/Merge/merge.css b/public/react/src/forge/Merge/merge.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/public/react/src/forge/Merge/merge.js b/public/react/src/forge/Merge/merge.js
new file mode 100644
index 000000000..bae55d60b
--- /dev/null
+++ b/public/react/src/forge/Merge/merge.js
@@ -0,0 +1,254 @@
+import React , { Component } from "react";
+import {Link} from 'react-router-dom';
+import { Input ,Dropdown , Menu , Icon , Pagination , Spin } from 'antd';
+import NoneData from '../../modules/courses/coursesPublic/NoneData';
+import Nav from '../Order/Nav';
+import MergeItem from './MergeItem';
+
+
+import axios from 'axios';
+
+const Search = Input.Search;
+/**
+ * issue_chosen:下拉的筛选列表,
+ * data:列表接口返回的所有数据,
+ * issues:列表数组,
+ * isSpin:加载中,
+ * search:搜索关键字,
+ * author_id:发布者id,
+ * assigned_to_id:指派给。。。的id，
+ * limit:每页条数,
+ * page:当前页,
+ * search_count:列表总条数
+ * issue_type:搜索条件
+ */
+class merge extends Component{
+ constructor(props){
+ super(props);
+ this.state={
+ issue_chosen:undefined,
+ data:undefined,
+ issues:undefined,
+ isSpin:false,
+ search:undefined,
+ author_id:undefined,
+ assigned_to_id:undefined,
+ limit:15,
+ page:1,
+ search_count:undefined,
+ issue_type:undefined
+ }
+ }
+
+ componentDidMount=()=>{
+ this.getSelectList();
+ this.getIssueList();
+ }
+
+ getSelectList=()=>{
+ const { projectsId } = this.props.match.params;
+
+ const url = `/projects/${projectsId}/issues/index_chosen.json`;
+ axios.get(url).then((result)=>{
+ if(result){
+ this.setState({
+ issue_chosen:result.data.issue_chosen
+ })
+ }
+ }).catch((error)=>{
+ console.log(error);
+ })
+ }
+
+ // 获取列表数据
+ getIssueList=(page,limit,search,author_id,assigned_to_id,id,value)=>{
+ const { projectsId } = this.props.match.params;
+
+ const url = `/projects/${projectsId}/issues.json`;
+ axios.get(url,{
+ params:{
+ page,limit,search,author_id,assigned_to_id,
+ [id]:value
+ }
+ }).then((result)=>{
+ if(result){
+ this.setState({
+ data:result.data,
+ issues:result.data.issues,
+ search_count:result.data.search_count,
+ isSpin:false
+ })
+ }
+ }).catch((error)=>{
+ console.log(error);
+ })
+ }
+
+ getOption=(e,id)=>{
+ this.setState({
+ [id]:e.key
+ })
+ const { page,limit,search,author_id,assigned_to_id } = this.state;
+ this.getIssueList(page,limit,search,author_id,assigned_to_id,id,e.key);
+ }
+
+ renderMenu =(array,name,id)=>{
+ return(
+
+ )
+ }
+
+ // 翻页
+ ChangePage=(page)=>{
+ this.setState({
+ page,
+ isSpin:true
+ })
+ const {limit,search} = this.state;
+ this.getIssueList(page,limit,search);
+ }
+
+ // 搜索
+ searchFunc=(value)=>{
+ this.setState({
+ search:value,
+ isSpin:true
+ })
+ const {page,limit} = this.state;
+ this.getIssueList(page,limit,value);
+ }
+
+ // 筛选：全部、指派给我、由我创建
+ ChangeAssign=(type)=>{
+ const { limit, search} = this.state;
+ this.setState({
+ isSpin:true
+ })
+ if(type){
+ const { current_user } = this.props;
+ if(type===1){
+ this.setState({
+ page:1,
+ author_id:current_user.user_id,
+ assigned_to_id:undefined
+ })
+ this.getIssueList(1,limit,search,current_user.user_id,undefined);
+ }else{
+ this.setState({
+ page:1,
+ author_id:undefined,
+ assigned_to_id:current_user.user_id
+ })
+ this.getIssueList(1,limit,search,undefined,current_user.user_id);
+ }
+ }else{
+ this.setState({
+ page:1,
+ author_id:undefined,
+ assigned_to_id:undefined
+ })
+ this.getIssueList(1,limit,search,undefined,undefined);
+ }
+ }
+
+ render(){
+
+ const { issue_chosen , issues , limit , page , search_count , data , assigned_to_id , author_id , isSpin } = this.state;
+ const { projectsId } = this.props.match.params;
+
+ const Paginations = (
+
+
:""
+ }
+
+
+
+
+
+ )
+ }
+}
+export default merge;
\ No newline at end of file
diff --git a/public/react/src/forge/Order/Detail.js b/public/react/src/forge/Order/Detail.js
index 08bc91cac..e0915cd49 100644
--- a/public/react/src/forge/Order/Detail.js
+++ b/public/react/src/forge/Order/Detail.js
@@ -3,13 +3,22 @@ import {Link} from 'react-router-dom';
import axios from 'axios';
import Nav from './Nav';
+import UploadComponent from '../Upload/Index';
+
+import{ Modal,List,Form,Input,Tooltip } from 'antd'
+
+const TextArea = Input.TextArea;
class Detail extends Component{
constructor(props){
super(props);
this.state={
- data:undefined
+ data:undefined,
+ isShow:false,
+ imgsrc:'',
+ //图片区域是否显示 none 隐藏 block 显示
+ display:'none'
}
}
@@ -31,53 +40,193 @@ class Detail extends Component{
})
}
+ handleok=() => {
+ this.setState({
+ isShow:false
+ });
+};
+handleCancel=()=>{
+ this.setState({
+ isShow:false
+ });
+}
+
+imgshow=()=>{
+ this.setState({
+ isShow:true
+ });
+};
+
+
+
+
render(){
const { projectsId } = this.props.match.params;
const { data } = this.state;
+ const numbers = [1, 2, 3, 4, 5];
+ const valuse = [
+ {
+ title: 'Title 1',
+ },
+ {
+ title: 'Title 2',
+ },
+ {
+ title: 'Title 3',
+ },
+ {
+ title: 'Title 4',
+ },
+ {
+ title: 'Title 1',
+ },
+ {
+ title: 'Title 2',
+ },
+ {
+ title: 'Title 3',
+ },
+ {
+ title: 'Title 4',
+ },
+ {
+ title: 'Title 1',
+ },
+ {
+ title: 'Title 2',
+ },
+ {
+ title: 'Title 3',
+ },
+ {
+ title: 'Title 4',
+ },
+ ];
+
+
+ const listTowItems = numbers.map((numbers) =>
+
+
+ 创建合并请求
+
+
+
+ + {data && data.open_count}个开启中 + {data && data.close_count}个已关闭 +
+
+
+
+
+ {
+ search_count === 0 ?
+
+
+
+ -
+
-
+
+ 标签 ++
+ -
+
+ 类型 ++
+ -
+
+ 分类 ++
+ -
+
+ 发布人 ++
+ -
+
+ 指派人 ++
+ -
+
+ 优先度 ++
+ -
+
+ 完成度 ++
+
+
+ 
+
+
+ 张三
+
+
+
+
+
+
+
+ {listTowItems}
+
+
-
-
- 创建工单
+
+
+ 创建工单
+
+
+
+
- + { data && data.subject } + 编辑 +
+{ data && data.description }
++ 由 { data && data.author_name} 于 { data && data.created_at }创建{ data && data.journals_count && data.journals_count > 0 ?` · ${data.journals_count} 条评论`:""} +
-
+
+
+
-
+ {listItems}
+
-
+ +
+ +
+ + ++