-
{header}
@@ -13,11 +13,11 @@ export default(({ header , nav })=>{
return(
!item.hide &&
- ) diff --git a/src/forge/Component/SiderBar.js b/src/forge/Component/SiderBar.js index b3900311b..eddb3b28b 100644 --- a/src/forge/Component/SiderBar.js +++ b/src/forge/Component/SiderBar.js @@ -159,7 +159,6 @@ function SiderBar(props) {
- - {k+1} - {i.name} - - ) - }) - } -
-
- --
-
--{j.name}{j.memberLevel && {j.memberLevel} }-{j.introduction}
-
- )
- })
- }
- -
-
- 开源发展委员会
公众号 -
- -
-
- GitLink官方
QQ群 -
- -
- {i.name}
-
{i.summary}
-- -
-- {i.publishTime} - - 查看详情
-
- )
- })
- }
- -
- {
- i.map((j,k1)=>{
- return(
- - { j.typeName && moreTypes && {j.typeName}} - { - j.link ?- ) - }) - } -
- : -
- } - -
- )
- })
- :
- ""
- }
- -
- {
- i[0].typeName === currentPartner ?
- i.map((j,k1)=>{
- return(
- - { - j.link ?- ) - }) - : - "" - } -- } -
- )
- })
- :
- ""
- }
-
-
-
- --
- )
- })
- }
-
{failApply}
}
diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js
index d1b785097..6c32ff91c 100644
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@@ -7,7 +7,7 @@ import { notification , Dropdown ,Popover, Menu,Badge } from 'antd';
import { Link } from 'react-router-dom';
import LoginDialog from '../../modules/login/LoginDialog';
-import HeadSearch from '../Component/HeadSearch';
+// import HeadSearch from '../Component/HeadSearch';
import AddProjectModal from './AddProjectModal';
import '../../modules/tpm/TPMIndex.css';
@@ -302,7 +302,7 @@ class NewHeader extends Component {
showSubMenu,
zoneList
} = this.state;
- let search_url = settings && settings.common && settings.common.search;
+ // let search_url = settings && settings.common && settings.common.search;
return (
@@ -319,14 +319,14 @@ class NewHeader extends Component {
{...this.props}
{...this.state}
/> : ""}
-
*/}
+ {/*
*/}
{
settings && settings.nav_logo_url ?
@@ -379,7 +379,7 @@ class NewHeader extends Component {
}
{/*
{
publicNav &&
}
-
+
- { search_url &&
diff --git a/src/forge/Index.js b/src/forge/Index.js
index dc4bb8707..5a8d16175 100644
--- a/src/forge/Index.js
+++ b/src/forge/Index.js
@@ -60,18 +60,18 @@ class Index extends Component {
)}
>
(
- (
+ > */}
);
diff --git a/src/forge/Information/Component/TopEdition.jsx b/src/forge/Information/Component/TopEdition.jsx
deleted file mode 100644
index e5e8be285..000000000
--- a/src/forge/Information/Component/TopEdition.jsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import React from 'react';
-import Slider from 'react-slick';
-import { getImageUrl } from 'educoder';
-import Left from '../../../home/Img/left.png';
-import Right from '../../../home/Img/right.png';
-import banner from '../img/mainbanner.png'
-
-
-
-let setting={
- dots:true,
- infinite: true,
- speed: 2000,
- slidesToShow: 1,
- slidesToScroll: 1,
- pauseOnDotsHover:true,
- autoplaySpeed:5000,
- pauseOnFocus:true,
- autoplay:true,
- arrows:true,
- prevArrow:
-
-
- )
- })
- :
-
-
- }
-
-
- 
-
-
- )
-}
-export default EditComment;
\ No newline at end of file
diff --git a/src/forge/Information/Component/comments/list.jsx b/src/forge/Information/Component/comments/list.jsx
deleted file mode 100644
index 4014063d4..000000000
--- a/src/forge/Information/Component/comments/list.jsx
+++ /dev/null
@@ -1,226 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Button, Popconfirm, Radio, Input, message, Tooltip, Spin, Pagination } from 'antd';
-import axios from 'axios';
-import { getImageUrl, timeAgo, isPhone } from 'educoder';
-import RenderHtml from '../../../../components/render-html';
-import Attachment from '../../../Upload/attachment';
-import EditComment from './editComment';
-import Nodata from '../../../Nodata';
-import CheckProfile from '../../../Component/ProfileModal/Profile';
-import './list.scss';
-import { Link } from 'react-router-dom';
-import { getCommentList, deleteComment } from '../../api'
-
-function IssueCommentList(props){
- const{docId, history: {location}, reload, reloadComment, showNotification, current_user:{login, admin, image_url, username}, isManager, showLoginDialog, author} = props;
- const {owner, projectsId, index} = props.match.params;
- const [category, setCategory] = useState('comment');
- const [journals, setJournals] = useState(undefined);
- // 是否展示新建/编辑评论markdown部分新建评论1 编辑父级评论2 回复评论3 编辑回复内容4 回复子机评论5
- const [showEdit, setShowEdit] = useState(false);
- const [parentId, setParentId] = useState(undefined);
- const [replyId, setReplyId] = useState(undefined);
- // 修改评论id
- const [updateId, setUpdateId] = useState(undefined);
- // 操作日志展开效果
- const [open, setOpen] = useState(undefined);
- // 加载中效果（缓冲css 线条效果）
- const [spin, setSpin] = useState(false);
- // issue 评论总数
- const [journalsCount, setJournalsCount] = useState(undefined);
- // 分页
- const limit = 50;
- const [page, setPage] = useState(1);
- const [totalCount, setTotalCount] = useState(undefined);
- // 操作记录 icon
- const journalsIcon ={
- 'issue': 'icon-chuangjianqianbao',
- 'branch_name': 'icon-fenzhi3',
- 'assigner': 'icon-chengyuan2',
- 'status_id': 'icon-xiugaibaobiaomoban',
- 'fixed_version_id': 'icon-lichengbeiicon2',
- 'due_date': 'icon-riqi',
- 'issue_tag': 'icon-biaoji2',
- 'description': 'icon-xiugaibaobiaomoban',
- 'subject': 'icon-xiugaibaobiaomoban',
- 'start_date': 'icon-riqi',
- 'priority_id': 'icon-youxian',
- 'attachment': 'icon-xiugaibaobiaomoban'
- }
-
- useEffect(()=>{
- setSpin(true);
- let params = {
- limit: limit,
- page: page
- }
- getCommentList(docId, params).then(res=>{
- if(res && res.data && res.data.data){
- const {journals, total_comment_journals_count, total_count} = res.data.data;
- if(category === 'all'){
- const array = [];
- let start = undefined;
- let isJournalCount = 0;
- journals.map((item, index)=>{
- !isJournalCount && (start = index)
- item.is_journal_detail && (isJournalCount++)
- if(!item.is_journal_detail && isJournalCount < 10){
- isJournalCount = 0;
- return
- }
- if(isJournalCount >= 10 && (!item.is_journal_detail || journals.length-1 === index)){
- array.push({start, count: isJournalCount});
- isJournalCount = 0;
- }
- })
- array.map((item, i)=>{
- journals[item.start].numCount = item.count-1;
- for (let index = 0; index < item.count; index++) {
- journals[item.start+index].start = journals[item.start].id;
- journals[item.start+index].closeAndSpan = true;
- }
- })
- }
- setTotalCount(total_count);
- setJournalsCount(total_comment_journals_count);
- setJournals(journals);
- setSpin(false)
- }
- })
- }, [reload, category, page])
-
- function commentCtx(v){
- return
- {setQuillFlag(false);setContent(value);}}
- changeAtWhoLoginList = {(loginList)=>{setAtWhoLoginList(loginList); setAttachmentClean(true)}}
- owner = {owner}
- projectsId = {projectsId}
- >
-
- - {quillFlag && 请输入评论内容} -
-- - -
-
- {/* 评论 */}
-
-
- {totalCount>limit &&
- )
-}
-export default IssueCommentList;
\ No newline at end of file
diff --git a/src/forge/Information/Component/comments/list.scss b/src/forge/Information/Component/comments/list.scss
deleted file mode 100644
index 7c548915a..000000000
--- a/src/forge/Information/Component/comments/list.scss
+++ /dev/null
@@ -1,217 +0,0 @@
-.typeActionBox{
- display: flex;
- align-items: center;
- font-size: 16px;
- .line {
- width: 3px;
- height: 14px;
- background: var(--primary-color);
- margin-right: 13px;
- }
-}
-.commentUserImg{
- height: 28px;
- width: 28px;
- border-radius: 50%;
- object-fit: cover;
-}
-.issueCommentsBox{
- .operationLog, .commentContentBox{
- position: relative;
- min-height: 62px;
- display: flex;
- >.flexCenter, >a{
- z-index: 2;
- }
- &::before, &::after{
- content: '';
- width: 1px;
- height: 50%;
- position: absolute;
- background: #eee;
- left: 12px;
- z-index: 1;
- }
- &::after{
- background: #eee;
- top: 50%;
- }
- }
- .commentContentBox+.operationLog .operationCommentBor, .operationLog+.commentContentBox .commentOperationBor{
- border-top: 1px solid #eee;
- width: 98.5%;
- position: absolute;
- left: 12px;
- }
- .operationLog+.commentContentBox{
- &>a, &>.commentContentRight{
- margin-top: 25px;
- }
- }
- .timeAgo{
- color:#acb0bf;
- }
- .operationLog:last-child::after, .operationLog:first-child::before, .commentContentBox:last-child::after, &.justComment .commentContentBox::before, &.justComment .commentContentBox::after{
- display: none;
- }
- .operationLog:first-child, .commentContentBox+.operationLog{
- margin-top: -15px;
- }
- .commentContentBox:last-child::before{
- height: 35%;
- }
- .flexCenter{
- display: flex;
- align-items: center;
- justify-content: space-between;
- }
- .commentRenderHtml.markdown-body p{
- font-size: 14px !important;
- }
- .commentReply{
- padding: 15px 0 0 20px;
- background-color: hsla(225, 31%, 95%, 0.41);
- &>div{
- padding-bottom: 5px;
- }
- &+.commentReply>div{
- margin-top: -15px;
- padding-top: 15px;
- border-top: 1px dashed #eee;
- }
- }
- .opBox{
- justify-content: flex-start;
- // flex: 1;
- // width: 100%;
- }
- .commentContentBox{
- display: flex;
- align-items: flex-start;
- }
- .commentContentRight{
- flex: 1;
- background-color:#fafafc;
- // border:1px solid var(--light-color-2);
- border:1px solid rgba(42, 97, 255, 0.23);
- border-radius:6px;
- position: relative;
- top: -6px;
- padding: 10px 15px 16px;
- width: 0;
- &::before{
- content: '';
- display: block;
- position: absolute;
- top: 13px;
- left: -14px;
- width: 0;
- height: 0;
- overflow: hidden;
- font-size: 0;
- line-height: 0;
- border: 7px;
- border-style: solid;
- border-color: transparent rgba(42, 97, 255, 0.23) transparent transparent;
- }
- &::after{
- content: '';
- display: block;
- width: 0;
- height: 0;
- overflow: hidden;
- font-size: 0;
- line-height: 0;
- border: 6px;
- border-style: solid;
- border-color: transparent #fafafc transparent transparent;
- position: absolute;
- top: 14px;
- left: -11px;
- }
- }
-}
-.attachmentBox{
- margin-top: -8px;
-}
-.color-grey-89{
- color: #898d9d;
- // &:hover {
- // color: var(--primary-color);
- // }
-}
-// 添加评论样式
-.unLoginComment{
- height:58px;
- line-height: 58px;
- background-color:var(--more-light-color);
- border-radius:4px;
- color: rgba(84, 87, 103, 1);
- .loginBtn{
- color: var(--primary-color);
- }
-}
-.quillFlagBox{
- color: red;
- margin-bottom: 5px !important;
- height: 28px;
-}
-.addComments{
- display: flex;
- align-items: center;
- background-color:var(--more-light-color);
- border-radius:4px;
- padding:7px 10px;
- &>img{
- height: 28px;
- width: 28px;
- border-radius: 50%;
- margin-right: 13px;
- }
-}
-.addCommentBox{
- width: 100%;
- height: 30px;
- border: none;
- &:focus {
- border-color: var(--primary-color) !important;
- }
-}
-.paginationIssueComment{
- text-align: center;
-}
-.gotoComment{
- // background-color:var(--more-light-color);
- background-color:rgba(241, 243, 252, 0.55);
- border-radius:4px;
- color: rgba(172, 176, 191, 1);
- padding: 8px 20px;
- margin-top: -10px;
- &>a{color: var(--primary-color);}
-}
-// .commentStyle {
-// &:hover {
-// border-color: var(--primary-color) !important;
-// }
-// }
-.colorButton {
- background-color: var(--primary-color);
- border-color: var(--primary-color);
- &:hover {
- background-color: var(--light-color);
- border-color: var(--primary-color);
- }
- &:focus {
- background-color: var(--primary-color);
- border-color: var(--primary-color);
- }
-}
-.colorButton2 {
- &:hover {
- border-color: var(--primary-color);
- color: var(--light-color);
- }
- &:focus {
- color: var(--primary-color);
- }
-}
\ No newline at end of file
diff --git a/src/forge/Information/Component/contributor.jsx b/src/forge/Information/Component/contributor.jsx
deleted file mode 100644
index 102a9ba26..000000000
--- a/src/forge/Information/Component/contributor.jsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import React , { useEffect, useState } from 'react';
-import Slider from 'react-slick';
-import { Link } from 'react-router-dom';
-
-const settings = {
- dots: true,
- infinite: false,
- speed: 500,
- slidesToShow: 3,
- slidesToScroll: 3,
- arrows: false,
- adaptiveHeight: true,
-};
-
-function Contributor(props) {
- const { personList } = props
- const [ showList, setShowList] = useState([]);
-
- function initList() {
- if (personList.length % 3 !== 0) {
- setShowList([].concat(personList, new Array(personList.length % 3 - 1).fill({})))
- } else {
- setShowList( personList )
- }
- }
-
- useEffect(()=>{
- initList();
- },[personList])
-
- return(
- 0 && 'pb15'}`}>
-
- {/* 评论快速入口-仅有评论且登录时展示 */}
- {login && category !== 'operate' && journalsCount > 0 && !isPhone() &&
-
-
- 评论{ journalsCount > 0 && `(共${ journalsCount }条评论)` }
- 0 && 'pt15'}`}>
}
- {/* 评论/操作日志 展示列表 */}
- 点击添加评论
- {journals && (journals.length > 0 && journals.map(item=>{return
-
- {/* 评论 */}
-
- })
-
}))}
-
- {/* 判断是否是编辑状态 */}
- {(showEdit === 2 && updateId === item.id) ?
-
-
}
- {showEdit === 3 && replyId === item.id &&
-
-
-
-
- {item.user.name}
- {timeAgo(item.created_at)}
-
- {login && !isPhone() &&
- {/* 平台管理员/仓库管理员/发布评论者/issue创建者 */}
- {(admin || isManager || login === item.user.login || username === author) && 0 ? '子评论也将被一起删除。' : ''}`}
- okText="是"
- cancelText="否"
- onConfirm={() => deleteCommentFunc(item.id)}
- >
-
- }
- {/* 仅评论者可修改 */}
- {login === item.user.login && }
- {setParentId(item.id); setReplyId(item.id); setShowEdit(3)}}>
-
}
- {commentCtx(item.notes)}
- {item && item.attachments && item.attachments.length > 0 &&
- {(showEdit === 4 && updateId === i.id) ?
})}
-
-
}
- {showEdit === 5 && replyId === i.id &&
-
-
- })
- {i.user.name}
- {i.reply_user && 回复}
- {i.reply_user && i.reply_user.name}
- {timeAgo(i.created_at)}
-
- {login && !isPhone() &&
- {/* 平台管理员/仓库管理员/发布评论者/回复评论者/issue创建者 */}
- {(admin || isManager || login === i.user.login || (i.reply_user && login === i.reply_user.login) || username === author) && deleteCommentFunc(i.id)}
- >
-
- }
- {/* 仅回复评论者可修改 */}
- {login === i.user.login && }
- {setParentId(item.id);setReplyId(i.id); setShowEdit(5)}}>
-
-
-
}
- {commentCtx(i.notes)}
- {i && i.attachments && i.attachments.length > 0 &&
- setPage(page)}/>
-
}
- {/* 添加评论 */}
- {category !== 'operate' && !isPhone() &&
- {login ? showEdit === 1 ? :
}
-
- })
-
:
- {setShowEdit(1)}}>
-
-
-
-
- {/* 未登录用户 */}
- {showLoginDialog()}}>登录并参与评论与回复
-
}
-
- {
- showList && showList.length > 0 ?
-
- {
- showList.map((i,k)=>{
- return(
-
- :""
- }
-
-
- )
-}
-export default Contributor;
\ No newline at end of file
diff --git a/src/forge/Information/Component/defaultImg.jsx b/src/forge/Information/Component/defaultImg.jsx
deleted file mode 100644
index 0ed489083..000000000
--- a/src/forge/Information/Component/defaultImg.jsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import React from 'react';
-
-
-function DefaultImg({name,title}){
-
- function randomNumberInRange(min, max) {
- // ?️ 获取 min（含）和 max（含）之间的数字
- return Math.floor(Math.random() * (max - min + 1)) + min;
- }
-
- return(
-
- { i.name &&
-
- )
- })
- }
-
-
-
- }
- {i.name}
- {i.introduction || "暂无~"}
-
- }.png`).default})
- }.png`).default})
-
- {name}
- {/* {title} */}
-
-
- )
-}
-export default DefaultImg;
\ No newline at end of file
diff --git a/src/forge/Information/Component/hot.jsx b/src/forge/Information/Component/hot.jsx
deleted file mode 100644
index 7bacc5b0d..000000000
--- a/src/forge/Information/Component/hot.jsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import React from 'react';
-import { Link } from 'react-router-dom';
-
-function Hot({list , title, deptId, temp}){
- return(
-
-
-
- {name}
- {/* {title} */}
-
-
-
- )
-}
-export default Hot;
\ No newline at end of file
diff --git a/src/forge/Information/Component/memberApply.jsx b/src/forge/Information/Component/memberApply.jsx
deleted file mode 100644
index 2db9d8109..000000000
--- a/src/forge/Information/Component/memberApply.jsx
+++ /dev/null
@@ -1,80 +0,0 @@
-import React , {forwardRef, useEffect, useState} from 'react';
-import { Modal , Form , Input , Button, Icon } from 'antd';
-import UploadImage from '../../Team/Component/UploadImage';
-import { getImageUrlAbsolute, getZoneUrl } from 'educoder';
-
-const { TextArea } = Input;
-
-function MemberApply(props){
- const { getFieldDecorator, validateFields , setFieldsValue } = props.form;
- const { current_user, onOk, visible, onCancel } = props
- const [imageUrl, setImageUrl] = useState(undefined)
-
- useEffect(()=>{
- if (current_user) {
- setImageUrl(getImageUrlAbsolute(`/${current_user.image_url}`));
- }
- },[current_user])
-
- function onSure(){
- validateFields((error,values)=>{
- if(!error){
- values.imageUrl = imageUrl
- onOk(values)
- }
- })
- }
-
- const layout = {
- labelCol: { span: 5 },
- wrapperCol: { span: 18 },
- };
- return(
- {title}
- { - list && list.length>0 && --
- {
- list.map((i,k)=>{
- return(
-
-
-
-
- )
-}
-export default Form.create()(forwardRef(MemberApply));
\ No newline at end of file
diff --git a/src/forge/Information/Component/memberList.jsx b/src/forge/Information/Component/memberList.jsx
deleted file mode 100644
index 67faf6af4..000000000
--- a/src/forge/Information/Component/memberList.jsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import React from 'react';
-import { Link } from 'react-router-dom';
-import { tempEnum } from '../tempInfo';
-import Crown from '../img/crown.png';
-import Nodata from '../../Nodata';
-import nodata from '../img/nodata.png';
-
-function Member(props) {
- const { vipLists, temp } = props;
-
- return(
-
- {
- vipLists.map((i,k)=>{
- return(
-
- )
-}
-export default Member;
\ No newline at end of file
diff --git a/src/forge/Information/Component/mobile/accessory.jsx b/src/forge/Information/Component/mobile/accessory.jsx
deleted file mode 100644
index 28d04bd37..000000000
--- a/src/forge/Information/Component/mobile/accessory.jsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import React from 'react';
-import './index.scss';
-import publicImg from '../../img/gitlink-gz.png';
-import qqImg from '../../img/gitlink-qq.png';
-
-function acce({type}){
- return(
- type === "head" ?
-
-
- )
- })
- }
-
- 
-
-
-
-
- {i.typeName}
-
- { temp === tempEnum.zone1 && {i.typeName}
}
- {i.typeIntroduction}
- { - i.zoneMemberList && i.zoneMemberList.length > 0 ? --
- {
- i.zoneMemberList.map((j,key)=>{
- return(
-
- })
-
- :
-
-
-
-
- )
-}
-export default acce;
\ No newline at end of file
diff --git a/src/forge/Information/Component/mobile/index.scss b/src/forge/Information/Component/mobile/index.scss
deleted file mode 100644
index da7ae84e2..000000000
--- a/src/forge/Information/Component/mobile/index.scss
+++ /dev/null
@@ -1,74 +0,0 @@
-@media screen and (max-width: 750px){
- #root{
- width: 100%;
- }
- .newContainers{
- min-width: unset;
- }
-}
-.head_zone{
- height: 4.4em;
- background-color:#183553;
- width: 100%;
- text-align: center;
- display: flex;
- align-items: center;
- justify-content: center;
- position: fixed;
- top: 0px;
- width: 100%;
- z-index: 10;
- img{
- height: 2em;
- }
-}
-.foot_zone{
- background-image: url(../../img/f_banner.png);
- background-size: 100% 100%;
- height: 26em;
- position: absolute;
- bottom: 0px;
- width: 100%;
- left: 0px;
- padding:1.6em 1.2em 0em 1.2em;
- display: flex;
- align-items: center;
- justify-content: center;
- flex-direction: column;
- .foot_ewm{
- display: flex;
- align-items: center;
- justify-content: space-around;
- width: 100%;
- padding:1.2em;
- li{
- display: flex;
- flex-direction: column;
- justify-content: center;
- text-align: center;
- img{
- width: 7em;
- height: 7em;
- margin-bottom: 0.8em;
- border-radius: 3px;
- }
- span{
- display: block;
- color:#444549;
- text-align: center;
- line-height: 1.5em;
- }
- }
- }
- .foot_copyright{
- padding:1em 0;
- border-top: 1px solid rgba(129, 131, 138, 0.15);
- color:#63687a;
- font-size: 1em;
- display: flex;
- align-items: center;
- justify-content: center;
- flex-direction: column;
- width: 100%;
- }
-}
\ No newline at end of file
diff --git a/src/forge/Information/Component/newsBox.jsx b/src/forge/Information/Component/newsBox.jsx
deleted file mode 100644
index 9bab62d8f..000000000
--- a/src/forge/Information/Component/newsBox.jsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import React , { useState } from 'react';
-
-
-
-function PublicBanner(props){
- const [ key , setKey ] = useState("1");
- const { deptId } = props.match.params;
- const { pathname } = props.history.location;
- const { data , adminUrl } = props;
-
- return(
-
-
- 欢迎加入GitLink！
--
-
- ©Copyright 2023 CCF 开源发展委员会 - Powered by Trustie& IntelliDE - 京ICP备13000930号 -
-
-
- )
-}
-export default newBox;
\ No newline at end of file
diff --git a/src/forge/Information/Component/partner.jsx b/src/forge/Information/Component/partner.jsx
deleted file mode 100644
index b07cb3590..000000000
--- a/src/forge/Information/Component/partner.jsx
+++ /dev/null
@@ -1,66 +0,0 @@
-import React , { useEffect } from 'react';
-// import Slider from 'react-slick';
-import { httpUrl } from '../fetch';
-import axios from 'axios';
-import { useState } from 'react';
-
-const settings = {
- dots: false,
- infinite: true,
- slidesToShow: 1,
- slidesToScroll: 1,
- vertical: true,
- verticalSwiping: true,
- autoplay:true,
- arrows:false
-};
-function Partner(props) {
- const [ topics ,setTopics ] = useState(undefined);
- const [ moreTypes ,setMoreTypes ] = useState(false);
- const { id, partnerList } = props;
- useEffect(()=>{
- getUnit(partnerList);
- },[id])
-
- function getUnit(array){
- const newArray = array
- setMoreTypes(array.length > 1)
-
- while(newArray[1] && newArray[1].length + newArray[0].length <= 5) {
- newArray[0] = [...newArray[0], ...newArray.splice(1, 1)[0]]
- }
- setTopics(newArray)
- }
-
- return(
- 新闻动态
-
-
-
- 
- {newsList[0].name}
-
- {newsList[0].summary}
-
-
- {newsList[0].publishTime}
-
- 查看详情
-
-
- {
- newsList.map((i,k)=>{
- return(
- k > 0 &&
-
- {
- topics && topics.length>0 ?
- topics.map((i, k)=>{
- return(
-
- {
- projectList && projectList.length > 0 ?
- (projectList.length < 3 ?
- projectList.map((i,k)=>{
- return(
-
- {
- projectList.map((i,k)=>{
- return(
-
- )
- :""
- }
-
- )
-}
-export default Projects;
\ No newline at end of file
diff --git a/src/forge/Information/Component/publicBanner.jsx b/src/forge/Information/Component/publicBanner.jsx
deleted file mode 100644
index f26dea5c3..000000000
--- a/src/forge/Information/Component/publicBanner.jsx
+++ /dev/null
@@ -1,74 +0,0 @@
-import React , { useState , useEffect } from 'react';
-import { Menu } from 'antd';
-import { Link } from 'react-router-dom';
-import { tempConfig } from '../tempInfo';
-import TopEdition from './TopEdition'
-
-
-
-function PublicBanner(props){
- const [ key , setKey ] = useState("1");
- const { deptId } = props.match.params;
- const { pathname } = props.history.location;
- const { data:{sectionHomepageShow, sectionHomepageTitle, sectionProjectShow,sectionDataSetShow,sectionDataSetTitle, sectionProjectTitle, sectionResourceShow, sectionResourceTitle, sectionCmsShow, sectionCmsTitle, sectionMemberShow, sectionMemberTitle, sectionHelperShow, sectionHelperTitle}, data , adminUrl, temp } = props;
-
- useEffect(()=>{
- if(pathname){
- const info = /[A-Za-z0-9]{0,}\/news/g;
- const infodetail = /[A-Za-z0-9]{0,}\/newdetail/g;
- const project = /[A-Za-z0-9]{0,}\/projects/g;
- const source = /[A-Za-z0-9]{0,}\/source/g;
- const vip = /[A-Za-z0-9]{0,}\/VIP/g;
- const help = /[A-Za-z0-9]{0,}\/help/g;
- const dataset = /[A-Za-z0-9]{0,}\/dataset/g;
- if(pathname === `/zone/${deptId}`){
- setKey("1");
- }
- else if(project.test(pathname)){
- setKey("2");
- }
- else if(source.test(pathname)){
- setKey("3");
- }
- else if(info.test(pathname) || infodetail.test(pathname)){
- setKey("4");
- }
- else if(vip.test(pathname)){
- setKey("6");
- }
- else if(help.test(pathname)){
- setKey("8");
- }
- else if(dataset.test(pathname)){
- setKey("9");
- }
- }
- },[pathname])
-
- return(
-
-
- )
- })
- :
-
- {i.projectProperties && i.projectProperties.authorImageUrl && 
}
-
- window.open(i.projectURL)}>{i.projectProperties && i.projectProperties.name}
-{i.projectProperties && i.projectProperties.description ? i.projectProperties.description : "暂无~"}
-
-
- )
- })
- }
-
- {i.projectProperties && i.projectProperties.authorImageUrl && }
-
- window.open(i.projectURL)}>{i.projectProperties && i.projectProperties.name}
-{i.projectProperties && i.projectProperties.description ? i.projectProperties.description : "暂无~"}
-
-
- )
-}
-export default PublicBanner;
\ No newline at end of file
diff --git a/src/forge/Information/Pages/JCC/Component/index.scss b/src/forge/Information/Pages/JCC/Component/index.scss
deleted file mode 100644
index 1eee14510..000000000
--- a/src/forge/Information/Pages/JCC/Component/index.scss
+++ /dev/null
@@ -1,58 +0,0 @@
-.partner_jcc{
- .grow_path {
- height: 100px;
- display: flex;
- justify-content: space-around;
- align-items: center;
- .grow_path_item {
- z-index: 10;
- display: flex;
- flex-direction: column;
- justify-content: center;
- align-items: center;
- align-self: self-start;
- cursor: pointer;
- transition: 1s;
- .grow_path_type {
- // width: 82px;
- height: 58px;
- // color: black;
- font-size: 15px;
- display: flex;
- align-items: center;
- justify-content: center;
- margin-top: 10px;
- }
- }
- .dot {
- width:28px;
- height:28px;
- background-color:#ffffff;
- border:7px solid;
- border-color:#0d8dfd52;
- border-radius: 50%;
- transition: .5s;
- }
- }
- .line {
- height: 0px;
- width: 1200px;
- border-bottom: solid 1px #ddd;
- transform: translate(0, -87px);
- }
- .zone_part_lists{
- margin-top: 40px;
- li {
- max-height: 414px;
- overflow-y: auto;
- align-items: flex-start;
- }
- }
- .type_active{
- border-color: #0d8ffd !important;
- }
- ::-webkit-scrollbar
- {
- display: none;
- }
-}
diff --git a/src/forge/Information/Pages/JCC/Component/partnerJcc.jsx b/src/forge/Information/Pages/JCC/Component/partnerJcc.jsx
deleted file mode 100644
index 82357539c..000000000
--- a/src/forge/Information/Pages/JCC/Component/partnerJcc.jsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import React , { useEffect } from 'react';
-import { useState } from 'react';
-import './index.scss'
-
-function Partner(props) {
- const [ topics ,setTopics ] = useState(undefined);
- const [ moreTypes ,setMoreTypes ] = useState(false);
- const [ currentPartner ,setPartner] = useState(undefined);
- const { id, partnerList } = props;
- useEffect(()=>{
- getUnit(partnerList);
- },[id])
-
- function getUnit(array){
- const newArray = array
- setMoreTypes(array.length > 1)
- while(newArray[1] && newArray[1].length + newArray[0].length <= 5) {
- newArray[0] = [...newArray[0], ...newArray.splice(1, 1)[0]]
- }
- setTopics(newArray)
- setPartner(newArray[0][0].typeName)
- }
-
- return(
-
-
- }
- {data.mainTitle}
- -
-
-
-
- {
- moreTypes &&
-
- )
-}
-export default Partner;
\ No newline at end of file
diff --git a/src/forge/Information/Pages/JCC/homePage.jsx b/src/forge/Information/Pages/JCC/homePage.jsx
deleted file mode 100644
index 999876ee7..000000000
--- a/src/forge/Information/Pages/JCC/homePage.jsx
+++ /dev/null
@@ -1,234 +0,0 @@
-import React,{ useState, useRef, useEffect } from 'react';
-import { httpUrl } from '../../fetch';
-import img1 from '../../img/img1.png';
-
-import visionFw from '../../img/vision-fw.png';
-import visionYj from '../../img/vision-yj.png';
-import visionZy from '../../img/vision-zy.png';
-import visionJz from '../../img/vision-jz.png';
-import guideArrow from '../../img/guideArrow1.png';
-import { Link } from 'react-router-dom';
-import shijian from '../../img/shijian.png';
-import axios from 'axios';
-import Projects from '../../Component/projects';
-import PartnerJcc from './Component/partnerJcc';
-import '../../indexZone1.scss'
-import './index.scss'
-import { Popover, Tabs } from 'antd';
-
-let tabTimer = undefined;
-
-function HeaderPageJCC(props){
- const [ projectList , setProjectList ] = useState(undefined);
- const [ personList , setPersonList ] = useState(undefined);
- const [ newsList, setNewsList ] = useState(undefined);
- const [ partnerList, setParterList ] = useState(undefined);
- const { deptId } = props.match.params;
- const { data, id, history } = props;
- const [ activeKey, setActiveKey ] = useState(undefined);
-
- const vision = [
- {imageUrl: visionFw, title: '服务无边界'},
- {imageUrl: visionYj, title: '云间有协作'},
- {imageUrl: visionZy, title: '资源易共享'},
- {imageUrl: visionJz, title: '价值可交换'}
- ]
-
- useEffect(()=>{
- if(id){
- getProjectList();
- getNewsList();
- getPersonList();
- getPartnerList();
- }
- return componentWillUnmount;
- },[id])
-
- function componentWillUnmount() {
- clearInterval(tabTimer)
- }
- function getPersonList(){
- const url = `${httpUrl}/zone/open/${id}/member/homePageList`;
- axios.get(url).then(result=>{
- if(result){
- setPersonList(result.data.rows);
- }
- }).catch(error=>{})
- }
-
- function getNewsList(){
- const url = `${httpUrl}/cms/doc/open/zone/${id}/homePageDocList`;
- axios.get(url).then(result=>{
- if(result){
- setNewsList(result.data.rows);
- clearInterval(tabTimer)
- tabTimer = setInterval(() => {
- handle(result.data.rows && result.data.rows[0].id, result.data.rows)
- }, 4000)
- }
- }).catch(error=>{})
- }
-
- function getProjectList(){
- const url = `${httpUrl}/zone/open/${id}/project/list`;
- axios.get(url,{params:{
- isHomepage:1
- }}).then(result=>{
- if(result){
- if (result.data.rows.length < 3) {
- setProjectList(result.data.rows)
- } else {
- setProjectList([...result.data.rows, {}]);
- }
- }
- }).catch(console.error())
- }
-
- function getPartnerList(){
- const url = `${httpUrl}/zone/open/${id}/partners/list`;
- axios.get(url).then(result=>{
- if(result){
- const array = result.data.rows;
- const newArray = [];
- for(let i in array) {
- let e = array[i]
- if (e.zonePartnersList && e.zonePartnersList.length > 0) {
- e.zonePartnersList[0].typeName = e.typeName;
- }
- if ( e.zonePartnersList.length > 0 ) {
- newArray.push(e.zonePartnersList);
- }
- }
- setParterList(newArray);
- }
- }).catch(error=>{})
- }
-
- function handle(value, rows){
- // 获取新闻id的数组
- let idList = rows ? rows.map(obj => obj.id) : []
- // 获取所有 tab节点
- let tabs = document.querySelectorAll('.zone_news .ant-tabs-tab')
- const tabIndex = idList.indexOf(Number(value))
- if(tabIndex !== -1 ){
- if(tabIndex !== idList.length -1){
- tabs[tabIndex + 1].click()
- }else{
- tabs[0].click()
- }
- }
- }
- function handleTabChange(key) {
- setTimeout(()=>{
- setActiveKey(key)
- },100)
- clearInterval(tabTimer)
- tabTimer = setInterval(() => {
- handle(key, newsList)
- }, 4000)
- }
-
- return(
-
- {
- topics && topics.length>0 ?
- topics.map((i, k) => {
- return (
-
- }
- {
- moreTypes &&
- }
- setPartner(i[0].typeName)}>
-
-
- )
- })
- :
- ""
- }
-
- { i[0].typeName }
-
- -
- {
- topics && topics.length>0 ?
- topics.map((i, k)=>{
- return(
-
- {
- // 专区简介
- data && (data.introductionTitle || data.introductionContent || data.introductionImage) &&
-
- )
-}
-export default HeaderPageJCC;
\ No newline at end of file
diff --git a/src/forge/Information/Pages/JCC/index.scss b/src/forge/Information/Pages/JCC/index.scss
deleted file mode 100644
index b9621632e..000000000
--- a/src/forge/Information/Pages/JCC/index.scss
+++ /dev/null
@@ -1,361 +0,0 @@
-@import '../../theme.scss';
-
-.zone_jcc_box{
- background-color: #f7f7f7;
- padding-top:70px;
- .zone_infos{
- display: flex;
- align-items: center;
- margin-top: 54px;
- padding:27px 24px;
- position: relative;
- &>img{
- position: absolute;
- right: 0;
- top: 0;
- border-radius: 4px;
- object-fit: contain;
- }
- .zone_infos_desc{
- position: relative;
- padding:0px 34px 0px 10px;
- flex: 1;
- .tleft{
- text-align: left;
- margin-bottom: 25px !important;
- }
- .z_name{
- color:#1f2329;
- font-size:26px;
- height: 28px;
- line-height: 28px;
- margin-bottom: 28px!important;
- font-size: 20px;
- }
- .z_desc{
- color:#3d485d;
- font-size:14px;
- line-height:32px;
- word-break: break-all;
- -webkit-line-clamp: 4;
- white-space: pre-wrap;
- background: white;
- padding: 50px 250px 50px 50px;
- margin-right: 350px;
- color: inherit;
- }
- }
- }
- .zone_vision {
- background-color: #ffffff;
- .boxmain {
- display: flex;
- justify-content: space-between;
- }
- .vision_item {
- width: 244px;
- display: flex;
- align-items: center;
- flex-direction: column;
- .vision_icon {
- height: 162px;
- width: 162px;
- background-image: url(../../img/visionBack.png);
- background-size: 100% 100%;
- position: relative;
- img {
- width: 50%;
- position: absolute;
- left: 50%;
- top: 50%;
- transform: translate(-50%, -50%);
- }
- }
- .vision_icon:hover {
- background-image: url(../../img/visionBackActive.png);
- }
- .vision_title {
- font-weight:700;
- color:#1f2329;
- font-size:17px;
- line-height:27px;
- text-align:center;
- margin-top: 39px;
- margin-top: 0;
- font-weight: 600;
- }
- .vision_content {
- margin-top: 21px;
- color:#4c5876;
- font-size:14px;
- line-height:27px;
- text-align:center;
- }
- }
- }
- .zone_news{
- height: 30.2vw;
- min-height: 475px;
- background-color: #273144;
- background-image: url(../../img/bgJccNews.png);
- background-repeat: no-repeat;
- background-size: cover;
- .boxmain {
- width: 1200px;
- height: 100%;
- display: flex;
- flex-direction: column;
- justify-content: space-evenly;
- }
- .news_title {
- height: 44px;
- font-weight: 500;
- color: #ffffff;
- font-size: 32px;
- text-align: center;
- }
- .photo {
- margin-bottom: 3px;
- margin-right: 5px;
- }
- .news_tab{
- color: #fff;
- height: 380px;
- .ant-tabs-bar{
- background-color: rgba(33, 84, 118, 0.5);
- }
- .ant-tabs-left-bar {
- border-right-color: transparent !important;
- }
- .ant-tabs-nav-container{
- font-size: 18px;
- }
- .ant-tabs-left-bar .ant-tabs-tab, .ant-tabs-right-bar .ant-tabs-tab {
- padding: 34px 24px;
- margin: 0;
- text-align: left;
- width: 260px;
- overflow-x: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
- .ant-tabs-left-content {
- padding-left: 100px;
- border-left-color: transparent !important;
- }
- .ant-tabs-tab-active{
- background-color: #04BBF7;
- color: white;
- }
- .ant-tabs-nav .ant-tabs-tab:active {
- color: white;
- }
- .ant-tabs-ink-bar{
- display: none !important;
- }
- .ant-tabs-nav .ant-tabs-tab:hover {
- color: white;
- }
- .tab-content{
- height: 100%;
- display: flex;
- flex-direction: column;
- justify-content: space-between;
- }
- .title_JCC{
- font-size: 20px;
- margin: 10px 0;
- }
- a:link, a:visited {
- color: white;
- }
-
- .new_desc{
- height: 48px;
- font-size: 15px;
- word-break: break-all;
- text-overflow: ellipsis;
- display: -webkit-box;
- -webkit-box-orient: vertical;
- -webkit-line-clamp: 2;
- overflow: hidden;
- margin-top: 10px;
- }
- }
- }
- .zone_projects{
- background-image:linear-gradient(180deg,#f1f4fa 0%,#ffffff 100%);
- .right_arraw {
- width: 48px;
- height: 48px;
- right: 0;
- }
- .left_arraw {
- width: 48px;
- height: 48px;
- left: 0;
- z-index: 100;
- }
- .slick-track {
- display: flex;
- align-items: center;
- height: 435px;
- .slick-slide {
- height: auto;
- }
- }
- .less_three_project {
- display: flex;
- justify-content: center;
- .container {
- .zone_p_item {
- background: #fefefe;
- }
- margin: 10px;
- }
- }
- .not_three_project {
- .slick-track {
- .slick-slide[aria-hidden="true"] {
- opacity: 0;
- }
- }
- }
- .slick-current {
- z-index: 100;
- }
- .slick-current .zone_p_item {
- width:364px;
- height:395px;
- background:#fefefe;
- }
- .zone_p_item {
- width: 364px;
- height: 320px;
- border-radius:16px;
- padding: 42px 42px 35px 42px;
- box-shadow:0px 0px 20px rgba(35, 54, 185, 0.06);
- background: url(../../img/projectBg.png) no-repeat;
- background-size: 100% 100%;
- border-color:#ffffff;
- transition: 0.3s;
- display: flex;
- flex-direction: column;
- align-items: center;
- .info_img {
- width:74px;
- height: 74px;
- border-radius: 50%;
- }
- .z_p_title {
- font-weight: 700;
- color: #1f2329;
- font-size: 16px;
- text-align: center;
- margin-top: 10px;
- cursor: pointer;
- width: 90%;
- }
- .z_p_desc{
- margin-top: 18px;
- color:#4c5876;
- font-size:14px;
- line-height:22px;
- word-break: break-all;
- -webkit-line-clamp: 5
- }
- }
- .zone_p_item:hover {
- .z_p_title {
- color: #07a583;
- }
- }
- }
- .zone_contributor{
- min-height: 466px;
- background-color: #F7F9FC;
- padding:44px 0px 30px;
- .container {
- height: 220px;
- }
- .zone_c_lists{
- display: flex;
- align-items: center;
- margin-top: 50px;
- flex-wrap: wrap;
- li{
- // background-image: url(./img/contributebg.png);
- box-shadow:0px 0px 15px rgba(49,61,113,0.06);
- background-size: 100% 100%;
- width:80px;
- height: 80px;
- border:1px solid #fff;
- display: flex;
- flex-direction: column;
- align-items: center;
- border-radius: 50%;
- margin-bottom: 40px!important;
- margin-right: 40px;
- & img{
- width: 80px;
- height: 80px;
- border-radius: 50%;
- margin-bottom: 16px;
- }
- }
- .slick-track {
- display: flex;
- }
- .c_item {
- margin-top: 40px;
- margin-left: 10px;
- width: 380px;
- height: 165px;
- background-image: url(../../img/cbg.png);
- background-size: 100% 100%;
- position: relative;
- background-color:#f6f7fa;
- border:2px solid;
- border-color:#ffffff;
- border-radius:4px;
- box-shadow:0px 0px 10px rgba(7, 70, 165, 0.11);
- padding: 30px 35px;
- img {
- position: absolute;
- width:80px;
- height:80px;
- border-radius: 50%;
- border: solid 2px #ffffff;
- right: 27px;
- top: -40px;
- object-fit: cover;
- }
- .c_name {
- color: #000000;
- font-size: 16px;
- text-align: center;
- max-width: 240px;
- }
- .c_desc {
- color: #4c5876;
- font-size: 15px;
- line-height: 26px;
- }
- }
- .c_item:hover {
- box-shadow:0px 0px 35px rgba(7, 70, 165, 0.11);
- }
- }
- }
-}
-.zone_popover{
- width: 300px;
- :global{
- .ant-popover-title{
- font-weight: 600;
- }
- .ant-popover-content{
- width: 300px;
- }
- }
-}
diff --git a/src/forge/Information/Pages/apply.jsx b/src/forge/Information/Pages/apply.jsx
deleted file mode 100644
index 400f08649..000000000
--- a/src/forge/Information/Pages/apply.jsx
+++ /dev/null
@@ -1,184 +0,0 @@
-import React, { useEffect } from 'react';
-import { Form , Input , Row , Col, Button, message } from 'antd';
-import '../index.scss';
-import { postCreateZone } from '../api';
-import axios from 'axios';
-
-const { TextArea } = Input;
-
-const phonereg = /^([1][3456789])\d{9}$/
-function Apply(props){
- const { form , current_user } = props;
- const { getFieldDecorator , validateFields } = form;
- useEffect(()=>{
- document.title = '申请创建专区';
- },[])
-
- useEffect(()=>{
- if(!(current_user && current_user.login)){
- props.history.push("/403");
- }
- },[current_user])
-
- function submitFunc(){
- validateFields((error,values)=>{
- if(!error){
- const zoneApplication = {...values};
- postCreateZone(zoneApplication).then(response=>{
- if(response && response.data && response.data.code===200){
- message.success("您的专区申请已提交，请耐心等待管理员与您联系!");
- setTimeout(() => {
- window.location.href="/";
- }, 1000);
- }
- }).catch(error=>{})
- }
- })
- }
-
- function checkPhone(rule, value, callback){
- if(!value){
- callback();
- }
- if(!phonereg.test(value)){
- callback("请输入正确的手机号码");
- }
- callback();
- }
-
- function checkId(rule,value,callback){
- value ? axios.post(`/accounts/check_keywords`, {
- text:value
- }).then(response => {
- if(response && response.data.data===false){
- callback("与系统标识重复，请更改标识");
- }
- callback();
- }):callback();
- }
-
-
-
- return(
-
- 
- }
-
- }
-
- {data &&
- {
- data.introductionImage &&
- {data.firstTitle}
} -{data.introductionTitle}
- -
-
- {
- // 新闻动态
- data && data.cmsShow === 1 && newsList && newsList.length>0 &&
- 宗旨及愿景
-
- {
- vision.map((i, k) => {
- return (
-
-
-
- )
- })
- }
-
-
-
- { i.title }
-
-
- }
- {
- // 精选项目
- data && data.projectShow === 1 && projectList && projectList.length > 0 &&
-
-
- {
- newsList.map((i,k)=>{
- return(
-
-
- )
- })
- }
-
-
- { data.homepageCmsTitle }
-
- 
-
- {i.name}
- {i.publishTime}
{i.summary || '-'}
-
-
- }
-
- {
- // 核心贡献者
- data && data.memberShow === 1 && personList && personList.length > 0 &&
- { data.homepageProjectTitle }
-
-
- }
-
- {
- // 合作伙伴
- data && data.partnersShow === 1 && partnerList && partnerList.length > 0 &&
- { data.homepageMemberTitle }
- { --
- {
- personList.map((i,k)=>{
- return(
-
-
- }
-
- { data.homepagePartnersTitle }
-
-
-
申请创建专区
-
-
- 申请说明：
-1、如果您想要创建自己的专区，请填写下方页面中的信息来提交专区申请。
-2、管理员在收到您的专区申请后，将会通过您提供的联系方式与您进行沟通，请您留意查收信息。
-3、如果您的专区建设情况出色，希望在官方专区列表中展示，请发送邮件至官方邮箱 gitlink@ccf.org.cn，并在邮件中注明”推荐专区+您的专区链接”。经官方审核后，您的专区将会被推荐展示。
-