-
+
{
list && list.length > 0 ?
diff --git a/src/forge/Order/Milepost.js b/src/forge/Order/Milepost.js
index 5f6efeeb9..48fc286ba 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 c3150323f..55c1efdda 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 dad9b64b9..94825905f 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 7e64c5de2..ea23ab079 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 7616fd6ca..5c85ae474 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 5bab8f53f..499a00c20 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/UsersList/common_users.js b/src/forge/UsersList/common_users.js
index dac45f480..e8404b387 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/Wiki/Welcome/index.css b/src/forge/Wiki/Welcome/index.css
new file mode 100644
index 000000000..d146549c8
--- /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 bbcdb3906..93c06ff3f 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 000000000..448243d6d
--- /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 00e46b6f8..d9a5b071c 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;
}
@@ -270,4 +273,16 @@ 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;
+ }
+ }
}
\ 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 000000000..280cce1b3
--- /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 276a0b1f8..bcfd75ffc 100644
--- a/src/forge/users/InfosUser.js
+++ b/src/forge/users/InfosUser.js
@@ -114,14 +114,14 @@ class InfosUser extends Component {
);
newItem =()=> (
-
);
@@ -192,6 +192,7 @@ class InfosUser extends Component {
trigger={["hover"]}
placement="bottom"
className="mr50"
+ overlayClassName="newPopUl"
>