diff --git a/src/forge/Order/MilepostDetail.js b/src/forge/Order/MilepostDetail.js
index c1c8bdd06..0f5d191e0 100644
--- a/src/forge/Order/MilepostDetail.js
+++ b/src/forge/Order/MilepostDetail.js
@@ -40,7 +40,7 @@ class MilepostDetail extends Component {
issue_type: undefined,
status_type: '1',
//设置选择高亮
- issue_tag_ids: '标签',
+ issue_tag_ids: '标记',
tracker_ids: '类型',
author_ids: '发布人',
assigned_to_ids: '负责人',
@@ -194,7 +194,7 @@ class MilepostDetail extends Component {
done_ratio : undefined,
status_id: undefined,
assigned_to_id: undefined,
- issue_tag_ids: '标签',
+ issue_tag_ids: '标记',
tracker_ids: '类型',
author_ids: '发布人',
assigned_to_ids: '负责人',
@@ -254,7 +254,7 @@ class MilepostDetail extends Component {
-
-
+
{this.state.issue_tag_ids}
diff --git a/src/forge/Order/Nav.js b/src/forge/Order/Nav.js
index b5d196d61..3f5a20c59 100644
--- a/src/forge/Order/Nav.js
+++ b/src/forge/Order/Nav.js
@@ -7,7 +7,7 @@ class Nav extends Component{
const { projectsId , owner } = this.props.match.params;
return(
- 标签
+ 标记
里程碑
)
diff --git a/src/forge/Order/Tags.js b/src/forge/Order/Tags.js
index 174891aa6..eeff8db28 100644
--- a/src/forge/Order/Tags.js
+++ b/src/forge/Order/Tags.js
@@ -324,11 +324,11 @@ class Tags extends Component {
data && data.issue_tags && data.issue_tags.length > 0 ?
-
共{data && data.issue_tags_count}个标签
+
共{data && data.issue_tags_count}个标记
diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js
index 290bb03e3..7275c759a 100644
--- a/src/forge/Order/order.js
+++ b/src/forge/Order/order.js
@@ -39,7 +39,7 @@ class order extends Component {
search_count: undefined,
issue_type: undefined,
status_type: "1", // 默认显示开启中的
- issue_tag_ids: "标签",
+ issue_tag_ids: "标记",
tracker_ids: "类型",
author_ids: "发布人",
assigned_to_ids: "负责人",
@@ -58,7 +58,7 @@ class order extends Component {
select_params: {
assigned_to_id: undefined, // 负责人
author_id: undefined, // 发布人
- issue_tag_id: undefined, // 标签
+ issue_tag_id: undefined, // 标记
tracker_id: undefined, //类型
done_ratio: undefined, // 完成度
status_id: undefined, // 优先级
@@ -257,7 +257,7 @@ class order extends Component {
author_id: undefined,
assigned_to_id: undefined,
status_type: type,
- issue_tag_ids: "标签",
+ issue_tag_ids: "标记",
tracker_ids: "类型",
author_ids: "发布人",
assigned_to_ids: "负责人",
@@ -677,7 +677,7 @@ class order extends Component {
className="topWrapperSelect"
overlay={this.renderMenu(
issue_chosen && issue_chosen.issue_tag,
- "标签",
+ "标记",
"issue_tag_id"
)}
trigger={["click"]}
diff --git a/src/forge/Order/order_form.js b/src/forge/Order/order_form.js
index 6515dde86..936dc3d11 100644
--- a/src/forge/Order/order_form.js
+++ b/src/forge/Order/order_form.js
@@ -442,13 +442,13 @@ class order_form extends Component {
)}
-
+
{getFieldDecorator("issue_tag_ids", {rules: []})(
diff --git a/src/forge/Settings/Index.js b/src/forge/Settings/Index.js
index 3ebb5b49a..fe546cdf4 100644
--- a/src/forge/Settings/Index.js
+++ b/src/forge/Settings/Index.js
@@ -102,8 +102,8 @@ class Index extends Component {
>
-
- 项目标签
+
+ 项目标记
diff --git a/src/forge/Settings/Setting.js b/src/forge/Settings/Setting.js
index c3150323f..d6d3cdc60 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"},
]
@@ -295,23 +295,23 @@ class Setting extends Component {
{getFieldDecorator("project_category_id", {
- rules: [
- {
- required: true,
- message: "请选择大类别",
- },
- ],
- })()}
+ rules: [],
+ })(
+
+ )}
{getFieldDecorator("project_language_id", {
- rules: [
- {
- required: true,
- message: "请选择项目语言",
- },
- ],
- })()}
+ rules: [],
+ })(
+
+ )}
{getFieldDecorator("project_units", {
diff --git a/src/forge/Settings/Webhooks/New.jsx b/src/forge/Settings/Webhooks/New.jsx
index d90934f04..22b3899d7 100644
--- a/src/forge/Settings/Webhooks/New.jsx
+++ b/src/forge/Settings/Webhooks/New.jsx
@@ -258,11 +258,11 @@ function New({ form , match , showNotification , history }) {
*/}
创建
- 创建分支或标签
+ 创建分支或标记
删除
- 删除分支或标签
+ 删除分支或标记
合并请求事件
diff --git a/src/forge/Settings/new_tags.js b/src/forge/Settings/new_tags.js
index bc763f9c8..ed9269cbb 100644
--- a/src/forge/Settings/new_tags.js
+++ b/src/forge/Settings/new_tags.js
@@ -348,7 +348,7 @@ class NewTags extends Component {
this.deletetag(item.id)}
@@ -383,7 +383,7 @@ class NewTags extends Component {
return (
-
共{data && data.issue_tags_count}个标签
+
共{data && data.issue_tags_count}个标记
-
- 标签
+ 标记
@@ -423,11 +423,11 @@ class NewTags extends Component {
className="flex-a-center baseForm bbr"
style={{ "justify-content": "space-between" }}
>
- 项目标签
+ 项目标记
{data && data.user_admin_or_member ? (
) : (
""
@@ -442,7 +442,7 @@ class NewTags extends Component {
rules: [
{
required: true,
- message: "请填写标签名字",
+ message: "请填写标记名字",
},
],
})()}
@@ -481,7 +481,7 @@ class NewTags extends Component {
onClick={this.createtagpost}
className="fr"
>
- 创建标签
+ 创建标记
{/* 创建标签 */}
@@ -497,7 +497,7 @@ class NewTags extends Component {
diff --git a/src/forge/Source/Index.jsx b/src/forge/Source/Index.jsx
index e158d7fba..1a57074ae 100644
--- a/src/forge/Source/Index.jsx
+++ b/src/forge/Source/Index.jsx
@@ -141,7 +141,7 @@ function Index(props){
params:{id,tagName:tag}
}).then(result=>{
if(result && result.data){
- props.showNotification("标签删除成功");
+ props.showNotification("标记删除成功");
setIsSpin(true);
getData();
}
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 ? (
) : (
-
+
)}
+ -
+ {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 f0c6d6013..5efdbe22c 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 000000000..6a1f55eb9
Binary files /dev/null and b/src/images/add.png differ
diff --git a/src/modules/tpm/challengesnew/tpm-md-editor.js b/src/modules/tpm/challengesnew/tpm-md-editor.js
index ad25fa9c4..e1c06eda7 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 7dc811d03..f1a196f6c 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;