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

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

@@ -1,7 +1,7 @@
 /*
  * @Description: jupyter tpi
  * @Author: tangjiang
- * @Github: 
+ * @Github:
  * @Date: 2019-12-11 08:35:23
  * @LastEditors: tangjiang
  * @LastEditTime: 2019-12-13 15:25:50
@@ -69,7 +69,7 @@ function JupyterTPI (props) {
       <Empty />
     </div>
   );
-  const {identifier} = params;  
+  const {identifier} = params;
   const [userInfo, setUserInfo] = useState({});
   const [jupyterInfo, setJupyterInfo] = useState({});
   const [updateTip, setUpdateTip] = useState(true);
@@ -94,8 +94,8 @@ function JupyterTPI (props) {
 
 
   useEffect(() => {
-    /* 先调用 jupyter的 TPI 接口， 
-     * 获取 用户信息,  
+    /* 先调用 jupyter的 TPI 接口，
+     * 获取 用户信息,
      * 实训的 identifier, 状态， 名称， 是否被修改等信息
     */
    addEventListeners()
@@ -109,7 +109,7 @@ function JupyterTPI (props) {
     if (user) {
       setUserInfo(user);
     }
-    
+
     if (myshixun_identifier) {
       setMyIdentifier(myshixun_identifier);
     }
@@ -210,7 +210,7 @@ function JupyterTPI (props) {
     saveJupyterTpi();
   }
 
-  // 分页信息改变时 
+  // 分页信息改变时
   const handlePageChange = (current) => {
     // 改变当前页
     changeCurrentPage(current);
@@ -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>
         );
@@ -276,9 +278,9 @@ function JupyterTPI (props) {
         </p>
         <p className="jupyter_btn">
           {/* sync | poweroff */}
-          <Button 
-            className="btn_common" 
-            type="link" 
+          <Button
+            className="btn_common"
+            type="link"
             icon="history"
             onClick={handleClickResetTpi}
           >重置实训</Button>
@@ -290,12 +292,12 @@ function JupyterTPI (props) {
             onClick={handleEnvironmentTpi}
           >重置环境</Button>
 
-          <Button 
-            className="btn_common" 
-            type="link" 
+          <Button
+            className="btn_common"
+            type="link"
             icon="poweroff"
             onClick={handleClickQuitTpi}
-          >退出实训</Button> 
+          >退出实训</Button>
         </p>
       </div>
 
@@ -358,7 +360,7 @@ function JupyterTPI (props) {
 const mapStateToProps = (state) => {
   const {
     jupyter_info,
-    jupyter_tpi_url, 
+    jupyter_tpi_url,
     jupyter_data_set,
     jupyter_tpi_url_state,
     jupyter_data_set_count,

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

@@ -14,7 +14,7 @@
   -webkit-transition: all 2s ease;
   transition: all 2s ease;
 }
- 
+
 .Resizer.horizontal {
   height: 11px;
   margin: -5px 0;
@@ -23,12 +23,12 @@
   cursor: row-resize;
   width: 100%;
 }
- 
+
 .Resizer.horizontal:hover {
   border-top: 5px solid rgba(0, 0, 0, 0.5);
   border-bottom: 5px solid rgba(0, 0, 0, 0.5);
 }
- 
+
 .Resizer.vertical {
   width: 11px;
   margin: 0 -5px;
@@ -36,7 +36,7 @@
   border-right: 5px solid rgba(255, 255, 255, 0);
   cursor: col-resize;
 }
- 
+
 .Resizer.vertical:hover {
   border-left: 5px solid rgba(0, 0, 0, 0.5);
   border-right: 5px solid rgba(0, 0, 0, 0.5);
@@ -89,7 +89,7 @@
       }
     }
   }
-  
+
 
   .jupyter_ctx{
     position: relative;
@@ -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;
@@ -70,4 +70,4 @@
     box-sizing: border-box;
     border-top: 1px solid rgba(238,238,238,1);
   }
-}
+}

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>