+
{
mirrorCheck &&
-
+
{
(projectsType === "deposit" || !projectsType) &&
{
projectsType && projectsType === "mirror" &&
diff --git a/src/forge/New/new.css b/src/forge/New/new.scss
similarity index 72%
rename from src/forge/New/new.css
rename to src/forge/New/new.scss
index fcb6fa8c..15aca70b 100644
--- a/src/forge/New/new.css
+++ b/src/forge/New/new.scss
@@ -12,7 +12,13 @@
border-bottom: 1px solid #f0f0f0
}
.newPanel_content{
- padding:1rem 2rem;
+ padding:2rem;
+}
+.newPanel_content form .ant-row.ant-form-item{
+ margin-bottom: 25px;
+}
+.newPanel_content .ant-form-item-label label{
+ font-size: 16px;
}
.newPanel_content .ant-form-item-control-wrapper{
flex: 1;
@@ -25,24 +31,35 @@
height: 35px;
line-height: 35px;
}
-
.newContent_inline{
display: flex;
flex-wrap: wrap;
justify-content: space-between;
align-items:flex-end
}
+.explainPos{
+ .ant-form-explain{
+ position: absolute;
+ }
+}
.newContent_inline > .ant-form-item:nth-child(2){
margin-left: 20px;
}
-.newPanel_content .privatePart .ant-form-item-label{
- margin-left: 0px;
+.privatePart{
+ margin-bottom: 0px!important;
+ .ant-form-item-label{
+ margin-left: 0px;
+ }
}
.newPanel_content .ant-form-item-label{
line-height: 25px;
height: 25px;
- margin-left: -0.8rem;
+}
+.plateAutoComplete{
+ .ant-input{
+ height: 34px!important;
+ }
}
@media screen and (max-width: 750px){
.newPanel_content{
diff --git a/src/forge/Newfile/index.css b/src/forge/Newfile/index.css
index 242fd451..feb82b97 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/Notice/UndoEvent.jsx b/src/forge/Notice/UndoEvent.jsx
index 18cb6d4a..17dcc321 100644
--- a/src/forge/Notice/UndoEvent.jsx
+++ b/src/forge/Notice/UndoEvent.jsx
@@ -61,7 +61,7 @@ function UndoEvent(props){
return(
-
+
{
list && list.length > 0 ?
diff --git a/src/forge/Order/Milepost.js b/src/forge/Order/Milepost.js
index 5f6efeeb..48fc286b 100644
--- a/src/forge/Order/Milepost.js
+++ b/src/forge/Order/Milepost.js
@@ -119,11 +119,12 @@ class Milepost extends Component {
}
ChangePage = (page) => {
+ document.body.scrollIntoView();
this.setState({
page
})
-
- this.getList(page);
+ const { status } = this.state;
+ this.getList( page , status );
}
// 排序
@@ -260,7 +261,7 @@ class Milepost extends Component {
{
data && data.versions_count > limit ?
: ""
}
diff --git a/src/forge/Settings/Setting.js b/src/forge/Settings/Setting.js
index c3150323..55c1efdd 100644
--- a/src/forge/Settings/Setting.js
+++ b/src/forge/Settings/Setting.js
@@ -16,7 +16,7 @@ const menu = [
{name:"合并请求",index:"pulls"},
{name:"Wiki",index:"wiki"},
{name:"工作流(beta版)",index:"devops"},
- // {name:"资源库",index:"resources"},
+ {name:"资源库",index:"resources"},
{name:"里程碑",index:"versions"},
{name:"动态",index:"activity"},
]
diff --git a/src/forge/Team/Group/GroupForm.jsx b/src/forge/Team/Group/GroupForm.jsx
index dad9b64b..94825905 100644
--- a/src/forge/Team/Group/GroupForm.jsx
+++ b/src/forge/Team/Group/GroupForm.jsx
@@ -34,13 +34,6 @@ export default Form.create()(
const { getFieldDecorator, validateFields, setFieldsValue } = form;
const { OIdentifier, groupId } = match.params;
- useEffect(()=>{
- setFieldsValue({
- authorize:"read",
- includes_all_project:0
- })
- },[])
-
useEffect(() => {
if (GroupDetail) {
setOnwers(GroupDetail.authorize === "owner");
diff --git a/src/forge/Team/List.jsx b/src/forge/Team/List.jsx
index 7e64c5de..ea23ab07 100644
--- a/src/forge/Team/List.jsx
+++ b/src/forge/Team/List.jsx
@@ -61,14 +61,14 @@ function List(props){
)
const menu_new=(
-
+
+ -
+ {props.history.push(`/projects/deposit/new/${OIdentifier}`)}}>新建项目
+
+ -
+ {props.history.push(`/projects/mirror/new/${OIdentifier}`)}}>导入项目
+
+
)
return(
@@ -81,7 +81,7 @@ function List(props){
{ organizeDetail && organizeDetail.can_create_project ?
-
+
+ 新建项目
:""}
diff --git a/src/forge/Team/RightBox.jsx b/src/forge/Team/RightBox.jsx
index 7616fd6c..5c85ae47 100644
--- a/src/forge/Team/RightBox.jsx
+++ b/src/forge/Team/RightBox.jsx
@@ -108,7 +108,7 @@ function RightBox({ OIdentifier , history , admin , showCompeleteDialog ,complet
{
(item.is_admin || item.is_member) ?
-
{item.name}
+
{item.nickname}
:
{item.name}
}
diff --git a/src/forge/Team/Setting/TeamSettingCommon.jsx b/src/forge/Team/Setting/TeamSettingCommon.jsx
index 5bab8f53..499a00c2 100644
--- a/src/forge/Team/Setting/TeamSettingCommon.jsx
+++ b/src/forge/Team/Setting/TeamSettingCommon.jsx
@@ -1,5 +1,5 @@
import React, { forwardRef , useCallback , useEffect, useState } from 'react';
-import { Form , Input , Radio ,Checkbox , Divider , Button } from 'antd';
+import { Form , Input , Radio ,Checkbox , Divider , Button , InputNumber } from 'antd';
import { WhiteBack , FlexAJ } from '../../Component/layout';
import Title from '../../Component/Title';
import styled from 'styled-components';
@@ -31,7 +31,8 @@ export default Form.create()(
useEffect(()=>{
if(organizeDetail){
setFieldsValue({
- ...organizeDetail
+ ...organizeDetail,
+ max_repo_creation:organizeDetail.max_repo_creation===-1 ? "":organizeDetail.max_repo_creation
})
setImage(organizeDetail.avatar_url);
setDescNum(organizeDetail.description ? organizeDetail.description.length : 0);
@@ -39,10 +40,10 @@ export default Form.create()(
},[organizeDetail])
const helper = useCallback(
- (label, name, rules, widget , isRequired , flag ) => (
+ (label, name, rules, widget , isRequired , flag , help ) => (
{label}
-
+
{getFieldDecorator(name, { rules, validateFirst: true , valuePropName:flag ? "checked":"value" })(widget)}
@@ -175,7 +176,8 @@ export default Form.create()(
'最大仓库数：',
"max_repo_creation",
[],
-
+
,false,false,
+ "当输入栏为空时，默认数量无限制"
)}
选择头像:
diff --git a/src/forge/Upload/Index.js b/src/forge/Upload/Index.js
index 5b09ca07..1858e5fd 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 {
:
{icon || }
- 拖动文件或点击此处上传
+ 拖动文件或点击此处上传
)
}
diff --git a/src/forge/Upload/untitled b/src/forge/Upload/untitled
deleted file mode 100644
index 2796e4d7..00000000
--- 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/UsersList/common_users.js b/src/forge/UsersList/common_users.js
index dac45f48..e8404b38 100644
--- a/src/forge/UsersList/common_users.js
+++ b/src/forge/UsersList/common_users.js
@@ -93,7 +93,13 @@ class CommonUsers extends Component {
{count === 0 ? (
) : (
-
+
)}
diff --git a/src/forge/Version/New.jsx b/src/forge/Version/New.jsx
deleted file mode 100644
index 0678a345..00000000
--- 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 (
-
-
-
-
-
标签命名建议
-
- 通常的做法是在版本名称前加上字母 v 前缀， v1.0 或者 v2.3.4。
-
-
- 如果标签不适合在生产环境下使用，请在版本名称后添加预发行版本。例如：v0.2-alpha
- 或者 v5.9-beta.3。
-
-
-
-
语义化版本
-
- 如果你是第一次发布版本，我们强烈建议你阅读语义化版本。
-
-
-
-
附件大小说明
-
- 单个附件不能超过 100M（GVP 项目200M），每个仓库总附件不可超过
- 1G（推荐项目不可超过 5G；GVP 项目不可超过
- 20G）。附件总容量统计包括仓库附件和发行版附件。
-
-
-
-
- );
- }
- )
-);
diff --git a/src/forge/Version/version.css b/src/forge/Version/version.css
deleted file mode 100644
index ddfbe7d6..00000000
--- 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 5049b31d..00000000
--- 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 (
-
-
- {item.draft}
- {item.created_at}
-
-
- {item.tag_name}
-
-
-
-
- {item.name}
- {
- (isManager || isDeveloper) && type !==2 &&
- （编辑）
- }
-
-
- this.showBody(key,item.bodyshow)}>
- {item.user_name}:发布了这个版本，并在发布后提交给{item.target_commitish}
-
- {
- item.bodyshow &&
- }
-
-
- TAR
- ZIP
-
-
-
- )
- })
- )
- } else if (releases && releases.length === 0) {
- return (
)
- }
- }
-
- render() {
- const { projectsId ,owner } = this.props.match.params;
- const { data , releases , isSpin } = this.state;
- const type = this.props.projectDetail && this.props.projectDetail.type;
- return (
-
-
- 版本发布
- {
- data && data.user_permission && type !== 2 ?
- + 发布新版
- : ''
- }
-
-
-
{this.renderList(releases)}
-
-
- )
- }
-}
-export default version;
\ No newline at end of file
diff --git a/src/forge/Wiki/Welcome/index.css b/src/forge/Wiki/Welcome/index.css
new file mode 100644
index 00000000..d146549c
--- /dev/null
+++ b/src/forge/Wiki/Welcome/index.css
@@ -0,0 +1,51 @@
+.welcome-main {
+ display: flex;
+ flex-flow: column nowrap;
+ justify-content: center;
+ align-items: center;
+ width: 1200px;
+ min-height: 400px;
+ padding: 20px;
+ margin: 20px auto;
+ background: #fafcff;
+ font-family: "PingFangSC-Medium";
+ border-radius: 4px;
+ border: 1px solid rgba(42, 97, 255, 0.23);
+}
+.welcome-main .icon-huanying_icon {
+ font-size: 48px !important;
+ font-weight: 700;
+}
+.welcome-main .welcome-title {
+ display: inline-flex;
+ align-items: center;
+ margin: 10px 0;
+ font-size: 26px;
+ color: #333333;
+ font-weight: 500;
+}
+.welcome-main .wiki-title {
+ display: inline-block;
+ max-width: 20em;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+.welcome-main .welcome-content {
+ font-size: 14px;
+ color: #333333;
+ font-weight: 400;
+}
+.welcome-main .wiki-line {
+ margin: 50px 0 40px;
+ width: 400px;
+ height: 1px;
+ background: #eeeeee;
+}
+.welcome-main .welcome-des {
+ font-size: 16px;
+ color: #333333;
+ font-weight: 500;
+}
+
+/*# sourceMappingURL=index.css.map */
diff --git a/src/forge/Wiki/components/FolderTree/index.js b/src/forge/Wiki/components/FolderTree/index.js
index bbcdb390..93c06ff3 100644
--- a/src/forge/Wiki/components/FolderTree/index.js
+++ b/src/forge/Wiki/components/FolderTree/index.js
@@ -1,6 +1,6 @@
import * as React from 'react';
import classNames from 'classnames';
-import { Icon, Tree } from 'antd';
+import { Tree } from 'antd';
import omit from 'omit.js';
import debounce from 'lodash/debounce';
import { conductExpandParent, convertTreeToEntities } from 'rc-tree/lib/util';
diff --git a/src/forge/Wiki/components/Login/index.css b/src/forge/Wiki/components/Login/index.css
new file mode 100644
index 00000000..448243d6
--- /dev/null
+++ b/src/forge/Wiki/components/Login/index.css
@@ -0,0 +1,56 @@
+.delete-modal .ant-modal-header {
+ padding: 9px 24px;
+ background: #f8f8f8;
+ border-bottom: 1px solid #eee;
+}
+.delete-modal .ant-modal-title {
+ text-align: left;
+}
+.delete-modal .ant-modal-close {
+ top: 0px !important;
+}
+.delete-modal .ant-modal-close-x {
+ font-size: 24px;
+}
+.delete-modal .ant-modal-body {
+ text-align: center;
+}
+.delete-modal .delete-title {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ margin: 2rem 0 1rem !important;
+ font-size: 16px;
+ color: #333;
+ letter-spacing: 0;
+ line-height: 29px;
+ font-weight: 400;
+}
+.delete-modal .red-circle {
+ align-self: flex-start;
+ color: #ca0002;
+ font-size: 1.5rem !important;
+}
+.delete-modal .delete-descibe {
+ font-size: 14px;
+ color: #666;
+ line-height: 33px;
+ font-weight: 400;
+}
+.delete-modal .ant-modal-footer {
+ padding: 2rem 0;
+ text-align: center;
+ border: 0;
+}
+.delete-modal .ant-modal-footer .ant-btn {
+ width: 6rem;
+}
+.delete-modal .foot-submit {
+ margin-left: 3rem;
+ color: #df0002;
+}
+.delete-modal .foot-submit:hover {
+ border-color: #df0002;
+}
+
+/*# sourceMappingURL=index.css.map */
diff --git a/src/forge/css/index.scss b/src/forge/css/index.scss
index 00e46b6f..03bbbc42 100644
--- a/src/forge/css/index.scss
+++ b/src/forge/css/index.scss
@@ -11,7 +11,10 @@ ul,ol,dl{
font-size: 22px;
font-weight: normal;
line-height: 30px;
- max-width: 850px;
+ max-width: 690px;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
.projectN{
word-break: break-all;
}
@@ -140,7 +143,7 @@ form.ant-form{
}
form{
.ant-row.ant-form-item{
- margin-bottom: 15px;
+ margin-bottom: 20px;
}
}
@media screen and (max-width: 1000px){
@@ -270,4 +273,41 @@ form{
background-color: #DF0002!important;
border-color: #DF0002;
color: #fff;
+}
+.newPopUl{
+ li{
+ height: 30px;
+ line-height: 30px;
+ border-bottom: 1px solid #eee;
+ min-width: 78px;
+ text-align: center;
+ &:last-child{
+ 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/forge/users/Index.css b/src/forge/users/Index.css
new file mode 100644
index 00000000..280cce1b
--- /dev/null
+++ b/src/forge/users/Index.css
@@ -0,0 +1,247 @@
+.headerbox {
+ padding: 20px;
+ border-bottom: 1px solid #E0E0E0;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+}
+.headerbox > div {
+ width: 400px;
+}
+.headerbox > p {
+ display: flex;
+ align-items: center;
+}
+.headerbox > p a {
+ color: #5091FF;
+ margin-left: 30px;
+ font-size: 16px;
+ display: flex;
+ align-items: center;
+}
+.headerbox .ant-btn.ant-input-search-button {
+ margin-top: -1px;
+ margin-right: -1px;
+}
+
+.echartBox {
+ border: 1px solid #DEDEDE;
+}
+.echartBox > p {
+ color: #999;
+ padding: 15px 20px;
+ text-align: center;
+}
+
+.contentBox {
+ padding: 20px 20px 0px 20px;
+}
+.contentBox > div {
+ margin-bottom: 20px;
+ display: flex;
+ align-items: center;
+ padding: 20px 25px;
+ background-color: #fafafa;
+}
+.contentBox > div .imgBox {
+ width: 190px;
+ height: 90px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin-right: 20px;
+ background-color: #fff;
+}
+.contentBox > div .imgBox img {
+ max-width: 90%;
+ max-height: 90%;
+}
+.contentBox .item-news {
+ display: flex;
+ justify-content: space-between;
+ font-size: 12px;
+ color: #888;
+ margin-top: 3px;
+ margin-bottom: 0px;
+}
+.contentBox .teamdesc {
+ word-break: break-all;
+ line-height: 20px;
+}
+
+.infosType {
+ padding: 20px 30px 0px 20px;
+ display: flex;
+ justify-content: space-between;
+}
+.infosType .infoStatus {
+ height: 30px;
+ background: white;
+ border-radius: 15px;
+ border: 1px solid #dddddd;
+ line-height: 30px;
+ font-size: 12px;
+ color: #888;
+ display: flex;
+}
+.infosType .infoStatus > span {
+ display: block;
+ padding: 0px 12px;
+ border-radius: 15px;
+ cursor: pointer;
+}
+.infosType .infoStatus > span.active {
+ background-color: #5091FF;
+ color: #fff;
+ padding: 0px 15px;
+}
+.infosType .infoStatus .statusDivider {
+ margin: 8px 0 0 0 !important;
+}
+
+.userDescription {
+ color: #666666;
+ line-height: 18px;
+ text-align: left;
+ margin: 10px 0px;
+ word-break: break-all;
+ text-align: justify;
+ font-size: 16px;
+ text-align: center;
+}
+
+.focusBox, .infoBox {
+ width: 100% !important;
+ display: inline-block;
+ margin-top: 30px;
+ padding-top: 30px;
+ border-top: 1px solid #f1f1f1;
+}
+
+.infoBox {
+ padding-bottom: 10px;
+ text-align: left;
+ line-height: 28px;
+ color: #666;
+ margin-top: 20px;
+}
+.infoBox > div {
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+}
+.infoBox i {
+ color: #DEDEDE;
+ font-size: 15px !important;
+}
+.infoBox span {
+ margin-left: 10px;
+}
+
+.headimg {
+ position: relative;
+ display: block;
+}
+.headimg img {
+ width: 110px;
+ height: 110px;
+ border-radius: 50%;
+}
+.headimg span {
+ position: absolute;
+ bottom: -6px;
+ right: 0px;
+ left: 65px;
+}
+.headimg span i {
+ font-size: 25px !important;
+ border-radius: 50%;
+ color: #fff;
+}
+.headimg span i.icon-nan1 {
+ background-color: #1890FF;
+}
+.headimg span i.icon-nv1 {
+ background-color: pink;
+}
+
+ul.ant-menu.menuStyle {
+ padding: 0px 30px;
+ font-size: 16px;
+}
+ul.ant-menu.menuStyle li {
+ height: 70px;
+ line-height: 70px;
+ padding: 0px;
+ margin-right: 30px !important;
+ border-bottom: transparent !important;
+}
+
+.disposeInfo {
+ padding: 0px 30px;
+ min-height: 400px;
+}
+.disposeInfo .disposeItem {
+ display: flex;
+ justify-content: space-between;
+ padding: 30px 0px;
+ border-bottom: 1px solid #eee;
+}
+
+.authTag {
+ display: inline-block;
+ padding: 0px 10px;
+ border-radius: 12px;
+ font-size: 12px;
+ height: 22px;
+ line-height: 22px;
+}
+.authTag.red {
+ border: 1px solid #F73030;
+ color: #F73030;
+}
+.authTag.green {
+ border: 1px solid #28BD6C;
+ color: #28BD6C;
+}
+
+.CIList {
+ padding: 0px 30px;
+ min-height: 400px;
+}
+.CIList li {
+ display: flex;
+ justify-content: space-between;
+ padding: 28px 0px;
+ border-bottom: 1px solid #eee;
+}
+
+.infosRightMenu .ant-menu-item {
+ padding: 0px;
+ margin: 0px 20px !important;
+ font-size: 17px;
+ height: 32px;
+ line-height: 0px;
+ border-bottom: 2px solid transparent !important;
+ position: relative;
+}
+.infosRightMenu .ant-menu-item a > i {
+ font-size: 15px !important;
+ margin-right: 8px;
+}
+.infosRightMenu .ant-menu-item .menuNum {
+ font-size: 12px;
+ margin-left: 3px;
+ color: #FF6E21;
+}
+.infosRightMenu .ant-menu-item.ant-menu-item-selected::before {
+ position: absolute;
+ width: 100%;
+ bottom: -1px;
+ height: 2px;
+ left: 0px;
+ background-color: #1890ff;
+ content: "";
+}
+
+/*# sourceMappingURL=Index.css.map */
diff --git a/src/forge/users/InfosUser.js b/src/forge/users/InfosUser.js
index 276a0b1f..bcfd75ff 100644
--- a/src/forge/users/InfosUser.js
+++ b/src/forge/users/InfosUser.js
@@ -114,14 +114,14 @@ class InfosUser extends Component {
);
newItem =()=> (
-
+
+ -
+ {this.props.history.push('/projects/deposit/new')}} >新建项目
+
+ -
+ {this.props.history.push('/projects/mirror/new')}}>导入项目
+
+
);
@@ -192,6 +192,7 @@ class InfosUser extends Component {
trigger={["hover"]}
placement="bottom"
className="mr50"
+ overlayClassName="newPopUl"
>
diff --git a/src/forge/users/Team-item.jsx b/src/forge/users/Team-item.jsx
index f0c6d601..5efdbe22 100644
--- a/src/forge/users/Team-item.jsx
+++ b/src/forge/users/Team-item.jsx
@@ -6,7 +6,7 @@ function TeamItem({item,history}){
{history.push(`/${item.name}`)}} style={{cursor:"pointer"}}>
}/)
-
{item.name}
+
{item.nickname}
{item.description}
diff --git a/src/images/add.png b/src/images/add.png
new file mode 100644
index 00000000..6a1f55eb
Binary files /dev/null and b/src/images/add.png differ
diff --git a/src/index.css b/src/index.css
index e58df61f..4c75d804 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 73d320ed..cf5f1783 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 b6d8c7aa..1d6edf78 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 859ddcf9..bdd6d36a 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 {
diff --git a/src/modules/tpm/challengesnew/tpm-md-editor.js b/src/modules/tpm/challengesnew/tpm-md-editor.js
index ad25fa9c..e1c06eda 100644
--- a/src/modules/tpm/challengesnew/tpm-md-editor.js
+++ b/src/modules/tpm/challengesnew/tpm-md-editor.js
@@ -134,6 +134,7 @@ export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, cla
},
toolbarIconsClass: {
"line-break": "fa-minus",
+ "fullScreen":"iconfont icon-fangdaicon font-14"
},
toolbarCustomIcons: {
"inline-latex": "
",
@@ -150,6 +151,10 @@ export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, cla
}
cm.replaceSelection(NULL_CH)
},
+ "fullScreen":function(cm,icon,cursor,selection){
+ icon.addClass("none");
+ console.log(cm,icon)
+ },
"inline-latex": function (cm, icon, cursor, selection) {
cm.replaceSelection("$$" + selection + "$$");
cm.setCursor(cursor.line, cursor.ch + 2);
@@ -164,7 +169,8 @@ export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, cla
lang: {
toolbar: {
"latex": "多行公式",
- "line-break": "换行"
+ "line-break": "换行",
+ "fullScreen":"开启全屏"
}
},
onload: function () {
@@ -229,7 +235,7 @@ export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, cla
if (resizeBarEl.current) {
let el = resizeBarEl.current
let dragging = false
- let startY = 0
+ let startY = 0
function onMouseDown(e) {
dragging = true
startY = e.pageY
diff --git a/src/modules/tpm/newshixuns/css/Newshixuns.css b/src/modules/tpm/newshixuns/css/Newshixuns.css
index 7dc811d0..f1a196f6 100644
--- a/src/modules/tpm/newshixuns/css/Newshixuns.css
+++ b/src/modules/tpm/newshixuns/css/Newshixuns.css
@@ -392,9 +392,6 @@ a.white-btn.use_scope-btn:hover{
border-color: #096dd9;
}
-/*.ant-btn:hover, .ant-btn:focus, .ant-btn:active, .ant-btn.active{*/
-/* background-color: #4CACFF;*/
-/*}*/
.newViewAfter .ant-input{
line-height: 40px !important;