{/* {nav === 0 ?"分支":"标签"} */}
diff --git a/src/forge/Component/Component.scss b/src/forge/Component/Component.scss
index d27d4aae4..bfd5e9617 100644
--- a/src/forge/Component/Component.scss
+++ b/src/forge/Component/Component.scss
@@ -112,6 +112,9 @@ li.ant-menu-item{
right:240px;
z-index: 10000;
}
+.laterest{
+ color: #05690d;
+}
@media screen and (max-width: 1800px){
.handleBox{
diff --git a/src/forge/Component/Releases.jsx b/src/forge/Component/Releases.jsx
index b3b0a774a..3dc8cf024 100644
--- a/src/forge/Component/Releases.jsx
+++ b/src/forge/Component/Releases.jsx
@@ -20,10 +20,13 @@ function Releases({owner,projectsId,releaseVersions}){
releaseVersions && releaseVersions.total_count>0 ?
releaseVersions.list.map((item,key)=>{
return(
-
+ key === 0 &&
diff --git a/src/forge/Component/User.jsx b/src/forge/Component/User.jsx
index 8701e607e..4d22c77bf 100644
--- a/src/forge/Component/User.jsx
+++ b/src/forge/Component/User.jsx
@@ -1,8 +1,8 @@
import React from 'react';
import styled from 'styled-components';
+import { Link } from 'react-router-dom';
-
-export default ({ url , name , column })=>{
+export default ({ url , name , column , id , login })=>{
const Img = styled.span`
display:flex;
${column && "flex-direction: column;text-align:center;"}
@@ -19,6 +19,14 @@ export default ({ url , name , column })=>{
}
`;
return(
+ id?
+
+ ![]()
+ { url && 
}
+ {name}
+
+
+ :
![]()
{ url && }
{name}
diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx
index 58e941d26..2e4f82da4 100644
--- a/src/forge/Main/CoderDepot.jsx
+++ b/src/forge/Main/CoderDepot.jsx
@@ -92,7 +92,7 @@ function CoderDepot(props){
setZip_url(result.data.zip_url);
let c = result.data.last_commit
setLastCommit(c && c.commit);
- setLastCommitAuthor(c && (c.author || (c.commit && c.commit.author)));
+ setLastCommitAuthor(c && c.committer);
setMainFlag(true);
}
setTimeout(function(){setIsSpin(false);},500);
@@ -133,7 +133,7 @@ function CoderDepot(props){
}
let c = result.data.last_commit
setLastCommit(c && c.commit);
- setLastCommitAuthor(c && (c.author || (c.commit && c.commit.author)));
+ setLastCommitAuthor(c && c.committer);
setMainFlag(false);
}
setTimeout(function(){setIsSpin(false);},500)
@@ -306,7 +306,7 @@ function CoderDepot(props){
{
lastCommit &&
+
+
+ )
+}
+export default UploadSource;
\ No newline at end of file
diff --git a/src/modules/login/LoginDialog.js b/src/modules/login/LoginDialog.js
index 86ba57b6f..aebfba8c7 100644
--- a/src/modules/login/LoginDialog.js
+++ b/src/modules/login/LoginDialog.js
@@ -1,13 +1,7 @@
import React, { Component } from 'react';
-import { Redirect } from 'react-router';
-import Dialog, {
- DialogActions,
- DialogContent,
- DialogContentText,
- DialogTitle,
-} from 'material-ui/Dialog';
-import { notification, Modal } from 'antd';
+import Dialog from 'material-ui/Dialog';
+import { notification } from 'antd';
import axios from 'axios';
@@ -329,6 +323,7 @@ class LoginDialog extends Component {
return flag;
}
componentDidMount() {
+
let flag = this.IsPC(); //true为PC端，false为手机端
this.setState({
isphone: flag
@@ -478,6 +473,7 @@ class LoginDialog extends Component {
let { qqlogin, login, isGoing, isGoingValue, disabled, bottonclass, Phonenumberisnotco,
dialogBox, isRender, weixinlogin } = this.state;
+ let { settings } = this.props;
if (isRender === undefined) {
isRender = false
}
@@ -580,9 +576,9 @@ class LoginDialog extends Component {
- this.getloginurl("https://www.trustie.net/account/lost_password")} className="mr3 color-grey-9">找回密码
+ this.getloginurl(`${settings && settings.common && settings.common.lost_password}`)} className="mr3 color-grey-9">找回密码
- this.getloginurl("https://www.trustie.net/login?login=false")} className="color-grey-9">注册
+ this.getloginurl(`${settings && settings.common && settings.common.register}`)} className="color-grey-9">注册
diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js
index cc054774f..6d5b9697a 100644
--- a/src/modules/tpm/NewHeader.js
+++ b/src/modules/tpm/NewHeader.js
@@ -812,16 +812,16 @@ class NewHeader extends Component {
this.educoderlogin()} className="mr5 color-grey-6">登录
{
- settings && settings.new_course && settings.new_course.register_url &&
- 注册
+ settings && settings.common && settings.common.register &&
+ 注册
}
: user.login === "" ?
this.educoderlogin()} className="mr5 color-grey-6">登录
{
- settings && settings.new_course && settings.new_course.register_url &&
- 注册
+ settings && settings.common && settings.common.register &&
+ 注册
}
:
From e2dbda30832a8526576221441c3f60b7a83fc201 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 31 Mar 2021 17:12:31 +0800
Subject: [PATCH 005/461] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81author?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/AppConfig.js | 2 +-
src/forge/DevOps/About.jsx | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/AppConfig.js b/src/AppConfig.js
index 31f391509..a5a063b09 100644
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@@ -27,7 +27,7 @@ if (isDev) {
}
debugType = window.location.search.indexOf('debug=t') !== -1 ? 'teacher' :
window.location.search.indexOf('debug=s') !== -1 ? 'student' :
- window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || ''
+ window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'admin'
}
function clearAllCookie() {
cookie.remove('_educoder_session', { path: '/' });
diff --git a/src/forge/DevOps/About.jsx b/src/forge/DevOps/About.jsx
index b9b10dada..bb79caad3 100644
--- a/src/forge/DevOps/About.jsx
+++ b/src/forge/DevOps/About.jsx
@@ -36,8 +36,7 @@ function About(props, ref) {
const [ disabled, setDisabled ] = useState(false);
const [ typeFlag, setTypeFlag] = useState(false);
-
- const AuthorLogin = props.author && props.author.login;
+ const AuthorLogin = props.projectDetail && props.projectDetail.author && props.projectDetail.author.login;
const CurrentLogin = props.current_user && props.current_user.login;
useEffect(()=>{
if(CurrentLogin === AuthorLogin){
From 6296434527b454e9cf683faabc12ddfd5f35a69a Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Thu, 1 Apr 2021 14:41:13 +0800
Subject: [PATCH 006/461] =?UTF-8?q?=E6=B8=85=E7=90=86appconfig=E6=96=87?=
=?UTF-8?q?=E4=BB=B6=20=E8=B5=84=E6=BA=90=E5=BA=93=E6=89=80=E6=9C=89?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=8E=92=E7=89=88=E3=80=81=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E6=9C=AA=E7=BB=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/AppConfig.js | 57 +++----------------
src/common/UrlTool.js | 12 ++--
src/forge/DevOps/About.jsx | 5 --
src/forge/Source/Index.jsx | 39 +++++++++++--
src/forge/Source/Index.scss | 22 ++++++++
src/forge/Source/UploadSource.jsx | 93 +++++++++++++++++++++++++++++--
src/forge/Upload/Index.js | 23 ++++----
7 files changed, 168 insertions(+), 83 deletions(-)
diff --git a/src/AppConfig.js b/src/AppConfig.js
index a5a063b09..c42dcbf48 100644
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@@ -2,7 +2,7 @@ import axios from 'axios';
import { requestProxy } from "./indexEduplus2RequestProxy";
import { broadcastChannelOnmessage, isDev, queryString } from 'educoder';
import { notification } from 'antd';
-import cookie from 'react-cookies';
+
import './index.css';
let message501 = false;
@@ -11,10 +11,8 @@ broadcastChannelOnmessage('refreshPage', () => {
})
function locationurl(list) {
- if (window.location.port === "3007") {
-
- } else {
- window.location.href = list
+ if (window.location.port !== "3007") {
+ window.location.href = list
}
}
// TODO 开发期多个身份切换
@@ -26,52 +24,21 @@ if (isDev) {
parsed = queryString.parse(_search);
}
debugType = window.location.search.indexOf('debug=t') !== -1 ? 'teacher' :
- window.location.search.indexOf('debug=s') !== -1 ? 'student' :
- window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'admin'
+ window.location.search.indexOf('debug=s') !== -1 ? 'student' :
+ window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'admin'
}
-function clearAllCookie() {
- cookie.remove('_educoder_session', { path: '/' });
- cookie.remove('autologin_trustie', { path: '/' });
- setpostcookie()
-}
-clearAllCookie();
-function setpostcookie() {
- const str = window.location.pathname;
- if (str.indexOf("/wxcode") !== -1) {
- cookie.remove('_educoder_session', { path: '/' });
- cookie.remove('autologin_trustie', { path: '/' });
- const _params = window.location.search;
- if (_params) {
- let _search = _params.split('?')[1];
- let _educoder_sessions = _search.split('&')[0].split('=');
- cookie.save('_educoder_session', _educoder_sessions[1], { domain: '.educoder.net', path: '/' });
- let autologin_trusties = _search.split('&')[1].split('=');
- cookie.save('autologin_trustie', autologin_trusties[1], { domain: '.educoder.net', path: '/' });
- }
- }
-}
-setpostcookie();
-
window._debugType = debugType;
export function initAxiosInterceptors(props) {
initOnlineOfflineListener();
- var proxy = "http://localhost:3000";
- proxy = "https://testforgeplus.trustie.net";
+ var proxy = "https://testforgeplus.trustie.net";
- const requestMap = {};
- window.setfalseInRequestMap = function (keyName) {
- requestMap[keyName] = false;
- }
//响应前的设置
axios.interceptors.request.use(
config => {
- setpostcookie()
- clearAllCookie()
-
- if (config.url.indexOf(proxy) !== -1) {
+ if (config.url.indexOf(proxy) !== -1 || config.url.indexOf("http") !== -1) {
return config
}
- requestProxy(config)
+ requestProxy(config);
let url = `/api${config.url}`;
@@ -86,12 +53,6 @@ export function initAxiosInterceptors(props) {
} else {
config.url = url;
}
- setpostcookie();
- }
- if (config.url.indexOf('update_file') === -1) {
- requestMap[config.url] = true;
-
- window.setTimeout("setfalseInRequestMap('" + config.url + "')", 900)
}
return config;
},
@@ -146,8 +107,6 @@ export function initAxiosInterceptors(props) {
message501 = false
}, 2000);
}
- requestMap[response.config.url] = false;
- setpostcookie();
return response;
}, function (error) {
return Promise.reject(error);
diff --git a/src/common/UrlTool.js b/src/common/UrlTool.js
index 6b3d3564b..329bc81af 100644
--- a/src/common/UrlTool.js
+++ b/src/common/UrlTool.js
@@ -162,28 +162,28 @@ export function getmyUrl(geturl) {
}
export function getUploadActionUrl(path, goTest) {
- return `${getUrl()}/api/attachments.json`;
+ return `${getUrl()}/api/attachments.json${isDev ?`${isDev ?`?debug=${window._debugType || 'admin'}` : ""}` : ""}`;
}
export function getUploadLogoActionUrl() {
- return `${getUrl()}/api/resumes/logo.json?debug=${window._debugType || 'admin'}`;
+ return `${getUrl()}/api/resumes/logo.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`;
}
export function getUploadActionUrltwo(id) {
- return `${getUrlmys()}/api/shixuns/${id}/upload_data_sets.json?debug=${window._debugType || 'admin'}`
+ return `${getUrlmys()}/api/shixuns/${id}/upload_data_sets.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
}
export function getUploadActionUrlthree() {
- return `${getUrlmys()}/api/jupyters/import_with_tpm.json?debug=${window._debugType || 'admin'}`
+ return `${getUrlmys()}/api/jupyters/import_with_tpm.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
}
export function getupload_git_file(id) {
- return `${getUrlmys()}/api/shixuns/${id}/upload_git_file.json?debug=${window._debugType || 'admin'}`
+ return `${getUrlmys()}/api/shixuns/${id}/upload_git_file.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
}
export function getUploadActionUrlOfAuth(id) {
- return `${getUrl()}/api/users/accounts/${id}/auth_attachment.json?debug=${window._debugType || 'admin'}`
+ return `${getUrl()}/api/users/accounts/${id}/auth_attachment.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
}
export function getRandomNumber(type) {
diff --git a/src/forge/DevOps/About.jsx b/src/forge/DevOps/About.jsx
index bb79caad3..b9524d548 100644
--- a/src/forge/DevOps/About.jsx
+++ b/src/forge/DevOps/About.jsx
@@ -55,11 +55,6 @@ function About(props, ref) {
setIsSpining(false);
if(result && result.data ){
setStep(result.data.step);
- // setStep(0);
- // setFieldsValue({...result.data.cloud_account});
- // if(result.data.cloud_account){
- // setDisabled(true);
- // }
}
}).catch(error=>{
setIsSpining(false);
diff --git a/src/forge/Source/Index.jsx b/src/forge/Source/Index.jsx
index 3ba406782..b01e39077 100644
--- a/src/forge/Source/Index.jsx
+++ b/src/forge/Source/Index.jsx
@@ -4,6 +4,7 @@ import { Blueback , FlexAJ } from '../Component/layout';
import { Dropdown, Input , Menu , Pagination } from 'antd';
import { Link } from 'react-router-dom';
import UploadSource from './UploadSource';
+import axios from 'axios';
const { Search } = Input;
const sort = [
@@ -13,16 +14,37 @@ const sort = [
]
const limit = 15;
function Index(props){
- const [ sortValue , setSortValue ] = useState(0);
+ const [ sortValue , setSortValue ] = useState(1);
const [ page , setPage ] = useState(1);
const [ total , setTotal ] = useState(0);
const [ search , setSearch ] = useState(undefined);
const [ visible , setVisible ] = useState(false);
+ const projectsId = props.match.params.projectsId;
+ const owner = props.match.params.owner;
useEffect(()=>{
+ if(owner && projectsId){
+ getData();
+ }
+ },[projectsId,owner,search,sort,page])
- },[search,sort,page])
+ function getData(){
+ const url = `http://117.50.100.12:8001/api/project/achievement/`;
+ axios.get(url,{
+ params:{
+ projectId:projectsId,
+ curPage:page,
+ pageSize:limit,
+ name:search,
+ sort:sortValue,
+ }
+ }).then(result=>{
+ if(result && result.data){
+
+ }
+ }).catch(error=>{})
+ }
// 搜索
function onSearch(value){
@@ -40,7 +62,7 @@ function Index(props){
{
sort && sort.map((item,key)=>{
return(
- changeSort(e,key)} value={key} className={key === sortValue ?"color-blue":""}>{item}
+ changeSort(e,key+1)} value={key} className={key+1 === sortValue ?"color-blue":""}>{item}
)
})
}
@@ -55,12 +77,19 @@ function Index(props){
)
+ // 上传资源确定
function onOk(){
}
+
+ // 删除标签
+ function removeTagFunc(){
+
+ }
+
return(
-
{item.name}
++ {item.name} + 最新 +
{item.created_at}
-
+
+ 复刻
+
+
{
forked_count > 0 ?
platform ?
diff --git a/src/forge/Main/sub/DetailBanner.jsx b/src/forge/Main/sub/DetailBanner.jsx
index fbdf5541c..1361acb05 100644
--- a/src/forge/Main/sub/DetailBanner.jsx
+++ b/src/forge/Main/sub/DetailBanner.jsx
@@ -1,5 +1,5 @@
import React, { useEffect, useState } from 'react';
-import { Skeleton } from 'antd';
+import { Skeleton , Tooltip} from 'antd';
import { Link } from 'react-router-dom';
function DetailBanner({ list , owner , projectsId , isManager , url , pathname , state , urlFlag , projectDetail , platform ,open_devops }){
@@ -39,11 +39,13 @@ function DetailBanner({ list , owner , projectsId , isManager , url , pathname ,
{
item.menu_name === "issues" &&
-
-
- 易修 (Issue)
- {projectDetail && projectDetail.issues_count ? {projectDetail.issues_count} : ""}
-
+
+
+
+ 易修
+ {projectDetail && projectDetail.issues_count ? {projectDetail.issues_count} : ""}
+
+
}
{
diff --git a/src/modules/login/LoginDialog.js b/src/modules/login/LoginDialog.js
index 441975249..86ba57b6f 100644
--- a/src/modules/login/LoginDialog.js
+++ b/src/modules/login/LoginDialog.js
@@ -580,8 +580,8 @@ class LoginDialog extends Component {
- this.getloginurl("https://www.trustie.net/account/lost_password")}
- className="mr3 color-grey-9">找回密码
+ this.getloginurl("https://www.trustie.net/account/lost_password")} className="mr3 color-grey-9">找回密码
+
this.getloginurl("https://www.trustie.net/login?login=false")} className="color-grey-9">注册
From 02f382e6fbbe6a3bf9b8e6ba338931aec972b5c0 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 31 Mar 2021 11:15:41 +0800
Subject: [PATCH 004/461] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=A1=86=E4=B8=AD?=
=?UTF-8?q?=E7=9A=84=E6=89=BE=E5=9B=9E=E5=AF=86=E7=A0=81=E3=80=81=E6=B3=A8?=
=?UTF-8?q?=E5=86=8C=E7=9A=84url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Head/Header.js | 4 +-
src/forge/Main/CoderRootCommit.js | 17 +++--
src/forge/Source/Index.jsx | 111 +++++++++++++++++++++++++++++-
src/forge/Source/Index.scss | 65 +++++++++++++++++
src/forge/Source/UploadSource.jsx | 22 ++++++
src/modules/login/LoginDialog.js | 16 ++---
src/modules/tpm/NewHeader.js | 8 +--
7 files changed, 220 insertions(+), 23 deletions(-)
create mode 100644 src/forge/Source/UploadSource.jsx
diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js
index e7880362c..64ad93fc8 100644
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@@ -696,8 +696,8 @@ class NewHeader extends Component {
this.educoderlogin()} className="mr5 color-grey-6">登录
{
- settings && settings.new_course && settings.new_course.register_url &&
- 注册
+ settings && settings.common && settings.common.register &&
+ 注册
}
:
diff --git a/src/forge/Main/CoderRootCommit.js b/src/forge/Main/CoderRootCommit.js
index f87a85398..bb4f5ba52 100644
--- a/src/forge/Main/CoderRootCommit.js
+++ b/src/forge/Main/CoderRootCommit.js
@@ -74,6 +74,7 @@ class CoderRootCommit extends Component{
array.push({
name:item.author && item.author.name,
login: item.author && item.author.login,
+ id: item.author && item.author.id,
image_url:item.author && item.author.image_url,
sha:item.sha,
time_from_now:item.time_from_now,
@@ -136,10 +137,18 @@ class CoderRootCommit extends Component{
{item.message}
)
diff --git a/src/forge/Source/Index.jsx b/src/forge/Source/Index.jsx
index 475bda0c5..3ba406782 100644
--- a/src/forge/Source/Index.jsx
+++ b/src/forge/Source/Index.jsx
@@ -1,16 +1,121 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
import './Index.scss';
import { Blueback , FlexAJ } from '../Component/layout';
+import { Dropdown, Input , Menu , Pagination } from 'antd';
+import { Link } from 'react-router-dom';
+import UploadSource from './UploadSource';
+const { Search } = Input;
+const sort = [
+ "按上传时间排序",
+ "按下载次数排序",
+ "按引用排序"
+]
+const limit = 15;
function Index(props){
+ const [ sortValue , setSortValue ] = useState(0);
+ const [ page , setPage ] = useState(1);
+ const [ total , setTotal ] = useState(0);
+ const [ search , setSearch ] = useState(undefined);
+
+ const [ visible , setVisible ] = useState(false);
+
+ useEffect(()=>{
+
+ },[search,sort,page])
+
+ // 搜索
+ function onSearch(value){
+ setSearch(value);
+ }
+
+ // 切换排序方式
+ function changeSort(e,index){
+ setSortValue(index);
+ }
+
+
+ const menu=(
+
+ )
+
+ const listmenu=(
+
+ )
+
+ function onOk(){
+
+ }
return(
{lastCommit && lastCommit.message}
-
- {item.image_url?:""}
-
-
+ {
+ item.id ?
+
+ {item.image_url?
:""}
+
+ :
+
+ {item.image_url?
:""}
+
+
+ }
+
+ setVisible(false)} onOk={onOk}/>
- 资源库
- 上传资源
+ 资源库(18)
+ setVisible(true)}>上传资源
+
+
+ {sort[sortValue]}
+
+
+
)
}
diff --git a/src/forge/Source/Index.scss b/src/forge/Source/Index.scss
index 4338c5a9f..20f55c27a 100644
--- a/src/forge/Source/Index.scss
+++ b/src/forge/Source/Index.scss
@@ -8,4 +8,69 @@
padding:15px 20px;
border-bottom: 1px solid #eee;
}
+ .subHeadtitle{
+ padding:15px 20px;
+ border-bottom: 1px solid #eee;
+ .ant-input-group-wrapper{
+ width:320px;
+ .ant-btn.ant-input-search-button{
+ margin: 0px;
+ margin-top: -1px;
+ }
+ }
+ }
+ .bodycontent{
+ padding:0px 20px;
+ & > ul.bodycontentul > li{
+ display: flex;
+ border-bottom: 1px solid #eee;
+ padding:20px 0px;
+ align-items: flex-start;
+ &:last-child{
+ border-bottom: none;
+ }
+ .infoImg{
+ img{
+ width: 50px;
+ height: 50px;
+ border-radius: 50%;
+ }
+ margin-right: 15px;
+ }
+ .infoname{
+ font-size: 16px;
+ }
+ .infos{
+ & > span{
+ margin-right: 20px;
+ color: #999;
+ & >span{
+ color: #666;
+ }
+ }
+ }
+ .infodesc{
+ color: #666;
+ line-height: 20px;
+ margin:5px 0px!important;
+ }
+ .infotag{
+ display: flex;
+ flex-wrap: wrap;
+ span{
+ display: block;
+ padding:0px 4px;
+ height: 20px;
+ line-height: 20px;
+ font-size: 12px;
+ margin-right: 10px;
+ border: 1px solid #f8df8c;
+ background: #fffce6;
+ color: #0d90c3;
+ border-radius: 2px;
+ cursor: pointer;
+ }
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/src/forge/Source/UploadSource.jsx b/src/forge/Source/UploadSource.jsx
new file mode 100644
index 000000000..a8ccfdc3a
--- /dev/null
+++ b/src/forge/Source/UploadSource.jsx
@@ -0,0 +1,22 @@
+import React from 'react';
+import { Modal } from 'antd';
+
+
+function UploadSource({ visible , onCancel , onOk }){
+ return(
+
+
-
+
-
+
+
+++ DaVinci.fdb + ++ + ++ 上传时间：2021-03-30 + 上传类型：软件版本 + 文件大小：10KB + 下载：111 +
+资源描述资源描述资源描述资源描述资源描述资源描述资源描述
++ 软件版本 ++
+
+ {setPage(p)}}
+ />
+
+ }
+
- setVisible(false)} onOk={onOk}/>
+ setVisible(false)} onOk={onOk} showNotification={props.showNotification}/>
资源库(18)
@@ -98,7 +127,7 @@ function Index(props){
diff --git a/src/forge/Source/Index.scss b/src/forge/Source/Index.scss
index 20f55c27a..c3ea90cf9 100644
--- a/src/forge/Source/Index.scss
+++ b/src/forge/Source/Index.scss
@@ -73,4 +73,26 @@
}
}
}
+}
+.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/UploadSource.jsx b/src/forge/Source/UploadSource.jsx
index a8ccfdc3a..72baa1951 100644
--- a/src/forge/Source/UploadSource.jsx
+++ b/src/forge/Source/UploadSource.jsx
@@ -1,8 +1,58 @@
-import React from 'react';
-import { Modal } from 'antd';
+import React , { forwardRef, useEffect, useState } from 'react';
+import { Modal , Form , Checkbox , Input , Table } from 'antd';
+import Upload from '../Upload/Index';
+import { AlignCenter } from '../Component/layout';
+const { TextArea } = Input;
-function UploadSource({ visible , onCancel , onOk }){
+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"}
+]
+function UploadSource({ form , visible , onCancel , onOk , showNotification}){
+ const [ tableData , setTableData ] = useState(data);
+ const { getFieldDecorator, validateFields , setFieldsValue } = form;
+
+ function UploadFunc(){
+
+ }
+
+ const columns = [
+ {
+ dataIndex:"name",
+ key:"name",
+ title:"资源名称",
+ width:"45%",
+ ellipsis:true,
+ render:(value,item,key)=>{
+ return
+
+ }
+ },
+ {
+ dataIndex:"loadNum",
+ key:"loadNum",
+ title:"下载数",
+ width:"15%",
+ className:"edu-txt-center"
+ },
+ {
+ dataIndex:"citeNum",
+ key:"citeNum",
+ title:"引用数",
+ width:"15%",
+ className:"edu-txt-center"
+ },
+ {
+ dataIndex:"time",
+ key:"time",
+ title:"上传时间",
+ width:"25%"
+ }
+ ]
return(
-
+
资源描述资源描述资源描述资源描述资源描述资源描述资源描述
- 软件版本
+ 软件版本
{value}
+ { key === 0 && 当前版本 }
+
+