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

Merge remote-tracking branch 'upstream/gitlink_server' into gitlink_server

This commit is contained in:
黄心宇 2023-10-10 10:37:13 +08:00
parent 8babcbd3a2 5eb317fac7
commit 5329b4bbf4
12 changed files with 60 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/forge/Issues/Component/allMenus.jsx
View File

@ -53,6 +53,12 @@ function AllMenus({owner,projectsId,chooseFunc,update,defaultNames,defaultIds,op
// 父组件按钮：清除筛选条件，将Ids\names里的字段全部改为undefined
setIds({author_id:undefined,issue_tag_ids:undefined,issue_priorities_id:undefined,milestone_id:undefined,sort_by:undefined,status_id:undefined,assigner_id:undefined});
setNames({author_name:undefined,issue_tag_name:undefined,issue_priorities_name:undefined,milestone_name:undefined,sortby_name:undefined,status_name:undefined,assigner_name:undefined});
},
setChooseTag: (info) => {
let copy = {...ids,issue_tag_ids:[info.id].join(",")};
let copyname = { ...names,issue_tag_name:info.name};
setIds(copy);setNames(copyname);
chooseFunc(copy,copyname);
}
}))
// 获取发布人列表

4
src/forge/Issues/Component/datas.jsx
View File

@ -7,7 +7,7 @@ import { Tooltip } from 'antd';
// issue列表显示
function Datas({checkbox ,item , projectsId,owner}){
function Datas({checkbox ,item , projectsId,owner,chooseTagFunc}){
function statusTag(name){
switch (name) {
@ -40,7 +40,7 @@ function Datas({checkbox ,item , projectsId,owner}){
item.tags && item.tags.length>0?
item.tags.map((i,k)=>{
return(
<span style={{backgroundColor: `${i.color}`}} className="ml8 tagscolor task-hide" title={i.name}>{i.name}</span>
<span onClick={()=>chooseTagFunc(i)} style={{backgroundColor: `${i.color}`,cursor:"pointer"}} className="ml8 tagscolor task-hide" title={i.name}>{i.name}</span>
)
})
:""

BIN
src/forge/Issues/Img/millestones-big.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

5
src/forge/Issues/Pages/list.jsx
View File

@ -340,6 +340,10 @@ function List(props){
setBegin(value[0] || '');
setEnd(value[1] || '');
}
function chooseTagFunc(taginfo){
menuRef.current && menuRef.current.setChooseTag(taginfo);
}
return(
<div>
<DelBox visible={visible} onCancel={()=>setVisible(false)} onSuccess={onSuccess}/>
@ -439,6 +443,7 @@ function List(props){
item={item}
owner={owner}
projectsId={projectsId}
chooseTagFunc={chooseTagFunc}
/>
)
})

4
src/forge/Merge/merge.js
View File

@ -407,7 +407,7 @@ class merge extends Component {
</li>
</ul>
</div>
<div style={{minHeight:"470px"}}>
<div style={{minHeight:"470px",paddingBottom:"50px"}}>
<Spin spinning={isSpin}>
{data && data.search_count && data.search_count > 0 ? (
<div className="mergeData">
@ -427,7 +427,7 @@ class merge extends Component {
</div>
):""}
{search_count > select_params.limit ? (
<div className="mt30 mb50 edu-txt-center">
<div className="mt30 edu-txt-center">
<Pagination
simple
current={select_params.page}

9
src/forge/Order/MilepostDetail.jsx
View File

@ -6,7 +6,7 @@ import Datas from '../Issues/Component/datas';
import axios from 'axios';
import { FlexAJ } from '../Component/layout';
import CheckProfile from '../Component/ProfileModal/Profile';
import emp from '../../forge/Issues/Img/emp.png';
import millestones from '../../forge/Issues/Img/millestones-big.png';
import './milepost.scss';
import './order.scss';
import '../Issues/index.scss';
@ -222,7 +222,12 @@ function MilepostDetail(props){
</div>
</div>
{
total === 0 && <div className="milestonesNoDate"><img src={emp} alt=""/></div>
total === 0 &&
<div className="listempty">
<img src={millestones} style={{width:"68px"}} alt="" />
<p className="font-22 mt5 mb10">欢迎使用里程碑</p>
<p className="font-15">里程碑用于集中归类管理项目的疑修及进度。在使用之前，您可以先<CheckProfile {...props} checklogin sureFunc={()=>{props.history.push(`/${owner}/${projectsId}/issues/${mileId}/new`)}} className="color-blue">创建一个疑修</CheckProfile></p>
</div>
}
{
total > 0 &&

6
src/forge/Server/pages/index.jsx
View File

@ -32,9 +32,11 @@ function Pages(props) {
// 获取站点列表
axios.get(`/site_pages/x.json`, {params:{owner, repo: projectsId}}).then(res=>{
if(res && res.status === 200){
const {last_build_info} = res.data.data
setPageInfo(res.data.data);
last_build_info && last_build_info.length && setResult(last_build_info);
if(res.data.data){
const {last_build_info} = res.data.data;
last_build_info && last_build_info.length && setResult(last_build_info);
}
}
setLoading(false);
})

8
src/forge/Team/List.jsx
View File

@ -7,7 +7,7 @@ import Item from './ListItem';
import Right from './RightBox';
import NoData from '../Nodata';
import CheckProfile from '../Component/ProfileModal/Profile';
import { Menu , Pagination , Dropdown , Spin , Tabs , Radio } from 'antd';
import { Menu , Pagination , Dropdown , Spin , Tooltip , Radio } from 'antd';
import ConcentrateProject from '../users/GeneralView/ConcentrateProject';
import { getImageUrl } from 'educoder';
import RenderHtml from "../../components/render-html";
@ -117,7 +117,11 @@ function List(props){
<Link to={`/${OIdentifier}/setting`} className="color-blue ml10 font-14 df"><i className="iconfont icon-shezhi2"></i>设置</Link>
:""}
</p>
<div className="orz-desc task-hide-2">{organizeDetail && organizeDetail.description}</div>
<div className="orz-desc task-hide-2">
<Tooltip title={organizeDetail && organizeDetail.description} placement={"bottomLeft"}>
<span style={{display:"block"}}>{organizeDetail && organizeDetail.description}</span>
</Tooltip>
</div>
</div>
</div>
</div>

7
src/home/Index.scss
View File

@ -812,8 +812,13 @@ body{
text-decoration: underline;
}
}
span{
span.listboxcount{
margin-left: 20px;
}
span.listboxtime{
margin-left: 40px;
width: 97px;
text-align: right;
}
.listboxcount{
min-width: 60px;

37
src/home/ThirdEdition.jsx
View File

@ -1,5 +1,6 @@
import React,{ useState , useEffect , useMemo } from 'react';
import { Spin , Skeleton } from 'antd';
import moment from 'moment';
import T311 from './Img/3-1-1.png';
import T312 from './Img/3-1-2.png';
import T321 from './Img/3-2-1.png';
@ -29,18 +30,18 @@ function ThirdEdition() {
return flag;
},[flag])
useEffect(()=>{
let box = document.getElementById('thirdUl');
var myTimer = setTimeout(intervalActive, 2500);
box.onmouseover = () => {
clearTimeout(myTimer);
setFlag(false);
}
box.onmouseleave = () => {
myTimer = setTimeout(intervalActive, 2500);
setFlag(true);
}
},[active,flag])
// useEffect(()=>{
// let box = document.getElementById('thirdUl');
// var myTimer = setTimeout(intervalActive, 2500);
// box.onmouseover = () => {
// clearTimeout(myTimer);
// setFlag(false);
// }
// box.onmouseleave = () => {
// myTimer = setTimeout(intervalActive, 2500);
// setFlag(true);
// }
// },[active,flag])
function intervalActive() {
if(doubleFlag){
@ -141,8 +142,8 @@ function ThirdEdition() {
return(
<li>
<a href={i.url} target="_blank">{i.title}</a>
<span className="listboxcount"><i className="iconfont icon-a-liulanicon2x mr5"></i>{i.visits}</span>
<span>{i.created_time && i.created_time.split(" ")[0]}</span>
{i.from !== "other" && <span className="listboxcount"><i className="iconfont icon-a-liulanicon2x mr5"></i>{i.visits}</span> }
{i.from !== "other" && <span className="listboxtime">{i.created_time && moment(i.created_time).format("YYYY-MM-DD")}</span> }
</li>
)
}):""
@ -179,8 +180,8 @@ function ThirdEdition() {
return(
<li>
<a href={i.url} target="_blank">{i.title}</a>
<span className="listboxcount"><i className="iconfont icon-a-liulanicon2x mr5"></i>{i.visits}</span>
<span>{i.created_time && i.created_time.split(" ")[0]}</span>
{i.from !== "other" && <span className="listboxcount"><i className="iconfont icon-a-liulanicon2x mr5"></i>{i.visits}</span> }
{i.from !== "other" && <span className="listboxtime">{i.created_time && moment(i.created_time).format("YYYY-MM-DD")}</span> }
</li>
)
}):""
@ -198,8 +199,8 @@ function ThirdEdition() {
return(
<li>
<a href={i.url} target="_blank">{i.title}</a>
<span className="listboxcount"><i className="iconfont icon-a-liulanicon2x mr5"></i>{i.visits}</span>
<span>{i.created_time && i.created_time.split(" ")[0]}</span>
{i.from !== "other" && <span className="listboxcount"><i className="iconfont icon-a-liulanicon2x mr5"></i>{i.visits}</span> }
{i.from !== "other" && <span className="listboxtime">{i.created_time && moment(i.created_time).format("YYYY-MM-DD")}</span> }
</li>
)
}):""

2
src/modules/tpm/challengesnew/css/newquestion.css
View File

@ -80,6 +80,6 @@
border: none;
margin:0px auto;
}
.editormd-editing .quoteBox{
.editormd-editing.quoteBox .editormd{
overflow: unset;
}

4
src/modules/tpm/challengesnew/tpm-md-editor.js
View File

@ -762,8 +762,8 @@ export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, cla
return (
<Fragment>
<div ref={editorEl} className={`df editormd-editing ${className} ${imageExpand && 'editormd-image-click-expand'} `}>
<div className={`edu-back-greyf5 radius4 editormd ${error ? 'error' : ''} ${quoteVisible || atWhoVisible ? 'quoteBox' : ''}`} id={containerId} >
<div ref={editorEl} className={`df editormd-editing ${className} ${imageExpand && 'editormd-image-click-expand'} ${(quoteVisible || atWhoVisible) ? 'quoteBox' : ''} `}>
<div className={`edu-back-greyf5 radius4 editormd ${error ? 'error' : ''}`} id={containerId} >
{quoteVisible && QuoteDiv }
{atWhoVisible && atWhoList}
<textarea style={{ display: 'none' }} id={editorBodyId} name="content"></textarea>