From 4f2dcb0f1c1531852108227cbb571438690acd2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= Date: Fri, 5 Jun 2026 11:47:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B6=85=E7=AE=97=E4=B8=93=E5=8C=BA?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=90=9C=E7=B4=A2=E6=94=B9=E7=94=A8=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E6=90=9C=E7=B4=A2=E6=8E=A5=E5=8F=A3=E3=80=81=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=A1=B9=E7=9B=AE=E5=BC=B9=E7=AA=97=E4=BC=A0=E5=8F=82?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Information/Component/addProjects.jsx | 2 +- .../Pages/project/cateDetail/index.jsx | 35 ++++++++++++++++--- src/forge/Information/Pages/projectSource.jsx | 4 +-- src/forge/Information/index.jsx | 2 +- 4 files changed, 35 insertions(+), 8 deletions(-) diff --git a/src/forge/Information/Component/addProjects.jsx b/src/forge/Information/Component/addProjects.jsx index e7e78e1c..6a701625 100644 --- a/src/forge/Information/Component/addProjects.jsx +++ b/src/forge/Information/Component/addProjects.jsx @@ -110,7 +110,7 @@ function AddProjects({id,visible,typeList,needAudit,role,onCancel,onFresh}){ } const res = response.data; if(res && res.code === 200){ - message.success((needAudit === 1 && role && role.role !== "Manager") ? "操作成功，请等待管理员审核" : "操作成功!"); + message.success((needAudit === 1 && role !== "Manager") ? "操作成功，请等待管理员审核" : "操作成功!"); Init(page,searchValue); onFresh(); }else{ diff --git a/src/forge/Information/Pages/project/cateDetail/index.jsx b/src/forge/Information/Pages/project/cateDetail/index.jsx index 3fa5ac13..c86773a1 100644 --- a/src/forge/Information/Pages/project/cateDetail/index.jsx +++ b/src/forge/Information/Pages/project/cateDetail/index.jsx @@ -1,7 +1,7 @@ import React, { Fragment, useEffect, useRef, useState } from 'react'; import { Spin, Pagination, Divider, message, Input } from 'antd'; import { Link } from 'react-router-dom'; -import { getProjectsLists } from '../../../api'; +import { getProjectsLists, getGlobal } from '../../../api'; import { projectCateConfig } from '../projectCateConfig'; import nodata from '../../../img/nodata.png'; import { getUniqueIdentifier, getUserName, getBrowserPlatform, getBrowserBrand } from '../../../utils'; @@ -118,6 +118,32 @@ function ProjectCateDetail(props) { }, [visibleSections.coreArea, visibleSections.projectList]); function getLists() { + if(searchName){ + getGlobal({ + extraSearchParam: { + projectTypeId: cateId + }, + keyword: searchName || "", + pageNum: page, + pageSize: pageSize, + types: ["zone_project"], + zoneId: id + }).then(result => { + if (result && result.data) { + setLists(result.data.rows.map(item=>{ + return{ + ...item, + projectProperties: item.extendData + } + })); + setTotal(result.data.total); + setLoading(false); + } + }).catch(() => { + setLoading(false); + }); + return + } getProjectsLists(id, { pageNum: page, pageSize: pageSize, @@ -132,6 +158,7 @@ function ProjectCateDetail(props) { }).catch(() => { setLoading(false); }); + } return ( @@ -243,7 +270,7 @@ function ProjectCateDetail(props) { {lists.map((item, key) => (
- {item.projectProperties && item.projectProperties.authorImageUrl && } + {item.projectProperties && item.projectProperties.authorImageUrl && }
{item.projectProperties && item.projectProperties.fromOwner}/{item.projectProperties && item.projectProperties.name && item.projectProperties.name.split("/").pop()}
@@ -263,7 +290,7 @@ function ProjectCateDetail(props) { )}
- {item.projectType && {item.projectType}} + {item.projectType || name} {item.projectProperties && item.projectProperties.language && {item.projectProperties.language} @@ -271,7 +298,7 @@ function ProjectCateDetail(props) {
{item.projectProperties && item.projectProperties.timeAgo && 更新于{item.projectProperties.timeAgo}}
- 查看详情 + 查看详情
))}
diff --git a/src/forge/Information/Pages/projectSource.jsx b/src/forge/Information/Pages/projectSource.jsx index ecee74d8..44fab0e4 100644 --- a/src/forge/Information/Pages/projectSource.jsx +++ b/src/forge/Information/Pages/projectSource.jsx @@ -26,7 +26,7 @@ function ProjectSource(props){ const [ value , setValue ] = useState(undefined); const [ loading , setLoading ] = useState(false); const [ memberStatus , setMemberStatus] = useState(memberStatusEnum.notMember); - const { id, temp, sectionProjectTitle , role } = props; + const { id, temp, sectionProjectTitle , role, data } = props; useEffect(()=>{ let uuid = getUniqueIdentifier() @@ -104,7 +104,7 @@ function ProjectSource(props){ } return(
- setVisible(false)} role={role && role.role} onFresh={getLists}/> + setVisible(false)} role={role && role.role} onFresh={getLists}/>

{sectionProjectTitle}

diff --git a/src/forge/Information/index.jsx b/src/forge/Information/index.jsx index 289fc5fa..27e54f85 100644 --- a/src/forge/Information/index.jsx +++ b/src/forge/Information/index.jsx @@ -342,7 +342,7 @@ function Index(props){ ( - + )} > Date: Fri, 5 Jun 2026 14:38:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B6=85=E7=AE=97=E6=96=B0=E9=97=BB?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=A0=8F=E7=9B=AE=E9=A1=B5=E7=A0=81=E5=92=8C?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Information/Pages/custom/newsIndex.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/forge/Information/Pages/custom/newsIndex.jsx b/src/forge/Information/Pages/custom/newsIndex.jsx index 8035d742..50cab6f3 100644 --- a/src/forge/Information/Pages/custom/newsIndex.jsx +++ b/src/forge/Information/Pages/custom/newsIndex.jsx @@ -130,11 +130,11 @@ function NewsIndex(props) { mainList && mainList.length > 0 &&
  • - 全部新闻 + {setPageNum(1)}}>全部新闻
    • {mainList.map((i, k) => { return
  • - + {setPageNum(1); setViewMode("default")}}> {i.name} From 1feff1fd57e85bb8a8ed439ad0ef04ef102f3e71 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 5 Jun 2026 15:42:44 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=B6=85=E7=AE=97=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E6=90=9C=E7=B4=A2-=E5=BC=80=E6=BA=90=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BAfromOwner=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Information/Pages/search/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/forge/Information/Pages/search/index.jsx b/src/forge/Information/Pages/search/index.jsx index d45e0566..1af26a7f 100644 --- a/src/forge/Information/Pages/search/index.jsx +++ b/src/forge/Information/Pages/search/index.jsx @@ -77,7 +77,7 @@ function SearchIndex(props){ lists.map((i,k)=>{ return type==="zone_project" ?
    {/* 开源项目 */} -
    +