@@ -175,7 +175,7 @@ class MergeItem extends Component { {item.journals_count ? ( {item.journals_count} diff --git a/src/forge/Merge/MergeLinkFooter.jsx b/src/forge/Merge/MergeLinkFooter.jsx new file mode 100644 index 000000000..104d2168b --- /dev/null +++ b/src/forge/Merge/MergeLinkFooter.jsx @@ -0,0 +1,192 @@ +import React, { Component } from 'react'; +import { Tabs, Spin } from 'antd'; +import { Link } from 'react-router-dom'; +import axios from 'axios'; + +import Commits from './Commits'; +import Comments from '../comments/comments'; +import Files from './Files'; + +import '../Order/order.css'; +import './merge.css'; + +const { TabPane } = Tabs; + +class MergeFooter extends Component { + constructor(props) { + super(props); + this.state = { + commitsData: undefined, + filesData: undefined, + isSpin: false, + activeKey: '1', + commitCount: 0, + filesCount: 0, + // 总评论数量，包含回复 + commentsTotalCount: 0, + }; + } + componentDidMount() { + this.Init(); + } + + componentDidUpdate(prevProps) { + // 解决切换tab后浏览器回退不刷新的问题、点击tab后url变化但tab未切换的问题 + const newPathname = this.props.location.pathname; + const prevPathname = prevProps.location.pathname; + if (newPathname !== prevPathname) { + this.Init(); + } + } + + Init = () => { + const { data, location, match } = this.props; + const { pathname } = location; + const { projectsId, owner, mergeId } = match.params; + + let activeKey = '1'; + if (pathname.indexOf('commits') > -1) { + activeKey = '2'; + this.getCommit(owner, projectsId, mergeId); + } else if (pathname.indexOf('files') > -1) { + activeKey = '3'; + this.getFile(owner, projectsId, mergeId); + } + this.setState({ + activeKey: activeKey, + commitCount: data && data.commits_count, + filesCount: data && data.files_count, + }); + }; + + getCommit = (owner, projectsId, mergeId) => { + this.setState({ isSpin: true }); + const url = `/${owner}/${projectsId}/pulls/${mergeId}/commits.json`; + axios + .get(url) + .then((result) => { + if (result) { + this.setState({ + commitsData: result.data.commits, + commitCount: result.data.commits_count, + }); + } + this.setState({ isSpin: false }); + }) + .catch((error) => { + this.setState({ isSpin: false }); + }); + }; + + getFile = (owner, projectsId, mergeId) => { + this.setState({ isSpin: true }); + const url = `/${owner}/${projectsId}/pulls/${mergeId}/files.json`; + axios + .get(url) + .then((result) => { + if (result) { + this.setState({ + filesData: result.data, + filesCount: result.data.files_count, + }); + } + this.setState({ isSpin: false }); + }) + .catch((error) => { + this.setState({ isSpin: false }); + }); + }; + + render() { + const { projectsId, owner, mergeId } = this.props.match.params; + + const { order_id, data = {} } = this.props; + const { + isSpin, + activeKey, + filesCount, + commitCount, + filesData, + commitsData, + } = this.state; + + // 评论数量优先取Comment组件中列表接口返回的，其次取合并请求详情接口中的，都没有取默认值0 + const commentsTotalCount = + this.state.commentsTotalCount || + (data.comments_total_count && parseInt(data.comments_total_count, 10)) || + 0; + + return ( +
+
+
+
+ 评论
+ {commentsTotalCount && (
+ {commentsTotalCount}
+ )}
+
+ }
+ key="1"
+ >
+ {
+ this.setState({ commentsTotalCount: commentsCount || 0 });
+ }}
+ {...this.props}
+ />
+
+
+ 提交
+ {commitCount > 0 && (
+ {commitCount}
+ )}
+
+ }
+ key="2"
+ >
+ {commitsData && (
+
+
+ 文件
+ {filesCount > 0 && (
+ {filesCount}
+ )}
+
+ }
+ key="3"
+ >
+
+
+
+
+ );
+ }
+}
+export default MergeFooter;
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index b064e3c2f..fc021f813 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -1,7 +1,6 @@
import React, { Component } from "react";
import { Tabs } from 'antd';
import { Link } from "react-router-dom";
-import { AlignCenter } from '../Component/layout';
import axios from "axios";
import { getImageUrl } from "educoder";
import {
@@ -11,7 +10,6 @@ import {
Dropdown,
Icon,
Menu,
- Select,
Tag,
Button,
Alert,
@@ -19,9 +17,8 @@ import {
import "./merge.css";
import RenderHtml from "../../components/render-html";
import "../Order/order.css";
-import MergeFooter from "./merge_footer";
+import MergeLinkFooter from "./MergeLinkFooter";
-const Option = Select.Option;
const TextArea = Input.TextArea;
function turnbar(str){
@@ -283,13 +280,13 @@ class MessageCount extends Component {
conflict_files && conflict_files.length>0 &&
如下文件有代码冲突：
-+
{
conflict_files.map((i,k)=>{
- return
{i}
+ return{i}
}) } - +@@ -558,19 +555,18 @@ class MessageCount extends Component { 取消 -
+ )} -
+
@@ -500,7 +503,7 @@ class comments extends Component {
loading={isSpin}
header=""
dataSource={journalsdata.issue_journals}
- renderItem={(item) => {renderList(item)} }
+ renderItem={(item) => {renderList(item)} }
/>
)}
{this.Paginations()}
@@ -558,7 +561,7 @@ class comments extends Component {
header=""
dataSource={journalsdata.issue_journals}
renderItem={(item) => (
- {renderList(item)}
+ {renderList(item)}
)}
/>
)}
--
2.34.1
From d7ab95eccc71eaa5cd0265bd690bfd7bb037fbdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Mon, 11 Oct 2021 11:28:41 +0800
Subject: [PATCH 02/73] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AF=A6=E6=83=85?=
=?UTF-8?q?=E9=A1=B5=E4=BD=93=E9=AA=8C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Merge/Files.jsx | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/forge/Merge/Files.jsx b/src/forge/Merge/Files.jsx
index 172038b21..87260cdd8 100644
--- a/src/forge/Merge/Files.jsx
+++ b/src/forge/Merge/Files.jsx
@@ -1,7 +1,7 @@
-import React ,{useEffect,useRef,useState } from 'react';
+import React ,{useEffect,useState } from 'react';
import { truncateCommitId } from '../common/util';
import { AlignCenter , FlexAJ } from '../Component/layout';
-import { Button, Tooltip,Progress, Popover, Anchor } from 'antd';
+import { Tooltip,Progress } from 'antd';
import './merge.css';
import './Index.scss';
@@ -16,6 +16,10 @@ function Files({ data,history,owner,projectsId , parentsSha }){
}
},[data]);
+ useEffect(()=>{
+ document.addEventListener('click',()=>{setIsOpen(false)})
+ })
+
function showDown(flag,index,isBin){
if(!isBin){
var lists = files.concat();
@@ -63,7 +67,7 @@ function Files({ data,history,owner,projectsId , parentsSha }){
)
return(
-
+
{e.nativeEvent.stopImmediatePropagation()}}>
{setIsOpen(!isOpen)}}>
--
2.34.1
From 1b9602df770e3e4305912fe2d4455dabdb67dd2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Mon, 11 Oct 2021 16:39:40 +0800
Subject: [PATCH 03/73] issue
---
src/forge/Main/Diff.jsx | 2 +-
src/forge/Main/version/version.js | 6 +++---
src/forge/Team/List.jsx | 3 +--
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/forge/Main/Diff.jsx b/src/forge/Main/Diff.jsx
index 17535e43b..67bb1cb1c 100644
--- a/src/forge/Main/Diff.jsx
+++ b/src/forge/Main/Diff.jsx
@@ -85,7 +85,7 @@ export default (props) => {
- {truncateCommitId(item.commit && item.commit.sha)}
+ {truncateCommitId(item.id)}
)
}
diff --git a/src/forge/Main/tag/Index.scss b/src/forge/Main/tag/Index.scss
index 3bd487db6..5ce43cf24 100644
--- a/src/forge/Main/tag/Index.scss
+++ b/src/forge/Main/tag/Index.scss
@@ -4,6 +4,7 @@
tr th{
background-color: #fff;
padding:5px 0px;
+ width: 172px;
.ant-table-column-title{
font-size: 16px;
font-weight: 500;
@@ -20,6 +21,9 @@
padding:0px;
height: 69px;
line-height: 69px;
+ div{
+ padding-left: 69px;
+ }
}
&:last-child{
td{
--
2.34.1
From 08b5f7edc0e2701664b8deb5b71f24e623884f35 Mon Sep 17 00:00:00 2001
From: caishi
Date: Mon, 11 Oct 2021 17:24:28 +0800
Subject: [PATCH 05/73] =?UTF-8?q?=E5=BC=80=E5=8F=91=E8=AF=AD=E8=A8=80?=
=?UTF-8?q?=E5=B7=A6=E4=BE=A7=E5=9C=86=E7=82=B9=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Main/Index.scss | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss
index a19bd80da..f2f7cd2b4 100644
--- a/src/forge/Main/Index.scss
+++ b/src/forge/Main/Index.scss
@@ -224,7 +224,7 @@
height: 8px;
width: 8px;
left: 0px;
- top:10px
+ top:8px;
}
&>span{
padding-left: 15px;
--
2.34.1
From 756e3f041632a5cb310d3a14434e473c3a255bd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Mon, 11 Oct 2021 17:41:58 +0800
Subject: [PATCH 06/73] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AF=A6=E6=83=85?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2-=E6=8F=90=E4=BA=A4md=E6=B8=B2=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Main/Diff.jsx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/forge/Main/Diff.jsx b/src/forge/Main/Diff.jsx
index 67bb1cb1c..a50c16c71 100644
--- a/src/forge/Main/Diff.jsx
+++ b/src/forge/Main/Diff.jsx
@@ -6,6 +6,7 @@ import { getImageUrl } from 'educoder';
import Files from '../Merge/Files';
import Tree from "./img/tree.png";
import User from "../Component/User";
+import RenderHtml from "../../components/render-html";
import axios from "axios";
import { Link } from "react-router-dom";
@@ -85,7 +86,7 @@ export default (props) => {
{commit && commit.message &&
-
diff --git a/src/forge/Main/version/version.js b/src/forge/Main/version/version.js
index 68cfd7746..2896899fc 100644
--- a/src/forge/Main/version/version.js
+++ b/src/forge/Main/version/version.js
@@ -15,10 +15,9 @@ function version(props) {
const [ releases , setReleases ] = useState(undefined);
const [ isSpin , setIsSpin ] = useState(true);
const { projectsId ,owner } = props.match.params;
- const { isManager, isDeveloper, location , user } = props;
+ const { location } = props;
const type = props.projectDetail && props.projectDetail.type;
const turnFromNew = location && location.query && location.query.turnFromNew;
- const current_user_login = user && user.login;
useEffect(()=>{
getIssueList();
},[])
@@ -34,7 +33,6 @@ function version(props) {
setReleases(result.data.releases);
setIsSpin(false);
}
-
}).catch((error) => {
console.log(error);
})
@@ -130,6 +128,8 @@ function version(props) {
addFunc={addFunc}
/>
)
+ } else{
+ return ()
}
}
diff --git a/src/forge/Team/List.jsx b/src/forge/Team/List.jsx
index ea23ab079..48a19c227 100644
--- a/src/forge/Team/List.jsx
+++ b/src/forge/Team/List.jsx
@@ -19,7 +19,6 @@ function List(props){
const [ search , setSearch ] = useState(undefined);
const [ page , setPage ] = useState(1);
const [ sortBy , setSortBy ] = useState("updated_on");
- const [ sortDirection , setSortDirection ] = useState("asc");
const OIdentifier = props.match.params.OIdentifier;
const organizeDetail = props.organizeDetail;
@@ -37,7 +36,7 @@ function List(props){
params:{
search,page,limit,
sort_by:sortBy,
- sort_direction:sortDirection
+ sort_direction:"desc"
}
}).then(result=>{
if(result && result.data){
--
2.34.1
From f6c5fd755019fe3d3bd51f5e9c82e24fd66b740e Mon Sep 17 00:00:00 2001
From: hucong <1422588487@qq.com>
Date: Mon, 11 Oct 2021 16:29:09 +0800
Subject: [PATCH 04/73] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BA=93=E4=BA=8C?=
=?UTF-8?q?=E7=BA=A7=E9=A1=B5=E9=9D=A2=E6=A0=87=E7=AD=BE=E6=A0=B7=E5=BC=8F?=
=?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Main/tag/Index.jsx | 4 ++--
src/forge/Main/tag/Index.scss | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/forge/Main/tag/Index.jsx b/src/forge/Main/tag/Index.jsx
index 88cca13b5..66e6f24cf 100644
--- a/src/forge/Main/tag/Index.jsx
+++ b/src/forge/Main/tag/Index.jsx
@@ -7,7 +7,7 @@ import { truncateCommitId } from '../../common/util';
import './Index.scss';
import Tree from '../img/tree.png'
import moment from 'moment';
-
+import Loading from '../../../Loading';
function Tags(props) {
@@ -59,7 +59,7 @@ function Tags(props) {
return (
{commit.message}
+ ').replaceAll('\n\r','
').replaceAll('\n','
')}} className="task-hide">
}
{data.branch}
').replaceAll('\n','
')}} className="task-hide">
{commit && commit.message &&
-
--
2.34.1
From dcb597ea3761be5d0f58e7723c991835cf2579a5 Mon Sep 17 00:00:00 2001
From: hucong <1422588487@qq.com>
Date: Mon, 11 Oct 2021 17:53:30 +0800
Subject: [PATCH 07/73] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BA=93=E4=BA=8C?=
=?UTF-8?q?=E7=BA=A7=E9=A1=B5=E9=9D=A2=E6=A0=87=E7=AD=BE=E5=8A=A0=E8=BD=BD?=
=?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Main/tag/Index.jsx | 18 ++++++++++++++----
src/forge/Main/tag/Index.scss | 6 ++++++
2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/forge/Main/tag/Index.jsx b/src/forge/Main/tag/Index.jsx
index 66e6f24cf..023adb449 100644
--- a/src/forge/Main/tag/Index.jsx
+++ b/src/forge/Main/tag/Index.jsx
@@ -1,17 +1,17 @@
import React,{ useEffect , useState } from 'react';
import SubMenu from '../sub/SubMenu';
-import { Table , Tooltip } from 'antd';
+import { Table , Tooltip , Spin } from 'antd';
import axios from 'axios';
import { Link } from 'react-router-dom';
import { truncateCommitId } from '../../common/util';
import './Index.scss';
import Tree from '../img/tree.png'
import moment from 'moment';
-import Loading from '../../../Loading';
function Tags(props) {
const [ source , setSource ] = useState([]);
+ const [ isSpin , setIsSpin ] = useState(true);
const { projectsId , owner } = props.match.params;
@@ -21,6 +21,7 @@ function Tags(props) {
axios.get(url).then((result) => {
if (result) {
setSource(result.data);
+ setIsSpin(false);
}
}).catch(error => {})
}
@@ -83,7 +84,6 @@ function Tags(props) {
render:(txt,item)=>{
return (
').replaceAll('\n\r','
').replaceAll('\n','
')}} className="task-hide">
+ ').replaceAll('\n','
')}} className="task-hide">
-
TAR
@@ -98,7 +98,17 @@ function Tags(props) {
return(
-
+ {
+ source && source.length > 0 ?
+
+
+ :
+
)
}
diff --git a/src/forge/Main/tag/Index.scss b/src/forge/Main/tag/Index.scss
index 5ce43cf24..b012cc588 100644
--- a/src/forge/Main/tag/Index.scss
+++ b/src/forge/Main/tag/Index.scss
@@ -32,4 +32,10 @@
}
}
}
+}
+.tagSpin{
+ text-align: center;
+ display: flex;
+ align-items: center;
+ justify-content: center;
}
\ No newline at end of file
--
2.34.1
From 825cee4eac7c9d0b31bb790db78707fe9ea27ba8 Mon Sep 17 00:00:00 2001
From: hucong <1422588487@qq.com>
Date: Mon, 11 Oct 2021 18:07:48 +0800
Subject: [PATCH 08/73] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BA=93=E4=BA=8C?=
=?UTF-8?q?=E7=BA=A7=E9=A1=B5=E9=9D=A2md=E6=96=87=E4=BB=B6=E5=AE=9A?=
=?UTF-8?q?=E4=BD=8D=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Main/tag/Index.jsx | 2 +-
src/forge/Main/tag/Index.scss | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/forge/Main/tag/Index.jsx b/src/forge/Main/tag/Index.jsx
index 023adb449..48f80ea29 100644
--- a/src/forge/Main/tag/Index.jsx
+++ b/src/forge/Main/tag/Index.jsx
@@ -105,7 +105,7 @@ function Tags(props) {
className="tagTable"
dataSource={source} columns={columns} pagination={false}>
:
-
+
+
+ }
+
}
diff --git a/src/forge/Main/tag/Index.scss b/src/forge/Main/tag/Index.scss
index b012cc588..5d72ab294 100644
--- a/src/forge/Main/tag/Index.scss
+++ b/src/forge/Main/tag/Index.scss
@@ -34,6 +34,7 @@
}
}
.tagSpin{
+ min-height: 300px;
text-align: center;
display: flex;
align-items: center;
--
2.34.1
From 8e1fb80f96b5259166972ac689150e94df6dd287 Mon Sep 17 00:00:00 2001
From: hucong <1422588487@qq.com>
Date: Mon, 11 Oct 2021 18:07:55 +0800
Subject: [PATCH 09/73] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BA=93=E4=BA=8C?=
=?UTF-8?q?=E7=BA=A7=E9=A1=B5=E9=9D=A2md=E6=96=87=E4=BB=B6=E5=AE=9A?=
=?UTF-8?q?=E4=BD=8D=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Main/CoderRootFileDetail.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/forge/Main/CoderRootFileDetail.js b/src/forge/Main/CoderRootFileDetail.js
index c6c976f47..bdcfc98a7 100644
--- a/src/forge/Main/CoderRootFileDetail.js
+++ b/src/forge/Main/CoderRootFileDetail.js
@@ -27,6 +27,7 @@ class CoderRootFileDetail extends Component {
}
componentDidMount = () => {
+ window.scrollTo(0, 0);
const { detail , mdFlag } = this.props;
this.setState({
value: detail.content,
@@ -214,7 +215,7 @@ class CoderRootFileDetail extends Component {
const Option = Select.Option;
return (
-
+
{
md && readOnly &&
--
2.34.1
From b0d13792816b193f8060499acc2791480bcae154 Mon Sep 17 00:00:00 2001
From: caishi
Date: Mon, 11 Oct 2021 18:35:50 +0800
Subject: [PATCH 10/73] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=BA=8C=E7=BA=A7?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=94=B9=E7=89=88=E5=90=8E=E4=B8=8D=E9=9C=80?=
=?UTF-8?q?=E8=A6=81=E7=9A=84=E6=8E=A5=E5=8F=A3top=5Fcount.json?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Main/CoderRootIndex.js | 63 ++++++++++++------------
src/forge/Newfile/UserSubmitComponent.js | 3 +-
2 files changed, 32 insertions(+), 34 deletions(-)
diff --git a/src/forge/Main/CoderRootIndex.js b/src/forge/Main/CoderRootIndex.js
index b5d241968..7ff25dae1 100644
--- a/src/forge/Main/CoderRootIndex.js
+++ b/src/forge/Main/CoderRootIndex.js
@@ -3,7 +3,6 @@ import { Route , Switch } from 'react-router-dom';
// import Top from './DetailTop';
import Loadable from 'react-loadable';
import Loading from '../../Loading';
-import axios from 'axios';
import './Index.scss';
const FileNew = Loadable({
@@ -51,37 +50,37 @@ class CoderRootIndex extends Component{
}
}
- componentDidMount=()=>{
- this.Init();
- }
- componentDidUpdate=(prevProps)=>{
- const { location } = this.props;
- const prevlocation = prevProps && prevProps.location;
- if (location !== prevlocation) {
- this.Init();
- }
- }
+ // componentDidMount=()=>{
+ // this.Init();
+ // }
+ // componentDidUpdate=(prevProps)=>{
+ // const { location } = this.props;
+ // const prevlocation = prevProps && prevProps.location;
+ // if (location !== prevlocation) {
+ // this.Init();
+ // }
+ // }
- Init=()=>{
- const { branchName } = this.props.match.params;
- const { defaultBranch } = this.props;
- this.getTopCount(branchName || defaultBranch);
- }
+ // Init=()=>{
+ // const { branchName } = this.props.match.params;
+ // const { defaultBranch } = this.props;
+ // this.getTopCount(branchName || defaultBranch);
+ // }
// 获取
@@ -100,12 +99,12 @@ class CoderRootIndex extends Component{
>
(
(
(
{/*
Date: Mon, 11 Oct 2021 19:39:01 +0800
Subject: [PATCH 11/73] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E9=A1=B5=E6=8F=90=E4=BA=A4=E4=BF=A1=E6=81=AFmd=E6=B8=B2?=
=?UTF-8?q?=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Main/CoderRootCommit.js | 5 +++--
src/forge/css/index.scss | 3 +++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/forge/Main/CoderRootCommit.js b/src/forge/Main/CoderRootCommit.js
index 604917ba0..b542c3905 100644
--- a/src/forge/Main/CoderRootCommit.js
+++ b/src/forge/Main/CoderRootCommit.js
@@ -6,7 +6,8 @@ import { AlignTop } from '../Component/layout';
import SelectBranch from '../Branch/Select';
import Nodata from '../Nodata';
-import User from '../Component/User'
+import User from '../Component/User';
+import RenderHtml from '../../components/render-html.jsx';
import Tree from './img/tree.png';
import axios from 'axios';
import {Link} from "react-router-dom";
@@ -158,7 +159,7 @@ class CoderRootCommit extends Component{
-
)
--
2.34.1
From cd30082956be3e6ffb45e813262988280b96bba0 Mon Sep 17 00:00:00 2001
From: caishi
Date: Mon, 11 Oct 2021 20:03:03 +0800
Subject: [PATCH 13/73] styel
---
src/forge/Main/tag/Index.jsx | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/forge/Main/tag/Index.jsx b/src/forge/Main/tag/Index.jsx
index cf89cd7b4..5e2ddbfa8 100644
--- a/src/forge/Main/tag/Index.jsx
+++ b/src/forge/Main/tag/Index.jsx
@@ -11,7 +11,7 @@ import moment from 'moment';
function Tags(props) {
- const [ source , setSource ] = useState([]);
+ const [ source , setSource ] = useState(undefined);
const [ isSpin , setIsSpin ] = useState(true);
const { projectsId , owner } = props.match.params;
@@ -99,18 +99,19 @@ function Tags(props) {
return(
- {
- source && source.length > 0 ?
-
- }
+
)
}
--
2.34.1
From 66c5662d01cb52af7d1986940dbc5b9d92683a9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Mon, 11 Oct 2021 21:20:08 +0800
Subject: [PATCH 14/73] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BA=93=E4=B8=80?=
=?UTF-8?q?=E7=BA=A7=E9=A1=B5=E9=9D=A2=E6=8F=90=E4=BA=A4=E6=8F=8F=E8=BF=B0?=
=?UTF-8?q?=E4=BF=A1=E6=81=AFmd=E6=B8=B2=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Main/CoderDepot.jsx | 5 +++--
src/forge/Main/Diff.jsx | 2 +-
src/forge/Main/Index.scss | 10 ++++++++--
src/forge/css/index.scss | 2 +-
4 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx
index 70d1901eb..fe7eba521 100644
--- a/src/forge/Main/CoderDepot.jsx
+++ b/src/forge/Main/CoderDepot.jsx
@@ -22,6 +22,7 @@ import UpdateDescModal from './sub/UpdateDescModal';
import Nodata from '../Nodata';
import Invite from './sub/Invite';
import CheckProfile from '../Component/ProfileModal/Profile';
+import RenderHtml from '../../components/render-html';
/**
* projectDetail.type:0是托管项目，1是镜像项目，2是同步镜像项目(为2时不支持在线创建、在线上传、在线修改、在线删除、创建合并请求等功能)
*/
@@ -196,7 +197,7 @@ function CoderDepot(props){
let ele = document.getElementById("ptxt");
if(ele){
let h = ele.offsetHeight;
- if( h > 18 ) setHideBtn(true);
+ if( h > 33 ) setHideBtn(true);
}
}
},[projectDetail,lastCommit])
@@ -457,7 +458,7 @@ function CoderDepot(props){
(
+ 项目标识 (项目url标识部分，更改项目标识将导致原仓库地址失效)}
+ >
{getFieldDecorator("project_identifier", {
rules: [
{
@@ -299,7 +301,7 @@ class Setting extends Component {
})(
)}
- */}
+
{getFieldDecorator("project_description", {
rules: [],
--
2.34.1
From a7c2120cf3c9f10390b68d161df2c678be8e30ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Wed, 13 Oct 2021 13:37:51 +0800
Subject: [PATCH 28/73] =?UTF-8?q?=E5=8A=A8=E6=80=81=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Head/Header.js | 7 +++----
src/forge/SecuritySetting/Index.jsx | 7 ++++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js
index 59513153b..9e10a0ff7 100644
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@@ -367,7 +367,6 @@ class NewHeader extends Component {
}
let search_url = settings && settings.common && settings.common.search;
- let notice_url = settings && settings.common && settings.common.notice;
return (
{item.message}
+
- :
-
+ :
+
+
-
-
-
-
- :
-
+
+ {
+ source && source.length > 0 &&
+
+ }
+ {
+ source && source.length === 0 &&
+ }
+
+
-
{ hideBtn && changeHide(hide)}> }
diff --git a/src/forge/Main/Diff.jsx b/src/forge/Main/Diff.jsx
index a50c16c71..f5220b092 100644
--- a/src/forge/Main/Diff.jsx
+++ b/src/forge/Main/Diff.jsx
@@ -86,7 +86,7 @@ export default (props) => {
{lastCommit.message}
+
{commit && commit.message &&
-
}
{data.branch}
diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss
index f2f7cd2b4..f87b82f97 100644
--- a/src/forge/Main/Index.scss
+++ b/src/forge/Main/Index.scss
@@ -252,7 +252,13 @@
border: 1px solid rgba(42, 97, 255, 0.23);
background-color: #FAFCFF;
.ellipsistxt{
- margin-top: 6px;
+ .markdown-body{
+ line-height: 8px;
+ & p {
+ margin: 0 0px !important;
+ }
+ }
+ margin-top: 2px;
// cursor: pointer;
#ptxt{
margin-bottom: 0px;
@@ -270,7 +276,7 @@
width: 0;
color: #666;
&.hidetxt{
- height: 18px;
+ height: 22px;
overflow: hidden;
position: relative;
padding-right:8px;
diff --git a/src/forge/css/index.scss b/src/forge/css/index.scss
index 12ebae462..a19619d73 100644
--- a/src/forge/css/index.scss
+++ b/src/forge/css/index.scss
@@ -104,7 +104,7 @@ ul,ol,dl{
white-space: normal;
&:hover{
text-decoration: underline;
- & p{
+ & .markdown-body{
color: #466AFF;
}
}
--
2.34.1
From 8bdd619dde53fd3e82f5722e975170d057eda5d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Tue, 12 Oct 2021 09:56:09 +0800
Subject: [PATCH 15/73] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BA=93=E4=B8=80?=
=?UTF-8?q?=E7=BA=A7=E9=A1=B5=E9=9D=A2=E6=8F=90=E4=BA=A4=E4=BF=A1=E6=81=AF?=
=?UTF-8?q?css=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Main/CoderDepot.jsx | 2 +-
src/forge/Main/Diff.jsx | 3 +++
src/forge/Main/Index.scss | 29 ++++++++++++++++++++++++-----
src/forge/Main/list.scss | 6 ++++++
4 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx
index fe7eba521..c86e31d94 100644
--- a/src/forge/Main/CoderDepot.jsx
+++ b/src/forge/Main/CoderDepot.jsx
@@ -197,7 +197,7 @@ function CoderDepot(props){
let ele = document.getElementById("ptxt");
if(ele){
let h = ele.offsetHeight;
- if( h > 33 ) setHideBtn(true);
+ if( h > 35 ) setHideBtn(true);
}
}
},[projectDetail,lastCommit])
diff --git a/src/forge/Main/Diff.jsx b/src/forge/Main/Diff.jsx
index f5220b092..045500615 100644
--- a/src/forge/Main/Diff.jsx
+++ b/src/forge/Main/Diff.jsx
@@ -18,6 +18,9 @@ const Infos = styled.div`
border: 1px solid rgba(42, 97, 255, 0.23);
border-radius: 3px 3px 0px 0px;
padding: 10px 20px 10px 16px;
+ & .markdown-body table{
+ background: #f1f8ff;
+ }
& .f-wrap-between{
align-items: center;
}
diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss
index f87b82f97..a177ccc79 100644
--- a/src/forge/Main/Index.scss
+++ b/src/forge/Main/Index.scss
@@ -252,10 +252,10 @@
border: 1px solid rgba(42, 97, 255, 0.23);
background-color: #FAFCFF;
.ellipsistxt{
- .markdown-body{
- line-height: 8px;
- & p {
- margin: 0 0px !important;
+ &:hover .markdown-body{
+ color: #466AFF;
+ & a{
+ color: #466AFF;
}
}
margin-top: 2px;
@@ -269,6 +269,25 @@
white-space:-pre-wrap; /* Opera 4-6 */
white-space:-o-pre-wrap; /* Opera 7 */
word-wrap:break-word;
+ .markdown-body{
+ line-height: 10px;
+ & p {
+ margin: 0px 0px !important;
+ }
+ & ol,ul{
+ padding-bottom: 3px;
+ & li{
+ min-height: 18px;
+ }
+ }
+ & table{
+ line-height: 1;
+ background: #FAFCFF;
+ }
+ &:first-child {
+ margin-top: -1px !important;
+ }
+ }
}
margin-left: 13px;
line-height:18px;
@@ -276,7 +295,7 @@
width: 0;
color: #666;
&.hidetxt{
- height: 22px;
+ height: 24px;
overflow: hidden;
position: relative;
padding-right:8px;
diff --git a/src/forge/Main/list.scss b/src/forge/Main/list.scss
index 73b534de9..83b4d5ee7 100644
--- a/src/forge/Main/list.scss
+++ b/src/forge/Main/list.scss
@@ -735,6 +735,9 @@ a.color-grey-ccc:hover{
border-radius: 4px;
margin-left: 16px;
align-items: center;
+ & .markdown-body table{
+ background: #FAFCFF;
+ }
&:after,&:before{
content: "";
position: absolute;
@@ -760,6 +763,9 @@ a.color-grey-ccc:hover{
&:before{
border-right: 10px solid rgba(42, 97, 255, 0.58);
}
+ & .markdown-body table{
+ background: #EEF6FF;
+ }
}
.treecopy-cont{
padding: 4px 15px;
--
2.34.1
From bcbd915bd1d95fcbd66174a02618428bf88ee8e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Tue, 12 Oct 2021 10:24:58 +0800
Subject: [PATCH 16/73] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AF=A6=E6=83=85Toolt?=
=?UTF-8?q?ip=E6=B8=B2=E6=9F=93=E5=87=BAfalse?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Merge/Files.jsx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/forge/Merge/Files.jsx b/src/forge/Merge/Files.jsx
index 87260cdd8..b4cf5b488 100644
--- a/src/forge/Merge/Files.jsx
+++ b/src/forge/Merge/Files.jsx
@@ -52,7 +52,7 @@ function Files({ data,history,owner,projectsId , parentsSha }){
{item.name}
- 0 && "："}${item.addition>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.tagger.id ?
+
+ 
+
+ :
+
+
+
+ }
+
+ }
创建于{txt}
)
@@ -86,17 +101,17 @@ function Tags(props) {
key:5,
ellipsis:true,
align:"center",
- width:"181px",
+ width:"204px",
render:(txt,item)=>{
return (
-
+
)
}
}
diff --git a/src/forge/Main/tag/Index.scss b/src/forge/Main/tag/Index.scss
index bff4c97b4..70e83a837 100644
--- a/src/forge/Main/tag/Index.scss
+++ b/src/forge/Main/tag/Index.scss
@@ -13,6 +13,9 @@
}
}
tbody{
+ .btn-83{
+ margin:0px 8px;
+ }
tr{
&:hover td{
background-color: #fff!important;
@@ -23,7 +26,6 @@
line-height: 69px;
color:#333333;
div{
- padding-left: 69px;
font-weight: 500;
}
}
@@ -43,8 +45,7 @@
justify-content: center;
}
.tagBranch{
- width: 200px;
- margin-left: -67px;
+ padding-right: 15px;
text-overflow: ellipsis;
overflow: hidden;
.tagClass{
@@ -53,4 +54,9 @@
}
.tagModel{
font-weight: 400;
+ .tagModelImg img{
+ width: 25px;
+ height: 25px;
+ border-radius: 50%;
+ }
}
\ No newline at end of file
--
2.34.1
From 19b73811201ce3d7476971d56c596202645ee736 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Tue, 12 Oct 2021 15:14:49 +0800
Subject: [PATCH 22/73] issue
---
src/forge/Branch/SelectOverlay.jsx | 2 ++
src/forge/Main/Diff.jsx | 2 +-
src/forge/Main/Index.scss | 4 +++-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/forge/Branch/SelectOverlay.jsx b/src/forge/Branch/SelectOverlay.jsx
index f043a8f52..e9c4aae4f 100644
--- a/src/forge/Branch/SelectOverlay.jsx
+++ b/src/forge/Branch/SelectOverlay.jsx
@@ -53,8 +53,10 @@ function SelectOverlay({ changeBranch , tagflag , branchList , projectsId , owne
setIsSpin(true);
if(e.key === "branch"){
getBranchs(projectsId,owner);
+ setNav(0);
}else{
getTags(projectsId,owner);
+ setNav(1);
}
}
diff --git a/src/forge/Main/Diff.jsx b/src/forge/Main/Diff.jsx
index 045500615..6556023e3 100644
--- a/src/forge/Main/Diff.jsx
+++ b/src/forge/Main/Diff.jsx
@@ -91,7 +91,7 @@ export default (props) => {
{commit && commit.message &&
}
- {data.branch}
+ {data.branch}
- 0 && "："} ${item.addition > 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 + "处删除" : ""}`}>
--
2.34.1
From 1c5b5a66d8d49744f05bc64da43e9ca4111fc5c9 Mon Sep 17 00:00:00 2001
From: hucong <1422588487@qq.com>
Date: Tue, 12 Oct 2021 10:32:09 +0800
Subject: [PATCH 17/73] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BA=93=E4=BA=8C?=
=?UTF-8?q?=E7=BA=A7=E9=A1=B5=E9=9D=A2=E6=A0=87=E7=AD=BE=E9=A1=B5=E4=BC=98?=
=?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/css/edu-purge.css | 4 +++-
src/forge/Main/tag/Index.jsx | 8 ++++++--
src/forge/Main/tag/Index.scss | 6 ++++++
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/public/css/edu-purge.css b/public/css/edu-purge.css
index 603513339..a9692c92e 100644
--- a/public/css/edu-purge.css
+++ b/public/css/edu-purge.css
@@ -1309,6 +1309,7 @@ span {
margin: 0;
padding: 0;
margin-bottom: 0px!important;
+ font-weight: 500;
}
table,
@@ -1362,7 +1363,8 @@ table {
a:link,
a:visited {
text-decoration: none;
- color: #05101a;
+ color: #333333;
+ font-weight: 500;
}
ol,
diff --git a/src/forge/Main/tag/Index.jsx b/src/forge/Main/tag/Index.jsx
index cf89cd7b4..20e74451e 100644
--- a/src/forge/Main/tag/Index.jsx
+++ b/src/forge/Main/tag/Index.jsx
@@ -35,7 +35,11 @@ function Tags(props) {
key:1,
ellipsis:true,
render:(txt,item)=>{
- return {item.name}
+ return(
+
-
+ }
)
}
--
2.34.1
From c282a1e034d63d8a4b5b5033b37acc70593d67d0 Mon Sep 17 00:00:00 2001
From: caishi
Date: Tue, 12 Oct 2021 11:57:27 +0800
Subject: [PATCH 21/73] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E5=A4=B4=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Main/tag/Index.jsx | 29 ++++++++++++++++++++++-------
src/forge/Main/tag/Index.scss | 12 +++++++++---
2 files changed, 31 insertions(+), 10 deletions(-)
diff --git a/src/forge/Main/tag/Index.jsx b/src/forge/Main/tag/Index.jsx
index 458de69a0..6a111b454 100644
--- a/src/forge/Main/tag/Index.jsx
+++ b/src/forge/Main/tag/Index.jsx
@@ -4,6 +4,7 @@ import { Table , Tooltip , Spin } from 'antd';
import axios from 'axios';
import { Link } from 'react-router-dom';
import { truncateCommitId } from '../../common/util';
+import { getImageUrl } from 'educoder';
import Nonedata from '../../Nodata';
import './Index.scss';
import Tree from '../img/tree.png'
@@ -34,12 +35,12 @@ function Tags(props) {
dataIndex:"name",
key:1,
ellipsis:true,
-
+ width:"200px",
render:(txt,item)=>{
return(
)
}
},
@@ -51,7 +52,21 @@ function Tags(props) {
render:(txt,item)=>{
return (
- {item.tagger && item.tagger.name}
+ {
+ item.tagger &&
+
+ {item.name}
+
+ )
}
},
{
@@ -46,7 +50,7 @@ function Tags(props) {
render:(txt,item)=>{
return (
- {item.commit && item.commit.name}
+ {item.tagger && item.tagger.name}
创建于{txt}
)
diff --git a/src/forge/Main/tag/Index.scss b/src/forge/Main/tag/Index.scss
index 5d72ab294..80a3c828d 100644
--- a/src/forge/Main/tag/Index.scss
+++ b/src/forge/Main/tag/Index.scss
@@ -39,4 +39,10 @@
display: flex;
align-items: center;
justify-content: center;
+}
+.tagBranch{
+ width: 200px;
+ margin-left: -67px;
+ text-overflow: ellipsis;
+ overflow: hidden;
}
\ No newline at end of file
--
2.34.1
From 63a74cc0764a7ab45ad11882d844b8ccdf4c031a Mon Sep 17 00:00:00 2001
From: hucong <1422588487@qq.com>
Date: Tue, 12 Oct 2021 10:45:54 +0800
Subject: [PATCH 18/73] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BA=93=E4=BA=8C?=
=?UTF-8?q?=E7=BA=A7=E9=A1=B5=E9=9D=A2=E6=A0=87=E7=AD=BE=E9=A1=B5=E4=BC=98?=
=?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/css/edu-purge.css | 4 +---
src/forge/Main/tag/Index.scss | 2 ++
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/public/css/edu-purge.css b/public/css/edu-purge.css
index a9692c92e..603513339 100644
--- a/public/css/edu-purge.css
+++ b/public/css/edu-purge.css
@@ -1309,7 +1309,6 @@ span {
margin: 0;
padding: 0;
margin-bottom: 0px!important;
- font-weight: 500;
}
table,
@@ -1363,8 +1362,7 @@ table {
a:link,
a:visited {
text-decoration: none;
- color: #333333;
- font-weight: 500;
+ color: #05101a;
}
ol,
diff --git a/src/forge/Main/tag/Index.scss b/src/forge/Main/tag/Index.scss
index 80a3c828d..89f473f54 100644
--- a/src/forge/Main/tag/Index.scss
+++ b/src/forge/Main/tag/Index.scss
@@ -23,6 +23,8 @@
line-height: 69px;
div{
padding-left: 69px;
+ font-weight: 500;
+ color:#333333;
}
}
&:last-child{
--
2.34.1
From fd58c70c545de128bec0e677f652f657d28358c6 Mon Sep 17 00:00:00 2001
From: hucong <1422588487@qq.com>
Date: Tue, 12 Oct 2021 11:03:03 +0800
Subject: [PATCH 19/73] =?UTF-8?q?issue=E6=A0=87=E7=AD=BE=E9=A1=B5=E6=A0=B7?=
=?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Main/tag/Index.jsx | 5 +++--
src/forge/Main/tag/Index.scss | 8 +++++++-
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/forge/Main/tag/Index.jsx b/src/forge/Main/tag/Index.jsx
index 20e74451e..4a0ce00a3 100644
--- a/src/forge/Main/tag/Index.jsx
+++ b/src/forge/Main/tag/Index.jsx
@@ -34,10 +34,11 @@ function Tags(props) {
dataIndex:"name",
key:1,
ellipsis:true,
+
render:(txt,item)=>{
return(
- {item.name}
+ {item.name}
)
}
@@ -49,7 +50,7 @@ function Tags(props) {
ellipsis:true,
render:(txt,item)=>{
return (
-
+
{item.tagger && item.tagger.name}
创建于{txt}
diff --git a/src/forge/Main/tag/Index.scss b/src/forge/Main/tag/Index.scss
index 89f473f54..bff4c97b4 100644
--- a/src/forge/Main/tag/Index.scss
+++ b/src/forge/Main/tag/Index.scss
@@ -21,10 +21,10 @@
padding:0px;
height: 69px;
line-height: 69px;
+ color:#333333;
div{
padding-left: 69px;
font-weight: 500;
- color:#333333;
}
}
&:last-child{
@@ -47,4 +47,10 @@
margin-left: -67px;
text-overflow: ellipsis;
overflow: hidden;
+ .tagClass{
+ color:#333333;
+ }
+}
+.tagModel{
+ font-weight: 400;
}
\ No newline at end of file
--
2.34.1
From 112aacb6a107c01cc5543fdb5bbe2fdcd9e723d4 Mon Sep 17 00:00:00 2001
From: hucong <1422588487@qq.com>
Date: Tue, 12 Oct 2021 11:49:04 +0800
Subject: [PATCH 20/73] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BA=93=E4=BA=8C?=
=?UTF-8?q?=E7=BA=A7=E9=A1=B5=E9=9D=A2=E6=A0=87=E7=AD=BE=E5=8A=A0=E8=BD=BD?=
=?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Main/tag/Index.jsx | 27 +++++++++++++--------------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/src/forge/Main/tag/Index.jsx b/src/forge/Main/tag/Index.jsx
index 458de69a0..4a0ce00a3 100644
--- a/src/forge/Main/tag/Index.jsx
+++ b/src/forge/Main/tag/Index.jsx
@@ -11,7 +11,7 @@ import moment from 'moment';
function Tags(props) {
- const [ source , setSource ] = useState(undefined);
+ const [ source , setSource ] = useState([]);
const [ isSpin , setIsSpin ] = useState(true);
const { projectsId , owner } = props.match.params;
@@ -104,19 +104,18 @@ function Tags(props) {
return(
-
- {
- source && source.length > 0 &&
-
- }
- {
- source && source.length === 0 &&
- }
-
-
+ {
+ source && source.length > 0 ?
+
+
+
+
+
+ :
+
- {item.name}
-
+ {item.name}
+
{
baseOperate &&
- urlLink(`/${owner}/${projectsId}/pulls/new/${branchName || defaultBranch}`)} >+ 合并请求
+ urlLink(`/${owner}/${projectsId}/compare/${branchName || defaultBranch}`)} >+ 合并请求
}
{
baseOper &&
diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index bc35344f4..70283d310 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -70,7 +70,7 @@ const MergeIndexDetail = Loadable({
})
const CreateMerge = Loadable({
- loader: () => import('../Merge/NewMerge'),
+ loader: () => import('../Merge/CreateMerge'),
loading: Loading,
})
@@ -150,7 +150,9 @@ function checkPathname(projectsId, owner, pathname) {
name = "about"
} else if (url.indexOf("/issues") > -1 || url.indexOf("Milepost") > 0) {
name = "issues";
- } else if (url.indexOf("/pulls") > -1) {
+ } else if (url.indexOf("/pulls") > -1 || url.indexOf("/compare") > -1) {
+ // /pulls，合并请求除新建合并请求外，
+ // /compare，新建合并请求
name = "pulls"
} else if (url.indexOf("/milestones") > -1) {
name = "milestones"
@@ -713,17 +715,17 @@ class Detail extends Component {
}
>
{/* 新建合并请求 */}
- ( */}
+ (
- (
- (
+ {getFieldDecorator("project_identifier", {
+ rules: [
+ {
+ required: true,
+ message: "请输入项目标识",
+ },
+ ],
+ })(
+
+ )}
+ */}
{getFieldDecorator("project_description", {
rules: [],
--
2.34.1
From 1fbe6671b1e0b77c3c33799d437eb740343dbc9b Mon Sep 17 00:00:00 2001
From: caishi
Date: Tue, 12 Oct 2021 17:32:09 +0800
Subject: [PATCH 25/73] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BA=93=E4=B8=80?=
=?UTF-8?q?=E7=BA=A7=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Main/CoderDepot.jsx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx
index c86e31d94..f2e4e149a 100644
--- a/src/forge/Main/CoderDepot.jsx
+++ b/src/forge/Main/CoderDepot.jsx
@@ -402,7 +402,7 @@ function CoderDepot(props){
getPathUrl={getPathUrl}
/>
:
-
--
2.34.1
From 94ceec26e98ea7c50d2d7b13dac8e19eac27e192 Mon Sep 17 00:00:00 2001
From: caishi
Date: Tue, 12 Oct 2021 18:03:25 +0800
Subject: [PATCH 26/73] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Main/tag/Index.jsx | 26 +++++++++++++-------------
src/forge/Main/tag/Index.scss | 4 ----
2 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/src/forge/Main/tag/Index.jsx b/src/forge/Main/tag/Index.jsx
index 6a111b454..0fd40b1f4 100644
--- a/src/forge/Main/tag/Index.jsx
+++ b/src/forge/Main/tag/Index.jsx
@@ -119,19 +119,19 @@ function Tags(props) {
return(
-
+
)
}
diff --git a/src/forge/Main/tag/Index.scss b/src/forge/Main/tag/Index.scss
index 70e83a837..6adba91e3 100644
--- a/src/forge/Main/tag/Index.scss
+++ b/src/forge/Main/tag/Index.scss
@@ -39,10 +39,6 @@
}
.tagSpin{
min-height: 300px;
- text-align: center;
- display: flex;
- align-items: center;
- justify-content: center;
}
.tagBranch{
padding-right: 15px;
--
2.34.1
From fe4c5a79d2631e62334d4e32fafacf43a1ed3905 Mon Sep 17 00:00:00 2001
From: caishi
Date: Wed, 13 Oct 2021 09:57:04 +0800
Subject: [PATCH 27/73] =?UTF-8?q?=E4=BB=93=E5=BA=93=E8=AE=BE=E7=BD=AE-?=
=?UTF-8?q?=E5=8F=AF=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/css/edu-purge.css | 2 +-
src/forge/Settings/Setting.js | 14 ++++++++------
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/public/css/edu-purge.css b/public/css/edu-purge.css
index 1ec104461..0d146204c 100644
--- a/public/css/edu-purge.css
+++ b/public/css/edu-purge.css
@@ -2456,7 +2456,7 @@ a.hoverLine:hover{
.color-grey-9 {
- color: #333333 !important;
+ color: #999 !important;
}
a:hover{
diff --git a/src/forge/Settings/Setting.js b/src/forge/Settings/Setting.js
index ec9f80c83..460ec1620 100644
--- a/src/forge/Settings/Setting.js
+++ b/src/forge/Settings/Setting.js
@@ -161,12 +161,12 @@ class Setting extends Component {
loading:false
})
this.props.showNotification(`仓库信息修改成功！`);
- // if(values.project_identifier !== projectsId){
- // this.props.history.push(`/${owner}/${values.project_identifier}/settings`);
- // }else{
- // }
+ if(values.project_identifier !== projectsId){
+ this.props.history.push(`/${owner}/${values.project_identifier}/settings`);
+ }else{
const { getDetail } = this.props;
getDetail && getDetail();
+ }
}
}).catch((error) => {
console.log(error);
@@ -288,7 +288,9 @@ class Setting extends Component {
)}
- {/*
{
(isManager || isDeveloper) && (projectDetail && projectDetail.type!==2) &&
- + 合并请求
+ + 合并请求
}
下载
diff --git a/src/forge/Merge/CreateMerge.js b/src/forge/Merge/CreateMerge.js
new file mode 100644
index 000000000..2ee29c39f
--- /dev/null
+++ b/src/forge/Merge/CreateMerge.js
@@ -0,0 +1,413 @@
+import React, { Component } from 'react';
+import { Input, Select, Spin, Alert } from 'antd';
+import axios from 'axios';
+import MergeForm from './merge_form';
+import MergeFooter from './merge_footer';
+
+import '../Order/order.css';
+import './merge.css';
+
+/**
+ * 根据url获取目标仓库、目标分支、源仓库、源分支
+ * 路由规则：owner/projectId/compare/merge...pullowner:pullBranch
+ * 可能存在的情况
+ * 1、代码库首页跳转，仓库相同，目标分支为默认分支，owner/projectId/compare/pullBranch
+ * 2、代码库分支列表，仓库相同，目标分支为默认分支，owner/projectId/compare/pullBranch
+ * 3、合并请求列表页（新建、无数据时的提示），仓库相同，源、目标都为默认分支，owner/projectId/compare
+ * 4、新建页面，切换分支、切换目标仓库、刷新页面等，存在所有可能情况
+ */
+function getBranchParams(pathname) {
+ const result = {
+ // 目标仓库所有者
+ mergeOwner: undefined,
+ // 目标分支
+ mergeBranch: 'master',
+ // 源仓库所有者
+ pullOwner: undefined,
+ // 源分支
+ pullBranch: 'master',
+ // 仓库名称
+ projectId: undefined,
+ };
+ // 去掉第一个字符/
+ const _pathname = pathname.slice(1);
+ const [ownerProject, branchUrl] = _pathname.split('/compare');
+ const [mergeOwner, projectId] = ownerProject.split('/');
+ // 同仓库时
+ result.mergeOwner = mergeOwner;
+ result.pullOwner = mergeOwner;
+ result.projectId = projectId;
+ if (branchUrl) {
+ // 如果存在具体的分支
+ const _branchUrl = branchUrl.slice(1);
+ if (_branchUrl.indexOf('...') > -1) {
+ // 存在源分支与目标分支
+ const [mergeBranch, pullObj] = _branchUrl.split('...');
+ result.mergeBranch = mergeBranch;
+ if (pullObj.indexOf(':') > -1) {
+ // 存在源仓库
+ const [pullOwner, pullBranch] = pullObj.split(':');
+ result.pullOwner = pullOwner;
+ result.pullBranch = pullBranch;
+ } else {
+ result.pullBranch = pullObj;
+ }
+ } else {
+ result.pullBranch = _branchUrl;
+ }
+ }
+ return result;
+}
+
+const Option = Select.Option;
+
+class CreateMerge extends Component {
+ constructor(props) {
+ super(props);
+ const { pullBranch, mergeBranch } = getBranchParams(
+ this.props.location.pathname
+ );
+ this.state = {
+ data: undefined,
+ pullBranches: undefined,
+ mergeBranches: undefined,
+ mergeProjects: undefined,
+ merge: mergeBranch || 'master',
+ pull: pullBranch || 'master',
+ id: undefined,
+ // isFork: false,
+ projects_names: undefined,
+ isSpin: true,
+ showMessage: false,
+ merge_head: false, // 是否向fork后的源项目发起合并请求
+ defaultMessage: '必须选择不同的分支',
+ project_id: undefined, // 当前项目的id，也即开始发送合并请求的源项目id
+ merge_project_user: undefined,
+ comparesData: undefined, //提交和文件的内容，保存compare接口返回的数据
+ // 比较分支时的加载效果
+ isCompareSpin: true,
+ // 是否是初次加载，用这个字段来控制提示组件和文件组件的显示、隐藏比直接用isCompareSpin交互友好些
+ isFirstLoading: true,
+ };
+ }
+
+ componentDidMount = () => {
+ // 初始化时根据url获取目标仓库、分支，源仓库、分支；
+ // 再获取对应的仓库列表、分支列表
+ // 再调用比较接口
+ const branchParams = getBranchParams(this.props.location.pathname);
+ console.log('componentDidMount branchParams', branchParams);
+ this.getMergeInfo(branchParams);
+ };
+
+ componentDidUpdate = (preProps) => {
+ // url变化触发时（切换源分支、切换目标仓库、切换目标分支；回退）
+ const oldPathname = preProps.location.pathname;
+ const newPathname = this.props.location.pathname;
+ if (oldPathname !== newPathname) {
+ const branchParams = getBranchParams(newPathname);
+ console.log('componentDidUpdate branchParams', branchParams);
+ this.getMergeInfo(branchParams);
+ }
+ };
+
+ //获取新建合并请求数据
+ getMergeInfo = (branchParams) => {
+ this.setState({ isSpin: true });
+ const { pullOwner, pullBranch, mergeOwner, mergeBranch, projectId } =
+ branchParams;
+ const url = `/${pullOwner}/${projectId}/pulls/new.json`;
+ axios
+ .get(url)
+ .then((result) => {
+ if (result) {
+ this.setState({
+ // isFork: result.data.is_fork,
+ projects_names: result.data.projects_names,
+ mergeProjects: result.data.merge_projects,
+ pullBranches: result.data.branches,
+ mergeBranches: result.data.branches,
+ project_id: result.data.project_id,
+ id: result.data.id,
+ merge: mergeBranch,
+ pull: pullBranch,
+ });
+ }
+ if (pullOwner !== mergeOwner) {
+ this.getBranchList(mergeOwner, projectId);
+ }
+ this.compareProject(result.data.id, branchParams);
+ this.setState({ isSpin: false });
+ })
+ .catch((error) => {
+ this.setState({ isSpin: false });
+ console.log(error);
+ });
+ };
+
+ // compare接口，获取分支对比信息
+ compareProject = (baseid, branchParams) => {
+ // const { project } = this.props;
+ // const { owner, projectsId } = this.props.match.params;
+ const projectObj = this.props.project;
+ const { pullOwner, pullBranch, mergeOwner, mergeBranch, projectId } =
+ branchParams;
+
+ let url = `/${mergeOwner}/${projectId}/compare`;
+ if (projectObj) {
+ if (baseid === projectObj.id) {
+ url += `/${pullBranch}...${mergeBranch}.json`;
+ } else {
+ url += `/${mergeBranch}...${pullOwner}/${projectId}:${pullBranch}.json`;
+ }
+ this.setState({ isSpin: false, isCompareSpin: true });
+ axios
+ .get(url)
+ .then((result) => {
+ if (result) {
+ if (result.data.status === 0) {
+ this.setState({
+ showMessage: false,
+ });
+ } else {
+ this.setState({
+ showMessage: true,
+ defaultMessage: result.data.message,
+ });
+ }
+ this.setState({
+ comparesData: result.data,
+ });
+ }
+ this.setState({
+ isFirstLoading: false,
+ isSpin: false,
+ isCompareSpin: false,
+ });
+ })
+ .catch((error) => {
+ this.setState({ isSpin: false, isCompareSpin: false });
+ });
+ }
+ };
+
+ // 根据所有者、仓库名，获取分支列表，目前仅涉及目标仓库分支查询
+ getBranchList = (login, projectId) => {
+ this.setState({ isSpin: true });
+ const url = `/${login}/${projectId}/pulls/get_branches.json`;
+ axios
+ .get(url)
+ .then((result) => {
+ if (result) {
+ this.setState({
+ mergeBranches: result.data,
+ });
+ }
+ this.setState({ isSpin: false });
+ })
+ .catch((error) => {
+ this.setState({ isSpin: false });
+ console.log(error);
+ });
+ };
+
+ // 切换分支事件
+ selectBrach = (type, value) => {
+ const { pullOwner, pullBranch, mergeOwner, mergeBranch, projectId } =
+ getBranchParams(this.props.location.pathname);
+ let _url = `/${mergeOwner}/${projectId}/compare/`;
+ // type为pull时，pullBranch取value，否则取原有值
+ // type为pull时，mergeBranch取原有值，否则取value
+ let _pullBranch = type === 'pull' ? value : pullBranch;
+ let _mergeBranch = type === 'pull' ? mergeBranch : value;
+ if (pullOwner === mergeOwner) {
+ // 如果仓库相同, compare/目标分支...源分支
+ _url += `${_mergeBranch}...${_pullBranch}`;
+ } else {
+ // 如果仓库不同, compare/目标分支...源分支
+ _url += `${_mergeBranch}...${pullOwner}:${_pullBranch}`;
+ }
+ this.props.history.push(_url);
+ };
+
+ // 切换仓库响应事件，目前仅目标分支可切换仓库
+ selectProjectName = (value) => {
+ const { projects_names, id } = this.state;
+ const { pullOwner, pullBranch } = getBranchParams(
+ this.props.location.pathname
+ );
+ let arr =
+ projects_names && projects_names.filter((item) => item.id === value);
+ let identifier = arr && arr[0].project_id;
+ let login = arr && arr[0].project_user_login;
+ // 目标仓库与源仓库不是一个仓库
+ let is_fork = parseInt(value, 10) !== parseInt(id, 10);
+ this.setState({
+ isSpin: true,
+ // merge_head: is_fork,
+ data: {
+ is_original: is_fork,
+ fork_project_id: is_fork ? id : '',
+ merge_user_login: is_fork
+ ? projects_names[0].project_user_login
+ : undefined,
+ },
+ });
+ if (login === pullOwner) {
+ // 如果切换后, 仓库与源仓库一致了
+ this.props.history.push(
+ `/${login}/${identifier}/compare/master...${pullBranch}`
+ );
+ } else {
+ this.props.history.push(
+ `/${login}/${identifier}/compare/master...${pullOwner}:${pullBranch}`
+ );
+ }
+ // this.newMergelist(login, identifier);
+ };
+
+ // 渲染分支列表
+ renderBrances = (list) => {
+ if (list && list.length > 0) {
+ return list.map((item, key) => {
+ return (
+
+ );
+ });
+ }
+ };
+
+ // 渲染项目列表
+ renderProjectNames = (list) => {
+ if (list && list.length > 0) {
+ return list.map((item, key) => {
+ return (
+
+ );
+ });
+ }
+ };
+
+ // 渲染html内容
+ withHtml = (html) => {
+ return ;
+ };
+
+ render() {
+ const {
+ data,
+ pullBranches,
+ mergeBranches,
+ mergeProjects,
+ pull,
+ merge,
+ isSpin,
+ isCompareSpin,
+ isFirstLoading,
+ showMessage,
+ defaultMessage,
+ projects_names,
+ id,
+ comparesData,
+ } = this.state;
+
+ let { project } = this.props;
+
+ return (
+
Date: Tue, 12 Oct 2021 17:15:16 +0800
Subject: [PATCH 24/73] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E6=A0=87=E8=AF=86=E6=9A=82=E6=97=B6=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/css/edu-purge.css | 6 ++----
src/forge/Main/Index.scss | 2 +-
src/forge/Settings/Setting.js | 23 ++++++++++++++++++++---
3 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/public/css/edu-purge.css b/public/css/edu-purge.css
index 603513339..1ec104461 100644
--- a/public/css/edu-purge.css
+++ b/public/css/edu-purge.css
@@ -1949,9 +1949,7 @@ a.decoration {
}
.mr20 {
- margin-right: 10px;
- margin-left: 10px;
- float: left;
+ margin-right: 20px;
}
.mr25 {
@@ -1959,7 +1957,7 @@ a.decoration {
}
.mr30 {
- margin-right: 10px;
+ margin-right: 30px;
}
.mr35 {
diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss
index a42bfec50..4ec6a7cb6 100644
--- a/src/forge/Main/Index.scss
+++ b/src/forge/Main/Index.scss
@@ -195,7 +195,7 @@
width: 40px;
height: 40px;
}
- &:nth-child(5){
+ &:nth-child(5n){
margin-right: 0px;
}
}
diff --git a/src/forge/Settings/Setting.js b/src/forge/Settings/Setting.js
index b1af2f998..ec9f80c83 100644
--- a/src/forge/Settings/Setting.js
+++ b/src/forge/Settings/Setting.js
@@ -153,15 +153,20 @@ class Setting extends Component {
name: values.project_name,
description: values.project_description,
private: private_check,
+ identifier:values.project_identifier,
...values,
}).then((result) => {
if (result) {
- this.props.showNotification(`仓库信息修改成功！`);
- const { getDetail } = this.props;
- getDetail && getDetail();
this.setState({
loading:false
})
+ this.props.showNotification(`仓库信息修改成功！`);
+ // if(values.project_identifier !== projectsId){
+ // this.props.history.push(`/${owner}/${values.project_identifier}/settings`);
+ // }else{
+ // }
+ const { getDetail } = this.props;
+ getDetail && getDetail();
}
}).catch((error) => {
console.log(error);
@@ -283,6 +288,18 @@ class Setting extends Component {
)}
+ {/*
+
+
+
+ );
+ }
+}
+
+export default CreateMerge;
diff --git a/src/forge/Merge/MergeLinkFooter.jsx b/src/forge/Merge/MergeLinkFooter.jsx
index 104d2168b..9f43086a9 100644
--- a/src/forge/Merge/MergeLinkFooter.jsx
+++ b/src/forge/Merge/MergeLinkFooter.jsx
@@ -111,10 +111,10 @@ class MergeFooter extends Component {
} = this.state;
// 评论数量优先取Comment组件中列表接口返回的，其次取合并请求详情接口中的，都没有取默认值0
- const commentsTotalCount =
- this.state.commentsTotalCount ||
- (data.comments_total_count && parseInt(data.comments_total_count, 10)) ||
- 0;
+ const commentsTotalCount = parseInt(
+ this.state.commentsTotalCount || data.comments_total_count || 0,
+ 10
+ );
return (
+
+ {!isFirstLoading && (
+
+
+ {/* 非加载状态且有提示 */}
+ {!isCompareSpin && showMessage && (
+
+
+
+
+
+
+ 源分支:
+
+
+
+
+
+
+
+
+
+
+
+ 目标分支:
+
+
+ )}
+ {/* 非加载状态且可以提交 */}
+ {!isCompareSpin && !showMessage && (
+
@@ -128,7 +128,7 @@ class MergeFooter extends Component {
tab={
评论
- {commentsTotalCount && (
+ {commentsTotalCount > 0 && (
{commentsTotalCount}
)}
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index 6409bd7f1..abdea3dd4 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -445,7 +445,7 @@ class MessageCount extends Component {
type="green"
ghost
className="ml20"
- onClick={()=>{this.props.history.push(`/${owner}/${projectsId}/pulls/${mergeId}/UpdateMerge`);}}
+ onClick={()=>{this.props.history.push(`/${owner}/${projectsId}/pulls/${mergeId}/updatemerge`);}}
>
编辑
diff --git a/src/forge/Merge/NewMerge.js b/src/forge/Merge/NewMerge.js
index 8913b0d1c..c5c5e2df6 100644
--- a/src/forge/Merge/NewMerge.js
+++ b/src/forge/Merge/NewMerge.js
@@ -194,7 +194,7 @@ class NewMerge extends Component {
// this.ischeckmerge();
let { id ,merge , pull } = this.state;
if(type==="pull"){
- this.props.history.push(`/${owner}/${projectsId}/pulls/new/${pull}`)
+ this.props.history.push(`/${owner}/${projectsId}/compare/${pull}`)
this.compareProject(id,value,merge);
}else{
this.compareProject(id,pull,value);
@@ -216,7 +216,7 @@ class NewMerge extends Component {
merge_user_login: is_fork_id ? projects_names[0].project_user_login : undefined
}
})
- this.props.history.push(`/${login}/${identifier}/pulls/new`);
+ this.props.history.push(`/${login}/${identifier}/compare`);
this.newMergelist(login,identifier);
};
diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js
index 399c9bd91..2e742d720 100644
--- a/src/forge/Merge/merge.js
+++ b/src/forge/Merge/merge.js
@@ -213,7 +213,7 @@ class merge extends Component {
checkOperation() {
const { projectsId,owner } = this.props.match.params;
- this.props.history.push(`/${owner}/${projectsId}/pulls/new`);
+ this.props.history.push(`/${owner}/${projectsId}/compare`);
}
render() {
const { projectsId , owner } = this.props.match.params;
diff --git a/src/forge/Merge/merge_footer.js b/src/forge/Merge/merge_footer.js
index 5e3a75560..868e736fe 100644
--- a/src/forge/Merge/merge_footer.js
+++ b/src/forge/Merge/merge_footer.js
@@ -1,169 +1,84 @@
-import React, { Component } from "react";
-import { Tabs, Spin } from "antd";
-import "../Order/order.css";
-import "./merge.css";
-import Commits from "./Commits";
-import Comments from "../comments/comments";
-import Files from "./Files";
-import axios from 'axios';
+import React, { Component } from 'react';
+import { Tabs } from 'antd';
+import Commits from './Commits';
+import Files from './Files';
+
+import '../Order/order.css';
+import './merge.css';
+
const { TabPane } = Tabs;
class MergeFooter extends Component {
- constructor(props){
+ constructor(props) {
super(props);
- this.state={
- pageData:undefined,
- commitsData:undefined,
- filesData:undefined,
- isSpin:false,
- activeKey:"1",
- commitCount:0,
- filesCount:0
- }
- }
- componentDidMount=()=>{
- const { footer_type ,data } = this.props;
- if(footer_type){
- const { projectsId , owner , mergeId } = this.props.match.params;
- this.getCommit(owner,projectsId,mergeId);
- this.getFile(owner,projectsId,mergeId);
- }
- this.setState({
- activeKey:footer_type ? "1" : "2",
- commitCount:data && data.commits_count,
- filesCount:data && data.files_count
- })
- }
- componentDidUpdate=(prevProps)=>{
- const { comparesData } = this.props;
- const { footer_type } = this.props;
- if(footer_type){
- const { data } = this.props;
- if(data !== prevProps.data){
- this.setState({
- commitCount:data && data.commits_count,
- filesCount:data && data.files_count
- })
- }
- }
- if(comparesData !== prevProps.comparesData){
- this.setState({
- activeKey:footer_type ? "1" : "2"
- })
- this.changeTab(footer_type ? "1" : "2");
- }
+ this.state = {
+ activeKey: '1',
+ };
}
- changeTab=(index)=>{
+ changeTab = (index) => {
this.setState({
- isSpin:true
- })
- this.setState({
- activeKey:index
- })
- const { footer_type , comparesData } = this.props;
- const { projectsId , owner , mergeId } = this.props.match.params;
-
- if(footer_type){
- if(index === "2"){
- this.getCommit(owner,projectsId,mergeId);
- }else if(index === "3"){
- this.getFile(owner,projectsId,mergeId);
- }else{
- this.setState({
- isSpin:false
- })
- }
- }else{
- this.setState({
- commitsData:comparesData.commits,
- filesData:comparesData.diff,
- commitCount:comparesData.commits_count,
- filesCount:comparesData.diff && comparesData.diff.files_count,
- isSpin:false
- })
- }
- }
-
- getCommit =(owner,projectsId,mergeId)=>{
- const url = `/${owner}/${projectsId}/pulls/${mergeId}/commits.json`;
- axios.get(url).then(result=>{
- if(result){
- this.setState({
- commitsData:result.data.commits,
- isSpin:false,
- commitCount:result.data.commits_count
- })
- }
- }).catch(error=>{})
- }
-
- getFile =(owner,projectsId,mergeId)=>{
- const url = `/${owner}/${projectsId}/pulls/${mergeId}/files.json`;
- axios.get(url).then(result=>{
- if(result){
- this.setState({
- filesData:result.data,
- isSpin:false,
- filesCount:result.data.files_count,
- })
- }
- }).catch(error=>{})
- }
+ activeKey: index,
+ });
+ };
render() {
- const { projectsId , owner } = this.props.match.params;
+ const { projectsId, owner } = this.props.match.params;
+ const { comparesData = {} } = this.props;
+ const { commits, diff, commits_count } = comparesData;
+ const { activeKey } = this.state;
- const { footer_type, order_id, data , comparesData } = this.props;
- let { isSpin , activeKey , filesCount, commitCount , filesData , commitsData } = this.state;
-
- return (
- !footer_type && !comparesData || (comparesData && ((comparesData.commits && comparesData.commits.length===0)||(comparesData && !comparesData.diff)) )?"":
-
--
2.34.1
From b578383e8d02f09afb076a60a9c0ecf77fefc753 Mon Sep 17 00:00:00 2001
From: caishi
-
-
- {
- footer_type &&
- 评论
- {data && parseInt(data.comments_count) > 0 && {data.comments_count}}
-
- } key="1">
-
- }
- {
- commitsData && commitsData.length > 0 &&
- 提交
- {commitCount > 0 && {commitCount}}
- } key="2">
-
- }
- {
- filesData && filesData.files && filesData.files.length>0 &&
- 文件
- {filesCount > 0 && {filesCount}}
-
- } key="3">
-
-
- }
-
-
-
+ return (commits && commits.length === 0) || !diff ? (
+ ''
+ ) : (
+
+
+ {commits && commits.length > 0 && (
+
+ 提交
+ {commits_count > 0 && (
+ {commits_count}
+ )}
+
+ }
+ key="1"
+ >
+
+ )}
+ {diff && diff.files && diff.files.length > 0 && (
+
+ 文件
+ {diff.files_count > 0 && (
+ {diff.files_count}
+ )}
+
+ }
+ key="3"
+ >
+
+ )}
+
);
}
diff --git a/src/forge/Merge/merge_form.js b/src/forge/Merge/merge_form.js
index 1f03a433e..4716bdfca 100644
--- a/src/forge/Merge/merge_form.js
+++ b/src/forge/Merge/merge_form.js
@@ -165,7 +165,8 @@ class MergeForm extends Component {
this.setState({
isSpin: false,
});
- this.props.history.push(`/${owner}/${projectsId}/pulls`);
+ const { pull_request_id } = result.data;
+ this.props.history.push(`/${owner}/${projectsId}/pulls/${pull_request_id}`);
const { getDetail } = this.props;
getDetail && getDetail();
} else {
diff --git a/src/forge/Merge/no_data.js b/src/forge/Merge/no_data.js
index d5584797f..f403bb4ea 100644
--- a/src/forge/Merge/no_data.js
+++ b/src/forge/Merge/no_data.js
@@ -12,7 +12,7 @@ class Nodata extends Component{
欢迎使用合并请求！
- 合并请求可以帮助您与他人协作编写代码。在使用之前，请先创建一个 合并请求
+ 合并请求可以帮助您与他人协作编写代码。在使用之前，请先创建一个 合并请求
+
@@ -417,7 +417,7 @@ function CoderDepot(props){
{projectDetail && projectDetail.tags && projectDetail.tags.total_count}
-
+
}
-
- {
- source && source.length > 0 &&
-
- }
- {
- source && source.length === 0 &&
- }
-
-
+
+ {
+ source && source.length > 0 &&
+
+ }
+ {
+ source && source.length === 0 &&
+ }
+
+
@@ -438,7 +437,7 @@ class NewHeader extends Component {
:""
}
- {current_user && current_user.login ?
+ { settings && settings.common && settings.common.notice ?
-
+ {current_user &&
-
+ }
: ""
diff --git a/src/forge/SecuritySetting/Index.jsx b/src/forge/SecuritySetting/Index.jsx
index 8419fd31c..f897dea19 100644
--- a/src/forge/SecuritySetting/Index.jsx
+++ b/src/forge/SecuritySetting/Index.jsx
@@ -43,8 +43,9 @@ const PrivateLetter = Loadable({
});
function Index(props){
- const { current_user } = props;
+ const { current_user,mygetHelmetapi } = props;
const { pathname } = props.location;
+ const notice_url = mygetHelmetapi && mygetHelmetapi.common && mygetHelmetapi.common.notice;
return(
@@ -59,11 +60,11 @@ function Index(props){
个人信息
-1 ?"active":""}>基本资料
-
-
+ {notice_url &&
- 消息通知
- -1 && pathname.indexOf("/settings/notice/config") == -1) || pathname.indexOf("/settings/notice/privateLetter")>-1 ?"active":""}>我的通知 {/*
- -1 ?"active":""}>通知管理 */} -
- 安全设置
- -1 ?"active":""}>SSH密钥 -- 2.34.1 From 38c553d87c87048042a27560c781b057db1df4ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Wed, 13 Oct 2021 15:14:47 +0800 Subject: [PATCH 29/73] =?UTF-8?q?=E6=9C=AA=E7=99=BB=E5=BD=95=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E9=9A=90=E8=97=8F=E6=B6=88=E6=81=AF=E9=93=83=E9=93=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Head/Header.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js index 9e10a0ff7..ac139351e 100644 --- a/src/forge/Head/Header.js +++ b/src/forge/Head/Header.js @@ -437,7 +437,7 @@ class NewHeader extends Component { :"" } - { settings && settings.common && settings.common.notice ? + { (settings && settings.common && settings.common.notice) && (current_user && current_user.login)?
- 原域名： +
- 官网顶级域名https://www.trustie.net +
- 版本库子域名https://forgeplus.trustie.net +
- 论坛子域名https://forum.trustie.net/forums +
- 更换后域名： +
- 官网顶级域名https://www.gitlink.org.cn +
- 版本库子域名https://www.git.gitlink.org.cn +
- 论坛子域名https://forum.gitlink.org.cn +
{
baseOperate &&
- urlLink(`/${owner}/${projectsId}/compare/${branchName || defaultBranch}`)} >+ 合并请求
+ urlLink(`/${owner}/${projectsId}/compare/master...${branchName || defaultBranch}`)} >+ 合并请求
}
{
baseOper &&
diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index 70283d310..da6d93382 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -320,6 +320,9 @@ class Detail extends Component {
const url = `/${owner}/${projectsId}/detail.json`;
axios.get(url).then((result) => {
if (result && result.data) {
+ if (result.data.status === 404) {
+ this.props.history.push('/nopage');
+ }
this.setState({
projectDetail: result.data,
project_id: result.data.project_id,
@@ -725,7 +728,7 @@ class Detail extends Component {
(props) => ( (
{
(isManager || isDeveloper) && (projectDetail && projectDetail.type!==2) &&
- + 合并请求
+ + 合并请求
}
下载
diff --git a/src/forge/Merge/CreateMerge.js b/src/forge/Merge/CreateMerge.js
index 2ee29c39f..0f6859071 100644
--- a/src/forge/Merge/CreateMerge.js
+++ b/src/forge/Merge/CreateMerge.js
@@ -121,6 +121,15 @@ class CreateMerge extends Component {
.get(url)
.then((result) => {
if (result) {
+ // 如果url上的分支不存在，取默认值master
+ const noMergeBranch =
+ (result.data.branches || []).filter(
+ (branch) => branch.name === mergeBranch
+ ).length === 0;
+ const noPullBranch =
+ (result.data.branches || []).filter(
+ (branch) => branch.name === pullBranch
+ ).length === 0;
this.setState({
// isFork: result.data.is_fork,
projects_names: result.data.projects_names,
@@ -132,11 +141,23 @@ class CreateMerge extends Component {
merge: mergeBranch,
pull: pullBranch,
});
+
+ if (!noMergeBranch && !noPullBranch) {
+ this.compareProject(result.data.id, branchParams);
+ } else {
+ const _message = [];
+ noMergeBranch && _message.push('目标分支不存在');
+ noPullBranch && _message.push('源分支不存在');
+ this.setState({
+ showMessage: true,
+ defaultMessage: _message.join(' , '),
+ isCompareSpin: false,
+ });
+ }
}
if (pullOwner !== mergeOwner) {
- this.getBranchList(mergeOwner, projectId);
+ this.getBranchList(branchParams);
}
- this.compareProject(result.data.id, branchParams);
this.setState({ isSpin: false });
})
.catch((error) => {
@@ -192,15 +213,19 @@ class CreateMerge extends Component {
};
// 根据所有者、仓库名，获取分支列表，目前仅涉及目标仓库分支查询
- getBranchList = (login, projectId) => {
+ getBranchList = ({ mergeOwner, projectId, mergeBranch }) => {
this.setState({ isSpin: true });
- const url = `/${login}/${projectId}/pulls/get_branches.json`;
+ const url = `/${mergeOwner}/${projectId}/pulls/get_branches.json`;
axios
.get(url)
.then((result) => {
if (result) {
+ const noMergeBranch =
+ (result.data || []).filter((branch) => branch.name === mergeBranch)
+ .length === 0;
this.setState({
mergeBranches: result.data,
+ merge: noMergeBranch ? 'master' : mergeBranch,
});
}
this.setState({ isSpin: false });
@@ -319,7 +344,7 @@ class CreateMerge extends Component {
return (
-
+
Date: Wed, 13 Oct 2021 17:58:45 +0800
Subject: [PATCH 33/73] =?UTF-8?q?=E5=9F=9F=E5=90=8D=E6=9B=B4=E6=8D=A2?=
=?UTF-8?q?=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Component/NoticeModal/Index.scss | 91 ++++++++++++++++++
.../Component/NoticeModal/SystemNotice.jsx | 82 ++++++++++++++++
src/forge/Component/NoticeModal/bg.png | Bin 0 -> 286967 bytes
src/modules/tpm/TPMIndexHOC.js | 19 +++-
4 files changed, 190 insertions(+), 2 deletions(-)
create mode 100644 src/forge/Component/NoticeModal/Index.scss
create mode 100644 src/forge/Component/NoticeModal/SystemNotice.jsx
create mode 100644 src/forge/Component/NoticeModal/bg.png
diff --git a/src/forge/Component/NoticeModal/Index.scss b/src/forge/Component/NoticeModal/Index.scss
new file mode 100644
index 000000000..32611b37f
--- /dev/null
+++ b/src/forge/Component/NoticeModal/Index.scss
@@ -0,0 +1,91 @@
+.systemBox{
+ .ant-modal-body{
+ padding:1px 0px 0px 0px;
+ .sysBox{
+ background-image: url('./bg.png');
+ background-repeat: no-repeat;
+ background-size: 100% 334px;
+ margin-top: -55px;
+ }
+ .sysnoticeBox{
+ width: 100%;
+ padding:80px 0px 34px;
+ display: flex;
+ flex-direction: column;
+ width: 780px;
+ margin: 0px auto;
+ p.ntitle{
+ height: 33px;
+ font-size: 24px;
+ font-weight: 500;
+ color: #31FFF7;
+ line-height: 33px;
+ text-align: center;
+ }
+ p.nSubtitle{
+ height: 25px;
+ line-height: 25px;
+ font-size: 18px;
+ font-weight: 500;
+ color: #FFFFFF;
+ margin-top: 60px;
+ padding-left: 20px;
+ }
+ .markdown-body{
+ box-shadow: 0px 0px 17px rgba(0,0,0,0.2);
+ border-radius: 4px;
+ margin-top: 17px!important;
+ }
+ .nContent{
+ padding:20px 34px;
+ background-color: #fff;
+ .nMaindesc{
+ height: 90px;
+ font-size: 15px;
+ font-weight: 400;
+ color: #000000;
+ line-height: 30px;
+ }
+ .realmName{
+ margin-top: 20px;
+ display: flex;
+ ul{
+ width: 50%;
+ li{
+ font-size: 15px;
+ font-weight: 500;
+ line-height: 32px;
+ text-align: left;
+ color: #000;
+ &:first-child{
+ color: #E65714;
+ }
+ }
+ }
+ }
+ .nSubdesc{
+ font-size: 15px;
+ font-weight: 400;
+ color: #000000;
+ line-height: 31px;
+ margin-top: 20px;
+ }
+ .nInfo{
+ font-size: 14px;
+ font-weight: 400;
+ color: #333333;
+ text-align: right;
+ margin-top: 25px;
+ p{
+ height: 20px;
+ line-height: 20px;
+ }
+ }
+ }
+ .nBtn{
+ text-align: center;
+ margin-top: 33px;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/forge/Component/NoticeModal/SystemNotice.jsx b/src/forge/Component/NoticeModal/SystemNotice.jsx
new file mode 100644
index 000000000..94b197480
--- /dev/null
+++ b/src/forge/Component/NoticeModal/SystemNotice.jsx
@@ -0,0 +1,82 @@
+import React , { useEffect , useState } from 'react';
+import { Modal , Button } from 'antd';
+import './Index.scss';
+import '../../css/index.scss';
+import RenderHtml from '../../../components/render-html';
+import axios from 'axios';
+
+function SystemNotice({system_notification,history,login,showNotice,hideSystemNotice}){
+ const [ visible , setVisible ] = useState(false);
+
+ useEffect(()=>{
+ if(system_notification && !system_notification.is_read && showNotice){
+ setVisible(true);
+ }
+ },[system_notification])
+
+ function sureContinue() {
+ if(login && ( system_notification && system_notification.id )){
+ const url = `/users/${login}/system_notification_histories.json`;
+ axios.post(url,{
+ system_notification_id:system_notification.id
+ }).then(result=>{
+ if(result && result.status === 0){
+ setVisible(false);
+ hideSystemNotice();
+ }
+ }).catch(error=>{})
+ }
+ setVisible(false);
+ hideSystemNotice();
+ }
+
+ return (
+
+
+ )
+}
+export default SystemNotice;
\ No newline at end of file
diff --git a/src/forge/Component/NoticeModal/bg.png b/src/forge/Component/NoticeModal/bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..625b3c311a06bfd45297a08166765c0ba148e90c
GIT binary patch
literal 286967
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 CTN%LTre==(NHKQ4_h6)7yoqB7)&(j0l4E@O7b#
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%0A~mC5`Ob;
zkuCq(t+$CFUs>ziBIL5qDcS5nIT?QXqD`xB9tG$D)-4qK%GBIWZ24TCmq>W%DL_E|PoA}|!#jj35EuuE@-b()6_
zgJdQf^zm+%jw=|RRhm9MrJF}{bOQcq7*~OUTy9zouhZVCfbCW@{W(X|ch$$|&Qtx%
zfAgodY-O)}-#pDzgs<FFC!nQbw+brs6>TIQiO_onx%DG
zyNWwr$s5r$ar8_#8|6`+(t0{$IRF#waSogWALeCz9zb6U%A*_mJvT~R@P+-tclntJ
z-K0vO9I9(ffE^9@G;}Geq2G9fBumh46VUTx+ZVMGJP#Foi%Mc+M2+Gcg)vv0+vvyc
zARPkr=dW;l1P|}k*AM&g{Cy9*Mmd=6+9;$F#IiX?EoJppGl_%NE&-$VQD9pt?#Wf$
zRRLj^X4Og&Y1$T8566@qjjb8bO`$_WhU2=Sy$A5NYxKKuBPyckIj6jccH8b9$mZfF
z1>n}##ovmYdk(qi?(w^TdqmM0pBz`GDUq#0sXZwDv@^l@^fl8N=r;VYnG`*b2)LIB
zVolcC>_D5J#XfQZdc~Ct(1-gd;@(lKkfsr-uTJh#j6GRkV+dAODnHRn~n
zxCPJ445P~35*VZ$n&sWjaNPKJ+|9=_E>tN-f1{nHq;bBI_P-C;w2)Iy+RD`3_y?hY`Es(U3~n*AE%bcJ*w${^;KH@;+=9-5St5u3urDx
zzB!(2$2ox4PXPUXt;u5TR3#n);vSk@2A_N#nhX%zNa--c1KEn=4nW6aDlt2}ssL^m
z6CrXQ0w9`%Y@QK4NjW)ydK4+6Zu+-6M8BtvUjpaRX}wE7ftNP!dkD;4wqqS7A}l9e
zlUr((>t-Txk2=;w;w*AV>oO{}sA3v~$A6Z#H*+yY>ZiwayFLZzQ22<-SZu)QXT<i2QoJHsR2Izv8Rg<4)Icgs2D-4R^TO94i_Tt>-
zI2az*Vdl~69__u+uIxdD(|5f*rtE?&SmseqiGny-ALW{kmk)A&ZLvIemvC~qWmlgW
z|3eIK20)=$oNMa_eT}?Fa?rn#p#`vFtdfhHRov4;ipfMSjre<`W1_zF5(Q-!g%cpw
zJ36>}fp!<`^1hRu8Quc>BS*QdiNXHyeHjgR@SUUM{+&g?1DunNQi-WHMHorWqmJ&5
zXxwyW;)Lb&!ah@?S7N4hKsMglqu6jAx1GPW4wHxK4s`ozV2^f;^@doQ{T<)i_5k36
z-yL|z_c>Y~k@6z{Jx9djm~heu=VuTl+ZyML~W?0
zOBpuU6QuLtpb08E4$@Y2Mmx!5oHzW35lK`Y`n&=3NxG}vD0-waYl@)XdEH+F==_U$
zSwP*R;`Ult99#~hwkzpom9L2gO(a65l5UDF&BgK%Q1{9na@c6j{t$-K2cp*#Fkeh^
zVE}&wu)cigg>OIdoY}@1%&yrnG%_!TqCU^eez$a*_&WeWv|;(@Dq!YWu;qeb{0MuV
z2H4|21MsI85T--iIyR&NDJrvOcCVDc$tsLY001BWNkl?b6@{-GqpD*&>oRjkbv}0W86FJmuGz%Z-_vNBHTse~e60Za*h!7
z26(HavU{49azHNsAv+vwB8Scn_@2v-S2ZT(xI=w!(u}fksJ@3LhyrTOcS>;wSi{0R
zOzm!08yn>+omLqzzG)GO!{NQp>gfRVX@hWa*ttH6$4Z|0s%Epv>B}4zkiKyvQratC
z2OXf!aktH_-WBrWw^2H{olD7`3xRE_)KB8)2ra(EiFA1ce=FZs|KeYF0KL3cw`Frm
zQ+8nc0@;h4dlVfZL?Y+rjqh^KgKBBuJXY9Fm_
diff --git a/src/forge/Merge/MergeDetail.js b/src/forge/Merge/MergeDetail.js
index 76c31ba0a..11bd3858b 100644
--- a/src/forge/Merge/MergeDetail.js
+++ b/src/forge/Merge/MergeDetail.js
@@ -228,7 +228,7 @@ class MergeDetail extends Component {
diff --git a/src/forge/comments/comments.js b/src/forge/comments/comments.js
index ceebb653c..dca7581f2 100644
--- a/src/forge/comments/comments.js
+++ b/src/forge/comments/comments.js
@@ -35,6 +35,8 @@ class comments extends Component {
componentDidMount = () => {
this.getjournalslist();
+ // 给父组件绑定，以使父组件可以使用组件内方法，用于切换tab时重新请求评论列表、合并请求完之后重新请求评论列表
+ this.props.bindCommentRef && this.props.bindCommentRef(this);
};
//添加评论
--
2.34.1
From 5c819070bb34b3f00ce19b43db14e3deff0bdf57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Wed, 13 Oct 2021 16:45:21 +0800
Subject: [PATCH 31/73] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=9C=AA=E7=99=BB?=
=?UTF-8?q?=E5=BD=95=E7=8A=B6=E6=80=81=E4=B8=8B=E5=9C=B0=E5=9D=80=E6=A0=8F?=
=?UTF-8?q?=E8=BE=93=E5=85=A5=E8=B7=B3=E8=BD=AC=E6=B6=88=E6=81=AF=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../SecuritySetting/notice/myNotice/Index.jsx | 20 ++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/forge/SecuritySetting/notice/myNotice/Index.jsx b/src/forge/SecuritySetting/notice/myNotice/Index.jsx
index 2de2b8c3f..2dac567f8 100644
--- a/src/forge/SecuritySetting/notice/myNotice/Index.jsx
+++ b/src/forge/SecuritySetting/notice/myNotice/Index.jsx
@@ -9,10 +9,9 @@ import './Index.scss';
import '../manager/Index.scss'
function MyNotice(props) {
- let current_user = props.current_user;
- let resetUserInfo = props.resetUserInfo;
+ let { current_user, resetUserInfo, location, mygetHelmetapi, history}= props;
//消息悬停框选择tab
- let popover = props.location.query && props.location.query.noticeType;
+ let popover = location && location.query && location.query.noticeType;
let pageSize = 15;
const [noticeType, setNoticeType] = useState(popover==="atme"?"2":"0");//消息类别tab栏选择
const [selectedNum, setSelectedNum] = useState(0);//@我批量删除选择消息条数
@@ -27,6 +26,17 @@ function MyNotice(props) {
const [currentPage, setCurrentPage] = useState(1);//当前页数
const [onlyUnread, setOnlyUnread] = useState();
+ //登录情况下，通过地址访问，直接跳转：/settings/profile
+ //未登录情况下，通过地址访问，直接跳转：/explore
+ useEffect(()=>{
+ let notice_url = mygetHelmetapi && mygetHelmetapi.common && mygetHelmetapi.common.notice;
+ if(!current_user){
+ history.push(`/explore`);
+ }else if(!notice_url){
+ history.push(`/settings/profile`);
+ }
+ },[mygetHelmetapi])
+
useEffect(()=>{
popover==="atme" ? setNoticeType("2"):setNoticeType("0");
},[popover])
@@ -46,7 +56,7 @@ function MyNotice(props) {
limit: pageSize,
page: currentPage,
};
- axios.get(`/users/${current_user.login}/messages.json`, {
+ current_user && axios.get(`/users/${current_user.login}/messages.json`, {
params: params,
}).then((response) => {
if(response && response.data){
@@ -59,7 +69,7 @@ function MyNotice(props) {
}
function readNotice(id){
- if(id){
+ if(id && current_user){
const params = {
type: noticeType === "0" ? "notification" : noticeType === "2" ? "atme" : "",
ids:id,
--
2.34.1
From 5d19f6c06b8fa5860458859a4c85747782936228 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Wed, 13 Oct 2021 17:17:51 +0800
Subject: [PATCH 32/73] =?UTF-8?q?=E6=9C=AA=E7=99=BB=E5=BD=95=E7=8A=B6?=
=?UTF-8?q?=E6=80=81=E8=BF=9B=E5=85=A5=E6=B6=88=E6=81=AF=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/SecuritySetting/notice/myNotice/Index.jsx | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/forge/SecuritySetting/notice/myNotice/Index.jsx b/src/forge/SecuritySetting/notice/myNotice/Index.jsx
index 2dac567f8..226606919 100644
--- a/src/forge/SecuritySetting/notice/myNotice/Index.jsx
+++ b/src/forge/SecuritySetting/notice/myNotice/Index.jsx
@@ -29,10 +29,11 @@ function MyNotice(props) {
//登录情况下，通过地址访问，直接跳转：/settings/profile
//未登录情况下，通过地址访问，直接跳转：/explore
useEffect(()=>{
- let notice_url = mygetHelmetapi && mygetHelmetapi.common && mygetHelmetapi.common.notice;
- if(!current_user){
+ let notice = mygetHelmetapi && mygetHelmetapi.common && mygetHelmetapi.common.notice;
+ let login = current_user && current_user.login;
+ if(!login){
history.push(`/explore`);
- }else if(!notice_url){
+ }else if(!notice){
history.push(`/settings/profile`);
}
},[mygetHelmetapi])
--
2.34.1
From 5223a84dac9c09334c997800218a52ac8b8c29a6 Mon Sep 17 00:00:00 2001
From: caishi
{
data && data.issue.user_permission ?
- 编辑
+ 编辑
: ''
}
diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js
index eaa6ba0e0..dadd6d8a5 100644
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@@ -196,7 +196,7 @@ class MergeItem extends Component {
>
diff --git a/src/forge/Merge/MergeLinkFooter.jsx b/src/forge/Merge/MergeLinkFooter.jsx
index 9f43086a9..2c9aa4814 100644
--- a/src/forge/Merge/MergeLinkFooter.jsx
+++ b/src/forge/Merge/MergeLinkFooter.jsx
@@ -16,7 +16,7 @@ class MergeFooter extends Component {
constructor(props) {
super(props);
this.state = {
- commitsData: undefined,
+ commitsData: [],
filesData: undefined,
isSpin: false,
activeKey: '1',
@@ -28,6 +28,8 @@ class MergeFooter extends Component {
}
componentDidMount() {
this.Init();
+ // 为父组件绑定当前，以方便调用方法
+ this.props.bindFootRef && this.props.bindFootRef(this);
}
componentDidUpdate(prevProps) {
@@ -35,11 +37,11 @@ class MergeFooter extends Component {
const newPathname = this.props.location.pathname;
const prevPathname = prevProps.location.pathname;
if (newPathname !== prevPathname) {
- this.Init();
+ this.Init(true);
}
}
- Init = () => {
+ Init = (isTabChange) => {
const { data, location, match } = this.props;
const { pathname } = location;
const { projectsId, owner, mergeId } = match.params;
@@ -52,6 +54,9 @@ class MergeFooter extends Component {
activeKey = '3';
this.getFile(owner, projectsId, mergeId);
}
+ if (isTabChange && activeKey === '1') {
+ this.refreshComment();
+ }
this.setState({
activeKey: activeKey,
commitCount: data && data.commits_count,
@@ -59,6 +64,14 @@ class MergeFooter extends Component {
});
};
+ bindCommentRef = (commentRef) => {
+ this.childComment = commentRef;
+ }
+
+ refreshComment = () => {
+ this.childComment && this.childComment.getjournalslist();
+ }
+
getCommit = (owner, projectsId, mergeId) => {
this.setState({ isSpin: true });
const url = `/${owner}/${projectsId}/pulls/${mergeId}/commits.json`;
@@ -107,7 +120,7 @@ class MergeFooter extends Component {
filesCount,
commitCount,
filesData,
- commitsData,
+ commitsData = [],
} = this.state;
// 评论数量优先取Comment组件中列表接口返回的，其次取合并请求详情接口中的，都没有取默认值0
@@ -117,7 +130,7 @@ class MergeFooter extends Component {
);
return (
-
+
- 提交
- {commitCount > 0 && (
- {commitCount}
- )}
-
- }
- key="2"
- >
- {commitsData && (
- 0 && (
+
+ 提交
+ {commitCount > 0 && (
+ {commitCount}
+ )}
+
+ }
+ key="2"
+ >
+ {commitsData.length > 0 && (
+
+ )}
+ {filesCount > 0 && (
+
+ 文件
+ {filesCount > 0 && (
+ {filesCount}
+ )}
+
+ }
+ key="3"
+ >
+
- )}
-
-
- 文件
- {filesCount > 0 && (
- {filesCount}
- )}
-
- }
- key="3"
- >
-
+ />
+
+ )}
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index abdea3dd4..685f42355 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -58,6 +58,11 @@ class MessageCount extends Component {
// this.clickBody();
};
+
+ bindFootRef = (footRef) => {
+ this.footRef = footRef;
+ }
+
clickBody=()=>{
document.body.addEventListener('click', e => {
let name = e.target.className;
@@ -147,6 +152,8 @@ class MessageCount extends Component {
});
const { getDetail } = this.props;
getDetail && getDetail();
+ // 调用子组件的方法刷新评论列表
+ this.footRef && this.footRef.refreshComment();
} else {
this.setState({ SpinMerge: false });
}
@@ -445,7 +452,7 @@ class MessageCount extends Component {
type="green"
ghost
className="ml20"
- onClick={()=>{this.props.history.push(`/${owner}/${projectsId}/pulls/${mergeId}/updatemerge`);}}
+ onClick={()=>{this.props.history.push(`/${owner}/${projectsId}/pulls/${mergeId}/edit`);}}
>
编辑
@@ -566,6 +573,7 @@ class MessageCount extends Component {
order_id={data && data.issue.id}
{...this.props}
{...this.state}
+ bindFootRef={this.bindFootRef}
>
) : (
diff --git a/src/forge/Merge/NewMerge.js b/src/forge/Merge/NewMerge.js
index c5c5e2df6..900dea824 100644
--- a/src/forge/Merge/NewMerge.js
+++ b/src/forge/Merge/NewMerge.js
@@ -6,6 +6,11 @@ import "./merge.css";
import MergeForm from "./merge_form";
import MergeFooter from "./merge_footer";
const Option = Select.Option;
+/**
+ * 此文件已废弃，新文件为CreateMerge.js
+ * 2021.10.12
+ */
+
class NewMerge extends Component {
constructor(props) {
super(props);
diff --git a/src/forge/Merge/UpdateMerge.js b/src/forge/Merge/UpdateMerge.js
index 8ed8034af..001bedd57 100644
--- a/src/forge/Merge/UpdateMerge.js
+++ b/src/forge/Merge/UpdateMerge.js
@@ -69,7 +69,7 @@ class UpdateMerge extends Component {
{" "}
{" "}
@@ -88,7 +88,7 @@ class UpdateMerge extends Component {
{" "}
{" "}
diff --git a/src/forge/Merge/merge.css b/src/forge/Merge/merge.css
index d5ce68d19..3ea2620cb 100644
--- a/src/forge/Merge/merge.css
+++ b/src/forge/Merge/merge.css
@@ -211,5 +211,6 @@ form .ant-cascader-picker, form .ant-select {
}
.mergeRequest .folders{
- width: 72rem;
+ /* width: 72rem; */
+ width: 100%;
}
\ No newline at end of file
diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js
index 2e742d720..8a0eaedea 100644
--- a/src/forge/Merge/merge.js
+++ b/src/forge/Merge/merge.js
@@ -213,7 +213,7 @@ class merge extends Component {
checkOperation() {
const { projectsId,owner } = this.props.match.params;
- this.props.history.push(`/${owner}/${projectsId}/compare`);
+ this.props.history.push(`/${owner}/${projectsId}/compare/master...master`);
}
render() {
const { projectsId , owner } = this.props.match.params;
diff --git a/src/forge/Merge/no_data.js b/src/forge/Merge/no_data.js
index f403bb4ea..d5e4ca89b 100644
--- a/src/forge/Merge/no_data.js
+++ b/src/forge/Merge/no_data.js
@@ -12,7 +12,7 @@ class Nodata extends Component{
欢迎使用合并请求！
- 合并请求可以帮助您与他人协作编写代码。在使用之前，请先创建一个 合并请求
+ 合并请求可以帮助您与他人协作编写代码。在使用之前，请先创建一个 合并请求
+
+
+
+
+ {system_notification && system_notification.subject}
+{system_notification && system_notification.sub_subject}
+ {/*
+
*/}
+
+ 为了给用户提供更加稳定、优质的服务，我们即将对平台门户首页、平台名称、平台域名进行一次全面升级与变更。原平台名称：Trustie（中文名：确实）将于2021年10月xx日统一更改为Gitlink（中文名：确实开源）。届时平台域名将统一进行更换，更换规则如下
+
+
+
+ -
+
-
+
+ 自2021年10月xx日起，旧域名将停止访问。因平台名称与域名变更给您带来的不便，我们深表歉意!非常感谢您一直以来对本平台的信任与支持，我们将一如既往地为您提供优质的服务。 特此通知!
+
+
+
+ Gitlink运营团队
+2021年10月xx日
+
+
+
+