diff --git a/Routes.js b/Routes.js index 1f71ccc7..576a879b 100644 --- a/Routes.js +++ b/Routes.js @@ -56,4 +56,4 @@ export const deepRoutes = [ ] // 不进行组织或个人判断 -export const specialRoute = ["explore", "settings", "setting", "mulan", "wiki", "issues", "setting", "trending", "code", "projects", "pulls", "mine", "login", "register", "email", "export", "nopage", "404", "403", "500", "501", "search", "organize", "login", "register", "resetPassword", "aboutus","educoder", "glcc","bindlogin", "softbot","zone", "undefined", "admins", "oauth", "competitions", "hiagent","softwareFactory", "development", "governance"] \ No newline at end of file +export const specialRoute = ["explore", "settings", "setting", "mulan", "wiki", "issues", "setting", "trending", "code", "projects", "pulls", "mine", "login", "register", "email", "export", "nopage", "404", "403", "500", "501", "search", "organize", "login", "register", "resetPassword", "aboutus","educoder", "glcc","bindlogin", "softbot","zone", "undefined", "admins", "oauth", "competitions", "hiagent","sf", "development", "governance"] \ No newline at end of file diff --git a/public/index.html b/public/index.html index 96169fd8..01d00e5d 100755 --- a/public/index.html +++ b/public/index.html @@ -2,21 +2,21 @@ - 生态治理平台 + 菌队可控开源社区 - - - + + + - - + + - + - - - + + + @@ -27,15 +27,15 @@ - - - + + + - - + + diff --git a/src/App.js b/src/App.js index befabd28..10a94549 100644 --- a/src/App.js +++ b/src/App.js @@ -232,7 +232,7 @@ const News = Loadable({ }); // 此处仅维护前端可能的一级路由，不用进行项目或者组织判断的字段。 -const keyWord = ["explore", "settings", "setting", "mulan", "wiki", "issues", "setting", "trending", "code", "projects", "pulls", "mine", "login", "register", "email", "export", "nopage", "404", "403", "500", "501", "search", "organize", "login", "register", "resetPassword", "aboutus","educoder", "glcc","bindlogin", "softbot","zone", "hiagent","softwareFactory", "development", "governance", "forums", "news", "exploreStore", "factory", "zoneAdmin"]; +const keyWord = ["explore", "settings", "setting", "mulan", "wiki", "issues", "setting", "trending", "code", "projects", "pulls", "mine", "login", "register", "email", "export", "nopage", "404", "403", "500", "501", "search", "organize", "login", "register", "resetPassword", "aboutus","educoder", "glcc","bindlogin", "softbot","zone", "hiagent","sf", "development", "governance", "forums", "news", "exploreStore", "factory", "zoneAdmin"]; class App extends Component { constructor(props) { diff --git a/src/factory/components/Feature/index.jsx b/src/factory/components/Feature/index.jsx index 19b902fb..35b8bd34 100644 --- a/src/factory/components/Feature/index.jsx +++ b/src/factory/components/Feature/index.jsx @@ -10,6 +10,7 @@ import gif2 from '../../../images/factory/feature-gif-2.gif' import gif3 from '../../../images/factory/feature-gif-3.webp' import { factoryZoneId, standardId} from '../../../constants/factory' import { getSourceList, httpUrl } from '../../api'; +import { downloadFunc } from '../../../forge/Utils/utils' import logo1 from '../../../images/factory/standard-logo-1.webp' import logo2 from '../../../images/factory/standard-logo-2.webp' diff --git a/src/factory/index.scss b/src/factory/index.scss index c1042e3b..6075fca0 100644 --- a/src/factory/index.scss +++ b/src/factory/index.scss @@ -74,7 +74,7 @@ line-height: 36px; font-family: alibabareg; font-size: 20px; - width: 635px; + width: 835px; text-align: center; animation: fadeInUp 2s ease-in-out forwards; animation-delay: 2s; diff --git a/src/factory/resource/developmentTools/detail/index.jsx b/src/factory/resource/developmentTools/detail/index.jsx index 834c8db0..2f0be727 100644 --- a/src/factory/resource/developmentTools/detail/index.jsx +++ b/src/factory/resource/developmentTools/detail/index.jsx @@ -45,10 +45,11 @@ function Index(props) { extendData = JSON.parse(response.data.data.extendData) } document.title = response.data.data.name - if (extendData.content) { - setContent(Base64.decode(extendData.content)) - } - setDetail({...response.data.data, ...extendData}); + if (extendData.content) { + const base64content = Base64.decode(extendData.content) + setContent(base64content !== '


' ? base64content : '') + } + setDetail({ ...response.data.data, ...extendData }); } }).catch(error => { }) } @@ -70,7 +71,7 @@ function Index(props) {

{detail.name}

-

{detail.summary}

+

{detail.summary}

{detail.downloadCount} @@ -107,11 +108,12 @@ function Index(props) {
-
- { - content && - } -
+ { + content && +
+ +
+ }
) diff --git a/src/factory/resource/developmentTools/detail/index.scss b/src/factory/resource/developmentTools/detail/index.scss index eb157cac..3ad88918 100644 --- a/src/factory/resource/developmentTools/detail/index.scss +++ b/src/factory/resource/developmentTools/detail/index.scss @@ -221,7 +221,7 @@ width: 1600px; height: 100%; margin: 52px auto; - margin-top: -100px; + margin-top: -130px; position: relative; z-index: 1; @@ -241,9 +241,12 @@ } .news-detail-content-wrapper { - width: 1600px; - float: left; - padding-bottom: 60px; + background-image: url('../../../../images/factory/resource/detail-bg.png'); + background-repeat: no-repeat; + background-size: 100% 100%; + padding: 30px; + border-radius: 16px; + margin-bottom: 60px; } .news-detail-content-others { diff --git a/src/forge/Main/projecthome/v2/index.scss b/src/forge/Main/projecthome/v2/index.scss index fff7f4f7..801ce1e1 100644 --- a/src/forge/Main/projecthome/v2/index.scss +++ b/src/forge/Main/projecthome/v2/index.scss @@ -959,7 +959,7 @@ img { max-width: 80%; - max-height: 100%; + max-height: 80%; } } } diff --git a/src/home/ThirdEdition.jsx b/src/home/ThirdEdition.jsx index 705cb9b8..521a4d84 100644 --- a/src/home/ThirdEdition.jsx +++ b/src/home/ThirdEdition.jsx @@ -128,10 +128,10 @@ function ThirdEdition() {

- {active === 1 ? "生态治理平台分享最新平台资讯、社区活动通知、开源竞赛信息，把握开源生态发展脉搏" - : active===2 ? "生态治理平台汇聚精英企业仓库、前沿技术仓库、人气热门仓库，孵化优质开源创新成果" - :active===3 ? "生态治理平台集萃社区精选项目介绍、平台使用技巧等优秀文章，助力开源开放协同创新" - :"生态治理平台甄选技术研究、心得体会、经验交流等高质量内容，推动社区健康稳定发展"} + {active === 1 ? "菌队可控开源社区分享最新平台资讯、社区活动通知、开源竞赛信息，把握开源生态发展脉搏" + : active===2 ? "菌队可控开源社区汇聚精英企业仓库、前沿技术仓库、人气热门仓库，孵化优质开源创新成果" + :active===3 ? "菌队可控开源社区集萃社区精选项目介绍、平台使用技巧等优秀文章，助力开源开放协同创新" + :"菌队可控开源社区甄选技术研究、心得体会、经验交流等高质量内容，推动社区健康稳定发展"}

{ diff --git a/src/home/ThirdEditionXing.jsx b/src/home/ThirdEditionXing.jsx index 274f42e0..cc72c847 100644 --- a/src/home/ThirdEditionXing.jsx +++ b/src/home/ThirdEditionXing.jsx @@ -24,7 +24,7 @@ let setting={ function ThirdEditionXing() { return(
-

生态治理平台操作系统简介

+

菌队可控开源社区操作系统简介

diff --git a/src/images/factory/resource/detail-bg.png b/src/images/factory/resource/detail-bg.png new file mode 100644 index 00000000..10f89de2 Binary files /dev/null and b/src/images/factory/resource/detail-bg.png differ diff --git a/src/modules/modals/npsModal.jsx b/src/modules/modals/npsModal.jsx index b3ce9b9c..dec40e89 100644 --- a/src/modules/modals/npsModal.jsx +++ b/src/modules/modals/npsModal.jsx @@ -47,7 +47,7 @@ function NpmModal(props){ width={690} footer={(activeGrade || activeGrade === 0) ? : null} > -
您向朋友或同事推荐生态治理平台平台的可能性有多大？
+
您向朋友或同事推荐菌队可控开源社区平台的可能性有多大？
不可能 {arr.map(item=>{return {setActiveGrade(item)}}>{item}})} @@ -55,7 +55,7 @@ function NpmModal(props){
{(activeGrade || activeGrade === 0) &&
-
【选填】你最想吐槽生态治理平台以下的哪个功能？欢迎勾选下方想要吐槽的选项并留言
+
【选填】你最想吐槽菌队可控开源社区以下的哪个功能？欢迎勾选下方想要吐槽的选项并留言
{setCheckGroupValue(e)}}> {list.map(item=>{item})} diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js index 5fd794bd..8af56cfc 100644 --- a/src/modules/tpm/TPMIndexHOC.js +++ b/src/modules/tpm/TPMIndexHOC.js @@ -332,7 +332,7 @@ export function TPMIndexHOC(WrappedComponent) { }
- {!pathCheck && !path.includes('softwareFactory') && } + {!pathCheck && !path.includes('/sf') && }
); }