- {item.message}
+ {item.message}
- {truncateCommitId(`${item.sha}`)}
+ {truncateCommitId(`${item.sha}`)}
@@ -188,7 +193,7 @@ class CoderRootCommit extends Component{
{
dataCount > limit ?
:""
}
diff --git a/src/forge/Main/Diff.jsx b/src/forge/Main/Diff.jsx
index 457426eaa..86cf9384c 100644
--- a/src/forge/Main/Diff.jsx
+++ b/src/forge/Main/Diff.jsx
@@ -90,7 +90,7 @@ export default (props) => {
diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss
index 9a0bf5391..8c0e18488 100644
--- a/src/forge/Main/Index.scss
+++ b/src/forge/Main/Index.scss
@@ -253,7 +253,7 @@
background-color: #FAFCFF;
.ellipsistxt{
margin-top: 6px;
- cursor: pointer;
+ // cursor: pointer;
#ptxt{
margin-bottom: 0px;
word-break: break-all;
diff --git a/src/forge/Main/version/New.jsx b/src/forge/Main/version/New.jsx
index ca9057caa..a235f31d9 100644
--- a/src/forge/Main/version/New.jsx
+++ b/src/forge/Main/version/New.jsx
@@ -247,7 +247,7 @@ export default Form.create()(
语义化版本
- 如果你是第一次发布版本,我们强烈建议你阅读语义化版本。
+ 如果你是第一次发布版本,我们强烈建议你阅读语义化版本。
diff --git a/src/forge/Merge/Files.jsx b/src/forge/Merge/Files.jsx
index 2e5cd7cce..a3015fcec 100644
--- a/src/forge/Merge/Files.jsx
+++ b/src/forge/Merge/Files.jsx
@@ -9,22 +9,7 @@ function Files({ data,history,owner,projectsId , parentsSha }){
const [ files , setFiles ] = useState(data && data.files);
const [ copyfileTipTitle, setCopyfileTipTitle] = useState("复制文件路径");
const [ isOpen, setIsOpen] = useState(false);
- const commitPage = history && history.location && history.location.query && history.location.query.commitPage;
- // console.log('222',commitPage);
- // const nextHref = useRef(null);
-
- // useEffect(()=>{
- // const unlisten = history.listen((location)=>{
- // if(nextHref.current !== location.pathname){
- // nextHref.current = location.pathname;
- // history.replace({pathname:location.pathname,search:`commitPage=${commitPage}`});
- // // history.replace({pathname:location.pathname, query:{page:commitPage}});
- // } else{
- // unlisten;
- // }
- // })
- // })
-
+
useEffect(()=>{
if(data){
setFiles(data.files);
@@ -63,7 +48,7 @@ function Files({ data,history,owner,projectsId , parentsSha }){
{item.name}
-
0?item.addition+"处添加":""}${item.addition>0 && item.deletion>0 ?"和":""}${item.deletion>0?item.deletion+"处删除":""}`}>
+ 0 && ":"}${item.addition>0?item.addition+"处添加":""}${item.addition>0 && item.deletion>0 ?"和":""}${item.deletion>0?item.deletion+"处删除":""}`}>
{item.addition >0 && +{item.addition}}
{item.deletion >0 && -{item.deletion}}
@@ -111,7 +96,7 @@ function Files({ data,history,owner,projectsId , parentsSha }){
-
0?item.addition+"处添加":""}${item.addition>0 && item.deletion>0 ?"和":""}${item.deletion>0?item.deletion+"处删除":""}`}>
+ 0 && ":"} ${item.addition > 0 ? item.addition + "处添加" : ""}${item.addition > 0 && item.deletion > 0 ? "和" : ""}${item.deletion > 0 ? item.deletion + "处删除" : ""}`}>
{item.addition+item.deletion}处