From 34b3b0a12d7ac6e480e0429ed7ee8d89c0de656b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Sat, 27 Dec 2025 17:02:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AD=A6=E6=B1=89=E9=A1=B9=E7=9B=AE=E7=BB=93?= =?UTF-8?q?=E5=90=88=E7=89=8801?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 6 +-- src/App.js | 25 ++++++++- src/factory/index.scss | 1 + src/forge/Component/feedBack.jsx | 9 ++-- src/forge/Head/Header.js | 51 +++++++++++++++++-- src/forge/Index.js | 12 +++++ src/forge/Main/projectHomeNew/index.jsx | 4 +- src/forge/Main/projectHomeNew/v2/index.jsx | 8 +-- .../Main/projecthome/components/Banner.jsx | 2 +- .../Main/projecthome/components/Store.jsx | 2 +- .../projecthome/v2/components/project.jsx | 2 +- .../v2/components/supplyChainGovernance.jsx | 5 ++ src/forge/Main/projecthome/v2/index.jsx | 7 +-- src/forge/Main/projecthome/v2/index.scss | 1 + src/forge/projectHome/explore/index.jsx | 7 +-- src/forge/projectHome/explore/index.scss | 13 +++-- src/forge/projectHome/projectList/index.jsx | 14 ++--- src/forums/list/index.jsx | 15 +++--- 18 files changed, 139 insertions(+), 45 deletions(-) diff --git a/package.json b/package.json index fd6bf2199..cfa8ad5bd 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "express": "^4.18.2", "flv.js": "^1.5.0", "fs-extra": "3.0.1", - "gsap": "^3.13.0", + "gsap": "^3.14.2", "http-proxy-middleware": "^2.0.6", "i18next": "^23.4.5", "immutability-helper": "^2.6.6", @@ -179,7 +179,7 @@ "/src/**/?(*.)(spec|test).{js,jsx,mjs}" ], "testEnvironment": "node", - "testURL": "http://localhost", + "testURL": "https://testforgeplus.trustie.net", "transform": { "^.+\\.(js|jsx|mjs)$": "/node_modules/babel-jest", "^.+\\.css$": "/config/jest/cssTransform.js", @@ -204,7 +204,7 @@ "eslintConfig": { "extends": "react-app" }, - "proxy": "http://172.20.32.203:4000/", + "proxy": "https://testforgeplus.trustie.net/", "port": "3007", "devDependencies": { "@babel/core": "^7.23.6", diff --git a/src/App.js b/src/App.js index 7f7b5623f..16738b8ed 100644 --- a/src/App.js +++ b/src/App.js @@ -150,7 +150,7 @@ const Home = Loadable({ }) const Store = Loadable({ - loader: () => import('./forge/Main/projectHomeNew/v2'), + loader: () => import('./forge/Main/projecthome/Index'), loading: Loading, }) @@ -227,7 +227,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"]; +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"]; class App extends Component { constructor(props) { @@ -650,6 +650,12 @@ class App extends Component { } }> + ( + + )} + > ( @@ -657,6 +663,12 @@ class App extends Component { ) } /> + ( + + )} + > + { + return () + } + }> + + {/* 判断为用户/组织，并进入对应页面 */} { pathType === 'User' ? diff --git a/src/factory/index.scss b/src/factory/index.scss index d4491ef13..ba96908cb 100644 --- a/src/factory/index.scss +++ b/src/factory/index.scss @@ -249,6 +249,7 @@ &-video { margin-top: 83px; + display: none; video { opacity: 0; diff --git a/src/forge/Component/feedBack.jsx b/src/forge/Component/feedBack.jsx index a84187eda..0bd2aecdf 100644 --- a/src/forge/Component/feedBack.jsx +++ b/src/forge/Component/feedBack.jsx @@ -23,7 +23,8 @@ $(window).scroll(function () { function SiderBar(props) { const {location, history,user, mygetHelmetapi= {}} = props; - const {navbar=[]} = mygetHelmetapi; + const {navbar=[], common} = mygetHelmetapi; + const {forums: forumsDoMain} = common || {}; const forumsList = navbar.filter(item=>item.link && item.link.includes("/forums")) const forumsUrl = forumsList[0] && forumsList[0].link; const {search, pathname} = location; @@ -86,12 +87,12 @@ function SiderBar(props) { // 意见反馈按钮点击事件 function feedBackClick(){ if(login){ - if(forumsUrl){ - return window.location.href=forumsUrl; + if(forumsDoMain){ + return window.location.href=`${forumsDoMain}/forums/new`; } setFeedBackModal(true); }else{ - history.push(`/login?go_page=${forumsUrl}`); + history.push(forumsDoMain ? `/login?go_page=${forumsDoMain}/forums/new` : `/login`); } } diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js index f716612b0..392f77973 100644 --- a/src/forge/Head/Header.js +++ b/src/forge/Head/Header.js @@ -322,6 +322,51 @@ class NewHeader extends Component { zoneList, isHome } = this.state; + const navbarlist = [ + { + "name": "军用可控开源社区", + "link": "/factory", + "index": "1", + "hidden": false + }, + { + "name": "社区动态", + "link": "/news", + "index": "5", + "hidden": false + }, + { + "name": "软件工厂专区", + "link": "/softwareFactory", + "index": "4", + "hidden": false + }, + { + "name": "开源软件仓库", + "link": "/exploreStore", + "index": "2", + "hidden": false + }, + { + "name": "供应链治理", + "link": "/projects", + "index": "3", + "hidden": false + }, + { + "name": "协作开发", + "link": "/projects", + "index": "3", + "hidden": false + }, + { + "name": "论坛交流", + "link": "/forums", + "index": "6", + "hidden": false + } + ] + const navbarByRoute = ["/factory", "/exploreStore", "/projects", "/softwareFactory", "/news", "/forums"].includes(this.props.match.path) ? navbarlist : settings ? settings.navbar : [] // let search_url = settings && settings.common && settings.common.search; return (
@@ -347,14 +392,14 @@ class NewHeader extends Component { }
*/} - {/* { + { settings && settings.nav_logo_url ? - 可控开源社区 + 菌用可控开源社区 : "" - } */} + } {/*
*/} { settings && settings.navbar && settings.navbar.length > 0 ? diff --git a/src/forge/Index.js b/src/forge/Index.js index dd9d7040a..a00798ffc 100644 --- a/src/forge/Index.js +++ b/src/forge/Index.js @@ -27,6 +27,11 @@ const ProjectHome = Loadable({ loading: Loading, }); +const ProjectHomeWH = Loadable({ + loader: () => import("./Main/projectHomeNew/v2/index"), + loading: Loading, +}); + class Index extends Component { componentDidUpdate = () => { @@ -68,6 +73,13 @@ class Index extends Component { ( + + )} + > + + ( )} diff --git a/src/forge/Main/projectHomeNew/index.jsx b/src/forge/Main/projectHomeNew/index.jsx index fdffb6a2d..1203312b8 100644 --- a/src/forge/Main/projectHomeNew/index.jsx +++ b/src/forge/Main/projectHomeNew/index.jsx @@ -31,7 +31,7 @@ function ProjectHomePage(props) { getCate(); getList(); getCateTopic(); - document.title = 'JY开源软件仓库'; + document.title = '菌用开源软件仓库'; }, []) useEffect(() => { @@ -247,4 +247,4 @@ function ProjectHomePage(props) {
} -export default TPMIndexHOC(ProjectHomePage) \ No newline at end of file +export default ProjectHomePage \ No newline at end of file diff --git a/src/forge/Main/projectHomeNew/v2/index.jsx b/src/forge/Main/projectHomeNew/v2/index.jsx index 4aa18b8ad..107e2ec3c 100644 --- a/src/forge/Main/projectHomeNew/v2/index.jsx +++ b/src/forge/Main/projectHomeNew/v2/index.jsx @@ -52,7 +52,7 @@ function ProjectHomePage(props) { getCate(); // getList(); getCateTopic(); - document.title = 'JY开源软件仓库'; + document.title = '菌用开源软件仓库'; // 获取总数 getInitCount(); }, []) @@ -154,7 +154,7 @@ function ProjectHomePage(props) {
-
JY开源软件仓库
+
菌用开源软件仓库
汇聚全球顶尖开源力量，构建安全、协同、创新的软件生态，赋能J事数字化转型与智能化升级
@@ -263,7 +263,7 @@ function ProjectHomePage(props) { }
})} -
: } + : } {cateID && { setPage(page) }} className='center mt30' />} @@ -272,4 +272,4 @@ function ProjectHomePage(props) { } -export default TPMIndexHOC(ProjectHomePage) \ No newline at end of file +export default ProjectHomePage \ No newline at end of file diff --git a/src/forge/Main/projecthome/components/Banner.jsx b/src/forge/Main/projecthome/components/Banner.jsx index 471c8154e..e2f9aa081 100644 --- a/src/forge/Main/projecthome/components/Banner.jsx +++ b/src/forge/Main/projecthome/components/Banner.jsx @@ -6,7 +6,7 @@ import banner3 from '../../img/home/banner3.webp'; import { Link } from "react-router-dom"; const BANNER_DATA = [ - { key: 1, keyword: '仓库', name: 'JY开源软件仓库', title: 'JY开源软件仓库', content: '提供软件源码的集中托管与协作、编译构建后的制品统一管理，并支持一键搜索与下载成熟可用的应用程序，为J事软件的全生命周期提供一站式管理与分发服务', img: banner1 }, + { key: 1, keyword: '仓库', name: '菌用开源软件仓库', title: '菌用开源软件仓库', content: '提供软件源码的集中托管与协作、编译构建后的制品统一管理，并支持一键搜索与下载成熟可用的应用程序，为J事软件的全生命周期提供一站式管理与分发服务', img: banner1 }, { key: 2, keyword: '供应链', name: '供应链监测', title: '供应链监测', content: '实现供应链全流程可视化与智能决策。通过实时数据监控、需求预测与风险预警，优化库存与资源配置，助力精准掌控供应链动态，实现降本增效', img: banner2 }, // { key: 3, keyword: '软件工厂', name: '软件工厂专区', title: '软件工厂专区', content: '为您提供从需求到部署的一站式项目工程化管理。通过标准化流程、自动化流水线与统一制品库，赋能团队高效协作、规范交付，全面提升软件生产质量与效率', img: banner3 } ] diff --git a/src/forge/Main/projecthome/components/Store.jsx b/src/forge/Main/projecthome/components/Store.jsx index 4c68316f6..5eb294ff9 100644 --- a/src/forge/Main/projecthome/components/Store.jsx +++ b/src/forge/Main/projecthome/components/Store.jsx @@ -49,7 +49,7 @@ function Store(props) { return (
-

JY开源软件仓库

+

菌用开源软件仓库

一站式软件资源服务中心

{ diff --git a/src/forge/Main/projecthome/v2/components/project.jsx b/src/forge/Main/projecthome/v2/components/project.jsx index 9d99cd304..76484d5bf 100644 --- a/src/forge/Main/projecthome/v2/components/project.jsx +++ b/src/forge/Main/projecthome/v2/components/project.jsx @@ -74,7 +74,7 @@ const RepositoryV2 = () => { ))}
- diff --git a/src/forge/Main/projecthome/v2/components/supplyChainGovernance.jsx b/src/forge/Main/projecthome/v2/components/supplyChainGovernance.jsx index 3b148bf8e..5feb56dbc 100644 --- a/src/forge/Main/projecthome/v2/components/supplyChainGovernance.jsx +++ b/src/forge/Main/projecthome/v2/components/supplyChainGovernance.jsx @@ -2,6 +2,7 @@ import React from 'react'; import icon1 from '../image/icon25.png'; import icon2 from '../image/icon22.png'; import icon3 from '../image/icon26.png'; +import moreContentButton from './moreContentButton'; const SupplyChainGovernance = () => { const governanceItems = [ @@ -78,6 +79,10 @@ const SupplyChainGovernance = () => {
))} + +
+ {moreContentButton({href:"/governance", classname:"font-16 but-to-right font-bd"})} +
); }; diff --git a/src/forge/Main/projecthome/v2/index.jsx b/src/forge/Main/projecthome/v2/index.jsx index 569aa69cb..89d331ced 100644 --- a/src/forge/Main/projecthome/v2/index.jsx +++ b/src/forge/Main/projecthome/v2/index.jsx @@ -12,6 +12,7 @@ import EcosystemAlliance from './components/ecosystemAlliance'; import './animation.scss'; function Index(props) { + const {mygetHelmetapi: {name}, mygetHelmetapi} = props; const observer = useRef(); const [visibleItems, setVisibleItems] = useState({}); @@ -47,8 +48,8 @@ function Index(props) { }, []); useEffect(() => { - document.title = props.mygetHelmetapi && props.mygetHelmetapi.name ? props.mygetHelmetapi.name : '生态创新治理中心'; - }, []) + document.title = name ? name : '菌用可控开源社区'; + }, [name]) return (
@@ -57,7 +58,7 @@ function Index(props) { - +
diff --git a/src/forge/Main/projecthome/v2/index.scss b/src/forge/Main/projecthome/v2/index.scss index 8e0efc469..eca836eaf 100644 --- a/src/forge/Main/projecthome/v2/index.scss +++ b/src/forge/Main/projecthome/v2/index.scss @@ -387,6 +387,7 @@ } .center-image-container-content { + min-width: 940px; height: 530px; background-image: url('./image/bk6.png'), linear-gradient(145deg, #1d36a1, #171e41); background-size: 100% 100%; diff --git a/src/forge/projectHome/explore/index.jsx b/src/forge/projectHome/explore/index.jsx index cb20b7ad4..aa3695cb0 100644 --- a/src/forge/projectHome/explore/index.jsx +++ b/src/forge/projectHome/explore/index.jsx @@ -150,7 +150,7 @@ function ProjectHomePage(props) {
反馈需求，共建优质体验
-
欢迎大家随时通过官方渠道提出宝贵建议
+
欢迎大家提出宝贵建议或需求反馈
@@ -244,7 +244,7 @@ function ProjectHomePage(props) { return
{i.lesson_url && } - {!i.lesson_url && } + {/* {!i.lesson_url && } */}
{i.name}
{/* 项目标签 */} @@ -259,7 +259,8 @@ function ProjectHomePage(props) { {i.description}
} */} - {i.author && i.author.login !== "gh_mirrors" && 下载} + {/* {i.author && i.author.login !== "gh_mirrors" && 下载} */} +
{i.description}
})} diff --git a/src/forge/projectHome/explore/index.scss b/src/forge/projectHome/explore/index.scss index 586e221d3..34f1b5e33 100644 --- a/src/forge/projectHome/explore/index.scss +++ b/src/forge/projectHome/explore/index.scss @@ -194,11 +194,18 @@ } .author_img { - width: 54px; - height: 54px; + width: 35px; + height: 35px; margin-right: 15px; border-radius: 6px; } + + + .detail-desc{ + position: absolute; + bottom: 10px; + top: 0; + } .download-icon { color: #8284a4; @@ -218,7 +225,7 @@ .detail-but-black { line-height: 32px; - width: 88%; + width: 85%; color: #ffffff; background-color: #2149d4; border: none; diff --git a/src/forge/projectHome/projectList/index.jsx b/src/forge/projectHome/projectList/index.jsx index d2bb12e2c..f86f42b2f 100644 --- a/src/forge/projectHome/projectList/index.jsx +++ b/src/forge/projectHome/projectList/index.jsx @@ -179,7 +179,7 @@ function ProjectList() {
-
+
开源项目
@@ -217,9 +217,9 @@ function ProjectList() {
{ setPage(page) }} className='center mt10' />
-
+ {projectsListByHot && userList && (!!userList.length || !!projectsListByHot.length) &&
{/* 热门开发者 */} -
+ {userList && !!userList.length &&
热门开发者 @@ -230,9 +230,9 @@ function ProjectList() { {user.name}
})} -
+
} {/* 热门项目 */} -
+ {projectsListByHot && !!projectsListByHot.length &&
热门项目 @@ -252,8 +252,8 @@ function ProjectList() { })} -
-
+
} +
}
diff --git a/src/forums/list/index.jsx b/src/forums/list/index.jsx index fe90b8cfe..9b420d82d 100644 --- a/src/forums/list/index.jsx +++ b/src/forums/list/index.jsx @@ -176,26 +176,25 @@ function List(props) { const isSelected = forumTagDetail && forumTagDetail.id === item.id; const forums = item.essencePosts[0] || {}; return ( -
{setForumTagDetail(item)}}> -
{item.title}
+
{setForumTagDetail(item)}}> +
{forums.memo_image_info && }
- -
{forums.subject}
- - + {setForumTagDetail(item)}} className="AlignCenter pt10 pb10"> +
{item.title}
+
{forums.username}
-
+ {/*
{forums.praises_count} {forums.replies_count} {forums.published_time} -
+
*/}