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/IndexItem.js b/src/forge/Main/IndexItem.js
index dab19841f..3c33b9c8d 100644
--- a/src/forge/Main/IndexItem.js
+++ b/src/forge/Main/IndexItem.js
@@ -75,7 +75,7 @@ class IndexItem extends Component {
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) {
}
}
-