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 01/23] =?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 172038b2..87260cdd 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)}}> 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 02/23] 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 17535e43..67bb1cb1 100644 --- a/src/forge/Main/Diff.jsx +++ b/src/forge/Main/Diff.jsx @@ -85,7 +85,7 @@ export default (props) => {
{commit && commit.message && - 
{commit.message}
+
').replaceAll('\n\r','
').replaceAll('\n','
')}} className="task-hide">
} {data.branch}
diff --git a/src/forge/Main/version/version.js b/src/forge/Main/version/version.js index 68cfd774..2896899f 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 ea23ab07..48a19c22 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){ 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 03/23] =?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 88cca13b..66e6f24c 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 ( 提交ID - {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 3bd487db..5ce43cf2 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{ From 08b5f7edc0e2701664b8deb5b71f24e623884f35 Mon Sep 17 00:00:00 2001 From: caishi Date: Mon, 11 Oct 2021 17:24:28 +0800 Subject: [PATCH 04/23] =?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 a19bd80d..f2f7cd2b 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; 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 05/23] =?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 67bb1cb1..a50c16c7 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 && -
').replaceAll('\n\r','
').replaceAll('\n','
')}} className="task-hide">
+ } {data.branch}
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 06/23] =?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 66e6f24c..023adb44 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 (
- 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 5ce43cf2..b012cc58 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 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 07/23] =?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 023adb44..48f80ea2 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 b012cc58..5d72ab29 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; 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 08/23] =?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 c6c976f4..bdcfc98a 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 && From b0d13792816b193f8060499acc2791480bcae154 Mon Sep 17 00:00:00 2001 From: caishi Date: Mon, 11 Oct 2021 18:35:50 +0800 Subject: [PATCH 09/23] =?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 b5d24196..7ff25dae 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); + // } // 获取组件里要显示的数据 - getTopCount=(branch)=>{ - const { projectsId , owner } = this.props.match.params; - const url = `/${owner}/${projectsId}/top_counts.json`; - axios.get(url,{params:{ - ref:branch - }}).then(result=>{ - if(result){ - this.setState({ - coderCount:result.data - }) - } - }).catch(error=>{console.log(error);}) - } + // getTopCount=(branch)=>{ + // const { projectsId , owner } = this.props.match.params; + // const url = `/${owner}/${projectsId}/top_counts.json`; + // axios.get(url,{params:{ + // ref:branch + // }}).then(result=>{ + // if(result){ + // this.setState({ + // coderCount:result.data + // }) + // } + // }).catch(error=>{console.log(error);}) + // } render(){ return(
@@ -100,12 +99,12 @@ class CoderRootIndex extends Component{ > () + (props) => () } > () + () => () } > () + () => () } > {/* Date: Mon, 11 Oct 2021 19:39:01 +0800 Subject: [PATCH 10/23] =?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 604917ba..b542c390 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{
-
{item.message}
+

Date: Mon, 11 Oct 2021 19:44:48 +0800 Subject: [PATCH 11/23] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=97=A0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Main/tag/Index.jsx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/forge/Main/tag/Index.jsx b/src/forge/Main/tag/Index.jsx index 48f80ea2..cf89cd7b 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 Nonedata from '../../Nodata'; import './Index.scss'; import Tree from '../img/tree.png' import moment from 'moment'; @@ -100,14 +101,15 @@ function Tags(props) { { source && source.length > 0 ? - -
- :

- + +
+
+ : + }
) From cd30082956be3e6ffb45e813262988280b96bba0 Mon Sep 17 00:00:00 2001 From: caishi Date: Mon, 11 Oct 2021 20:03:03 +0800 Subject: [PATCH 12/23] 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 cf89cd7b..5e2ddbfa 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 ? -
- -
- -
- : - - } +
+ + { + source && source.length > 0 && +
+ } + { + source && source.length === 0 && + } + +
) } 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 13/23] =?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 70d1901e..fe7eba52 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){
- 
{lastCommit.message}
+
{ hideBtn && changeHide(hide)}> } diff --git a/src/forge/Main/Diff.jsx b/src/forge/Main/Diff.jsx index a50c16c7..f5220b09 100644 --- a/src/forge/Main/Diff.jsx +++ b/src/forge/Main/Diff.jsx @@ -86,7 +86,7 @@ export default (props) => {
{commit && commit.message && - + } {data.branch}
diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss index f2f7cd2b..f87b82f9 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 12ebae46..a19619d7 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; } } 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 14/23] =?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 fe7eba52..c86e31d9 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 f5220b09..04550061 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 f87b82f9..a177ccc7 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 73b534de..83b4d5ee 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; 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 15/23] =?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 87260cdd..b4cf5b48 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.addition >0 && +{item.addition}} {item.deletion >0 && -{item.deletion}} @@ -100,7 +100,7 @@ function Files({ data,history,owner,projectsId , parentsSha }){
- 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.addition+item.deletion}处 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 16/23] =?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 60351333..a9692c92 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 cf89cd7b..20e74451 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( +
+ {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 5d72ab29..80a3c828 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 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 17/23] =?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 a9692c92..60351333 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 80a3c828..89f473f5 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{ 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 18/23] =?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 20e74451..4a0ce00a 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 89f473f5..bff4c97b 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 From c282a1e034d63d8a4b5b5033b37acc70593d67d0 Mon Sep 17 00:00:00 2001 From: caishi Date: Tue, 12 Oct 2021 11:57:27 +0800 Subject: [PATCH 19/23] =?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 458de69a..6a111b45 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(
- {item.name} -
+ {item.name} +
) } }, @@ -51,7 +52,21 @@ function Tags(props) { render:(txt,item)=>{ return ( - {item.tagger && item.tagger.name} + { + item.tagger && + + { + 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 bff4c97b..70e83a83 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 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 20/23] 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 f043a8f5..e9c4aae4 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 04550061..6556023e 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}
diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss index a177ccc7..a42bfec5 100644 --- a/src/forge/Main/Index.scss +++ b/src/forge/Main/Index.scss @@ -271,8 +271,10 @@ word-wrap:break-word; .markdown-body{ line-height: 10px; + font-size: 14px; & p { - margin: 0px 0px !important; + margin: 1px 0px 0px !important; + font-size: 14px !important; } & ol,ul{ padding-bottom: 3px; From b578383e8d02f09afb076a60a9c0ecf77fefc753 Mon Sep 17 00:00:00 2001 From: caishi Date: Tue, 12 Oct 2021 17:15:16 +0800 Subject: [PATCH 21/23] =?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 60351333..1ec10446 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 a42bfec5..4ec6a7cb 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 b1af2f99..ec9f80c8 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 { )}
+ {/* + {getFieldDecorator("project_identifier", { + rules: [ + { + required: true, + message: "请输入项目标识", + }, + ], + })( + + )} + */} {getFieldDecorator("project_description", { rules: [], From 1fbe6671b1e0b77c3c33799d437eb740343dbc9b Mon Sep 17 00:00:00 2001 From: caishi Date: Tue, 12 Oct 2021 17:32:09 +0800 Subject: [PATCH 22/23] =?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 c86e31d9..f2e4e149 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -402,7 +402,7 @@ function CoderDepot(props){ getPathUrl={getPathUrl} /> : -
+ @@ -417,7 +417,7 @@ function CoderDepot(props){ {projectDetail && projectDetail.tags && projectDetail.tags.total_count} -
+ } From 94ceec26e98ea7c50d2d7b13dac8e19eac27e192 Mon Sep 17 00:00:00 2001 From: caishi Date: Tue, 12 Oct 2021 18:03:25 +0800 Subject: [PATCH 23/23] =?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 6a111b45..0fd40b1f 100644 --- a/src/forge/Main/tag/Index.jsx +++ b/src/forge/Main/tag/Index.jsx @@ -119,19 +119,19 @@ function Tags(props) { return(
-
- - { - source && source.length > 0 && -
- } - { - source && source.length === 0 && - } - -
+ +
+ { + source && source.length > 0 && +
+ } + { + source && source.length === 0 && + } +
+
) } diff --git a/src/forge/Main/tag/Index.scss b/src/forge/Main/tag/Index.scss index 70e83a83..6adba91e 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;