Merge pull request 'issue-优化' (#291) from caishi/forgeplus-react:gitlink_server into gitlink_server

src/forge/Main/version/New.jsx

@@ -224,7 +224,7 @@ export default Form.create()(
                   <Checkbox defaultChecked={!stable}>这是一个预览版本</Checkbox>
               )}
             </Form.Item>
-            <p className="pt20" style={{borderTop:"1px solid #eee"}}>
+            <p className="pt20 pb20" style={{borderTop:"1px solid #eee"}}>
               <Button onClick={submit} type="primary" className="mr30 btnblue">
                 {versionId ? "保存" : "创建"}发行版
               </Button>

src/forge/Merge/merge_form.js

@@ -167,8 +167,8 @@ class MergeForm extends Component {
               this.setState({
                 isSpin: false,
               });
-              const { pull_request_id } = result.data;
+              const { pull_request_number } = result.data;
-              this.props.history.push(`/${owner}/${projectsId}/pulls/${pull_request_id}`);
+              this.props.history.push(`/${owner}/${projectsId}/pulls/${pull_request_number}`);
               const { getDetail } = this.props;
               getDetail && getDetail();
             } else {

src/forge/Order/MilepostDetail.js

@@ -236,7 +236,7 @@ class MilepostDetail extends Component {
                     <span >暂无截止时间</span>
                 }
               </span>
-              <span className="font-weight-bold">{data && data.percent && data.percent.toFixed(2)}%完成 </span>
+              {data && (data.percent || data.percent===0) ? <span className="font-weight-bold"> {data.percent > 0 ? data.percent.toFixed(2):data.percent}%完成 </span> :"" }
             </span>
             <div className="milepostdiv">
               {

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) {
             </div>
           }
           {
-            percentData &&
+            percentData && percentData.length >0 &&
             <div className="pBox">
               <div className="progress">
                 {
@@ -200,7 +201,12 @@ function Index(props) {
         </FlexAJ>
         <div className="echartBox">
           <p>展示你擅长、关注、感兴趣的专业范围，通过你参与项目、收藏项目、关注项目、复刻项目等数据来统计。</p>
-          <Cloud data={cloudData}/>
+          {
+            cloudData && cloudData.length >0?
+            <Cloud data={cloudData}/>
+            :
+            <Nodata _html="暂无数据" small={true}/>
+          }
         </div>
       </div>
     </div>

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;