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){ ( - + )} >