diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js
index cbc1e1b6..57b46a6b 100644
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@@ -182,7 +182,7 @@ class NewHeader extends Component {
geturlsdata = () => {
let url = "/setting.json";
axios.get(url).then((response) => {
- if (response && response.data) {
+ if (response && response.data && response.data.setting) {
this.setState({ settings: response.data.setting });
localStorage.setItem('chromesetting', JSON.stringify(response.data.setting));
localStorage.setItem('chromesettingresponse', JSON.stringify(response));
diff --git a/src/forge/Head/header.scss b/src/forge/Head/header.scss
index bcdb9499..7878f20b 100644
--- a/src/forge/Head/header.scss
+++ b/src/forge/Head/header.scss
@@ -77,6 +77,7 @@
min-width: 1200px;
z-index: 8;
left: 0px;
+ padding-bottom: 15px;
p {
margin-top: 0;
margin-bottom:0px !important;
diff --git a/src/forge/Main/sub/DetailBanner.jsx b/src/forge/Main/sub/DetailBanner.jsx
index f03f14ba..3576c990 100644
--- a/src/forge/Main/sub/DetailBanner.jsx
+++ b/src/forge/Main/sub/DetailBanner.jsx
@@ -66,17 +66,16 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
:""
}
- {
+ {/* {
item.menu_name === "devops" ?
- {/* */}
引擎(Engine)
{projectDetail && projectDetail.ops_count ? {projectDetail.ops_count} : ""}
:""
- }
+ } */}
{/* {
item.menu_name === "resources" &&
diff --git a/src/forge/Main/version/version.scss b/src/forge/Main/version/version.scss
index 7cd5ddb4..dd22a423 100644
--- a/src/forge/Main/version/version.scss
+++ b/src/forge/Main/version/version.scss
@@ -59,6 +59,8 @@
}
.body-show{
padding: 5px 10px 10px 10px;
+ width: 100%;
+ box-sizing: border-box;
}
& .version-user>a>span{
display: inline-block;
@@ -108,6 +110,7 @@
margin-top: 5px;
padding-top: 20px;
border-top: 1px solid #eee;
+ width: 100%;
// width: 100%;
a{
display: block;
diff --git a/src/forge/Order/order_form.js b/src/forge/Order/order_form.js
index e1ae9a67..205f476f 100644
--- a/src/forge/Order/order_form.js
+++ b/src/forge/Order/order_form.js
@@ -81,10 +81,9 @@ class order_form extends Component {
if (result) {
let data ={
branch_name: result.data.branch_name,
- issue_tag_ids: [
- result.data.issue_tags && result.data.issue_tags[0].id ?
- String(result.data.issue_tags[0].id) : "",
- ],
+ issue_tag_ids:result.data.issue_tags && result.data.issue_tags[0].id ?
+ String(result.data.issue_tags[0].id) : []
+ ,
fixed_version_id: result.data.fixed_version_id ? String(result.data.fixed_version_id) : "",
tracker_id: result.data.tracker_id ? String(result.data.tracker_id) : "",
issue_type: result.data.issue_type,
diff --git a/src/forge/Settings/Index.js b/src/forge/Settings/Index.js
index e4c3e8cd..ae957911 100644
--- a/src/forge/Settings/Index.js
+++ b/src/forge/Settings/Index.js
@@ -115,10 +115,10 @@ class Index extends Component {
{
projectDetail && projectDetail.permission && (projectDetail.permission === "Owner" || projectDetail.permission === "Admin") ?
-1 ? "active" : ""}
+ className={pathname.indexOf("settings/special") > -1 ? "active" : ""}
>
-
+
特殊开源许可证项目管理
@@ -172,7 +172,7 @@ class Index extends Component {
>
(
)}
diff --git a/src/forge/Settings/Webhooks/New.jsx b/src/forge/Settings/Webhooks/New.jsx
index d05a261e..df331d3a 100644
--- a/src/forge/Settings/Webhooks/New.jsx
+++ b/src/forge/Settings/Webhooks/New.jsx
@@ -180,9 +180,12 @@ function New({ form , match , showNotification , history }) {
subTitle={`删除后未来事件将不会推送至此Webhook地址：${data && data.url}`}
/>
- Webhooks
-
- {id ? "更新" : "添加"}Webhook
+
+
+ Webhooks
+
+
+ {/* */}
当webhook被触发时，我们将向以下URL发送通知，包括已选择事件的详细信息。更多信息可查阅webhooks指南。
diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js
index 6fedf7c5..05d0a2d2 100644
--- a/src/modules/tpm/TPMIndexHOC.js
+++ b/src/modules/tpm/TPMIndexHOC.js
@@ -279,7 +279,10 @@ export function TPMIndexHOC(WrappedComponent, headFoot) {
}
-
+ {
+ headFoot && headFoot.noFooter ? "" :
+
+ }