-
共{data && data.issue_tags_count}个标签
+
共{data && data.issue_tags_count}个标记
diff --git a/src/forge/Order/UpdateDetail.js b/src/forge/Order/UpdateDetail.js
index 9cbb3cd64..0bf4f0f13 100644
--- a/src/forge/Order/UpdateDetail.js
+++ b/src/forge/Order/UpdateDetail.js
@@ -1,11 +1,11 @@
-import React, { Component } from "react";
+import React from "react";
import OrderForm from './order_form'
-class UpdateDetail extends Component {
- render() {
- return (
-
- )
- }
+
+function CopyDetail(props){
+ const operateName = props.match.params.operateName;
+ return(
+
+ )
}
-export default UpdateDetail;
+export default CopyDetail;
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..2c572d594 100644
--- a/src/forge/Order/order_form.js
+++ b/src/forge/Order/order_form.js
@@ -153,7 +153,7 @@ class order_form extends Component {
values.issue_tag_ids = [values.issue_tag_ids];
}
const { description, start_date, due_date, issue_type } = this.state;
- if (form_type === "new") {
+ if (form_type !== "edit") {
const url = `/${owner}/${projectsId}/issues.json`;
axios.post(url, {
...values,
@@ -442,13 +442,13 @@ class order_form extends Component {
)}
-
+
{getFieldDecorator("issue_tag_ids", {rules: []})(
diff --git a/src/forge/SecuritySetting/Index.jsx b/src/forge/SecuritySetting/Index.jsx
index d9d4e49c2..8419fd31c 100644
--- a/src/forge/SecuritySetting/Index.jsx
+++ b/src/forge/SecuritySetting/Index.jsx
@@ -14,6 +14,16 @@ import { Link } from 'react-router-dom';
import './Index.scss';
+const MyNoticeIndex = Loadable({
+ loader: () => import("./notice/myNotice/Index"),
+ loading: Loading,
+});
+
+const NoticeManager = Loadable({
+ loader: () => import("./notice/manager/Index"),
+ loading: Loading,
+});
+
const SSHNew = Loadable({
loader: () => import("./sub/New"),
loading: Loading,
@@ -26,6 +36,12 @@ const SSHIndex = Loadable({
loader: () => import("./sub/SSH"),
loading: Loading,
});
+
+const PrivateLetter = Loadable({
+ loader: () => import("./notice/privateLetter/Index"),
+ loading: Loading,
+});
+
function Index(props){
const { current_user } = props;
const { pathname } = props.location;
@@ -39,18 +55,35 @@ function Index(props){
{current_user && current_user.username}