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

Merge pull request '列表样式，合并请求路由值根据接口改为number或者id' (#286) from caishi/forgeplus-react:gitlink_server into gitlink_server

This commit is contained in:
xxq250 2021-11-26 10:19:02 +08:00
parent eff12234fa 9299a1667e
commit fbd4273603
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/AppConfig.js
View File

@ -25,7 +25,7 @@ if (isDev) {
} }
debugType = window.location.search.indexOf('debug=t') !== -1 ? 'teacher' : debugType = window.location.search.indexOf('debug=t') !== -1 ? 'teacher' :
window.location.search.indexOf('debug=s') !== -1 ? 'student' : window.location.search.indexOf('debug=s') !== -1 ? 'student' :
window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'admin' window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'student'
} }
window._debugType = debugType; window._debugType = debugType;
export function initAxiosInterceptors(props) { export function initAxiosInterceptors(props) {

2
src/forge/Main/projecthome/Index.scss
View File

@ -310,7 +310,6 @@
margin:0px auto; margin:0px auto;
.left{ .left{
width: 850px; width: 850px;
box-shadow: 0px 0px 4px 5px rgba(0, 0, 0, 0.02);
display: flex; display: flex;
.leftTypes{ .leftTypes{
width: 220px; width: 220px;
@ -343,6 +342,7 @@
} }
.leftLists{ .leftLists{
flex:1; flex:1;
box-shadow: 0px 0px 4px 5px rgba(0, 0, 0, 0.02);
.leftTitles{ .leftTitles{
height: 60px; height: 60px;
display: flex; display: flex;

2
src/forge/Merge/MergeItem.js
View File

@ -62,7 +62,7 @@ class MergeItem extends Component {
<p className="mb15 df" style={{ alignItems: "center" }}> <p className="mb15 df" style={{ alignItems: "center" }}>
<i className={`iconfont icon-hebingqingqiu1 font-14 mr3 i_${status}`}></i> <i className={`iconfont icon-hebingqingqiu1 font-14 mr3 i_${status}`}></i>
<Link <Link
to={`/${owner}/${projectsId}/pulls/${item.pull_request_id}`} to={`/${owner}/${projectsId}/pulls/${item.pull_request_number || item.pull_request_id}`}
className="hide-1 font-15 color-grey-3 fwb lineh-30 mr10" className="hide-1 font-15 color-grey-3 fwb lineh-30 mr10"
style={{ maxWidth: "600px" }} style={{ maxWidth: "600px" }}
> >

5
src/forge/users/Echart/Calendar.jsx
View File

@ -35,9 +35,11 @@ function Calendar({ userLogin , time , chooseTime }) {
const url = `/users/${userLogin}/headmaps.json`; const url = `/users/${userLogin}/headmaps.json`;
Axios.get(url).then(result=>{ Axios.get(url).then(result=>{
if(result && result.data){ if(result && result.data){
let m = result.data.headmaps; // result.data.headmaps
let m = [];
m.sort(compare('contributions')); m.sort(compare('contributions'));
let max = m[m.length -1].contributions; let max = m[m.length -1].contributions;
Init(m,max); Init(m,max);
} }
}).catch(error=>{}) }).catch(error=>{})
@ -52,6 +54,7 @@ function Calendar({ userLogin , time , chooseTime }) {
} }
function getVirtulData(data) { function getVirtulData(data) {
debugger;
var date = +echarts.number.parseDate(baginT); var date = +echarts.number.parseDate(baginT);
var end = +echarts.number.parseDate(endT); var end = +echarts.number.parseDate(endT);
var dayTime = 3600 * 24 * 1000; var dayTime = 3600 * 24 * 1000;