From fd465c376d296a106efe4e2030b06fdf1b521e4f 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, 27 Dec 2019 19:25:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/tpm/TPMsettings/Configuration.js  |  4 +---
 public/react/src/modules/tpm/jupyter/index.js | 19 ++++++++++---------
 .../react/src/modules/tpm/jupyter/index.scss  |  2 +-
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/public/react/src/modules/tpm/TPMsettings/Configuration.js b/public/react/src/modules/tpm/TPMsettings/Configuration.js
index bd93fa4e5..f48314261 100644
--- a/public/react/src/modules/tpm/TPMsettings/Configuration.js
+++ b/public/react/src/modules/tpm/TPMsettings/Configuration.js
@@ -164,7 +164,7 @@ export default class Shixuninformation extends Component {
 
     axios.post(url,
       {
-        scope_partment: list,
+        scope_partment:use_scope===0?undefined:list,
         shixun: {
           can_copy: can_copy,
           use_scope: use_scope,
@@ -213,7 +213,6 @@ export default class Shixuninformation extends Component {
     if(scope_partment.length>0){
       scope_partment.map((item, key) => {
         if (item === e) {
-          debugger
           scopetype = true
         }
       })
@@ -222,7 +221,6 @@ export default class Shixuninformation extends Component {
     if(oldscope_partment.length>0){
       oldscope_partment.map((item, key) => {
         if (item === e) {
-          debugger
           scopetype = true
         }
       })
diff --git a/public/react/src/modules/tpm/jupyter/index.js b/public/react/src/modules/tpm/jupyter/index.js
index 702ae2b71..feaa27e49 100644
--- a/public/react/src/modules/tpm/jupyter/index.js
+++ b/public/react/src/modules/tpm/jupyter/index.js
@@ -219,7 +219,6 @@ function JupyterTPI (props) {
       title: '重置环境',
       content: (
         <p style={{ lineHeight: '24px' }}>
-          你在本文件中修改的内容将丢失,<br />
           是否确定重置环境？
         </p>
       ),
@@ -277,20 +276,22 @@ function JupyterTPI (props) {
   const firstDrawerWidth = ()=>{
     return 260
   };
-
+  let newPage=false
   // 分页处理
-  const handleChangePage = (e) => {
+  const handleChangePage = (e,page) => {
     //滑动到底判断
     let newscrollTop=parseInt(e.currentTarget.scrollTop);
     let allclientHeight=e.currentTarget.clientHeight+newscrollTop;
-    if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1||e.currentTarget.scrollHeight-allclientHeight===-1){
-      handlePageChange(pagination.page+1);
+    if(dataSets.length<total){
+      if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1||e.currentTarget.scrollHeight-allclientHeight===-1){
+        handlePageChange(page+1);
+      }
     }
   }
   // const listCtx = ;
   useEffect(() => {
     if (dataSets.length > 0) {
-      console.log('数据集的个数: ', dataSets.length);
+      // console.log('数据集的个数: ', dataSets.length);
       const oList = dataSets.map((item, i) => {
         return (
           <li className="jupyter_item" key={`key_${i}`}>
@@ -314,7 +315,7 @@ function JupyterTPI (props) {
       });
 
       const oUl = (
-        <ul className="jupyter_data_list"  onScroll={(event)=>handleChangePage(event)} >
+        <ul className="jupyter_data_list"  onScroll={(event)=>handleChangePage(event,pagination.page)} >
           { oList }
         </ul>
       );
@@ -413,7 +414,7 @@ function JupyterTPI (props) {
               <i className={"iconfont icon-base"}></i>数据集
               {/* <span className="iconfont icon-java jupyter_data_icon"></span>数据集 */}
             </h2>
-            <h2 className="borbottom17212F jupyterfilepaths">
+            {dataSets&&dataSets.length===0?"":<h2 className="borbottom17212F jupyterfilepaths">
               <span className={"ml50"}>文件路径</span>
               <div className="sortinxdirection">
                 <a className="jupyter_name ml50  maxnamewidth186JUPYTER lineheighttaj colorlineheighttaj">{jupyter_folder_name}</a>
@@ -423,7 +424,7 @@ function JupyterTPI (props) {
                    }}>复制地址</a>
               </div>
               <input id="jupyter_folder_name" className={"file_path_input"} value={jupyter_folder_name}/>
-            </h2>
+            </h2>}
               { renderCtx }
             {/*<div className='jupyter_pagination'>*/}
             {/*  {total<20?"":<Pagination*/}
diff --git a/public/react/src/modules/tpm/jupyter/index.scss b/public/react/src/modules/tpm/jupyter/index.scss
index 57f833437..1808e4bb6 100644
--- a/public/react/src/modules/tpm/jupyter/index.scss
+++ b/public/react/src/modules/tpm/jupyter/index.scss
@@ -132,7 +132,7 @@
 
   .jupyter_data_list{
     height:500px;
-    overflow: auto;
+    overflow-y: auto;
   }
 
   .ant-pagination{