diff --git a/src/forge/Information/Component/addProjects.jsx b/src/forge/Information/Component/addProjects.jsx
index e7e78e1ce..6a701625c 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/custom/newsIndex.jsx b/src/forge/Information/Pages/custom/newsIndex.jsx
index 8035d7427..50cab6f3b 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}
diff --git a/src/forge/Information/Pages/project/cateDetail/index.jsx b/src/forge/Information/Pages/project/cateDetail/index.jsx
index 3fa5ac138..c86773a13 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 ecee74d89..44fab0e42 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/Pages/search/index.jsx b/src/forge/Information/Pages/search/index.jsx
index d45e05669..1af26a7fa 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" ?
{/* 开源项目 */}
-
+
diff --git a/src/forge/Information/index.jsx b/src/forge/Information/index.jsx
index 424e693b7..7ea074006 100644
--- a/src/forge/Information/index.jsx
+++ b/src/forge/Information/index.jsx
@@ -362,7 +362,7 @@ function Index(props){
(
-
+
)}
>