diff --git a/src/factory/resource/softwareProject/index.scss b/src/factory/resource/softwareProject/index.scss
index 8f5828172..8f3f6115a 100644
--- a/src/factory/resource/softwareProject/index.scss
+++ b/src/factory/resource/softwareProject/index.scss
@@ -164,8 +164,8 @@
}
&-content {
- background: linear-gradient(180deg,#f4f8fd6c 0%,#f4f8fd6c 80.62%,#f4f8fd 100%), #ffffff;
- border-radius:80px 80px 0px 0px;
+ background: linear-gradient(180deg, #f4f8fd6c 0%, #f4f8fd6c 80.62%, #f4f8fd 100%), #ffffff;
+ border-radius: 80px 80px 0px 0px;
padding-top: 28px;
display: flex;
flex-direction: column;
@@ -330,6 +330,13 @@
color: #091221;
font-size: 13px;
+ span {
+ max-width: 200px;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ }
+
img {
width: 15px;
margin-right: 5px;
@@ -349,19 +356,25 @@
margin-right: 32px;
}
- &:nth-child(1), &:nth-child(4) {
+ &:nth-child(1),
+ &:nth-child(4) {
color: #ffffff;
- h5, div {
+
+ h5,
+ div {
color: #ffffff;
}
+
.item-data {
span {
color: #ffffff;
+
&:after {
color: #ffffff;
}
}
}
+
.item-tags {
height: 32px;
background: rgba(179, 190, 252, 0.18);
@@ -453,6 +466,13 @@
color: #091221;
font-size: 13px;
+ span {
+ max-width: 200px;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ }
+
img {
width: 15px;
margin-right: 5px;
diff --git a/src/forge/Branch/CloneAddress.js b/src/forge/Branch/CloneAddress.js
index b3e31cccb..fc99ed2bb 100644
--- a/src/forge/Branch/CloneAddress.js
+++ b/src/forge/Branch/CloneAddress.js
@@ -1,24 +1,41 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
import { Menu } from 'antd';
import "./branch.scss";
import CopyTool from '../Component/CopyTool';
-function CloneAddress({http_url , ssh_url , zip_url , tar_url}) {
- const [ key , setKey ] = useState("HTTP");
+function CloneAddress({ http_url, ssh_url, zip_url, tar_url }) {
+ const [key, setKey] = useState("HTTP");
+ const [cloneUrl, setCloneUrl] = useState("");
+
+ useEffect(() => {
+ if (!http_url) {
+ setCloneUrl('');
+ return;
+ }
+
+ const match = http_url.match(/:3000\/(.+)/);
+
+ if (match && match[1]) {
+ const path = match[1];
+ setCloneUrl(`${ window.location.protocol }//${window.location.hostname}:3000/${path}`);
+ } else {
+ setCloneUrl(http_url);
+ }
+ }, [http_url]);
return (
diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js
index d77fc928c..77889865f 100644
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@@ -78,7 +78,7 @@ class NewHeader extends Component {
}
window._header_componentHandler = this;
- this.getZoneList(settings && settings.common.zone +'/api')
+ this.getZoneList(settings && settings.common.zone +'/zoneAdmin/api')
try {
window.sessionStorage.setItem("yslgeturls", JSON.stringify(window.location.href))
diff --git a/src/forge/Information/fetch.js b/src/forge/Information/fetch.js
index b8314f50e..64fe63a70 100644
--- a/src/forge/Information/fetch.js
+++ b/src/forge/Information/fetch.js
@@ -49,7 +49,7 @@ function beforeFetch(actionUrl){
return service;
}
let settings = localStorage.chromesetting&& localStorage.chromesetting !=="undefined"&& JSON.parse(localStorage.chromesetting);
-let actionUrl = settings && settings.common.zone +'/api';
+let actionUrl = settings && settings.common.zone +'/zoneAdmin/api';
const service = beforeFetch(actionUrl);
export const httpUrl = actionUrl;
diff --git a/src/forge/Main/projecthome/v2/components/banner.jsx b/src/forge/Main/projecthome/v2/components/banner.jsx
index 1dfe071bc..5ee47f12a 100644
--- a/src/forge/Main/projecthome/v2/components/banner.jsx
+++ b/src/forge/Main/projecthome/v2/components/banner.jsx
@@ -155,7 +155,7 @@ function Banner({isVisible}) {
{/* 底部统计数据 */}
@@ -165,7 +165,7 @@ function Banner({isVisible}) {
diff --git a/src/forge/Team/fetch.js b/src/forge/Team/fetch.js
index e6651edc9..3a21a9383 100644
--- a/src/forge/Team/fetch.js
+++ b/src/forge/Team/fetch.js
@@ -56,7 +56,7 @@ function beforeFetch(actionUrl){
return service;
}
let settings = localStorage.chromesetting&& localStorage.chromesetting !=="undefined"&& JSON.parse(localStorage.chromesetting);
-let actionUrl = settings && settings.common.zone +'/api';
+let actionUrl = settings && settings.common.zone +'/zoneAdmin/api';
const service = beforeFetch(actionUrl);
export const httpUrl = actionUrl;
diff --git a/src/services/project.js b/src/services/project.js
index ea2f62e5a..22a7b60fd 100644
--- a/src/services/project.js
+++ b/src/services/project.js
@@ -6,7 +6,7 @@ let baseZoneUrl = `${zoneUrl}/api`
if (__CLIENT__ ) {
let settings = localStorage.chromesetting && localStorage.chromesetting !== 'undefined' &&JSON.parse(localStorage.chromesetting);
baseUrl = settings && settings.common && settings.common.main_site_url ? `${settings.common.main_site_url}/api` : baseUrl;
- baseZoneUrl = settings ? `${settings && settings.common.zone}/api` : `${zoneUrl}/api`;
+ baseZoneUrl = settings ? `${settings && settings.common.zone}/zoneAdmin/api` : `${zoneUrl}/api`;
}
console.log("__CLIENT__",__CLIENT__,baseUrl);