From 97a9734bf75daa575b662522a7981c58534a0e45 Mon Sep 17 00:00:00 2001 From: caicai8 <1149225589@qq.com> Date: Fri, 27 Mar 2020 18:29:00 +0800 Subject: [PATCH] issue --- src/forge/Activity/Activity.js | 30 +++++++++------- src/forge/Images/nodata.png | Bin 0 -> 5877 bytes src/forge/Main/CoderRootFileDetail.js | 49 ++++++++++---------------- src/forge/Merge/MergeDetail.js | 4 +-- src/forge/Merge/merge.js | 6 ++-- src/forge/Nodata.js | 18 ++++++++++ src/forge/Order/Milepost.js | 4 +-- src/forge/Order/MilepostDetail.js | 4 +-- src/forge/Order/Tags.js | 4 +-- src/forge/Order/order.js | 4 +-- src/forge/Version/version.js | 9 ++--- src/forge/css/index.css | 14 ++++++++ 12 files changed, 85 insertions(+), 61 deletions(-) create mode 100644 src/forge/Images/nodata.png create mode 100644 src/forge/Nodata.js diff --git a/src/forge/Activity/Activity.js b/src/forge/Activity/Activity.js index 2457cb512..137677a53 100644 --- a/src/forge/Activity/Activity.js +++ b/src/forge/Activity/Activity.js @@ -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{
- 周期: + 周期: {name && name.length>0 && name[0].name}
-
- { - project_trends && project_trends.map((item,key)=>{ - return( - - ) - }) - } -
+ { + project_trends && project_trends.length > 0 ? +
+ { + project_trends && project_trends.map((item,key)=>{ + return( + + ) + }) + } +
+ : + + } + { data && data.project_trends_size > 0 && data.project_trends_size > LIMIT &&
diff --git a/src/forge/Images/nodata.png b/src/forge/Images/nodata.png new file mode 100644 index 0000000000000000000000000000000000000000..ad4c76b97b4100d34558aa4a36838e650d1dbc36 GIT binary patch literal 5877 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 { + 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(
@@ -144,23 +149,7 @@ class CoderRootFileDetail extends Component{ 下载原始文件
: - + // + ) } } diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js index b20dd3866..157f33661 100644 --- a/src/forge/Merge/merge.js +++ b/src/forge/Merge/merge.js @@ -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{
{ search_count === 0 ? - + : } @@ -312,7 +312,7 @@ class merge extends Component{
: - + } diff --git a/src/forge/Nodata.js b/src/forge/Nodata.js new file mode 100644 index 000000000..54f34c412 --- /dev/null +++ b/src/forge/Nodata.js @@ -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( +
+
+ +
{_html}
+
+
+ ) + } +} +export default Nodata; \ No newline at end of file diff --git a/src/forge/Order/Milepost.js b/src/forge/Order/Milepost.js index e160462c1..ec630bb52 100644 --- a/src/forge/Order/Milepost.js +++ b/src/forge/Order/Milepost.js @@ -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( - + ) } } diff --git a/src/forge/Order/MilepostDetail.js b/src/forge/Order/MilepostDetail.js index 363db282b..480a9d7e1 100644 --- a/src/forge/Order/MilepostDetail.js +++ b/src/forge/Order/MilepostDetail.js @@ -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{ { search_count === 0 ? - + : } diff --git a/src/forge/Order/Tags.js b/src/forge/Order/Tags.js index 5d8267507..7a0c84895 100644 --- a/src/forge/Order/Tags.js +++ b/src/forge/Order/Tags.js @@ -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( - + ) } } diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js index a985086af..3751c0ac9 100644 --- a/src/forge/Order/order.js +++ b/src/forge/Order/order.js @@ -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{ { search_count === 0 ? - + : } diff --git a/src/forge/Version/version.js b/src/forge/Version/version.js index c089a76ad..36b2e9ede 100644 --- a/src/forge/Version/version.js +++ b/src/forge/Version/version.js @@ -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( - + ) } } diff --git a/src/forge/css/index.css b/src/forge/css/index.css index ab8e7a5df..f56357c4f 100644 --- a/src/forge/css/index.css +++ b/src/forge/css/index.css @@ -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;