Merge branch 'dev_jupyter' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_jupyter

public/react/src/modules/tpm/jupyter/index.js

@@ -243,13 +243,15 @@ function JupyterTPI (props) {
               // title={item.file_path}
               mouseLeaveDelay={0.3}
             >
-              <Icon type="file-text" className="jupyter_icon"/>
-              <span className="jupyter_name ml10">{item.title}</span>
-              <a className={"fr color-blue"}
-               onClick={() => {
-                jsCopy("file_path"+i)
-              }}>复制地址</a>
-              <input id={"file_path"+i}  className={"file_path_input"} value={item.file_path}/>
+            <div className="sortinxdirection">
+							<Icon type="file-text" className="jupyter_icon fl lineheighttaj" />
+							<a className="jupyter_name ml10  maxnamewidth150 lineheighttaj colorlineheighttaj" title={item.title}>{item.title}</a>
+							<a className={"fr color-blue lineheighttaj"}
+								 onClick={() => {
+									 jsCopy("file_path"+i)
+								 }}>复制地址</a>
+						</div>
+							<input id={"file_path"+i}  className={"file_path_input"} value={item.file_path}/>
             </Tooltip>
           </li>
         );

public/react/src/modules/tpm/jupyter/index.scss

@@ -122,7 +122,6 @@
   .ant-drawer-wrapper-body{
     padding-top: 60px;
     background: #070F1A;
-    overflow: hidden !important;
   }
 
   .ant-pagination{
@@ -159,3 +158,22 @@
   }
 }
 
+.maxnamewidth150 {
+  max-width: 150px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: default;
+  width: 150px;
+}
+.sortinxdirection{
+  display: flex;
+  flex-direction:row;
+}
+
+.lineheighttaj{
+line-height: 50px !important;
+}
+.colorlineheighttaj{
+  color: #ffffff;
+}

public/react/src/modules/tpm/jupyter/leftPane/index.scss

@@ -33,7 +33,7 @@
     .jupyter_item{
       line-height:45px;
       //border-bottom: 1px solid rgba(238,238,238, 1);
-      padding: 0 30px 0 60px;
+      padding: 0 30px 0 45px;
       overflow: hidden;
       text-overflow:ellipsis;
       white-space: nowrap;

public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js

@@ -243,14 +243,9 @@ class Challengesjupyter extends Component {
 			enlarge:bool
 		})
 	}
-	daoruzhon=()=>{
-		var _iframe = document.getElementById("frame");
-		if(_iframe == null || _iframe == undefined || _iframe == ""){
-			console.log("framenull");
-			return;
-		}
-		console.log("framego");
-		_iframe.contentWindow.postMessage("Parentwindow", "*");
+	Importingfiles=()=>{
+		// 导入文件
+
 	}
 
 	render() {
@@ -414,7 +409,7 @@ class Challengesjupyter extends Component {
 															}}  onClick={()=>this.onclki(true)}></i>
 													}
 													<div className="challenbaocun" ><p
-														className="challenbaocuntest" onClick={()=>this.daoruzhon()}>导入</p>
+														className="challenbaocuntest" onClick={()=>this.Importingfiles()}>导入</p>
 													</div>
 												</div>
 											</div>