}
- placeholder="请输入分支或标签名称搜索"
+ placeholder={`请输入分支${tagflag ? "或标签" :""}名称搜索`}
autocomplete="off" className="OptionsInput"
value={inputValue}
onChange={changeInputValue}
diff --git a/src/forge/Main/CoderRootBranch.js b/src/forge/Main/CoderRootBranch.js
deleted file mode 100644
index 4982414a2..000000000
--- a/src/forge/Main/CoderRootBranch.js
+++ /dev/null
@@ -1,92 +0,0 @@
-import React , { useState, useEffect } from 'react';
-import { Link } from "react-router-dom";
-import { Dropdown , Menu , Icon , Tooltip , Spin } from 'antd';
-import { truncateCommitId } from '../common/util';
-import { getBranch } from '../GetData/getData';
-import Nodata from '../Nodata';
-import './list.scss';
-
-function turnbar(str){
- if(str && str.length>0 && str.indexOf("/")>-1){
- return str.replaceAll('/','%2F');
- }
- return str;
-}
-export default ((props)=>{
- const [ data , setData ] =useState(undefined);
- const [ isSpin , setIsSpin ] =useState(true);
-
- const { projectsId , owner } = props.match.params;
- const { isManager , isDeveloper , projectDetail } = props;
- useEffect(()=>{
- getBranchs(projectsId, owner);
- },[projectsId])
-
- async function getBranchs(id,owner){
- let result = await getBranch(id,owner);
- setData(result);
- setIsSpin(false);
- }
-
- const list =()=>{
- if(data && data.length>0){
- return(
-
-
- )
- }else if(data && data.length === 0){
- return (
-
- )
-})
-
-
-
diff --git a/src/forge/Main/CoderRootIndex.js b/src/forge/Main/CoderRootIndex.js
index 0fb30c4e1..b5d241968 100644
--- a/src/forge/Main/CoderRootIndex.js
+++ b/src/forge/Main/CoderRootIndex.js
@@ -1,9 +1,10 @@
import React , { Component } from 'react';
import { Route , Switch } from 'react-router-dom';
-import Top from './DetailTop';
+// import Top from './DetailTop';
import Loadable from 'react-loadable';
import Loading from '../../Loading';
import axios from 'axios';
+import './Index.scss';
const FileNew = Loadable({
loader: () => import('../Newfile/Index'),
@@ -18,25 +19,25 @@ const CoderRootCommit = Loadable({
loading: Loading,
})
const CoderRootBranch = Loadable({
- loader: () => import('./CoderRootBranch'),
+ loader: () => import('./tree/Index'),
loading: Loading,
})
const CoderRootTag = Loadable({
- loader: () => import('./CoderRootTag'),
+ loader: () => import('./tag/Index'),
loading: Loading,
})
const CoderRootVersion = Loadable({
- loader: () => import('../Version/version'),
- loading: Loading,
-})
-const CoderRootVersionNew = Loadable({
- loader: () => import('../Version/New'),
- loading: Loading,
-})
-const CoderRootVersionUpdate = Loadable({
- loader: () => import('../Version/New'),
+ loader: () => import('./version/Index'),
loading: Loading,
})
+// const CoderRootVersionNew = Loadable({
+// loader: () => import('./version/New'),
+// loading: Loading,
+// })
+// const CoderRootVersionUpdate = Loadable({
+// loader: () => import('./version/New'),
+// loading: Loading,
+// })
const Diff = Loadable({
loader: () => import('./Diff'),
loading: Loading,
@@ -83,8 +84,8 @@ class CoderRootIndex extends Component{
}
render(){
return(
-
-
- {
- data.map((item,key)=>{
- return(
-
-
- - {item.name} -- - { - (isManager || isDeveloper) && (projectDetail && projectDetail.type!==2) && - 创建合并请求 - } -
- {item.last_commit && truncateCommitId(item.last_commit.sha)} - {item.last_commit && item.last_commit.message} - 最后更新于{item.last_commit && item.last_commit.time_from_now} -
-- - - -
-
-
-
-
-
- 分支列表
-{list()}
-
-
+ {/*
{/* 新建文件 */}
(
- (
+ > */}
(
+ 
+ {truncateCommitId(item.id)}
+
+ )
+ }
+ },
+ {
+ title:"描述信息",
+ dataIndex:"message",
+ key:4,
+ ellipsis:true,
+ render:(txt,item)=>{
+ return item.message || "--"
+ }
+ },
+ {
+ title:"下载",
+ dataIndex:"stage_type",
+ key:5,
+ ellipsis:true,
+ align:"center",
+ width:"181px",
+ render:(txt,item)=>{
+ return (
+
+
+ )
+}
+export default Index;
\ No newline at end of file
diff --git a/src/forge/Main/tree/Index.scss b/src/forge/Main/tree/Index.scss
new file mode 100644
index 000000000..964fee19e
--- /dev/null
+++ b/src/forge/Main/tree/Index.scss
@@ -0,0 +1,81 @@
+.branchSort{
+ font-weight: 500;
+ color: #333333;
+ font-size: 15px;
+ height: 20px;
+ line-height: 20px;
+ padding-left: 10px;
+ margin-top: 20px;
+ margin-bottom: 6px!important;
+}
+.treeUl{
+ background: #FAFCFF;
+ border-radius: 4px;
+ border: 1px solid rgba(42, 97, 255, 0.23);
+ li{
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 12px 20px;
+ border-bottom: 1px solid rgba(42, 97, 255, 0.23);
+ &:last-child{
+ border-bottom: none;
+ }
+ .treeinfo{
+ max-width: 399px;
+ flex:1;
+ flex-direction: column;
+ a:hover{
+ text-decoration: underline;
+ }
+ img{
+ height: 20px;
+ width: 20px;
+ margin-right: 5px;
+ }
+ }
+ .treecopy{
+ flex:1;
+ display: flex;
+ justify-content: center;
+ &>div{
+ height: 32px;
+ background: #FAFBFC;
+ border-radius: 4px;
+ border: 1px solid #D0D0D0;
+ position: relative;
+ z-index: 1;
+ display: flex;
+ align-items: center;
+ &>span{
+ padding:0px 15px;
+ border-right: 1px solid rgba(153, 153, 153, 0.4);
+ height: 100%;
+ img{
+ margin-right: 4px;
+ }
+ a{
+ color: #466AFF;
+ &:hover{
+ text-decoration: underline;
+ }
+ }
+ }
+ &>i{
+ margin:0px 12px;
+ color: #333!important;
+ }
+ input{
+ position: absolute;
+ z-index: 0;
+ opacity: 0;
+ top: 32px;
+ }
+ }
+ }
+ .treeabout{
+ flex:1;
+ text-align: right;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/forge/Main/version/Empty.jsx b/src/forge/Main/version/Empty.jsx
new file mode 100644
index 000000000..5dac793ec
--- /dev/null
+++ b/src/forge/Main/version/Empty.jsx
@@ -0,0 +1,22 @@
+import { Button } from 'antd';
+import React from 'react';
+import './version.scss';
+
+function Empty({operation,addFunc}) {
+ return(
+
+ {
+ data && data.user_permission && type !== 2 &&
+
+ )
+ } else if (releases && releases.length === 0) {
+ return (
+
{icon ||
)
}
diff --git a/src/forge/Upload/untitled b/src/forge/Upload/untitled
deleted file mode 100644
index 2796e4d71..000000000
--- a/src/forge/Upload/untitled
+++ /dev/null
@@ -1,21 +0,0 @@
-
-1.请求URL： https://code.ihub.org.cn/api/v1/mirrors/create.json
-
-2.请求方式： POST
-
-3.参数：
-
-{
- "image_url": "xxx.git", #必填，且后缀必为.git,
- "language": "Ruby", #必填，如数据库不存在，则会创建新的记录
-}
-
-
-4. 返回值： {
- "status": 1,
- "message": "同步成功，项目ID===1806"
-}
-
-5. 返回值说明： 仅有当有返回值，且返回值的status 的值为1， 才是创建成功，其余均为创建失败
-
-
diff --git a/src/forge/Version/New.jsx b/src/forge/Version/New.jsx
deleted file mode 100644
index 0678a3457..000000000
--- a/src/forge/Version/New.jsx
+++ /dev/null
@@ -1,278 +0,0 @@
-import React, { useState, useEffect, useCallback, forwardRef } from "react";
-import styled from "styled-components";
-import { AutoComplete, Select, Input, Checkbox, Button, Form } from "antd";
-
-import Editor from "../../modules/tpm/challengesnew/tpm-md-editor";
-import Upload from "../Upload/Index";
-import Attachments from "../Upload/attachment";
-import axios from "axios";
-import "./version.css";
-import UploadImg from "../Images/upload.png";
-import { getBranch } from '../GetData/getData';
-
-const { Option } = AutoComplete;
-
-export default Form.create()(
- forwardRef(
- (
- { form, projectDetail , match, showNotification, history },
- ref
- ) => {
- const { getFieldDecorator, validateFields, setFieldsValue } = form;
- const [tagList, setTagList] = useState(undefined);
- const [branchList, setBranchList] = useState(undefined);
- const [desc, setDesc] = useState(null);
- const [fileList, setFileList] = useState(undefined);
- const [attachment, setAttachment] = useState(undefined);
- const [options , setOptions] = useState(undefined);
-
-
- const repo_id = projectDetail && projectDetail.repo_id;
- const { projectsId, versionId , owner } = match.params;
- useEffect(()=>{
- getBranchs(projectsId,owner);
- },[projectsId])
-
- async function getBranchs(id,owner){
- let result = await getBranch(id,owner);
- setBranchList(result);
- }
-
- const Span = styled.span`
- margin: 0px 15px;
- color: #bbb;
- line-height: 35px;
- `;
-
-
- useEffect(() => {
- if (versionId) {
- const url = `/${owner}/${projectsId}/releases/${versionId}/edit.json`;
- axios.get(url).then(result => {
- if (result) {
- setFieldsValue(result.data);
- setDesc(result.data.body);
- setAttachment(result.data.attachments);
- }
- });
- }
- }, [versionId]);
-
- useEffect(() => {
- if (projectsId) {
- const url = `/${owner}/${projectsId}/tags.json`;
- axios
- .get(url,{params:{
- limit:1000
- }})
- .then(result => {
- if (result) {
- setTagList(result.data);
- setOptions(renderTagList(result.data));
- }
- })
- .catch(error => {
- console.log(error);
- });
- }
- }, [projectsId]);
-
- function renderTagList(list) {
- if (list) {
- let array = list.map((item, key) => {
- return (
-
- );
- });
- return array || undefined;
- }
- }
- function submit() {
- validateFields((err, value) => {
- if(err)return;
- if (versionId) {
- let url = `/${owner}/${projectsId}/releases/${versionId}.json`;
- axios
- .put(url, {
- ...value,
- body: desc,
- attachment_ids: fileList
- })
- .then(result => {
- if (result) {
- showNotification("版本修改成功！");
- history.push(`/${owner}/${projectsId}/releases`);
- }
- });
- } else {
- let url = `/${owner}/${projectsId}/releases.json`;
- axios.post(url, {
- ...value,
- body: desc,
- attachment_ids: fileList
- })
- .then(result => {
- if (result) {
- showNotification("版本发布成功！");
- history.push(`/${owner}/${projectsId}/releases`);
- }
- });
- }
- });
- }
-
- const helper = useCallback(
- (label, name, rules, widget, isRequired = true) => (
-
- {label}
-
- {getFieldDecorator(name, { rules, validateFirst: true })(widget)}
-
-
- ),
- []
- );
- // 输入标签名
- function changeAuto(value){
- let l = tagList.filter(item=>item.name.indexOf(value) > -1);
- setOptions(renderTagList(l));
- }
- return (
-
-
-
-
-
- )
-})
\ No newline at end of file
diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss
index 1158c38e6..6e7ae731b 100644
--- a/src/forge/Main/Index.scss
+++ b/src/forge/Main/Index.scss
@@ -447,4 +447,8 @@
.ant-anchor-ink::before{
background-color: #fff;
}
+}
+.coderSubPage{
+ width: 1200px;
+ margin:0px auto;
}
\ No newline at end of file
diff --git a/src/forge/Main/img/tree.png b/src/forge/Main/img/tree.png
new file mode 100644
index 000000000..56247256c
Binary files /dev/null and b/src/forge/Main/img/tree.png differ
diff --git a/src/forge/Main/sub/SubMenu.jsx b/src/forge/Main/sub/SubMenu.jsx
new file mode 100644
index 000000000..78f37b4de
--- /dev/null
+++ b/src/forge/Main/sub/SubMenu.jsx
@@ -0,0 +1,13 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import'./sub.scss'
+
+function SubMenu({tab,owner,projectsId}) {
+ return(
+ -
+ 标签
+ 发行版
+
+
+ TAR
+
+
+ ZIP
+
+
+ )
+ }
+ }
+ ]
+ return(
+
+
+
+
+ )
+}
+export default Tags;
\ No newline at end of file
diff --git a/src/forge/Main/tag/Index.scss b/src/forge/Main/tag/Index.scss
new file mode 100644
index 000000000..3bd487db6
--- /dev/null
+++ b/src/forge/Main/tag/Index.scss
@@ -0,0 +1,31 @@
+.tagTable{
+ margin-top: 30px;
+ thead{
+ tr th{
+ background-color: #fff;
+ padding:5px 0px;
+ .ant-table-column-title{
+ font-size: 16px;
+ font-weight: 500;
+ color: #333333;
+ }
+ }
+ }
+ tbody{
+ tr{
+ &:hover td{
+ background-color: #fff!important;
+ }
+ td{
+ padding:0px;
+ height: 69px;
+ line-height: 69px;
+ }
+ &:last-child{
+ td{
+ border-bottom: none!important;
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/forge/Main/tree/Index.jsx b/src/forge/Main/tree/Index.jsx
new file mode 100644
index 000000000..3d532de5f
--- /dev/null
+++ b/src/forge/Main/tree/Index.jsx
@@ -0,0 +1,104 @@
+import React , { useEffect , useState } from 'react';
+import CopyTool from '../../Component/CopyTool';
+import { truncateCommitId } from '../../common/util';
+import { Link } from 'react-router-dom';
+import { getImageUrl } from 'educoder';
+import { Dropdown , Menu , Spin } from 'antd';
+import './Index.scss';
+
+import Tree from '../img/tree.png';
+import Axios from 'axios';
+
+function turnbar(str){
+ if(str && str.length>0 && str.indexOf("/")>-1){
+ return str.replaceAll('/','%2F');
+ }
+ return str;
+}
+function Index(props) {
+ const [ list , setList ] = useState([]);
+ const [ isSpin , setIsSpin ] = useState(true);
+
+ const { projectsId , owner } = props.match.params;
+ const { isManager , isDeveloper , projectDetail } = props;
+
+ useEffect(()=>{
+ getList();
+ },[])
+
+
+ const menu =(zip_url,tar_url)=> (
+
+ )
+
+ function getList() {
+ const url = `/${owner}/${projectsId}/branches_slice.json`;
+ Axios.get(url).then(result=>{
+ if(result){
+ setList(result.data);
+ }
+ setIsSpin(false);
+ }).catch(error=>{setIsSpin(false);})
+ }
+
+ return(
+
+ {
+ list && list.length>0 && list.map((item,key)=>{
+ return(
+
+
+ )
+ })
+ }
+
+ {item.branch_type === "default" ? "默认分支" : item.branch_type==="protected"?"保护分支":"其它分支"}
+ { + item.list && item.list.length>0 && +-
+ {
+ item.list.map((i,k)=>{
+ let last_commit = i.last_commit;
+ return(
+
-
+ + {i.name} ++++
+ {last_commit && last_commit.committer && last_commit.committer.name} + 更新于{last_commit && last_commit.time_from_now} +
+++ +++ + { + (isManager || isDeveloper) && (projectDetail && projectDetail.type!==2) && + + 合并请求 + } +++ 下载 + +
+ )
+ })
+ }
+
+
+ 这里暂未发布过任何版本
+ 发行版功能基于仓库中的历史标记
建议使用类似 V1.0 的版本标记作为发布点 +
+ )
+}
+export default Empty;
\ No newline at end of file
diff --git a/src/forge/Main/version/Index.jsx b/src/forge/Main/version/Index.jsx
new file mode 100644
index 000000000..37cc8c128
--- /dev/null
+++ b/src/forge/Main/version/Index.jsx
@@ -0,0 +1,41 @@
+import React from 'react';
+import { Switch , Route } from 'react-router';
+import Loadable from 'react-loadable';
+import Loading from '../../../Loading';
+import SubMenu from '../sub/SubMenu';
+import "./version.scss";
+
+const CoderRootVersion = Loadable({
+ loader: () => import('./version'),
+ loading: Loading,
+})
+const CoderRootVersionNew = Loadable({
+ loader: () => import('./New'),
+ loading: Loading,
+})
+function Index(props) {
+ const { projectsId , owner } = props.match.params;
+ return(
+ 建议使用类似 V1.0 的版本标记作为发布点 +
+ {
+ operation ?
+
+ :
+ 该项目暂时没有发布版本
+ }
+
+
+
+
+ (
+ (
+ (
+
+
+ )
+}
+export default Index;
\ No newline at end of file
diff --git a/src/forge/Main/version/New.jsx b/src/forge/Main/version/New.jsx
new file mode 100644
index 000000000..6b1dc2489
--- /dev/null
+++ b/src/forge/Main/version/New.jsx
@@ -0,0 +1,253 @@
+import React, { useState, useEffect, forwardRef } from "react";
+import styled from "styled-components";
+import { AutoComplete , Input, Checkbox, Button, Form } from "antd";
+import SelectBranch from '../../Branch/Select';
+
+import Editor from "../../../modules/tpm/challengesnew/tpm-md-editor";
+import Upload from "../../Upload/Index";
+import Attachments from "../../Upload/attachment";
+import axios from "axios";
+import "./version.scss";
+
+const { Option } = AutoComplete;
+
+const Span = styled.span`
+ margin: 0px 15px;
+ color: #bbb;
+ line-height: 35px;
+ font-size:16px;
+ font-weight:400;
+ color:#666;
+`;
+export default Form.create()(
+ forwardRef(
+ (
+ { form, projectDetail , match, showNotification, history },
+ ref
+ ) => {
+ const { getFieldDecorator, validateFields, setFieldsValue } = form;
+ const [tagList, setTagList] = useState(undefined);
+ const [desc, setDesc] = useState(null);
+ const [branch, setBranch ] = useState(null);
+ const [fileList, setFileList] = useState(undefined);
+ const [attachment, setAttachment] = useState(undefined);
+ const [options , setOptions] = useState(undefined);
+
+ const { projectsId, versionId , owner } = match.params;
+
+ useEffect(()=>{
+ if(projectDetail && projectDetail.default_branch){
+ setBranch(projectDetail.default_branch);
+ }
+ },[projectDetail])
+
+
+ useEffect(() => {
+ if (versionId) {
+ const url = `/${owner}/${projectsId}/releases/${versionId}/edit.json`;
+ axios.get(url).then(result => {
+ if (result) {
+ setFieldsValue(result.data);
+ setDesc(result.data.body);
+ setAttachment(result.data.attachments);
+ }
+ });
+ }
+ }, [versionId]);
+
+ useEffect(() => {
+ if (projectsId) {
+ const url = `/${owner}/${projectsId}/tags.json`;
+ axios
+ .get(url,{params:{
+ limit:1000
+ }})
+ .then(result => {
+ if (result) {
+ setTagList(result.data);
+ setOptions(renderTagList(result.data));
+ }
+ })
+ .catch(error => {
+ console.log(error);
+ });
+ }
+ }, [projectsId]);
+
+ function renderTagList(list) {
+ if (list) {
+ let array = list.map((item, key) => {
+ return (
+
+ );
+ });
+ return array || undefined;
+ }
+ }
+ function submit() {
+ validateFields((err, value) => {
+ if(err)return;
+ if (versionId) {
+ let url = `/${owner}/${projectsId}/releases/${versionId}.json`;
+ axios
+ .put(url, {
+ ...value,
+ body: desc,
+ attachment_ids: fileList,
+ target_commitish:branch
+ })
+ .then(result => {
+ if (result) {
+ showNotification("版本修改成功！");
+ history.push(`/${owner}/${projectsId}/releases`);
+ }
+ });
+ } else {
+ let url = `/${owner}/${projectsId}/releases.json`;
+ axios.post(url, {
+ ...value,
+ body: desc,
+ attachment_ids: fileList
+ })
+ .then(result => {
+ if (result) {
+ showNotification("版本发布成功！");
+ history.push(`/${owner}/${projectsId}/releases`);
+ }
+ });
+ }
+ });
+ }
+ // 输入标签名
+ function changeAuto(value){
+ let l = tagList.filter(item=>item.name.indexOf(value) > -1);
+ setOptions(renderTagList(l));
+ }
+
+ function changeBranch(params) {
+ setBranch(params);
+ }
+ return (
+
+
+
+ );
+ }
+ )
+);
diff --git a/src/forge/Main/version/version.js b/src/forge/Main/version/version.js
new file mode 100644
index 000000000..9feec8894
--- /dev/null
+++ b/src/forge/Main/version/version.js
@@ -0,0 +1,122 @@
+import React, { useEffect , useState } from "react";
+import { Link } from 'react-router-dom';
+import { Spin , Button } from 'antd';
+import { getImageUrl } from 'educoder';
+import Empty from './Empty';
+import './version.scss';
+import axios from 'axios';
+import RenderHtml from '../../../components/render-html';
+
+function version(props) {
+ const [ data , setData ] = useState(undefined);
+ const [ releases , setReleases ] = useState(undefined);
+ const [ isSpin , setIsSpin ] = useState(true);
+ const { projectsId ,owner } = props.match.params;
+ const { isManager , isDeveloper } = props;
+ const type = props.projectDetail && props.projectDetail.type;
+
+ useEffect(()=>{
+ getIssueList();
+ },[])
+ // 获取列表数据
+ function getIssueList(){
+ const url = `/${owner}/${projectsId}/releases.json`;
+ axios.get(url).then((result) => {
+ if (result) {
+ setData(result.data);
+ setReleases(result.data.releases);
+ setIsSpin(false);
+ }
+ }).catch((error) => {
+ console.log(error);
+ })
+ }
+
+ // 显示版本描述
+ function showBody(key,flag){
+ var lists = releases.concat();
+ lists[key].bodyshow = !flag ? true : false;
+ lists.splice();
+ setReleases(lists);
+ }
+
+ function renderList(releases){
+ if (releases && releases.length > 0) {
+ return (
+
+
+
+
+ 标签命名建议
++ 通常的做法是在版本名称前加上字母 v 前缀， v1.0 或者 v2.3.4。 +
++ 如果标签不适合在生产环境下使用，请在版本名称后添加预发行版本。例如：v0.2-alpha + 或者 v5.9-beta.3。 +
+
+
+ 语义化版本
++ 如果你是第一次发布版本，我们强烈建议你阅读语义化版本。 +
+
+
+ 附件大小说明
++ 单个附件不能超过 100M（GVP 项目200M），每个仓库总附件不可超过 + 1G（推荐项目不可超过 5G；GVP 项目不可超过 + 20G）。附件总容量统计包括仓库附件和发行版附件。 +
+
+
+
+ }
+
+ {
+ releases.map((item, key) => {
+ return (
+
+
+
+ {item.draft}
+
+
+ {item.tag_name}{item.draft === "预发行" ?"(standalone)":""}
+
+
+
+ )
+ })
+ }
+
+ })
+ {item.user_name}
+ 发布于{item.created_at}
+
+ {
+ item.bodyshow &&
+
+
+ 发布{item.name}{item.draft === "预发行" ?"(standalone)版本":""}
+ {
+ (isManager || isDeveloper) && type !==2 &&
+
+ }
+
+
+ showBody(key,item.bodyshow)}>
+
+
+
+ }
+
+
+ )
+}
+export default version;
\ No newline at end of file
diff --git a/src/forge/Main/version/version.scss b/src/forge/Main/version/version.scss
new file mode 100644
index 000000000..6f04e060d
--- /dev/null
+++ b/src/forge/Main/version/version.scss
@@ -0,0 +1,338 @@
+.topWrapper {
+ padding: 20px 0;
+ box-sizing: border-box;
+ display: flex;
+ justify-content: space-between;
+ border-bottom: 1px solid #EEEEEE;
+ align-items: center;
+}
+.topWrapper_btn_new {
+ background: #fff;
+ color: #5091FF!important;
+ padding:0px 12px;
+ text-align: center;
+ height: 32px;
+ line-height: 32px;
+ border-radius: 4px;
+ border:1px solid #5091FF;
+}
+.versionInfo{
+ display: flex;
+ width: 100%;
+}
+.versionInfo_left{
+ display: flex;
+ width: 182px;
+ flex-direction: column;
+ align-items: flex-end;
+ padding-right: 15px;
+}
+.versionInfo_right{
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+ align-items: flex-start;
+ border-left: 1px solid #eee;
+ position: relative;
+ padding: 0px 30px 60px 24px;
+ &::before{
+ position: absolute;
+ left: -4px;
+ top:0px;
+ content: '';
+ width: 8px;
+ height: 8px;
+ background-color: #5091FF;
+ border-radius: 50%;
+ }
+ .sendAuthorImg{
+ width: 20px;
+ height: 20px;
+ border-radius: 50%;
+ margin-right: 5px;
+ }
+}
+.versionTag{
+ display: inline;
+ padding:0px 9px;
+ color: #fff;
+ position: relative;
+ margin-top: -8px;
+ height: 22px;
+ line-height: 20px;
+ border-radius: 4px;
+ &::before{
+ position: absolute;
+ content: "";
+ width: 0;
+ height: 0px;
+ border-left: 4px solid #cccccc;
+ border-top: 4px solid transparent;
+ border-bottom: 4px solid transparent;
+ border-right: 4px solid transparent;
+ z-index: 9;
+ top: 6px;
+ right: -9px;
+ }
+ &:after{
+ width: 0px;
+ height: 0px;
+ top:6px;
+ right: -7px;
+ position: absolute;
+ border-left:4px solid #fff;
+ border-top:4px solid transparent;
+ border-bottom:4px solid transparent;
+ border-right:4px solid transparent;
+ content:'';
+ z-index:10;
+ }
+}
+.versionFile{
+ margin-top: 5px;
+ padding-top: 20px;
+ border-top: 1px solid #eee;
+ width: 100%;
+ a{
+ display: block;
+ color: #333;
+ font-weight: 400;
+ height: 20px;
+ margin-bottom: 10px;
+ }
+}
+.versionTag.yellow{
+ border: 1px solid #FBBC06;
+ color: #FBBC06;
+ &::before{
+ border-left-color: #FBBC06;
+ }
+}
+.versionTag.green{
+ border: 1px solid #2DB44D;
+ color: #2DB44D;
+ &::before{
+ border-left-color: #2DB44D;
+ }
+}
+.versionTag.orange{
+ border: 1px solid #FF6E23;
+ color: #FF6E23;
+ &::before{
+ border-left-color: #FF6E23;
+ }
+}
+.addReleaseBtn{
+ text-align: right;
+ margin-bottom: 30px;
+}
+.versionName{
+ font-size: 16px;
+ color: #333;
+ margin-bottom: 15px;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ width: 100%;
+ height: 18px;
+ line-height: 18px;
+ margin-top: -5px;
+}
+
+
+.versionmilepostleft{
+ padding: 15px;
+ margin-right: 50px;
+ width: 80%;
+ }
+.topWrapper_btn_close {
+ background: #504b4b;
+ color: #FFFFFF!important;
+ padding:0px 12px;
+ text-align: center;
+ height: 32px;
+ line-height: 32px;
+ border-radius: 4px;
+ }
+
+ .topWrapper_btn_delete {
+ background: #da1010;
+ color: #FFFFFF!important;
+ padding:0px 12px;
+ text-align: center;
+ height: 32px;
+ line-height: 32px;
+ border-radius: 4px;
+ }
+
+ .versionrighe{
+ flex: 2;
+ }
+ .versionleft{
+ flex: 1;
+ text-align: right;
+ display: flex;
+ justify-content: right;
+ }
+
+ /* .version_line{
+ display: flex;
+ height: 30px;
+ margin: auto;
+ border-left:1px solid #eee;
+ } */
+ .version_line_one{
+ display: flex;
+ height: 45px;
+ margin: auto;
+ border-left:1px solid #eee;
+ }
+
+ .version_line_tpw{
+ display: flex;
+ height: 80px;
+ margin: auto;
+ border-left:1px solid #eee;
+ }
+
+ .versiondiv{
+ display: flex;
+ }
+ .verwinth{
+ width: 80%;
+ }
+
+ /*开启中 关闭中*/
+.opendversionetail{
+ display: inline-block;
+ background: #21ba45;
+ color: #ffffff!important;
+ padding:0px 5px;
+ text-align: center;
+ height: 25px;
+ /*width: 110px;*/
+ border-radius: 4px;
+ line-height: 25px;
+}
+.closedversionetail{
+ display: inline-block;
+ background: #e60b0b;
+ color: #ffffff!important;
+ padding:0px 5px;
+ text-align: center;
+ height: 25px;
+ /*width: 110px;*/
+ border-radius: 4px;
+ line-height: 25px;
+}
+.versionrectangle {
+ width: 8px;
+ height: 8px;
+ border-radius: 100%;
+ margin-top: 15px;
+ margin-left: -4px;
+ margin-bottom: 10px;
+ background: rgb(83, 81, 81);
+ }
+.ver-middle{
+ vertical-align: middle;
+}
+/* new */
+.versionForm{
+ flex:1;
+ padding-right: 40px;
+ box-sizing: border-box;
+}
+.versionTips{
+ width:268px;
+ box-sizing: border-box;
+}
+.infosTip{
+ border-bottom: 1px solid #EEEEEE;
+ color: #333;
+ padding-bottom: 26px;
+ margin-bottom: 26px;
+ font-weight: 400;
+ text-align: justify;
+ &:last-child{
+ border-bottom: none;
+ }
+}
+.dragBox{
+ background: rgba(153, 153, 153, 0.04);
+ border-radius: 4px;
+ border: 1px dashed #d9d9d9;
+ padding:20px;
+ .versionStyle{
+ border: none!important;
+ padding-bottom:20px;
+ .dragIcon{
+ font-size: 40px!important;
+ color: #666!important;
+ line-height: 40px;
+ height: 40px;
+ margin-bottom: 14px;
+ display: block;
+ }
+ }
+ .ant-upload-list-item:hover .ant-upload-list-item-info {
+ background-color: rgba(239, 244, 255, 1);
+ }
+ .ant-upload-list-item-info{
+ padding:0px 20px 0px 8px;
+ &>span{
+ display: flex;
+ align-items: center;
+ }
+ }
+}
+
+.set-ant-row .ant-row{
+ display: flex;
+ height: 20px;
+ align-items: center;
+}
+.itemInline{
+ display: flex;
+ align-items: flex-start;
+ position: relative;
+ &>p{
+ position: absolute;
+ bottom: 0px;
+ }
+}
+.itemInline .ant-row{
+ margin-bottom: 0px;
+}
+.prerelease{
+ padding-top: 20px;
+ .ant-form-item-control{
+ height: 20px;
+ line-height: 20px;
+ }
+}
+.releaseIndex{
+ margin: 30px auto;
+ width: 1200px;
+}
+.emptyPanel{
+ width: 100%;
+ background: #FAFCFF;
+ border-radius: 4px;
+ border: 1px solid rgba(42, 97, 255, 0.23);
+ min-height: 418px;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ .operation{
+ width: 400px;
+ border-top: 1px solid #eee;
+ padding-top: 34px;
+ text-align: center;
+ margin-top: 30px;
+ }
+}
+.ant-form-item-control{
+ line-height: initial;
+}
\ No newline at end of file
diff --git a/src/forge/Newfile/index.css b/src/forge/Newfile/index.css
index 242fd4516..feb82b97a 100644
--- a/src/forge/Newfile/index.css
+++ b/src/forge/Newfile/index.css
@@ -39,7 +39,7 @@
z-index: 1;
}
.ant-input-group .ant-input:focus{
- border-right: 1px solid #d9d9d9!important;
+ border-right: 1px solid rgba(70, 106, 255, 1)!important;
}
.ant-btn-primary.grey{
border:1px solid #BBBBBB;
diff --git a/src/forge/Upload/Index.js b/src/forge/Upload/Index.js
index 5b09ca071..1858e5fd1 100644
--- a/src/forge/Upload/Index.js
+++ b/src/forge/Upload/Index.js
@@ -1,7 +1,6 @@
import React, { Component } from "react";
import { Upload, Icon , Button } from 'antd';
import { getUploadActionUrl, appendFileSizeToUploadFileAll } from 'educoder';
-import { AlignCenter } from '../Component/layout';
import axios from 'axios';
const { Dragger } = Upload;
@@ -64,7 +63,6 @@ class Index extends Component {
changeIsComplete && changeIsComplete(true);
if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
let fileList = info.fileList;
-
this.setState({ fileList: appendFileSizeToUploadFileAll(fileList) });
this.fileIdList(fileList);
}
@@ -111,7 +109,7 @@ class Index extends Component {
:
+
+ {renderList(releases)}
+
+
+ 拖动文件或点击此处上传
+拖动文件或点击此处上传
-
-
- );
- }
- )
-);
diff --git a/src/forge/Version/version.css b/src/forge/Version/version.css
deleted file mode 100644
index ddfbe7d64..000000000
--- a/src/forge/Version/version.css
+++ /dev/null
@@ -1,205 +0,0 @@
-.topWrapper {
- padding: 20px 0;
- box-sizing: border-box;
- display: flex;
- justify-content: space-between;
- border-bottom: 1px solid #EEEEEE;
- align-items: center;
-}
-.topWrapper_btn_new {
- background: #fff;
- color: #5091FF!important;
- padding:0px 12px;
- text-align: center;
- height: 32px;
- line-height: 32px;
- border-radius: 4px;
- border:1px solid #5091FF;
-}
-.versionInfo{
- display: flex;
- width: 100%;
-}
-.versionInfo_left{
- display: flex;
- width: 30%;
- padding-top: 20px;
- flex-direction: column;
- align-items: flex-end;
- padding-right: 15px;
-}
-.versionInfo_right{
- flex: 1;
- padding: 20px 0px 20px 15px;
- display: flex;
- flex-direction: column;
- align-items: flex-start;
- border-left: 1px solid #eee;
-}
-.versionTag{
- display: inline;
- border-radius: 2px;
- padding:2px 12px;
- font-size: 12px;
- color: #fff;
-}
-.versionTag.yellow{
- background-color: #FBBC06;
-}
-.versionTag.green{
- background-color: #20BA45;
-}
-.versionTag.orange{
- background-color: #F2711D;
-}
-.versionName{
- font-size: 16px;
- color: #333;
- margin-bottom: 10px;
- display: flex;
- align-items: flex-end;
- position: relative;
-}
-.versionName::before{
- position: absolute;
- left: -19px;
- top:8px;
- content: '';
- width: 8px;
- height: 8px;
- background-color: #5091FF;
- border-radius: 50%;
-}
-
-
-.versionmilepostleft{
- padding: 15px;
- margin-right: 50px;
- width: 80%;
- }
-.topWrapper_btn_close {
- background: #504b4b;
- color: #FFFFFF!important;
- padding:0px 12px;
- text-align: center;
- height: 32px;
- line-height: 32px;
- border-radius: 4px;
- }
-
- .topWrapper_btn_delete {
- background: #da1010;
- color: #FFFFFF!important;
- padding:0px 12px;
- text-align: center;
- height: 32px;
- line-height: 32px;
- border-radius: 4px;
- }
-
- .versionrighe{
- flex: 2;
- }
- .versionleft{
- flex: 1;
- text-align: right;
- display: flex;
- justify-content: right;
- }
-
- /* .version_line{
- display: flex;
- height: 30px;
- margin: auto;
- border-left:1px solid #eee;
- } */
- .version_line_one{
- display: flex;
- height: 45px;
- margin: auto;
- border-left:1px solid #eee;
- }
-
- .version_line_tpw{
- display: flex;
- height: 80px;
- margin: auto;
- border-left:1px solid #eee;
- }
-
- .versiondiv{
- display: flex;
- }
- .verwinth{
- width: 80%;
- }
-
- /*开启中 关闭中*/
-.opendversionetail{
- display: inline-block;
- background: #21ba45;
- color: #ffffff!important;
- padding:0px 5px;
- text-align: center;
- height: 25px;
- /*width: 110px;*/
- border-radius: 4px;
- line-height: 25px;
-}
-.closedversionetail{
- display: inline-block;
- background: #e60b0b;
- color: #ffffff!important;
- padding:0px 5px;
- text-align: center;
- height: 25px;
- /*width: 110px;*/
- border-radius: 4px;
- line-height: 25px;
-}
-.versionrectangle {
- width: 8px;
- height: 8px;
- border-radius: 100%;
- margin-top: 15px;
- margin-left: -4px;
- margin-bottom: 10px;
- background: rgb(83, 81, 81);
- }
-.ver-middle{
- vertical-align: middle;
-}
-/* new */
-.versionForm{
- flex:1;
- padding-right: 30px;
- box-sizing: border-box;
-}
-.versionTips{
- width:30%;
- padding-left: 15px;
- box-sizing: border-box;
-}
-.infosTip{
- padding:20px;
- background-color: #F1F8FF;
- margin-bottom: 22px;
- color: #333;
-}
-.versionStyle{
- height: 200px!important;
- border: 1px dashed rgba(80,145,255,1)!important;
-}
-.set-ant-row .ant-row{
- display: flex;
- height: 20px;
- align-items: center;
-}
-.itemInline{
- display: flex;
- align-item: center;
- margin-bottom: 5px;
-}
-.itemInline .ant-row{
- margin-bottom: 0px;
-}
\ No newline at end of file
diff --git a/src/forge/Version/version.js b/src/forge/Version/version.js
deleted file mode 100644
index 5049b31d9..000000000
--- a/src/forge/Version/version.js
+++ /dev/null
@@ -1,128 +0,0 @@
-import React, { Component } from "react";
-import { Link } from 'react-router-dom';
-import { Spin } from 'antd';
-import NoneData from '../Nodata';
-import './version.css';
-import axios from 'axios';
-import RenderHtml from '../../components/render-html';
-
-/**
- * issue_chosen:下拉的筛选列表,
- * data:列表接口返回的所有数据,
- * issues:列表数组,
- * isSpin:加载中,
- */
-class version extends Component {
- constructor(props) {
- super(props);
- this.state = {
- issue_chosen: undefined,
- data: undefined,
- releases:undefined,
- issues: undefined,
- isSpin: true,
- search: undefined,
- search_count: undefined,
- }
- }
-
- componentDidMount = () => {
- this.getIssueList();
- }
- // 获取列表数据
- getIssueList = () => {
- const { projectsId, owner } = this.props.match.params;
- const url = `/${owner}/${projectsId}/releases.json`;
- axios.get(url).then((result) => {
- if (result) {
- this.setState({
- data: result.data,
- releases:result.data.releases,
- issues: result.data.issues,
- isSpin: false
- })
- }
- }).catch((error) => {
- console.log(error);
- })
- }
-
- // 显示版本描述
- showBody=(key,flag)=>{
- let { releases } = this.state;
- releases[key].bodyshow = !flag;
- this.setState({
- releases
- })
- }
-
- renderList = (releases) => {
- const { projectsId , owner } = this.props.match.params;
- const { isManager , isDeveloper } = this.props;
- const type = this.props.projectDetail && this.props.projectDetail.type;
-
- if (releases && releases.length > 0) {
- return (
- releases.map((item, key) => {
- return (
-
-
-
-
- 标签命名建议
-- 通常的做法是在版本名称前加上字母 v 前缀， v1.0 或者 v2.3.4。 -
-- 如果标签不适合在生产环境下使用，请在版本名称后添加预发行版本。例如：v0.2-alpha - 或者 v5.9-beta.3。 -
-
-
- 语义化版本
-- 如果你是第一次发布版本，我们强烈建议你阅读语义化版本。 -
-
-
- 附件大小说明
-- 单个附件不能超过 100M（GVP 项目200M），每个仓库总附件不可超过 - 1G（推荐项目不可超过 5G；GVP 项目不可超过 - 20G）。附件总容量统计包括仓库附件和发行版附件。 -
-
-
- {item.draft}
- {item.created_at}
-
-
- {item.tag_name}
-
-
-
-
- )
- })
- )
- } else if (releases && releases.length === 0) {
- return (
-
- )
- }
-}
-export default version;
\ No newline at end of file
diff --git a/src/forge/css/index.scss b/src/forge/css/index.scss
index d9a5b071c..03bbbc42e 100644
--- a/src/forge/css/index.scss
+++ b/src/forge/css/index.scss
@@ -143,7 +143,7 @@ form.ant-form{
}
form{
.ant-row.ant-form-item{
- margin-bottom: 15px;
+ margin-bottom: 20px;
}
}
@media screen and (max-width: 1000px){
@@ -285,4 +285,29 @@ form{
border-bottom: none;
}
}
+}
+.btn-83{
+ width: 83px;
+ height: 32px;
+ line-height: 30px;
+ text-align: center;
+ background: #FAFBFC;
+ border: 1px solid #D0D0D0;
+ display: inline-block;
+ border-radius: 5px;
+ font-weight: 500;
+ color: #333333!important;
+ &:hover,&:active{
+ background: #F3F4F6;
+ color: #333333!important;
+ }
+}
+a.hover:hover{
+ text-decoration: underline;
+}
+button.ant-btn-primary.btnblue{
+ background-color:rgba(70, 106, 255, 1);
+ &:hover{
+ background-color:rgba(70, 106, 255, 0.85);
+ }
}
\ No newline at end of file
diff --git a/src/index.css b/src/index.css
index e58df61f0..4c75d804f 100644
--- a/src/index.css
+++ b/src/index.css
@@ -30,11 +30,11 @@
.ant-upload-list-item-info .anticon-loading,
.ant-upload-list-item-info .anticon-paper-clip {
- color: #29bd8b !important;
+ color: rgba(102, 102, 102, 1) !important;
}
.anticon anticon-paper-clip {
- color: #29bd8b !important;
+ color: rgba(102, 102, 102, 1) !important;
}
.MuiModal-root-15 {
diff --git a/src/modules/courses/css/Courses.css b/src/modules/courses/css/Courses.css
index 73d320ed7..cf5f1783e 100644
--- a/src/modules/courses/css/Courses.css
+++ b/src/modules/courses/css/Courses.css
@@ -938,7 +938,7 @@ body #root {
}
.ant-input:focus {
- border: 1px solid #d9d9d9 !important;
+ border: 1px solid rgba(70, 106, 255, 1) !important;
}
/* 公用的文字按钮：蓝、白、灰 */
@@ -1423,7 +1423,7 @@ samp {
}
.newcourses .ant-select-selection--single:hover {
- border: 1px solid #d9d9d9 !important;
+ border: 1px solid rgba(70, 106, 255, 1) !important;
}
.pd20 {
@@ -1528,9 +1528,6 @@ samp {
display: none;
}
-.exerciselist .ant-input {
- border: 1px solid #d9d9d9 !important;
-}
.exercisetime .ant-form-explain {
margin-left: 107px;
@@ -1689,18 +1686,12 @@ samp {
height: 40px;
}
-.ant-input-affix-wrapper:hover .ant-input:not(.ant-input-disabled) {
- border: 1px solid #d9d9d9 !important;
-}
.ant-input-affix-wrapper .ant-input-prefix,
.ant-input-affix-wrapper .ant-input-suffix {
background: #fafafa !important;
}
-.ant-input:hover {
- border: 1px solid #d9d9d9 !important;
-}
.ant-input:focus {
box-shadow: none !important;
diff --git a/src/modules/courses/publicNav/nav.css b/src/modules/courses/publicNav/nav.css
index b6d8c7aab..1d6edf785 100644
--- a/src/modules/courses/publicNav/nav.css
+++ b/src/modules/courses/publicNav/nav.css
@@ -11,9 +11,6 @@
.ant-input-affix-wrapper:hover .ant-input:not(.ant-input-disabled){
border:1px solid #d9d9d9!important;
}
-.ant-input:hover{
- border:1px solid #d9d9d9!important;
-}
.ant-input:focus{
box-shadow:none!important;
background-color: #fff!important;
diff --git a/src/modules/tpm/TPMIndex.css b/src/modules/tpm/TPMIndex.css
index 859ddcf96..bdd6d36a8 100644
--- a/src/modules/tpm/TPMIndex.css
+++ b/src/modules/tpm/TPMIndex.css
@@ -163,7 +163,6 @@ body>.-task-title {
outline: 0;
-webkit-box-shadow: 0 0 0 2px transparent;
box-shadow: 0 0 0 2px transparent;
- border: 1px solid #d9d9d9;
}
.HeaderSearch .ant-input-search .ant-input::-webkit-input-placeholder {
- 版本发布
- {
- data && data.user_permission && type !== 2 ?
- + 发布新版
- : ''
- }
-
-
-
- {this.renderList(releases)}