Merge branch 'gitlink_server' of https://git.trustie.net/Gitlink/forgeplus-react into gitlink_server

src/forge/Activity/Activity.js

@@ -243,7 +243,7 @@ class Activity extends Component{
           }
         </div>
         {
-          false ? 
+          false ?
           <div className="normalBox mt20">
             <div class="normalBox-title">项目演化分析</div>
             <div className="echartBox">
@@ -254,8 +254,7 @@ class Activity extends Component{
               <span className="echartTitle">Issue演化图</span>
               <Pie />
             </div>
-          </div>
-          :""
+          </div>:""
         }
         <div className="commentsBox">
           <div className="trendsTop">

src/forge/Activity/line.jsx

@@ -1,35 +1,56 @@
 import React ,{ useEffect } from 'react';
-import echarts from 'echarts/lib/echarts';
+import * as echarts from 'echarts';
 import 'echarts/lib/chart/line';
+import axios from 'axios';
+import { getdata } from './data';
 
-function Line({data}) {
+function Line() {
   useEffect(()=>{
     Init();
   },[])
 
   function Init() {
-    var huan_val = document.getElementById("line");
-    var myEcharts = echarts.init(huan_val);
-    let option = {
-      xAxis: {
-        type: 'category',
-        data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
-      },
-      yAxis: {
-        type: 'value'
-      },
-      series: [
-        {
-          data: [150, 230, 224, 218, 135, 147, 260],
-          type: 'line'
-        },
-        {
-          data: [100, 200, 290, 300, 100, 140, 260],
-          type: 'line'
-        }
-      ]
-    };
-    myEcharts.setOption(option);
+    var chartDom = document.getElementById('line');
+    var myChart = echarts.init(chartDom);
+    var option;
+    console.log(getdata());
+    var data = getdata();
+    // axios.get('http://106.75.10.84:5000/Paddle/entropy').then((result)=>{
+      myChart.setOption(
+        (option = {
+          tooltip: {
+            trigger: 'axis'
+          },
+          color: ['orange'],
+          grid: {
+            left: '5%',
+            right: '1%',
+            bottom: '18%'
+          },
+          xAxis: {
+            data: data.map(function (item) {
+              return item[0];
+            })
+          },
+          yAxis: {},
+          dataZoom: [
+            {
+              startValue: '2022-06-01'
+            },
+            {
+              type: 'inside'
+            }
+          ],
+          series: {
+            type: 'line',
+            data: data.map(function (item) {
+              return item[1];
+            })
+          }
+        })
+      );
+    // })
+    option && myChart.setOption(option);
   }
 
   return(

src/forge/Main/CoderDepotCatalogue.jsx

@@ -20,9 +20,6 @@ function CoderDepotCatalogue({item , goToSubRoot , owner , projectsId , platform
     return value;
   }
 
-  useEffect(()=>{
-    
-  },[])
 
   return(
     <li>
@@ -31,9 +28,15 @@ function CoderDepotCatalogue({item , goToSubRoot , owner , projectsId , platform
           (!platform && item.image_type) ? 
           <span><i className={`iconfont ${typeIco[`${item.type}`]} mr8`}></i>{item.name}</span>
           :
-          <a onClick={()=>goToSubRoot(item.path,item.type,item.name)} className={item.type === "submodule" ? "submoduleStyle":''}>
-            <i className={`iconfont ${typeIco[`${item.type}`]} mr8`}></i>{item.name}
-          </a>
+          (item.type === "submodule" ? 
+            <Link to={`/${owner}/${item.name}`}>
+              <i className={`iconfont ${typeIco[`${item.type}`]} mr8`}></i>{item.name}
+            </Link>
+            :
+            <a onClick={()=>goToSubRoot(item.path,item.type,item.name)}>
+              <i className={`iconfont ${typeIco[`${item.type}`]} mr8`}></i>{item.name}
+            </a>
+          )
         }
       </span>
       <span title="init project">

src/forge/Server/List.jsx

@@ -54,16 +54,16 @@ function Main(props){
             <a onClick={openDetail} className="btnhover">查看详情</a>
           </span>
         </li>
-        <li>
+        {/* <li>
           <div className="servername" style={{marginBottom: '8px'}}>
-            {/* <img src={require('./img/logo.png')} alt=""/> */}
+            //记得注释 <img src={require('./img/logo.png')} alt=""/>
             <Link to={`/${owner}/${projectsId}/service/reposyncer`}>Reposyncer仓库同步</Link>
           </div>
           <p className="task-hide-2 serverdesc">支持不同开源托管平台自动同步推送/拉取相关代码，实现多平台项目同步开发功能</p>
           <span className="serverbtn">
             <Link to={`/${owner}/${projectsId}/service/reposyncer`} className="btnhover">查看详情</Link>
           </span>
-        </li>
+        </li> */}
       </ul>
     </div>
   )