diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index a16034560..437ad68f2 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -26,13 +26,13 @@ import CheckProfile from '../Component/ProfileModal/Profile'; import RenderHtml from '../../components/render-html'; import Loadable from 'react-loadable'; import Loading from '../../Loading'; +import ProjectPortrait from '../Component/projectPortrait'; const CoderRootFileDetail = Loadable({ loader: () => import("./CoderRootFileDetail"), loading: Loading, }); -import ProjectPortrait from '../Component/projectPortrait'; /** * projectDetail.type:0是托管项目,1是镜像项目,2是同步镜像项目(为2时不支持在线创建、在线上传、在线修改、在线删除、创建合并请求等功能) * project.open_portrait: 是否开启项目画像展示 @@ -40,7 +40,6 @@ import ProjectPortrait from '../Component/projectPortrait'; function CoderDepot(props){ // const [ projectDetail , setProjectDetail ]= useState(undefined); let { platform , mirror_status , bannerList , projectDetail, projectEntries, projectReadMe, project } = props ; - projectDetail = props.defaultDetail || projectDetail || {} const [ inviteCode , setInviteCode ] = useState(projectDetail.invite_code || undefined); @@ -435,6 +434,10 @@ function CoderDepot(props){ }
+ { + mirror_status === 2 && +
导入项目失败,请前往 仓库设置 删除本项目后重新导入!
+ } { projectDetail && mirror_status === 0 &&
diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index e3b0fa191..012f090f9 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -277,50 +277,44 @@ class Detail extends Component { open_devops: data.open_devops, platform: data.platform && data.platform !== 'educoder' }) - if(data.status === -1){ - this.toMirrorFunc(); - }else{ - if (data.type !== 0 && data.mirror_status === 1) { - console.log("--------start channel --------"); - this.setState({ - firstSync: true, - secondSync: false, - mirror_status:1 - }) - // 是镜像项目,且未完成迁移 - this.canvasChannel(); - } else if (data.mirror_status === 2) { - this.toMirrorFunc(); + if (data.type !== 0 && data.mirror_status === 1) { + console.log("--------start channel --------"); + this.setState({ + firstSync: true, + secondSync: false, + mirror_status:1 + }) + // 是镜像项目,且未完成迁移 + this.canvasChannel(); + } else { + this.setState({ + firstSync: false, + secondSync: false, + mirror_status:data.mirror_status ? data.mirror_status : 0 + }) + this.getBanner(this.props.projectMenu) + let projectdata + if (this.props.defaultDetail) { + projectdata = this.props.defaultDetail } else { this.setState({ firstSync: false, secondSync: false, - mirror_status:0 + mirror_status:data.mirror_status ? data.mirror_status : 0 }) this.getBanner(this.props.projectMenu) let projectdata if (this.props.defaultDetail) { projectdata = this.props.defaultDetail } else { - this.setState({ - firstSync: false, - secondSync: false, - mirror_status:0 - }) - this.getBanner(this.props.projectMenu) - let projectdata - if (this.props.defaultDetail) { - projectdata = this.props.defaultDetail - } else { - const res = await getProjectDetailFunc(owner, projectsId, !window.location.host); - if (res.status === 200) { - projectdata = res.data - } - } - if (projectdata) { - this.getDetail(projectdata) + const res = await getProjectDetailFunc(owner, projectsId, !window.location.host); + if (res.status === 200) { + projectdata = res.data } } + if (projectdata) { + this.getDetail(projectdata) + } } } } diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss index dc000a3be..795bfb28e 100644 --- a/src/forge/Main/Index.scss +++ b/src/forge/Main/Index.scss @@ -557,4 +557,11 @@ color:#4c5b76; background-color: rgba(175, 183, 194, 0.16); +} +.importFailTip{ + height: 100%; + line-height: 500px; + text-align: center; + font-size: 19px; + color: #333; } \ No newline at end of file