Merge branch 'feature_news' of https://gitlink.org.cn/durian/forgeplus-react into feature_websiteBuild

src/forge/Information/Pages/help.jsx

@@ -198,7 +198,7 @@ function ProjectSource(props) {
         <span>{item.titleStr}</span>
       );
       return (
-        <TreeNode title={title} key={item.key + ""} dataRef={item} className='menuHcNode font-15'>
+        <TreeNode title={title} key={item.key + ""} isLeaf={item.isFile} dataRef={item} className='menuHcNode font-15'>
           {renderTreeNodes(item.children)}
         </TreeNode>
       );
@@ -214,16 +214,18 @@ function ProjectSource(props) {
           {
             wikiList && (wikiList.length > 0 ? <Box className='zoneHelpBox'>
               {/* wiki目录导航 */}
-              <div className='leftMenuHC mr20'>
-                <Search
-                  allowClear
-                  placeholder="输入关键字搜索文件"
-                  className="searchHC mb10"
-                  onSearch={changeSearchValue}
-                />
-                <DirectoryTree onSelect={selectTree} expandedKeys={expandedKeys} onExpand={onExpand} autoExpandParent={autoExpandParent} showIcon={false}>
-                  {renderTreeNodes(initMenuList)}
-                </DirectoryTree>
+              <div className='leftMenuBox mr20'>
+                <div className='leftMenuHC'>
+                  <Search
+                    allowClear
+                    placeholder="输入关键字搜索文件"
+                    className="searchHC mb10"
+                    onSearch={changeSearchValue}
+                  />
+                  <DirectoryTree onSelect={selectTree} expandedKeys={expandedKeys} onExpand={onExpand} autoExpandParent={autoExpandParent} showIcon={false}>
+                    {renderTreeNodes(initMenuList)}
+                  </DirectoryTree>
+                </div>
               </div>
               {/* 内容区 */}
               {wikiDetail && <LongWidth className='wikiContentBox'>

src/forge/Information/Pages/sourceDetail.jsx

@@ -48,8 +48,8 @@ function SourceDetail(props){
                 <img src={SourceIcon} alt="" width="18px" className="mr5" style={{marginTop: '-4px'}}/><span style={{color:"#5e6685"}}>{detail.downloadCount}</span>
               </div>
             </FlexAJ>
-            {detail.createUser && detail.createUser.avatar && <img alt='' src={detail.createUser.avatar} className='publicUserAvatar mr10'/>}
-            <span className='mr20'>{detail.createUser && detail.createUser.nickName}</span>
+            {detail.createUser && detail.createUser.avatar && <Link to={`/${detail.createUser.userName}`}><img alt='' src={detail.createUser.avatar} className='publicUserAvatar mr10'/></Link>}
+            {detail.createUser && <Link className='mr20' to={`/${detail.createUser.userName}`}>{detail.createUser.nickName}</Link>}
             <span>发布于{detail.updateTime || detail.createTime}</span>
           </div>
           <div className='pb20'>{detail.summary}</div>
@@ -62,7 +62,7 @@ function SourceDetail(props){
                     <li>
                       <img src={SourceFile} alt="" width="20px" className="mr12"/>
                       <span className="task-hide">{i.fileOriginName}</span>
-                      <span>{i.zoneResourceType.name}</span>
+                      <span style={{width: '340px'}}>{i.zoneResourceType.name}</span>
                       <span>{i.fileSizeInfo}</span>
                       <a href={`${httpUrl}/file/open/download/${i.fileId}`} download className="f_b_load primaryColor">下载</a>
                     </li>

src/forge/Information/index.scss

@@ -1420,7 +1420,7 @@
         font-size:15px;
         min-width: 190px;
         &.task-hide{
-          width: 500px;
+          width: 450px;
           margin-right: 20px;
         }
       }
@@ -1437,15 +1437,17 @@
 }
 // 帮助中心
 .zoneHelpBox{
+  .leftMenuBox{
+    background: #ffffff;
+    padding: 25px 18px 25px 15px;
+  }
   .leftMenuHC{
     width: 290px;
     min-height: 500px;
     overflow-x: auto;
-    &::-webkit-scrollbar{
-      display: none;
-    }
-    background: #ffffff;
-    padding: 25px 15px;
+    // &::-webkit-scrollbar{
+    //   display: none;
+    // }
     .ant-tree.ant-tree-directory > .menuHcNode span.ant-tree-node-content-wrapper.ant-tree-node-selected, .ant-tree.ant-tree-directory .ant-tree-child-tree > .menuHcNode span.ant-tree-node-content-wrapper.ant-tree-node-selected{
       color: var(--primary-color);
     }
@@ -1468,6 +1470,9 @@
     .searchHC .ant-input-search-icon:hover{
       color: var(--primary-color);
     }
+    .ant-tree li span.ant-tree-switcher{
+      width: 10px;
+    }
   }
   .wikiTitleHC{
     font-weight: 700;