From 9608f204e805d699ad3aea8f35c58e5bc3dea82c Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Mon, 29 Nov 2021 09:54:54 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Main/version/New.jsx | 2 +- src/forge/Order/MilepostDetail.js | 2 +- src/home/Index.scss | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/forge/Main/version/New.jsx b/src/forge/Main/version/New.jsx index 8adde9b01..b1d764af2 100644 --- a/src/forge/Main/version/New.jsx +++ b/src/forge/Main/version/New.jsx @@ -224,7 +224,7 @@ export default Form.create()( 这是一个预览版本 )} -

+

diff --git a/src/forge/Order/MilepostDetail.js b/src/forge/Order/MilepostDetail.js index f56945ca2..eff19fb7b 100644 --- a/src/forge/Order/MilepostDetail.js +++ b/src/forge/Order/MilepostDetail.js @@ -236,7 +236,7 @@ class MilepostDetail extends Component { 暂无截止时间 } - {data && data.percent && data.percent.toFixed(2)}%完成 + {data && (data.percent || data.percent===0) ? {data.percent > 0 ? data.percent.toFixed(2):data.percent}%完成 :"" }

{ diff --git a/src/home/Index.scss b/src/home/Index.scss index 7678aba43..b60a31e31 100644 --- a/src/home/Index.scss +++ b/src/home/Index.scss @@ -203,7 +203,7 @@ body{ background-image: url('./Img/top-2.png'); height: 139px; width: 353px; - padding:30px 24px; + padding:15px 24px; color: #fff; margin:0px 17px; border-radius: 11px; From 07511efbd621e6a041b0a37554f680d1a23ed621 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Mon, 29 Nov 2021 10:55:50 +0800 Subject: [PATCH 2/8] =?UTF-8?q?issue-=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Merge/merge_form.js | 4 ++-- src/forge/users/Statistics/Index.jsx | 12 +++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/forge/Merge/merge_form.js b/src/forge/Merge/merge_form.js index d050116f4..c6de96388 100644 --- a/src/forge/Merge/merge_form.js +++ b/src/forge/Merge/merge_form.js @@ -167,8 +167,8 @@ class MergeForm extends Component { this.setState({ isSpin: false, }); - const { pull_request_id } = result.data; - this.props.history.push(`/${owner}/${projectsId}/pulls/${pull_request_id}`); + const { pull_request_number } = result.data; + this.props.history.push(`/${owner}/${projectsId}/pulls/${pull_request_number}`); const { getDetail } = this.props; getDetail && getDetail(); } else { diff --git a/src/forge/users/Statistics/Index.jsx b/src/forge/users/Statistics/Index.jsx index aca25eb11..91118a672 100644 --- a/src/forge/users/Statistics/Index.jsx +++ b/src/forge/users/Statistics/Index.jsx @@ -9,6 +9,7 @@ import Pie from '../Echart/Pie'; import Cloud from '../Echart/Cloud'; import Radar from '../Echart/Radar'; import Round from '../Echart/Round'; +import Nodata from '../../Nodata'; import { DatePicker } from 'antd'; import moment from 'moment'; @@ -120,7 +121,7 @@ function Index(props) { } }).then(result=>{ if(result && result.data){ - setCloudData(result.data); + setCloudData({categories:[]}); } }).catch(error=>{}) } @@ -148,7 +149,7 @@ function Index(props) {
} { - percentData && + percentData && percentData.length >0 &&
{ @@ -200,7 +201,12 @@ function Index(props) {

展示你擅长、关注、感兴趣的专业范围，通过你参与项目、收藏项目、关注项目、复刻项目等数据来统计。

- + { + cloudData && cloudData.length >0? + + : + + }
From 131d8fa81ccef44dd26908881079feb2fa4a1e0d Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Mon, 29 Nov 2021 14:01:23 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Head/AddProjectModal.jsx | 144 ++++++++++++++--------------- src/forge/Head/header.scss | 3 + src/forge/Main/tree/Index.jsx | 2 +- src/forge/users/InfosUser.js | 2 +- src/modules/tpm/TPMIndex.css | 2 +- 5 files changed, 77 insertions(+), 76 deletions(-) diff --git a/src/forge/Head/AddProjectModal.jsx b/src/forge/Head/AddProjectModal.jsx index 81f1d27cc..3dcb2d953 100644 --- a/src/forge/Head/AddProjectModal.jsx +++ b/src/forge/Head/AddProjectModal.jsx @@ -2,84 +2,82 @@ import React, { useState , forwardRef, useEffect } from 'react'; import { Form , Modal , Input , Radio } from 'antd'; import Axios from 'axios'; import CheckProfile from '../Component/ProfileModal/Profile'; +function AddProjectModal(props){ + const { getFieldDecorator, validateFields , setFieldsValue } = props && props.form; + const [ visible , setVisible ] = useState(false); -export default Form.create()( - forwardRef((props)=>{ - const { getFieldDecorator, validateFields , setFieldsValue } = props && props.form; - const [ visible , setVisible ] = useState(false); - - useEffect(()=>{ - if(!visible){ - setFieldsValue({ - code:undefined, - role:"developer" - }) - } - },[visible]) - - function onOk() { - validateFields((error,values)=>{ - if(!error){ - const url = `/applied_projects.json`; - Axios.post(url,{ - applied_project:{ - ...values - } - }).then(result=>{ - if(result && result.data){ - setVisible(false); - props.showNotification("申请加入项目成功，等待审核!"); - } - }).catch(error=>{}) - } + useEffect(()=>{ + if(!visible){ + setFieldsValue({ + code:undefined, + role:"developer" }) } - function checkValue(rule, value, callback){ - if(!value){ - callback(); + },[visible]) + + function onOk() { + validateFields((error,values)=>{ + if(!error){ + const url = `/applied_projects.json`; + Axios.post(url,{ + applied_project:{ + ...values + } + }).then(result=>{ + if(result && result.data){ + setVisible(false); + props.showNotification("申请加入项目成功，等待审核!"); + } + }).catch(error=>{}) } + }) + } + function checkValue(rule, value, callback){ + if(!value){ + callback("请输入6位数的邀请码"); + }else{ if(value.length < 6 || value.length > 6){ callback("请输入6位数的邀请码"); } - callback(); - } + } + } - return( - - setVisible(false)} - > -
- - {getFieldDecorator("code",{ - rules:[ - {required:true,message:"请输入6位项目邀请码"}, - {validator:checkValue} - ] - })( - - )} - - - {getFieldDecorator("role",{ - rules:[{required:true,message:"请选择角色"}] - })( - - 管理员 - 开发者 - 报告者 - - )} - -
- - setVisible(true)}>加入项目 - - ) - }) -) \ No newline at end of file + return( + + setVisible(false)} + > +
+ + {getFieldDecorator("code",{ + rules:[ + {required:true,message:" "}, + {validator:checkValue} + ] + })( + + )} + + + {getFieldDecorator("role",{ + rules:[{required:true,message:"请选择角色"}] + })( + + 管理员 + 开发者 + 报告者 + + )} + +
+ + setVisible(true)}>加入项目 + + ) +} +export default Form.create()(forwardRef(AddProjectModal)); \ No newline at end of file diff --git a/src/forge/Head/header.scss b/src/forge/Head/header.scss index dbe640d57..bcdb94997 100644 --- a/src/forge/Head/header.scss +++ b/src/forge/Head/header.scss @@ -127,6 +127,9 @@ width: 110px; text-align: right; } + .ant-form-explain{ + position: absolute; + } } // 右上角小铃铛单独样式 diff --git a/src/forge/Main/tree/Index.jsx b/src/forge/Main/tree/Index.jsx index 2fc574349..714bf3533 100644 --- a/src/forge/Main/tree/Index.jsx +++ b/src/forge/Main/tree/Index.jsx @@ -46,7 +46,7 @@ function Index(props) { return( -
+
{ list && list.length>0 && list.map((item,key)=>{ return( diff --git a/src/forge/users/InfosUser.js b/src/forge/users/InfosUser.js index bcfd75ffc..fff3685e7 100644 --- a/src/forge/users/InfosUser.js +++ b/src/forge/users/InfosUser.js @@ -147,7 +147,7 @@ class InfosUser extends Component { let list = button_lists.map((item, key) => { return ( - +