Merge branch 'factory' of https://gitlink.org.cn/Gitlink/forgeplus-react-v2 into factory

src/factory/resource/commonTools/detail/index.scss

@@ -40,7 +40,7 @@
     .header-content {
       margin-top: 30px;
       width: 1600px;
-      height: 481px;
+      // height: 481px;
       position: relative;
       border-radius: 16px;
       padding: 60px 45px;
@@ -140,10 +140,11 @@
 
       .more-tools {
         display: flex;
-        margin-top: 20px;
+        margin-top: 5px;
+        max-width: 800px;
+        flex-wrap: wrap;
 
         span {
-          max-width: 200px;
           cursor: pointer;
           display: inline-block;
           background: #e9f2ff;
@@ -154,9 +155,7 @@
           font-family: alibaba;
           color: #091221;
           font-size: 15px;
-          white-space: nowrap;
-          text-overflow: ellipsis;
-          overflow: hidden;
+          margin-top: 15px !important;
 
           img {
             width: 19px;

src/factory/resource/developmentTools/index.jsx

@@ -17,6 +17,7 @@ import '../../common.scss'
 import { downloadFunc } from '../../../forge/Utils/utils'
 import { Link } from "react-router-dom";
 import InfiniteScroll from 'react-infinite-scroller';
+import Nodata from '../../../forge/Nodata'
 
 const bgList = [bg1, bg2, bg3]
 
@@ -218,6 +219,7 @@ function Index(props) {
                 </ActionItem>
               })
             }
+            {contentList && !contentList.length && <div className="mt100 mlauto mrauto"><Nodata _html="暂无数据"/></div>}
           </div>
         </div>
         <div className="tools-content-new">

src/factory/resource/developmentTools/index.scss

@@ -484,4 +484,10 @@
       justify-content: center;
     }
   }
+  .mlauto{
+    margin-left: auto;
+  }
+  .mrauto {
+    margin-right: auto;
+  }
 }

src/forge/Head/Header.js

@@ -242,7 +242,8 @@ class NewHeader extends Component {
     }else{
       str = match.path;
     }
-    if (url && (str === url || (str === url+'/'))) {
+    
+    if (url && (str === url || (str === url+'/')|| ( str.startsWith(url) && url !== '/' ))) {
       return true
     }else {
       return false

src/forge/projectHome/projectList/index.scss

@@ -15,6 +15,7 @@
     width: 24px;
     height: 24px;
     border-radius: 50%;
+    background-color: #FFFFFF;
   }
 
   .p_h_title {