merging

src/forge/Information/Pages/homepage/component/specialProjects.jsx

@@ -152,12 +152,13 @@ function SpecialProjects({data, subTitle}) {
                   { awards && <p className='font-15 pb5'>奖项：<span className='color-blue'>{awards}</span></p> }
                   { introductionImageIdentifier &&<p className='font-15 pb5 intro imageLayerParent'>简介：<img className="intro-img pointer" src={ getImage(introductionImageIdentifier) } alt="" /></p>}
                 </div>
-                <div style={{padding: '22px 33px'}}>
-                  {list("论文", "论文标题", "作者", "单位", PAPER)}
-                  {list("专利", "专利标题", "作者", "单位", PATENT)}
-                  {list2("开源项目", "项目名称", "参与者", PROJECT)}
-                  {!PAPER.length && !PATENT.length && !PROJECT.length && <Nodata _html="暂无数据" small/>}
-                </div>
+                {
+                  PAPER.length + PATENT.length + PROJECT.length > 0 &&  <div style={{padding: '22px 33px'}}>
+                    {list("论文", "论文标题", "作者", "单位", PAPER)}
+                    {list("专利", "专利标题", "作者", "单位", PATENT)}
+                    {list2("开源项目", "项目名称", "参与者", PROJECT)}
+                  </div>
+                }
               </div>
             </div>
           );

src/forge/Information/Pages/source.jsx

@@ -22,7 +22,7 @@ function Source(props){
   const [ total , setTotal ] = useState(0);
   const [ search , setSearch ] = useState(undefined);
   const [ isSpin , setIsSpin ] = useState(true);
-  const limit = 20;
+  const limit = 21;
   const { id , temp, history, role, sectionResourceTitle } = props;
 
   useEffect(()=>{

src/forge/Information/Pages/sourceDetail.jsx

@@ -71,7 +71,7 @@ function SourceDetail(props){
             {detail.auditStatus === '0' && <Badge color={temp === "zone" ? "#466aff" : "#089f7f"} text="待审核" className='pass'/> }
             {detail.auditStatus === '2' && <Badge color="#eb1212" text="未通过" className='failed'/> }
           </div>
-          <div className='pb20'>{detail.summary}</div>
+          <div className='pb20' dangerouslySetInnerHTML={{ __html: detail.summary }} ></div>
           {
             detail.fileList && detail.fileList.length > 0 &&
             <ul className="files_box">