diff --git a/src/forge/Component/MemberCards.jsx b/src/forge/Component/MemberCards.jsx index 48d90e136..a02efffb7 100644 --- a/src/forge/Component/MemberCards.jsx +++ b/src/forge/Component/MemberCards.jsx @@ -18,6 +18,10 @@ const Name = styled.div`{ height:22px; line-height:22px; margin-bottom:7px; + width: 170px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; }` const Time = styled.div`{ color:#888; diff --git a/src/forge/Information/Pages/help.jsx b/src/forge/Information/Pages/help.jsx index 10352e197..a46971fad 100644 --- a/src/forge/Information/Pages/help.jsx +++ b/src/forge/Information/Pages/help.jsx @@ -198,7 +198,7 @@ function ProjectSource(props) { {item.titleStr} ); return ( - + {renderTreeNodes(item.children)} ); @@ -214,16 +214,18 @@ function ProjectSource(props) { { wikiList && (wikiList.length > 0 ? {/* wiki目录导航 */} -
- - - {renderTreeNodes(initMenuList)} - +
+
+ + + {renderTreeNodes(initMenuList)} + +
{/* 内容区 */} {wikiDetail && diff --git a/src/forge/Information/Pages/source.jsx b/src/forge/Information/Pages/source.jsx index d4fe165a0..06c22e4f3 100644 --- a/src/forge/Information/Pages/source.jsx +++ b/src/forge/Information/Pages/source.jsx @@ -1,5 +1,5 @@ import React , { useEffect , useState } from 'react'; -import { Input , Pagination, Spin } from 'antd'; +import { Input , Pagination, Spin, Tag } from 'antd'; import SourceIcon from '../img/sourceIcon.png'; import { Link } from 'react-router-dom'; import axios from 'axios'; @@ -7,6 +7,7 @@ import { getSourceTypeList , getSourceList , getSourceZoneList } from '../api'; import Nodata from '../../Nodata'; import ImgGreen from '../img/green_nodata.png'; import '../indexZone1.scss'; +import { FlexAJ } from '../../Component/layout'; const { Search } = Input; @@ -53,7 +54,7 @@ function Source(props){ function getLists(){ setIsSpin(true); getSourceList({ - id,pageSize:limit,pageNum:page,typeId:chooseTypeId,domainId:chooseZoneId,name:search + id,pageSize:limit,pageNum:page,searchTypeId:chooseTypeId,domainId:chooseZoneId,name:search }).then(response=>{ if(response){ setSourceList(response.data.rows); @@ -98,7 +99,7 @@ function Source(props){ { zoneList.map((i,k)=>{ return( -
  • {setChooseZoneId(i.id);window.scrollTo(0,450)}} className={chooseZoneId && chooseZoneId === i.id ? "active":"" }>{i.name}
  • +
  • {setChooseZoneId(i.id);window.scrollTo(0,450)}} className={`${chooseZoneId && chooseZoneId === i.id ? "active":""} task-hide`}>{i.name}
  • ) }) } @@ -114,7 +115,7 @@ function Source(props){ { typeList.map((i,k)=>{ return( -
  • {setChooseTypeId(i.id);window.scrollTo(0,450)}} className={chooseTypeId && chooseTypeId === i.id ? "active":"" }>{i.name}
  • +
  • {setChooseTypeId(i.id);window.scrollTo(0,450)}} className={`${chooseTypeId && chooseTypeId === i.id ? "active":""} task-hide`}>{i.name}
  • ) }) } @@ -138,12 +139,19 @@ function Source(props){ {i.summary}

    -

    - {i.downloadCount} -

    + + {temp === "zone" && {i.domainName}} +

    + {i.downloadCount} +

    +
    {temp === "zone1" &&

    {i.domainName} - {i.typeName} + {i.zoneResourceTypeList && + {i.zoneResourceTypeList.reduce((pre, cur)=>{ + return pre ? `${pre}, ${cur.name}` : cur.name + }, '')} + }

    }
    diff --git a/src/forge/Information/Pages/sourceDetail.jsx b/src/forge/Information/Pages/sourceDetail.jsx index 9d1570776..d94f85362 100644 --- a/src/forge/Information/Pages/sourceDetail.jsx +++ b/src/forge/Information/Pages/sourceDetail.jsx @@ -7,6 +7,8 @@ import { Link } from 'react-router-dom'; import axios from 'axios'; import { Base64 } from 'js-base64'; import { httpUrl } from '../fetch'; +import { AlignCenter, FlexAJ } from '../../Component/layout'; +import SourceIcon from '../img/sourceIcon.png'; function SourceDetail(props){ @@ -36,7 +38,21 @@ function SourceDetail(props){ { detail &&
    -
    {detail.name}
    +
    + + + {detail.domainName} + {detail.name} + +
    + {detail.downloadCount} +
    +
    + {detail.createUser && detail.createUser.avatar && } + {detail.createUser && {detail.createUser.nickName}} + 发布于{detail.updateTime || detail.createTime} +
    +
    {detail.summary}
    { detail.fileList && detail.fileList.length > 0 &&
      @@ -46,6 +62,7 @@ function SourceDetail(props){
    • {i.fileOriginName} + {i.zoneResourceType.name} {i.fileSizeInfo} 下载
    • @@ -54,16 +71,6 @@ function SourceDetail(props){ }
    } - - { detail.introduction && -
    - -
    - }
    }
    diff --git a/src/forge/Information/index.scss b/src/forge/Information/index.scss index 0d488e358..c305887f7 100644 --- a/src/forge/Information/index.scss +++ b/src/forge/Information/index.scss @@ -1380,18 +1380,33 @@ margin-bottom: 14px!important; } } + .domainNameBox{ + border:1px solid var(--primary-color); + border-radius:2px; + height: 28px; + padding: 0px 12px; + color: var(--primary-color); + max-width: 70%; + } } } } .source_detail_box{ background-color: #fff; - padding:10px 35px 30px; + padding:10px 35px 70px 30px; .s_d_title{ - padding:25px 0px; + padding:20px 0px 10px; border-bottom: 1px dashed rgba(141, 149, 172, 0.27); color:#1f2329; - font-size:22px; margin-bottom: 20px!important; + &>span{ + color: #4c5876; + } + .publicUserAvatar{ + width: 24px; + border-radius: 50%; + margin-top: -3px; + } } .files_box{ padding:11px 30px; @@ -1405,24 +1420,34 @@ font-size:15px; min-width: 190px; &.task-hide{ - width: 500px; + width: 450px; margin-right: 20px; } } } } + .domainNameBoxD{ + display: inline-block; + border:1px solid var(--primary-color); + border-radius:2px; + height: 28px; + padding: 0px 12px; + color: var(--primary-color); + } } // 帮助中心 .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); } @@ -1445,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; diff --git a/src/forge/Information/indexZone1.scss b/src/forge/Information/indexZone1.scss index 6ee7816ae..f434bba06 100644 --- a/src/forge/Information/indexZone1.scss +++ b/src/forge/Information/indexZone1.scss @@ -721,7 +721,7 @@ align-items: center; margin-top: 10px; .load_count{ - margin-right: 10px; + margin-right: 100px; min-width: 68px; } } diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js index 4c82bb392..373532f95 100644 --- a/src/forge/Merge/MergeItem.js +++ b/src/forge/Merge/MergeItem.js @@ -112,7 +112,7 @@ class MergeItem extends Component { {item.is_original ? item.fork_project_user_name @@ -136,7 +136,7 @@ class MergeItem extends Component { {project_author_name}: {item.pull_request_base} diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js index d4a0b6fac..b12e73aae 100644 --- a/src/forge/Merge/MessageCount.js +++ b/src/forge/Merge/MessageCount.js @@ -406,7 +406,7 @@ class MessageCount extends Component { {data.pull_request && data.pull_request.fork_project_user}: {data.pull_request && data.pull_request.head} @@ -421,7 +421,7 @@ class MessageCount extends Component { {data.issue.project_author}: {data.pull_request.base} diff --git a/src/glcc/apply/editInfo.jsx b/src/glcc/apply/editInfo.jsx index b9b836e43..cd037a6b6 100644 --- a/src/glcc/apply/editInfo.jsx +++ b/src/glcc/apply/editInfo.jsx @@ -242,12 +242,12 @@ function EditRepoApplyInfo(props) { { pattern: emailreg, message: "请输入正确的邮箱地址"},], {verify("name")}}/> )} -
    {helper('社区简介', +
    {helper('项目简介', '', 'projectIntro', - [{ required: true, message: "请输入社区简介" }, + [{ required: true, message: "请输入项目简介" }, { max: 200, message: '超出限制长度200位字符,请重新编辑' }], -