- 为确保您能正常使用平台功能，请确认以下信息: + { + current_user && current_user.email ? + `平台已检测到您已绑定邮箱${current_user.email},请您确认如下操作` + : + "平台已检测到您未绑定邮箱，为不影响使用协同开发功能，请先绑定邮箱" + }
diff --git a/src/forge/Component/ProfileModal/Profile.jsx b/src/forge/Component/ProfileModal/Profile.jsx index e63c1286..977c6de0 100644 --- a/src/forge/Component/ProfileModal/Profile.jsx +++ b/src/forge/Component/ProfileModal/Profile.jsx @@ -1,17 +1,36 @@ import React from 'react'; +import { useState } from 'react'; +import EducoderAccount from '../EducoderAccount'; -function Profile({children,sureFunc,showCompeleteDialog , completeProfile, className}) { - +function Profile({ + children, + sureFunc, + showCompeleteDialog , + completeProfile, + className , + current_user +}) { + const [ giteaVisible , setGiteaVisible ] = useState(false); + function checkProfile() { - if(!completeProfile){ - showCompeleteDialog && showCompeleteDialog(); - }else{ - sureFunc(); + if(current_user && current_user.login){ + if(!current_user.has_gitea_user || (current_user.has_gitea_user && !current_user.is_sync_pwd)){ + setGiteaVisible(true); + }else{ + if(!completeProfile){ + showCompeleteDialog && showCompeleteDialog(); + }else{ + sureFunc(); + } + } } } return( - {children} +
+
+ 您可以在QQ服务群向管理员申请，获得继续操作的权限
+ < img src={require("./teacherQQ.png")} width={200} height={200} alt=""/> +群号：693542422
+
-
+
{value && showhtml(value)}
{/*
diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js
index ac139351..d7f4b28b 100644
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@@ -1,9 +1,8 @@
import React, { Component } from 'react';
import AccountProfile from "../../modules/user/AccountProfile";
-import { getImageUrl } from 'educoder'
+import { getImageUrl , openNewWindow } from 'educoder';
import axios from 'axios';
-import { Input , notification , Dropdown ,Popover, Menu,Badge, Button } from 'antd';
-import { Link } from 'react-router-dom';
+import { Input , notification , Dropdown , Menu } from 'antd';
import LoginDialog from '../../modules/login/LoginDialog';
import HeadSearch from '../Component/HeadSearch';
@@ -13,13 +12,14 @@ import '../../modules/tpm/TPMIndex.css';
import CheckProfile from '../Component/ProfileModal/Profile';
import './header.scss';
-import NoticeContent from './NoticeContent';
+import Engineer from './Engineer';
const $ = window.$
// TODO 这部分脚本从公共脚本中直接调用
const { Search } = Input;
let old_url;
window._header_componentHandler = null;
+const isPath= window.location.hostname ==='code.educoder.net' || window.location.hostname==='testforgeplus.educoder.net';
// 非trustie链接则新开页跳转
const str = ['www.trustie.net','forgeplus.trustie.net','forum.trustie.net','testforgeplus.trustie.net']
class NewHeader extends Component {
@@ -49,6 +49,7 @@ class NewHeader extends Component {
visiblemyss: false,
openSearch:false,
visible:false, //浮动消息框展示控制
+ QQVisible:false
}
}
componentDidMount() {
@@ -82,6 +83,36 @@ class NewHeader extends Component {
} catch (e) {}
}
+ SearchInput = (open,item)=>{
+ if(open){
+ return(
+
{
+ setTimeout(() => {
+ this.setState({
+ openSearch:false
+ })
+ }, 300)
+ }}
+ >
+ this.onGlobalSearch(value,item)}
+ autoFocus={true}
+ />
+
+ )
+ }else{
+ return {
+ this.setState({openSearch:true})
+ }} />
+ }
+ }
+
+ onGlobalSearch=(value,item)=>{
+ window.location.href=`${item}?value=` + value;
+ }
+
openNotification = (messge) => {
notification.open({
message: "提示",
@@ -96,6 +127,26 @@ class NewHeader extends Component {
})
}
+ submitsubmitapplications = () => {
+ let {
+ submitapplicationssum,
+ submitapplicationsvaluedata
+ } = this.state;
+ this.setState({
+ submitapplications: false,
+ RadioGroupvalue: undefined
+ })
+ if (submitapplicationssum === 0) {
+ if (submitapplicationsvaluedata !== undefined) {
+ window.location.href = "/courses/" + submitapplicationsvaluedata;
+ }
+ } else if (submitapplicationssum === 1) {
+ if (submitapplicationsvaluedata !== undefined) {
+ window.location.href = "/projects/" + submitapplicationsvaluedata;
+ }
+ }
+ }
+
educoderlogin = () => {
//登录账号
this.setState({
@@ -132,6 +183,24 @@ class NewHeader extends Component {
})
};
+
+ hidetojoinclass = () => {
+ this.setState({
+ tojoinclasstype: false,
+ tojoinitemtype: false,
+ tojoinclasstitle: undefined,
+ rolearr: ["", ""],
+ Checkboxteacherchecked: false,
+ Checkboxstudentchecked: false,
+ Checkboxteachingchecked: false,
+ Checkboxteachertype: false,
+ Checkboxteachingtype: false,
+ code_notice: false,
+ checked_notice: false,
+ RadioGroupvalue: undefined
+ })
+ }
+
// 关闭
cancelModulationModels = () => {
this.setState({ isRenders: false })
@@ -278,10 +347,32 @@ class NewHeader extends Component {
this.setState({ visible });
};
+ turntoEngineer=(url)=>{
+ const { current_user } = this.props;
+ if(current_user && current_user.login){
+ if(url){
+ window.location.href=url;
+ }else{
+ this.setState({
+ QQVisible:true
+ })
+ }
+ }else{
+ this.educoderlogin();
+ }
+ }
+
+ setQQVisible=()=>{
+ this.setState({
+ QQVisible:false
+ })
+ }
+
render() {
- const { match ,resetUserInfo ,showNotification} = this.props;
+ const { match } = this.props;
let current_user = this.props.user;
let {
+ QQVisible,
AccountProfiletype,
user,
isRender,
@@ -369,6 +460,7 @@ class NewHeader extends Component {
let search_url = settings && settings.common && settings.common.search;
return (
+
{isRender === true ?
new_link.indexOf(item)>-1) );
var wl = waiLian && waiLian.length>0;
return (
- this.headtypesonClick(item.link, true)} className={`${this.matchpaths(item.link) === true ? 'pr active' : 'pr'}`} style={!is_hidden ? { display: 'flex' } : { display: 'none' }}>
- {item.name}
+ this.headtypesonClick(item.link, true)} className={`${((isPath && item.name === "大学开源") || this.matchpaths(item.link) === true) ? 'pr active' : 'pr'}`} style={!is_hidden ? { display: 'flex' } : { display: 'none' }}>
+
)
})
}
+ {
+ settings && settings.engineer_url !== undefined ?
+
+ this.turntoEngineer(settings.engineer_url)}>工程认证
+
+ :""
+ }
: ""
}
@@ -438,29 +537,20 @@ class NewHeader extends Component {
}
{ (settings && settings.common && settings.common.notice) && (current_user && current_user.login)?
- }
- visible={visible}
- onVisibleChange={this.handleVisibleChange}
- destroyTooltipOnHide
- >
-
- {current_user &&
-
- }
-
-
+
+ {current_user &&
+
+ }
+
: ""
}
{!user || (user && !user.login) ?
- this.educoderlogin()} className="mr5 color-grey-6">登录
+ this.educoderlogin()} className="mr5 color-white">登录
{
settings && settings.common && settings.common.register &&
- 注册
+ 注册
}
:
diff --git a/src/forge/Head/NoticeContent.jsx b/src/forge/Head/NoticeContent.jsx
index 634a7adc..24cf9fb2 100644
--- a/src/forge/Head/NoticeContent.jsx
+++ b/src/forge/Head/NoticeContent.jsx
@@ -184,11 +184,11 @@ function NoticeContent({ visible, showNotification, resetUserInfo, current_user:
className='hoverNotice-body' // 外部添加className加以区分
onPullRefresh={() => { setNoticePage(noticePage + 1); }} //触发加载ajax的function
// type={2} // 传送加载组件的状态
- count={noticeUnreadList.length} // 数据当前的总数量
+ count={noticeUnreadList && noticeUnreadList.length} // 数据当前的总数量
pageSize={10} //
>
{
- noticeUnreadList.map(item => {
+ noticeUnreadList && noticeUnreadList.length>0 && noticeUnreadList.map(item => {
return (
{ readItem(item) }}>
diff --git a/src/forge/Head/teacherQQ.png b/src/forge/Head/teacherQQ.png
new file mode 100644
index 00000000..772a0e8d
Binary files /dev/null and b/src/forge/Head/teacherQQ.png differ
diff --git a/src/forge/Images/banner.png b/src/forge/Images/banner.png
new file mode 100644
index 00000000..af644cb4
Binary files /dev/null and b/src/forge/Images/banner.png differ
diff --git a/src/forge/Index.js b/src/forge/Index.js
index c2e36916..e189fe63 100644
--- a/src/forge/Index.js
+++ b/src/forge/Index.js
@@ -79,6 +79,12 @@ class Index extends Component {
(
+
);
diff --git a/src/forge/Main/Index.js b/src/forge/Main/Index.js
index 3b1f66db..b03ae0bc 100644
--- a/src/forge/Main/Index.js
+++ b/src/forge/Main/Index.js
@@ -11,8 +11,9 @@ import ListItem from './IndexItem'
import axios from 'axios';
import img_new from '../Images/new.png';
import img_array from '../Images/array.png';
-import banner from '../Images/banner_list.jpg';
+import banner from '../Images/banner.png';
import CheckProfile from '../Component/ProfileModal/Profile';
+import AddProjectModal from '../Head/AddProjectModal';
const Search = Input.Search;
@@ -291,35 +292,33 @@ class Index extends Component {
arrows:false,
adaptiveHeight:true
}
- const settings={
- dots: true,
- infinite: true,
- speed: 500,
- slidesToShow: 6,
- slidesToScroll: 6,
- autoplay:false,
- arrows:false,
- adaptiveHeight:true
- }
-
return (
-
- {
- recommendOriList.map((i,k)=>{
- return(
- } "{i.name}")
- :""
- } */}
+ 5 ? "recommandProjects":"recommandProjects mb20"}>
@@ -345,7 +344,7 @@ class Index extends Component {
-
-
+ 
+
+
{
recommendList && recommendList.length>0 &&
-
-
- 项目类型 +
- 项目类型 {typeList}
-
diff --git a/src/forge/Main/list.scss b/src/forge/Main/list.scss
index 59589fb6..c2b8a2ab 100644
--- a/src/forge/Main/list.scss
+++ b/src/forge/Main/list.scss
@@ -1,10 +1,78 @@
.lineH2{line-height:2}
-.t_project_banner {
- /* height: 260px;
- background: url(../Images/banner_list.jpg) no-repeat center; */
+.subjectBanner {
+ height: 160px;
+ position: relative;
+ overflow: hidden;
background-color: #050d34;
}
+.subjectleft{
+ margin-top: 40px;
+ display: -ms-flexbox;
+ display: flex;
+ -ms-flex-align: center;
+ align-items: center;
+}
+.bannerBox{
+ width: 1200px;
+ position: absolute;
+ z-index: 2;
+ left: 50%;
+ top: 0;
+ transform: translateX(-50%);
+}
+.subjectleft>span:first-child{
+ width: 140px;
+ height: 30px;
+ font-size: 30px;
+ font-weight: 600;
+ color: #fff;
+ line-height: 30px;
+ letter-spacing: 4px;
+}
+.subjectleft>span:last-child{
+ height: 16px;
+ font-size: 16px;
+ color: #fff;
+ line-height: 16px;
+ margin-left: 16px;
+}
+.subjectleft>span:last-child .words{
+ letter-spacing: 3px;
+ display: block;
+ margin-top: -6px;
+ margin-bottom: 2px!important;
+}
+.bannerBox > a{
+ display: inline-block;
+ width: 104px;
+ height: 30px;
+ line-height: 28px;
+ text-align: center;
+ border-radius: 4px;
+ border: 1px solid #666;
+ margin-right: 30px;
+ margin-top: 30px;
+ color: #fff;
+ cursor: pointer;
+}
+.bannerBox .ant-btn{
+ margin-top: 30px;
+ height: 40px;
+ font-size: 16px;
+ width: 120px;
+ border-radius: 4px;
+ margin-right: 40px;
+}
+
+.bannerBox > a > i{
+ font-size: 14px!important;
+ display: inline-block;
+ margin-right: 10px;
+}
+.bannerBox > a > a{
+ color: #fff!important;
+}
.ProjectListIndex{
width: 1200px;
margin:20px auto;
@@ -53,8 +121,9 @@
justify-content: space-between;
flex-wrap: wrap;
align-items: center;
- padding:25px 30px;
+ padding:0px 30px;
border-bottom: 1px solid #E0E0E0;
+ height: 62px;
}
.list-r-Search{
width: 400px;
diff --git a/src/forge/Main/sub/DetailBanner.jsx b/src/forge/Main/sub/DetailBanner.jsx
index 22a5ce41..803ad6aa 100644
--- a/src/forge/Main/sub/DetailBanner.jsx
+++ b/src/forge/Main/sub/DetailBanner.jsx
@@ -20,7 +20,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
return(
- @@ -74,7 +74,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa Wiki - } + } */} { item.menu_name === "devops" && platform ?
-
diff --git a/src/forge/Main/tree/Index.jsx b/src/forge/Main/tree/Index.jsx
index 2fc57434..e9cb06fc 100644
--- a/src/forge/Main/tree/Index.jsx
+++ b/src/forge/Main/tree/Index.jsx
@@ -4,6 +4,7 @@ import { truncateCommitId } from '../../common/util';
import { Link } from 'react-router-dom';
import { getImageUrl } from 'educoder';
import { Dropdown , Menu , Spin } from 'antd';
+import Nodata from '../../Nodata';
import './Index.scss';
import Tree from '../img/tree.png';
@@ -107,6 +108,9 @@ function Index(props) {
)
})
}
+ {
+ list && list.length === 0 &&
+ } -
-
-
--- -- {item.fileName} - - {item.isPublic === 0 && 私有} - - { current_user && current_user.login && -listmenu(item.id,item.attachments,item.isPublic)} placement={'bottomRight'}> - - - } -- 上传时间：{item.uploadTime} - 文件大小：{item.fileSize} - 下载：{item.download} -
-{item.remark}
+++ + ) + }) + } + { total > limit &&-
+ {
+ data && data.length> 0 && data.map((item,key)=>{
+ return(
+
-
+
+
+-+ {item.fileName} + ++ + ++ 上传时间：{item.uploadTime} + 文件大小：{item.fileSize} + 下载：{item.download} +
+{item.remark}
+ { item.tags && item.tags.length>0 &&{ - item.tags && item.tags.length>0 && item.tags.map((i,k)=>{ + item.tags.map((i,k)=>{ return( - {i} - { - current_user && (current_user.login === item.login) ? --removeTagFunc(item.id,i)} okText="是" cancelText="否"> - - :"" - } - + {i} ) }) } - { - current_user && (current_user.login === item.login) && - addPanel(item.id)} style={{height:"20px",lineHeight:"20px"}}>+新增标签 - }
- )
- })
- }
-
- } + } + @@ -280,7 +178,6 @@ function Index(props){} -
+
{
- menuName && projectDetail ?
+ menuName && menuName.length> 0 && projectDetail ?
)
diff --git a/src/forge/Merge/MergeSubmit.js b/src/forge/Merge/MergeSubmit.js
index d4b42c3b..35d6c379 100644
--- a/src/forge/Merge/MergeSubmit.js
+++ b/src/forge/Merge/MergeSubmit.js
@@ -102,7 +102,7 @@ class MergeSubmit extends Component{
-
{
Array.isArray(menuName)&& menuName.map((item,key)=>{
@@ -66,7 +66,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
:""
}
- {
+ {/* {
item.menu_name === "wiki" &&
已通过你加入【{project && project.name}】项目的申请
+ default: + return已拒绝你加入【{project && project.name}】项目的申请
+ } + }else{ + return "" + } + } + return(
- setVisible(false)}
@@ -185,15 +109,11 @@ function Index(props){
showNotification={props.showNotification}
owner={owner}
projectsId={repo_id}
- id={id}
- attachments={attachments}
/>
- 资源库{total ? ({total}):""}
- { current_user && current_user.login && (props.projectDetail && props.projectDetail.permission) ?
- {setId(undefined);setVisible(true);}}>上传资源 :""
- }
+ 资源库(18)
+ setVisible(true)}>上传资源
@@ -208,65 +128,43 @@ function Index(props){
{sort[sortValue]}
-
-
-
}
},
{
- dataIndex:"downloads",
- key:"downloads",
+ dataIndex:"loadNum",
+ key:"loadNum",
title:"下载数",
- width:"14%",
+ width:"15%",
className:"edu-txt-center"
},
{
- dataIndex:"fileSizeString",
- key:"fileSizeString",
- title:"文件大小",
- width:"16%",
+ dataIndex:"citeNum",
+ key:"citeNum",
+ title:"引用数",
+ width:"15%",
className:"edu-txt-center"
},
{
- dataIndex:"createdAt",
- key:"createdAt",
+ dataIndex:"time",
+ key:"time",
title:"上传时间",
+ width:"25%"
}
]
@@ -73,35 +74,22 @@ function UploadSource({ form , visible , onCancel , onOk , showNotification , at
function postInfo(values){
const url = https+`/api/project/achievement/`;
- if(id){
- // 修改
- axios.put(url,{
- id,fileName,fileId:`${fileId}`,
- remark:values.remark
- }).then(result=>{
- if(result && result.data){
- onOk();
- }
- }).catch(error=>{})
- }else{
- // 上传
- axios.post(url,{
- fileId:`${fileId}`,
- fileName,
- login:owner,
- projectId:projectsId,
- ...values
- }).then(result=>{
- if(result && result.data){
- onOk();
- }
- }).catch(error=>{})
- }
+ axios.post(url,{
+ fileId:`${fileId}`,
+ fileName,
+ login:owner,
+ projectId:projectsId,
+ ...values
+ }).then(result=>{
+ if(result && result.data){
+ onOk();
+ }
+ }).catch(error=>{})
}
return(
- {
- data && data.length> 0 &&
-
)
}
diff --git a/src/forge/Source/Index.scss b/src/forge/Source/Index.scss
index 57b122ae..20f55c27 100644
--- a/src/forge/Source/Index.scss
+++ b/src/forge/Source/Index.scss
@@ -21,7 +21,6 @@
}
.bodycontent{
padding:0px 20px;
- min-height: 500px;
& > ul.bodycontentul > li{
display: flex;
border-bottom: 1px solid #eee;
@@ -41,16 +40,6 @@
.infoname{
font-size: 16px;
}
- .privateTip{
- display: block;
- font-size: 12px;
- margin-left: 10px;
- background-color: orange;
- height: 18px;
- line-height: 18px;
- padding:0px 3px;
- color: #fff;
- }
.infos{
& > span{
margin-right: 20px;
@@ -84,26 +73,4 @@
}
}
}
-}
-.versionTable{
- .currentTip{
- display: block;
- padding:0px 3px;
- border-radius: 2px;
- border:1px solid #68c7ec;
- font-size: 12px;
- color: #68c7ec;
- height: 18px;
- line-height: 18px;
- margin-left: 5px;
- }
- .ant-table-body{
- margin:0px!important;
- thead{
- background-color: #eee;
- }
- thead >tr >th,tbody > tr > td{
- padding:4px 5px!important;
- }
- }
}
\ No newline at end of file
diff --git a/src/forge/Source/Upload.jsx b/src/forge/Source/Upload.jsx
index de2c8ecb..aac28699 100644
--- a/src/forge/Source/Upload.jsx
+++ b/src/forge/Source/Upload.jsx
@@ -79,4 +79,4 @@ function Uploads({ className , size , actionUrl,fileList,showNotification , load
)
}
-export default Uploads;
\ No newline at end of file
+export default Uploads;
diff --git a/src/forge/Source/UploadSource.jsx b/src/forge/Source/UploadSource.jsx
index 64bd5b7c..22a45392 100644
--- a/src/forge/Source/UploadSource.jsx
+++ b/src/forge/Source/UploadSource.jsx
@@ -5,18 +5,18 @@ import { AlignCenter } from '../Component/layout';
import axios from 'axios';
const { TextArea } = Input;
+const data = [
+ {name:"sdfkjsfj.pdf",loadNum:"10",citeNum:"15",time:"2021-04-01 10:45"},
+ {name:"sdfkjsfj.pdf",loadNum:"10",citeNum:"15",time:"2021-04-01 10:45"},
+ {name:"sdfkjsfj.pdf",loadNum:"10",citeNum:"15",time:"2021-04-01 10:45"}
+]
const https = 'https://testfiles.trustie.net';
-function UploadSource({ form , visible , onCancel , onOk , showNotification , attachments , id ,owner,projectsId}){
- const [ tableData , setTableData ] = useState(undefined);
+function UploadSource({ form , visible , onCancel , onOk , showNotification ,owner,projectsId}){
+ const [ tableData , setTableData ] = useState(data);
const [ fileId , setFilesId ] = useState(undefined);
const [ fileName , setFileName ] = useState(undefined);
const { getFieldDecorator, validateFields , setFieldsValue } = form;
- useEffect(()=>{
- if(id && attachments){
- setTableData(attachments);
- }
- },[id,attachments])
// 上传附件后得到的文件id数组
function UploadFunc(id,name){
setFilesId(id);
@@ -25,36 +25,37 @@ function UploadSource({ form , visible , onCancel , onOk , showNotification , at
const columns = [
{
- dataIndex:"fileName",
- key:"fileName",
+ dataIndex:"name",
+ key:"name",
title:"资源名称",
- width:"42%",
+ width:"45%",
ellipsis:true,
render:(value,item,key)=>{
return -
- {
- data.map((item,key)=>{
- return(
-
{value}
+ {value}
{ key === 0 && 当前版本 }