From 3e3bb42b3ebb13c34427556e0ea3c167be6b4014 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 5 Jun 2024 16:37:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E9=A1=B9=E7=9B=AE=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E5=90=8E=E4=B8=8D=E5=88=A0=E9=99=A4=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=EF=BC=8C=E6=98=BE=E7=A4=BA=E6=8F=90=E7=A4=BA=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Main/CoderDepot.jsx |  7 +++--
 src/forge/Main/Detail.js      | 58 ++++++++++++++++-------------------
 src/forge/Main/Index.scss     |  7 +++++
 3 files changed, 38 insertions(+), 34 deletions(-)

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){
           </React.Fragment>
         }
         <div style={{minHeight:"500px"}}>
+          {
+            mirror_status === 2 &&
+            <div className='importFailTip'>导入项目失败，请前往 <Link className='color-blue' to={`/${owner}/${projectsId}/settings`}>仓库设置</Link> 删除本项目后重新导入！</div>
+          }
           { 
             projectDetail && mirror_status === 0 &&
             <div className="Panels Box">
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