diff --git a/src/factory/resource/commonTools/detail/index.scss b/src/factory/resource/commonTools/detail/index.scss index 3ad889182..3addb95d1 100644 --- a/src/factory/resource/commonTools/detail/index.scss +++ b/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; diff --git a/src/factory/resource/developmentTools/index.jsx b/src/factory/resource/developmentTools/index.jsx index c8c56122c..e8c003cc8 100644 --- a/src/factory/resource/developmentTools/index.jsx +++ b/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) { }) } + {contentList && !contentList.length &&
}
diff --git a/src/factory/resource/developmentTools/index.scss b/src/factory/resource/developmentTools/index.scss index a54b9274f..a8ba8d746 100644 --- a/src/factory/resource/developmentTools/index.scss +++ b/src/factory/resource/developmentTools/index.scss @@ -484,4 +484,10 @@ justify-content: center; } } + .mlauto{ + margin-left: auto; + } + .mrauto { + margin-right: auto; + } } \ No newline at end of file diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js index 77889865f..ce3e154fd 100644 --- a/src/forge/Head/Header.js +++ b/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 diff --git a/src/forge/projectHome/projectList/index.scss b/src/forge/projectHome/projectList/index.scss index 541c35943..1eef86aa4 100644 --- a/src/forge/projectHome/projectList/index.scss +++ b/src/forge/projectHome/projectList/index.scss @@ -15,6 +15,7 @@ width: 24px; height: 24px; border-radius: 50%; + background-color: #FFFFFF; } .p_h_title {