From 710a18f3a23991d59f736dc2d965dbbaafeb7354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 3 Jan 2020 09:20:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=89=88=E6=9C=AC=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tpm/shixunchild/Repository/Repository.css |  7 +++++++
 .../tpm/shixunchild/Repository/Repository.js  | 11 +++++++---
 .../Repository/RepositoryCombinePath.js       | 21 +++++++------------
 .../Repository/RepositoryNoneData.js          |  2 +-
 4 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/public/react/src/modules/tpm/shixunchild/Repository/Repository.css b/public/react/src/modules/tpm/shixunchild/Repository/Repository.css
index 45f7c8507..158666548 100644
--- a/public/react/src/modules/tpm/shixunchild/Repository/Repository.css
+++ b/public/react/src/modules/tpm/shixunchild/Repository/Repository.css
@@ -49,4 +49,11 @@
 
 .padding020Repository{
     padding: 0px 20px 0px 20px;
+}
+
+.colorFF6601{
+  color:#FF6601
+}
+.padding040pxRepository{
+    padding: 40px 40px 0px 40px;
 }
\ No newline at end of file
diff --git a/public/react/src/modules/tpm/shixunchild/Repository/Repository.js b/public/react/src/modules/tpm/shixunchild/Repository/Repository.js
index 43fbc3ca2..4a78a85e4 100644
--- a/public/react/src/modules/tpm/shixunchild/Repository/Repository.js
+++ b/public/react/src/modules/tpm/shixunchild/Repository/Repository.js
@@ -122,7 +122,7 @@ class Repository extends Component {
 
                     {
                       this.props.current_user && (this.props.current_user.admin ==true || (TPMRightSectionData && TPMRightSectionData.creator && TPMRightSectionData.creator.login == this.props.current_user.login)) ?
-                        !this.props.secret_repository_tab &&
+                        // !this.props.secret_repository_tab &&
                         (
                           <div>
                             <Button type="primary"
@@ -160,8 +160,13 @@ class Repository extends Component {
               </style>
 
               {/*私密版本库*/}
-
-            {this.props.secret_repository_tab && <div className={"padding020Repository mt20"}>
+              {this.props.secret_repository_tab && (
+                <div className={"combinePathEditRow padding040pxRepository"}>
+                  <div className={"colorFF6601"}>私密版本库的文件对学员始终隐藏，无法访问查看。 </div>
+                  <div className={"colorFF6601"}>若评测学员任务需要使用私密版本库的文件，请指定将私密版本库合并到常规版本库的目标路径，以确保评测时能访问私密版本库的文件。</div>
+                </div>
+              )}
+            {  trees === undefined || trees === null ||trees.length===0? "":this.props.secret_repository_tab && <div className={"padding020Repository mt20"}>
                   <RepositoryCombinePath {...this.props}></RepositoryCombinePath>
               </div> }
 
diff --git a/public/react/src/modules/tpm/shixunchild/Repository/RepositoryCombinePath.js b/public/react/src/modules/tpm/shixunchild/Repository/RepositoryCombinePath.js
index aba008e20..8bc66acc8 100644
--- a/public/react/src/modules/tpm/shixunchild/Repository/RepositoryCombinePath.js
+++ b/public/react/src/modules/tpm/shixunchild/Repository/RepositoryCombinePath.js
@@ -1,13 +1,5 @@
 import React, { Component } from 'react';
 
-import { Redirect } from 'react-router';
-
-import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
-
-import PropTypes from 'prop-types';
-
-import classNames from 'classnames';
-
 import axios from 'axios';
 
 import { trace_collapse, WordsBtn } from 'educoder'
@@ -56,7 +48,7 @@ class RepositoryCombinePath extends Component {
         const { isEdit, value } = this.state;
         return (
             
-            <div className="df combinePathEditRow">
+            <div className="combinePathEditRow">
                 <style>{`
                     .combinePathEditRow {
                         margin: 4px 0;
@@ -69,10 +61,13 @@ class RepositoryCombinePath extends Component {
                         margin-left: 24px;
                     }
                 `}</style>
-                <span>第一版本库合并路径：</span>
-                <Input disabled={!isEdit} value={value} onChange={this.onChange}></Input>
-                {!isEdit && <WordsBtn className="wordsBtn" onClick={this.onEdit} style="blue">修改</WordsBtn>}
-                {isEdit && <WordsBtn className="wordsBtn" onClick={this.onSave} style="blue">保存</WordsBtn>}
+                <div> 第一版本库合并路径 </div>
+                <div className={"df"}>
+                    <Input disabled={!isEdit} value={value} onChange={this.onChange}></Input>
+                    {!isEdit && <WordsBtn className="wordsBtn" onClick={this.onEdit} style="blue">修改</WordsBtn>}
+                    {isEdit && <WordsBtn className="wordsBtn" onClick={this.onSave} style="blue">保存</WordsBtn>}
+                </div>
+
             </div>
 
 
diff --git a/public/react/src/modules/tpm/shixunchild/Repository/RepositoryNoneData.js b/public/react/src/modules/tpm/shixunchild/Repository/RepositoryNoneData.js
index ca7fe8298..2de778e62 100644
--- a/public/react/src/modules/tpm/shixunchild/Repository/RepositoryNoneData.js
+++ b/public/react/src/modules/tpm/shixunchild/Repository/RepositoryNoneData.js
@@ -8,7 +8,7 @@ class RepositoryNoneData extends Component{
   render(){
     const { style } = this.props;
     return(
-      <div className="mt50 clearfix edu-txt-center" style={ style || { width:"100%" }}>
+      <div className="mt20 clearfix edu-txt-center" style={ style || { width:"100%" }}>
         <style>
           {`
             .edu-tab-con-box{