+
SSH密钥
From 278cdba3526077568ec59b75745cac77b895db6a Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 15 Dec 2021 09:46:39 +0800
Subject: [PATCH 2/3] commit clear
---
src/forge/Merge/CreateMerge.js | 2 --
src/forge/Order/CopyDetail.js | 2 --
src/forge/Order/Detail.js | 16 ----------------
src/forge/Order/index.scss | 10 ----------
4 files changed, 30 deletions(-)
diff --git a/src/forge/Merge/CreateMerge.js b/src/forge/Merge/CreateMerge.js
index 2dfa6f98b..129079229 100644
--- a/src/forge/Merge/CreateMerge.js
+++ b/src/forge/Merge/CreateMerge.js
@@ -178,8 +178,6 @@ class CreateMerge extends Component {
// compare接口，获取分支对比信息
compareProject = (sameProject, branchParams) => {
- // const { project } = this.props;
- // const { owner, projectsId } = this.props.match.params;
const { pullOwner, pullBranch, mergeOwner, mergeBranch, projectId } = branchParams;
let url = `/${mergeOwner}/${projectId}/compare`;
diff --git a/src/forge/Order/CopyDetail.js b/src/forge/Order/CopyDetail.js
index 906de4be7..d1f628ed4 100644
--- a/src/forge/Order/CopyDetail.js
+++ b/src/forge/Order/CopyDetail.js
@@ -4,8 +4,6 @@ import OrderItem from './order_form'
function CopyDetail(props){
- const operate = props.match.params.operate;
- console.log(operate);
return(
)
diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js
index b0c82acd5..44f13439d 100644
--- a/src/forge/Order/Detail.js
+++ b/src/forge/Order/Detail.js
@@ -124,22 +124,6 @@ class Detail extends Component {
//复制
copydetail = () => {
const { projectsId, orderId, owner } = this.props.match.params;
- // const url = `/${owner}/${projectsId}/issues/${orderId}/copy.json`;
- // axios
- // .post(url, {
- // project_id: projectsId,
- // id: orderId,
- // })
- // .then((result) => {
- // if (result) {
- // this.props.history.push(
- // `/${owner}/${projectsId}/issues/${result.data.issue_id}/copyetail`
- // );
- // }
- // })
- // .catch((error) => {
- // console.log(error);
- // });
this.props.history.push(
`/${owner}/${projectsId}/issues/${orderId}/copyetail`
);
diff --git a/src/forge/Order/index.scss b/src/forge/Order/index.scss
index fc88d54d7..124c1fdb4 100644
--- a/src/forge/Order/index.scss
+++ b/src/forge/Order/index.scss
@@ -49,16 +49,6 @@
justify-content: center
}
}
-// .statusTag{
-// display: block;
-// height: 24px;
-// line-height: 24px;
-// border-radius: 4px;
-// padding:0px 12px;
-// color: #fff;
-// margin:3px 0px 0px 10px;
-// }
-
.updateBtn{
display: block;
width:60px;
From 1954a4f8d3dc26678795d7484f2eadeacb59b30f Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Thu, 16 Dec 2021 16:08:13 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5-?=
=?UTF-8?q?=E7=BB=84=E7=BB=87-sort?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/users/Team.jsx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/forge/users/Team.jsx b/src/forge/users/Team.jsx
index 9ddfae161..2751280b3 100644
--- a/src/forge/users/Team.jsx
+++ b/src/forge/users/Team.jsx
@@ -12,7 +12,7 @@ function Team(props){
const [ list ,setList ] = useState(undefined);
const [ page ,setPage ] = useState(1);
const [ total ,setTotal ] = useState(0);
- const [ sort_direction , setSort_direction ] = useState("asc");
+ const [ sort_direction , setSort_direction ] = useState("desc");
const [ sort_by ,setSort_by ] = useState("created_at");
const [ search ,setSearch ] = useState(undefined);
const { checkIfLogin , showLoginDialog , current_user } = props;
@@ -42,7 +42,7 @@ function Team(props){
}
const menu = (