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 1/4] =?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 && -
').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 2/4] =?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 (
- 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 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 3/4] =?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; 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 4/4] =?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 &&