morii
/
forgeplus-react
forked from Gitlink/forgeplus-react
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request '前端页面优化' (#282) from hc1913847458/forgeplus-react:testdev into develop

This commit is contained in:
xxq250 2021-11-25 09:43:19 +08:00
parent 7579dc8a59 5a1fcb1443
commit 801c544f65
7 changed files with 53 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/forge/Images/taskbar.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 52 KiB

2
src/forge/Main/sub/DetailBanner.jsx
View File

@ -48,7 +48,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
item.menu_name === "issues" &&
<li className={pathname==="issues" ? "active" : ""}>
<Link to={{ pathname: `/${owner}/${projectsId}/issues`, state }}>
<Tooltip title="易修是Issue的中文名，即问题列表" placement="bottom">
<Tooltip placement="bottom">
<i className={"iconfont icon-yixiuicon1 color-grey-3 mr5 font-14"}></i>
<span>易修(Issue)</span>
</Tooltip>

4
src/forge/Team/Group/GroupDetails.jsx
View File

@ -117,8 +117,8 @@ export default ((props) => {
</AlignCenterBetween>
<div className="g-desc">{group.description ? group.description : "暂无描述"}</div>
<div className="g-tip">
<p>管理员团队对 <span>所有仓库</span> 具有操作权限，且对组织具有 <span>管理员权限</span>。 </p>
<p>此外，该团队拥有了 <span>创建仓库</span> 的权限：成员可以在组织中创建新的仓库。 </p>
<p>组织的Owner团队拥有更改组织设置，在组织内新建仓库，新建组织团队等权限。</p>
<p>此外，Owner团队成员对当前组织下所有项目均具有仓库管理员权限，组织下其他团队的权限可由Owner团队成员自由制定。</p>
{group.is_admin ? <Button type="primary" onClick={()=>props.history.push(`/${OIdentifier}/teams/${groupId}/setting`)}><span className="color-white">团队设置</span></Button> : ""}
</div>
</div>

7
src/forge/css/index.scss
View File

@ -4,6 +4,13 @@ ul,ol,dl{
.newMain{
background-color: #fff;
}
.newTable{
background-color: #F0F5FF;
.newImages{
background-image: url('../../forge/Images/taskbar.png');
height: 364px;
}
}
.color-black{
color: #333;
}

30
src/modules/403/Shixunauthority.js
View File

@ -1,4 +1,4 @@
import React, { Component } from 'react';
import React, { Component, useReducer } from 'react';
import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
@ -11,20 +11,29 @@ import { TPMIndexHOC } from '../tpm/TPMIndexHOC';
import { SnackbarHOC,getImageUrl } from 'educoder';
class Shixunauthority extends Component {
constructor(props) {
super(props);
}
render() {
console.log(this.props);
const { current_user } = this.props;
return (
<div className="newMain clearfix">
<div className=" edu-txt-center mt60 mb60">
<div className="newMain newTable clearfix">
<div className="edu-txt-center mt60 mb60">
{/*mt100 mb100*/}
<img src={getImageUrl("images/warn/pic_403.jpg")} />
<p className="font-18 mt40">
您可以稍后尝试&nbsp;<a href="/"
className="color-blue">返回首页</a>
，或者&nbsp;
<p className="font-16 mt56 newImages">
<p>您尚未被授权访问此页面，请先获取相关权限</p>
您可尝试
{(!current_user || !current_user.login) && (
<p style={{display:"inline"}}>您可尝试<a href="//testforgeplus.trustie.net/login" className="color-blue">登录</a>或</p>
)}
<a href="/"
className="color-blue">返回首页</a>，也可以通过
<a target="_blank"
href="//shang.qq.com/wpa/qunwpa?idkey=2f2043d88c1bd61d182b98bf1e061c6185e23055bec832c07d8148fe11c5a6cd"
className="color-blue">QQ反馈&gt;&gt;</a>
</p>
href="https://qm.qq.com/cgi-bin/qm/qr?k=YVGUhY7uK8ovpyd7tG_lHe2qGZ63LOij&jump_from=webapi"
className="color-blue">QQ</a>向我们反馈
</p>
</div>
{/*<div style="clear:both;"></div>*/}
{/*<div id="ajax-indicator" style="display:none;"><span>载入中...</span></div>*/}
@ -33,5 +42,4 @@ class Shixunauthority extends Component {
);
}
}
export default SnackbarHOC() (TPMIndexHOC ( Shixunauthority ));

24
src/modules/404/Shixunnopage.js
View File

@ -11,19 +11,29 @@ import { TPMIndexHOC } from '../tpm/TPMIndexHOC';
import { SnackbarHOC,getImageUrl } from 'educoder';
class http500 extends Component {
constructor(props) {
super(props);
}
render() {
console.log(this.props);
const { current_user } = this.props;
return (
<div className="newMain clearfix">
<div className=" edu-txt-center mt60 mb60">
<div className="newMain newTable clearfix">
<div className=" edu-txt-center mt60">
{/*mt100 mb100*/}
<img src={getImageUrl("/images/warn/pic_404.jpg")} />
<p className="font-18 mt40">
您可以稍后尝试&nbsp;<a href="/"
<p className="font-16 mt56 newImages">
<p>你访问的页面不存在</p>
您可尝试
{(!current_user || !current_user.login) && (
<p style={{display:"inline"}}>您可尝试<a href="//testforgeplus.trustie.net/login" className="color-blue">登录</a>或</p>
)}
<a href="/"
className="color-blue">返回首页</a>
，或者&nbsp;
，也可通过
<a target="_blank"
href="//shang.qq.com/wpa/qunwpa?idkey=2f2043d88c1bd61d182b98bf1e061c6185e23055bec832c07d8148fe11c5a6cd"
className="color-blue">QQ反馈&gt;&gt;</a>
href="https://qm.qq.com/cgi-bin/qm/qr?k=YVGUhY7uK8ovpyd7tG_lHe2qGZ63LOij&jump_from=webapi"
className="color-blue">QQ</a>向我们反馈
</p>
</div>
{/*<div style="clear:both;"></div>*/}

13
src/modules/500/http500.js
View File

@ -13,17 +13,18 @@ import { SnackbarHOC,getImageUrl } from 'educoder';
class Shixunnopage extends Component {
render() {
return (
<div className="newMain clearfix">
<div className="newMain newTable clearfix">
<div className=" edu-txt-center mt60 mb60">
{/*mt100 mb100*/}
<img src={getImageUrl("images/warn/pic_500.jpg")} />
<p className="font-18 mt40">
您可以稍后尝试&nbsp;<a href="/"
<p className="font-16 mt56 newImages">
<p>服务器异常，请稍后重试</p>
您可尝试<a href="javascript:location.reload();" className="color-blue">刷新页面</a>或<a href="/"
className="color-blue">返回首页</a>
，或者&nbsp;
，也可以通过
<a target="_blank"
href="//shang.qq.com/wpa/qunwpa?idkey=2f2043d88c1bd61d182b98bf1e061c6185e23055bec832c07d8148fe11c5a6cd"
className="color-blue">QQ反馈&gt;&gt;</a>
href="https://qm.qq.com/cgi-bin/qm/qr?k=YVGUhY7uK8ovpyd7tG_lHe2qGZ63LOij&jump_from=webapi"
className="color-blue">QQ</a>向我们反馈
</p>
</div>
{/*<div style="clear:both;"></div>*/}