diff --git a/src/forge/Component/NoticeModal/SystemNotice.jsx b/src/forge/Component/NoticeModal/SystemNotice.jsx index 9198fbfb5..eb616df4b 100644 --- a/src/forge/Component/NoticeModal/SystemNotice.jsx +++ b/src/forge/Component/NoticeModal/SystemNotice.jsx @@ -51,6 +51,7 @@ function SystemNotice({system_notification,history}){ centered={true} closable={false} wrapClassName={'systemBox'} + onCancel={()=>{sureContinue()}} >
diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index cf13f765c..9de0521b6 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -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__ &&
changeHide(hide)}>
} - {lastCommit.time_from_now} + {lastCommit.time_from_now} { commitCount ? diff --git a/src/forge/Main/CoderDepotCatalogue.jsx b/src/forge/Main/CoderDepotCatalogue.jsx index 808f9ea61..179efd6e2 100644 --- a/src/forge/Main/CoderDepotCatalogue.jsx +++ b/src/forge/Main/CoderDepotCatalogue.jsx @@ -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 } - - {getEmoji(getMessage(item.commit && item.commit.message.split('\n')[0]))} - + + + {getEmoji(getMessage(item.commit && item.commit.message.split('\n')[0]))} + + - {item.commit && item.commit.time_from_now} + {item.commit && item.commit.time_from_now} ) } diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index 1baa204ef..5a43db0f1 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -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 { diff --git a/src/forge/Main/tag/Index.jsx b/src/forge/Main/tag/Index.jsx index 651f03bba..838072583 100644 --- a/src/forge/Main/tag/Index.jsx +++ b/src/forge/Main/tag/Index.jsx @@ -78,7 +78,7 @@ function Tags(props) { } } - 最后一次提交于{item.time_ago} + 最后一次提交于{item.time_ago}
) diff --git a/src/forge/Main/tree/Index.jsx b/src/forge/Main/tree/Index.jsx index 57cec0c87..b742570b5 100644 --- a/src/forge/Main/tree/Index.jsx +++ b/src/forge/Main/tree/Index.jsx @@ -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) { {txt && txt.committer && txt.committer.name} } - 更新于{txt && txt.time_ago} + 更新于{txt && txt.time_ago} ) } diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js index 373532f95..8ca39bce0 100644 --- a/src/forge/Merge/MergeItem.js +++ b/src/forge/Merge/MergeItem.js @@ -105,7 +105,7 @@ class MergeItem extends Component { ? "合并于" : "更新于"} - {item.pr_time} + {item.pr_time} { item.pull_request_head && diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js index b12e73aae..251db6fef 100644 --- a/src/forge/Merge/MessageCount.js +++ b/src/forge/Merge/MessageCount.js @@ -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 { ? "合并于" : "更新于"} - {data.pr_time} + {data.pr_time} { open_blockchain && data.attached_issues && data.attached_issues.length>0 ? 关联issue: diff --git a/src/services/project.js b/src/services/project.js index c2b22757f..900ffd569 100644 --- a/src/services/project.js +++ b/src/services/project.js @@ -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 => {