From 1e09a04193dcd21488e58b5a53a9698cc33365df Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Tue, 28 Mar 2023 10:12:33 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E7=82=B9=E5=87=BB=E5=90=8E=E9=A1=B5=E9=9D=A2=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E8=B7=B3=E5=88=B0=E9=A1=B6=E9=83=A8#2659?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 2 +- src/forge/Component/Contributors.jsx | 2 +- src/forge/Component/Releases.jsx | 2 +- src/forge/Issues/Pages/details.jsx | 2 ++ src/forge/Issues/Pages/new.jsx | 1 + src/forge/Main/tag/Index.jsx | 8 ++++---- src/forge/Main/tree/Index.jsx | 2 +- src/forge/Main/version/version.js | 8 ++++---- src/forge/Merge/MergeItem.js | 1 + src/forge/Order/UpdateMilepost.js | 1 + src/forge/Order/newMilepost.js | 1 + src/forge/Settings/Setting.js | 11 ++++++----- 12 files changed, 24 insertions(+), 17 deletions(-) diff --git a/public/index.html b/public/index.html index 90f33d8f2..c11418aef 100755 --- a/public/index.html +++ b/public/index.html @@ -68,11 +68,11 @@ window.onload=function(){ $(".newContainer").delegate("a.anchors","click",function(){ let h = $(this).offset().top - 180; - console.log($(this).offset().top,document.body.scrollTop); $("html,body").animate({scrollTop:h},10); window.location.hash = $(this).attr("name"); return false; }); + } diff --git a/src/forge/Component/Contributors.jsx b/src/forge/Component/Contributors.jsx index fd7b48028..bb5a8db47 100644 --- a/src/forge/Component/Contributors.jsx +++ b/src/forge/Component/Contributors.jsx @@ -166,7 +166,7 @@ function Contributors({owner,projectsId,currentLogin}){ return( total > 0 ?
- + {window.scrollTo(0,0)}} className="font-16 color-ooo hoverA"> 贡献者 { total > 0 && {total}} diff --git a/src/forge/Component/Releases.jsx b/src/forge/Component/Releases.jsx index 260e6bd2d..94768e733 100644 --- a/src/forge/Component/Releases.jsx +++ b/src/forge/Component/Releases.jsx @@ -5,7 +5,7 @@ import { Link } from 'react-router-dom'; function Releases({ owner, projectsId, releaseVersions, distribution }) { return(
- + {window.scrollTo(0,0)}} className="font-16 color-ooo hoverA"> 发行版 { releaseVersions && releaseVersions.total_count > 0 && {releaseVersions.total_count}} diff --git a/src/forge/Issues/Pages/details.jsx b/src/forge/Issues/Pages/details.jsx index 626278eca..e1db36d9c 100644 --- a/src/forge/Issues/Pages/details.jsx +++ b/src/forge/Issues/Pages/details.jsx @@ -275,6 +275,7 @@ function Details(props){ ...params }).then(result=>{ if(result){ + window.scrollTo(0,0); props.showNotification("疑修更新成功！"); // 刷新操作记录 setCommentReload(Math.random()); @@ -303,6 +304,7 @@ function Details(props){ due_date }).then(result=>{ if(result && result.data && result.data.project_issues_index){ + window.scrollTo(0,0); props.showNotification("任务复制成功！"); props.history.push(`/${owner}/${projectsId}/issues/${result.data.project_issues_index}`); } diff --git a/src/forge/Issues/Pages/new.jsx b/src/forge/Issues/Pages/new.jsx index c7f2a87c9..ce09cc6be 100644 --- a/src/forge/Issues/Pages/new.jsx +++ b/src/forge/Issues/Pages/new.jsx @@ -197,6 +197,7 @@ function New(props){ blockchain_token_num:rewardAmount }).then(result=>{ if(result && result.data && result.data.project_issues_index){ + window.scrollTo(0,0); props.showNotification("任务创建成功！"); props.history.push(`/${owner}/${projectsId}/issues/${result.data.project_issues_index}`); } diff --git a/src/forge/Main/tag/Index.jsx b/src/forge/Main/tag/Index.jsx index 4efb1c4cd..651f03bba 100644 --- a/src/forge/Main/tag/Index.jsx +++ b/src/forge/Main/tag/Index.jsx @@ -61,18 +61,18 @@ function Tags(props) { render: (txt, item) => { return (
- {item.name} + {window.scrollTo(0,0)}}>{item.name}
{ item.tagger && { item.tagger.id ? - + {window.scrollTo(0,0)}}> : - + {window.scrollTo(0,0)}}> } @@ -97,7 +97,7 @@ function Tags(props) { sha - {truncateCommitId(item.id)} + {window.scrollTo(0,0)}}>{truncateCommitId(item.id)} diff --git a/src/forge/Main/tree/Index.jsx b/src/forge/Main/tree/Index.jsx index f2abc4475..73ec3aa1c 100644 --- a/src/forge/Main/tree/Index.jsx +++ b/src/forge/Main/tree/Index.jsx @@ -75,7 +75,7 @@ function Index(props) { className: "branchNameColumn", render: (txt, item) => { return ( - {txt} + {window.scrollTo(0,0)}} className="task-hide">{txt} ) } }, diff --git a/src/forge/Main/version/version.js b/src/forge/Main/version/version.js index bee09621b..1c233dc2b 100644 --- a/src/forge/Main/version/version.js +++ b/src/forge/Main/version/version.js @@ -71,16 +71,16 @@ function version(props) { {item.draft} - {item.tag_name} + {window.scrollTo(0,0)}}>{item.tag_name} - - {truncateCommitId(item.sha)} + + {window.scrollTo(0,0)}} className="hover" to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`}>{truncateCommitId(item.sha)}
- {item.name} + {window.scrollTo(0,0)}} to={`/${owner}/${projectsId}/tree/${item.tag_name}`} className="task-hide color-blue hover font-18">{item.name} {data && data.user_admin_permission && type !== 2 && } {data && data.user_admin_permission && type !== 2 && diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js index ece07f35b..f7fceacc9 100644 --- a/src/forge/Merge/MergeItem.js +++ b/src/forge/Merge/MergeItem.js @@ -56,6 +56,7 @@ class MergeItem extends Component { {window.scrollTo(0,0)}} className="hide-1 font-15 color-grey-3 fwb lineh-30 mr10" style={{ maxWidth: "600px" }} > diff --git a/src/forge/Order/UpdateMilepost.js b/src/forge/Order/UpdateMilepost.js index 7ffb1927e..4bb410409 100644 --- a/src/forge/Order/UpdateMilepost.js +++ b/src/forge/Order/UpdateMilepost.js @@ -92,6 +92,7 @@ class UpdateMilepost extends Component { }).then(result => { if (result) { this.setState({ isSpin: false }) + window.scrollTo(0,0); this.props.history.push(`/${owner}/${projectsId}/milestones/${meilid}`); } diff --git a/src/forge/Order/newMilepost.js b/src/forge/Order/newMilepost.js index a5aeb08c5..9418d8de3 100644 --- a/src/forge/Order/newMilepost.js +++ b/src/forge/Order/newMilepost.js @@ -77,6 +77,7 @@ class NewMilepost extends Component { }).then(result => { if (result) { this.setState({ isSpin: false }) + window.scrollTo(0,0); this.props.history.push(`/${owner}/${projectsId}/milestones`); const { getDetail } = this.props; getDetail && getDetail(); diff --git a/src/forge/Settings/Setting.js b/src/forge/Settings/Setting.js index b7023f0fd..fdf557c53 100644 --- a/src/forge/Settings/Setting.js +++ b/src/forge/Settings/Setting.js @@ -1,5 +1,5 @@ import React, { Component } from "react"; -import { Form, Input, Checkbox, Select , Spin } from "antd"; +import { Form, Input, Checkbox, Select , Spin, Button } from "antd"; import Title from '../Component/Title'; import {WhiteBack} from '../Component/layout'; import DivertModal from '../Divert/DivertModal'; @@ -208,6 +208,7 @@ class Setting extends Component { store_id: project_id, store_identifier: projectsId }) + window.scrollTo(0,0); this.props.showNotification("仓库删除成功！"); this.props.history.push(`/${owner}`); }) @@ -409,9 +410,9 @@ class Setting extends Component {
{ is_transfering ? - 取消转移 + : - 转移 + }
@@ -422,9 +423,9 @@ class Setting extends Component { 无法撤消，且删除后，与仓库关联的项目/任务/合并请求/版本发布等，均会被删除

- +