diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx
index 437ad68f2..cf13f765c 100644
--- a/src/forge/Main/CoderDepot.jsx
+++ b/src/forge/Main/CoderDepot.jsx
@@ -1,6 +1,5 @@
import React , { useEffect , useState } from 'react';
-import { WhiteBack , Box , LongWidth , ShortWidth , Gap , AlignCenter , FlexAJ } from '../Component/layout';
-import { Dropdown , Menu , Divider , Spin, Button , Typography } from 'antd';
+import { Dropdown , Menu , Divider , Spin, Button } from 'antd';
import { getImageUrl , turnbar , returnbar } from "educoder";
import { Link } from 'react-router-dom';
import { connect } from 'react-redux';
@@ -27,12 +26,13 @@ import RenderHtml from '../../components/render-html';
import Loadable from 'react-loadable';
import Loading from '../../Loading';
import ProjectPortrait from '../Component/projectPortrait';
+import imNoneImg from './img/importNone.png';
const CoderRootFileDetail = Loadable({
loader: () => import("./CoderRootFileDetail"),
loading: Loading,
});
-
+const mangementOperate =["Manager","Admin","Owner"]
/**
* projectDetail.type:0是托管项目,1是镜像项目,2是同步镜像项目(为2时不支持在线创建、在线上传、在线修改、在线删除、创建合并请求等功能)
* project.open_portrait: 是否开启项目画像展示
@@ -436,7 +436,15 @@ function CoderDepot(props){
{
mirror_status === 2 &&
-
导入项目失败,请前往 仓库设置 删除本项目后重新导入!
+
+

+ {
+ projectDetail.permission && mangementOperate.includes(projectDetail.permission) ?
+
导入项目失败,请前往 仓库设置 删除本项目后重新导入!
+ :
+
导入项目失败,请联系管理员重新导入!
+ }
+
}
{
projectDetail && mirror_status === 0 &&
diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index 012f090f9..65b71d600 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -209,7 +209,7 @@ class Detail extends Component {
// 非本平台项目
platform: false,
- mirror_status:2,
+ mirror_status:0,
bannerList: props.projectMenu || []
}
}
@@ -604,8 +604,7 @@ class Detail extends Component {
render() {
const { projectDetail, watchers_count, praises_count,
- forked_count, firstSync, secondSync,
- isManager, watched, praised,
+ forked_count, firstSync, secondSync, watched, praised,
project, open_devops, platform, defaultBranch, bannerList, forkSpin , mirror_status } = this.state;
const url = this.props.history.location.pathname;
const urlArr = url.split("/");
@@ -975,7 +974,7 @@ const mapDispatchToProps = (dispatch) => ({
Detail.preFetch = ({ store, match, query }) => {
return new Promise(async function(resolve, reject) {
- let { dispatch, getState } = store;
+ let { dispatch } = store;
// const { owner,projectsId } = match.params
const promises = [
dispatch(setProjectDetail(match.params)),
diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss
index 795bfb28e..d553499a8 100644
--- a/src/forge/Main/Index.scss
+++ b/src/forge/Main/Index.scss
@@ -559,9 +559,15 @@
}
.importFailTip{
- height: 100%;
- line-height: 500px;
- text-align: center;
- font-size: 19px;
- color: #333;
+ height: 500px;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ font-weight: 400;
+ font-size: 15px;
+ color: #4C5B76;
+ img{
+ margin-bottom: 20px;
+ }
}
\ No newline at end of file
diff --git a/src/forge/Main/img/importNone.png b/src/forge/Main/img/importNone.png
new file mode 100644
index 000000000..a25e59fac
Binary files /dev/null and b/src/forge/Main/img/importNone.png differ