Merge pull request '开源健康成熟度评分相关优化' (#783) from gitlink_management into pre_gitlink_ssr

1

src/forge/Activity/Activity.js

@@ -267,13 +267,13 @@ class Activity extends Component{
               <BranchLine url={ai_shang_v1_url}/>
               <p>基于信息熵围绕疑修任务的社群群智激发演化度量</p>
 
-              <span className="echartTitle">开源项目代码变更演化拓扑熵</span>
+              {/* <span className="echartTitle">开源项目代码变更演化拓扑熵</span>
               <IssueLine url={ai_shang_v3_url}/>
               <p>基于信息熵围绕代码提交的软件代码变更演化度量</p>
 
               <span className="echartTitle">开源项目社区演化拓扑熵</span>
               <SmoothLineTwo url={ai_shang_v4_url}/>
-              <p>基于信息熵围绕项目社群的社区分裂、缩减、合并和扩大演化行为度量</p>
+              <p>基于信息熵围绕项目社群的社区分裂、缩减、合并和扩大演化行为度量</p> */}
 
 
             </div>

src/forge/Component/projectCompass.jsx

@@ -140,14 +140,17 @@ function Compass({owner,projectsId}) {
               projection: "perspective",
               zoomSensitivity: 0,
               rotateSensitivity: [1, 0],
-              distance: 280,
+              distance: 380,
               alpha: 20,
               beta: 25
           },
-          top: -40,
-          right: -10,
-          boxWidth: 150,
-          boxDepth: 150,
+          height: 300,
+          right: -30,
+          top: -50,
+          bottom: 0,
+          boxWidth: 180,
+          boxDepth: 180,
+          boxHeight: 150,
           environment: "none",
           light: {
               main: {

src/forge/Information/Pages/homepage/component/specialProjects.jsx

@@ -64,7 +64,7 @@ function SpecialProjects({data, subTitle}) {
     setSelectedItem(selectedItem === id ? null : id);
   };
 
-  const list = (title, table1, table2,table3, list)=>{
+  const list = (title, table1, table2, table3, list)=>{
     return !!list.length && <React.Fragment>
       <p className='leftBox font-16 font-bd'>{title}</p>
       <Divider dashed className="margin0-20"/>
@@ -84,7 +84,7 @@ function SpecialProjects({data, subTitle}) {
               </a>
             </Col>
             <Col span={6} className='task-hide'>{author}</Col>
-            <Col span={6} className='task-hide'>{company}</Col>
+            <Col span={6} className='task-hide'>{company || '-'}</Col>
           </React.Fragment>
         })}
       </Row>

src/forge/Main/CoderDepot.jsx

@@ -29,10 +29,10 @@ import ProjectPortrait from '../Component/projectPortrait';
 import imNoneImg from './img/importNone.png';
 import moment from 'moment';
 
-// const ProjectCompass = Loadable({
-//   loader: () => import('../Component/projectCompass'),
-//   loading: Loading,
-// })
+const ProjectCompass = Loadable({
+  loader: () => import('../Component/projectCompass'),
+  loading: Loading,
+})
 
 const format = "YYYY-MM-DD HH:mm"
 const CoderRootFileDetail = Loadable({
@@ -699,7 +699,7 @@ function CoderDepot(props){
                         />
                       </React.Fragment>
                     }
-                    {/* {__CLIENT__ && <ProjectCompass owner={owner} projectsId={projectsId} />} */}
+                    {__CLIENT__ && projectDetail && !projectDetail.private && <ProjectCompass owner={owner} projectsId={projectsId} />}
                     {/* 贡献者 */}
                     {mirror_status ===0 && <Contributors owner={owner} projectsId={projectsId} /> }
                     {/* 项目画像: 导入/fork项目不展示, open_portrait后台配置是否开启仓库 */}

src/forge/api/project.js

@@ -5,6 +5,7 @@ export function getmaturityAnalyse(params) {
   return service({
     url: `https://testbd.trustie.net/maturityAnalyse/`,
     method: 'get',
-    params: window.location.hostname === 'testforgeplus.trustie.net' ? { ...params, env_url: 'testforgeplus' } : params
+    params: window.location.hostname === 'testforgeplus.trustie.net' ? { ...params, env_url: 'testforgeplus' } : params,
+    withCredentials: false
   });
 }