修改issue

This commit is contained in:
caishi 2024-07-05 13:54:02 +08:00
parent d572a423d7
commit 6d64f2cdd2
9 changed files with 35 additions and 12 deletions

View File

@ -51,6 +51,7 @@ function SystemNotice({system_notification,history}){
centered={true}
closable={false}
wrapClassName={'systemBox'}
onCancel={()=>{sureContinue()}}
>
<div className="sysBox">
<div className="sysnoticeBox">

View File

@ -1,5 +1,5 @@
import React , { useEffect , useState } from 'react';
import { Dropdown , Menu , Divider , Spin, Button } from 'antd';
import { Dropdown , Menu , Divider , Spin, Button, Tooltip } from 'antd';
import { getImageUrl , turnbar , returnbar } from "educoder";
import { Link } from 'react-router-dom';
import { connect } from 'react-redux';
@ -27,7 +27,9 @@ import Loadable from 'react-loadable';
import Loading from '../../Loading';
import ProjectPortrait from '../Component/projectPortrait';
import imNoneImg from './img/importNone.png';
import moment from 'moment';
const format = "YYYY-MM-DD HH:mm"
const CoderRootFileDetail = Loadable({
loader: () => import("./CoderRootFileDetail"),
loading: Loading,
@ -566,7 +568,7 @@ function CoderDepot(props){
}
{ hideBtn && __CLIENT__ && <div className="ellipsis" onClick={()=>changeHide(hide)}><i className="iconfont icon-shenglvehao"></i></div> }
<span className="ml20 color-grey-6 font-12 mt3">{lastCommit.time_from_now}</span>
<Tooltip title={lastCommit.committer && moment(lastCommit.committer.date).format(format)}><span className="ml20 color-grey-6 font-12 mt3">{lastCommit.time_from_now}</span></Tooltip>
{
commitCount ?
<Link to={`/${owner}/${projectsId}/commits/branch/${turnbar(branchName || defaultBranch)}`} className="ml20 color-grey-3"style={{height:"28px",lineHeight:"28px"}}>

View File

@ -1,6 +1,7 @@
import React , { useEffect } from 'react';
import { Link } from 'react-router-dom';
import { truncateCommitId } from '../common/util';
import {Tooltip} from 'antd';
import {getEmoji} from './emoji';
const typeIco = {
"submodule":"icon-file-submodule font-17",
@ -53,11 +54,13 @@ function CoderDepotCatalogue({item , goToSubRoot , owner , projectsId , platform
}
</span>
<span title="init project">
<Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.commit && item.commit.sha}`)}`} title={item.commit && item.commit.message}>
{getEmoji(getMessage(item.commit && item.commit.message.split('\n')[0]))}
</Link>
<Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.commit && item.commit.sha}`)}`} title={item.commit && item.commit.message}>
{getEmoji(getMessage(item.commit && item.commit.message.split('\n')[0]))}
</Link>
</span>
<span title={item.commit && item.commit.created_at}>{item.commit && item.commit.time_from_now}</span>
<Tooltip title={item.commit && item.commit.created_at} placement="right"><span>{item.commit && item.commit.time_from_now}</span></Tooltip>
</li>
)
}

View File

@ -260,7 +260,7 @@ class Detail extends Component {
if (!this.props.projectBase) {
const data = await getProjectFunc(owner, projectsId);
if (data.data) {
if (data && data.data) {
this.getProject(data.data)
}
} else {

View File

@ -78,7 +78,7 @@ function Tags(props) {
}
</Tooltip>
}
<span>最后一次提交于{item.time_ago}</span>
<Tooltip placement="right" title={moment(item.created_time).format("YYYY-MM-DD HH:mm")}><span>最后一次提交于{item.time_ago}</span></Tooltip>
</div>
</div>
)

View File

@ -6,10 +6,13 @@ import { getImageUrl , turnbar } from 'educoder';
import { Button, Dropdown , Input, Menu , message, Modal, Select, Spin, Table, Tooltip , Radio , Popover } from 'antd';
import Modals from '../../Component/PublicModal/Index';
import './Index.scss';
import moment from 'moment';
import Tree from '../img/tree.png';
import Axios from 'axios';
const format = "YYYY-MM-DD HH:mm";
function Index(props) {
const [ reload, setReload] = useState(undefined);
const [ list , setList ] = useState([]);
@ -87,7 +90,7 @@ function Index(props) {
<span style={{fontWeight:"500"}}>{txt && txt.committer && txt.committer.name}</span>
</React.Fragment>
}
<span className="color-grey-3">更新于{txt && txt.time_ago}</span>
<Tooltip title={item && item.commit_time && moment(item.commit_time).format(format)} placement='right'><span className="color-grey-3">更新于{txt && txt.time_ago}</span></Tooltip>
</div>
)
}

View File

@ -105,7 +105,7 @@ class MergeItem extends Component {
? "合并于"
: "更新于"}
</span>
<span className="color-grey-8">{item.pr_time}</span>
<Tooltip placement="bottom" title={moment(item.pr_full_time).format("YYYY-MM-DD HH:mm")}><span className="color-grey-8">{item.pr_time}</span></Tooltip>
<span className="ml15">
{
item.pull_request_head &&

View File

@ -12,7 +12,7 @@ import {
Menu,
Tag,
Button,
Alert,
Alert,Tooltip
} from "antd";
import "./merge.css";
import RenderHtml from "../../components/render-html";
@ -447,7 +447,7 @@ class MessageCount extends Component {
? "合并于"
: "更新于"}
</span>
<span className="color-grey-8 ml5">{data.pr_time}</span>
<Tooltip placement="bottom" title={data.issue && data.issue.created_at}><span className="color-grey-8 ml5">{data.pr_time}</span></Tooltip>
{
open_blockchain && data.attached_issues && data.attached_issues.length>0 ?
<span className="color-grey-8 ml25">关联issue:

View File

@ -13,6 +13,20 @@ if (__CLIENT__ ) {
const axiosInstance = axios.create({
withCredentials: true
});
axiosInstance.interceptors.request.use(
config => {
if (window.location.port === "3007") {
if (config.url.indexOf('?') === -1) {
config.url = `${config.url}?debug=admin`;
} else {
config.url = `${config.url}&debug=admin`;
}
}
return config;
},
err => {
return Promise.reject(err);
});
axiosInstance.interceptors.response.use(
response => {