From 223291452b9577bf13ca4b3d29a960233e704d34 Mon Sep 17 00:00:00 2001
From: "zorro.zhang" <zorro.zhang@bambulab.com>
Date: Mon, 6 Mar 2023 20:03:34 +0800
Subject: [PATCH] FIX: Some bug in modelinfo webpage

Change-Id: I182fd0006f92975018012cb52a7093373153f80e
(cherry picked from commit c8341df9b548c0eed8769cb6b6dc80aab10b8827)
---
 resources/web/model/css/dark.css |  8 ++++++++
 resources/web/model/index.html   |  6 +++---
 resources/web/model/model.css    | 23 ++++++++++++++++++++++-
 resources/web/model/model.js     | 19 ++++++++++++-------
 4 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/resources/web/model/css/dark.css b/resources/web/model/css/dark.css
index 08e5baf817..52cd4df2db 100644
--- a/resources/web/model/css/dark.css
+++ b/resources/web/model/css/dark.css
@@ -4,6 +4,14 @@ body
 	color: #B3B3B5;
 }
 
+.ZScrol::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
+    background-color: #939594;
+}
+
+.ZScrol::-webkit-scrollbar-track {/*滚动条里面轨道*/
+        background: #161817;
+}
+
 #EmptyArea img
 {
 	content:url(../img/null2.png);
diff --git a/resources/web/model/index.html b/resources/web/model/index.html
index d2e3f894a3..37933f60b2 100644
--- a/resources/web/model/index.html
+++ b/resources/web/model/index.html
@@ -31,7 +31,7 @@
 <div id="WholeArea">
   <div class="TopBottomBar">&nbsp;</div>	
 	
-  <div id="Info_Inside_Board" >
+  <div id="Info_Inside_Board" class="ZScrol" >
   <div id="LeftProcessBlock" class="Block_BKGA">
     <div id="Info_ProcessBar" class="LeftProcessBar ProcessBarSelected" onclick="OnMenuClick('Model_Basic');">
 	  <img class="LeftTipIcon" src="img/info_h.svg" /><span class="trans" tid='t95'>Model Information</span>
@@ -46,12 +46,12 @@
 	  
   <div style="height: 100%;width:280px;"></div>
 	
-  <div id="ModelInfoBlock">	
+  <div id="ModelInfoBlock" class="ZScrol">
 	<div id="Model_Basic" class="InfoBlock">
 		<div id="Model_Name_Area" class="Text_TitleBoard">
 		<div id="Model_Name_Line" class="Text_TitleArea">
 		   <div class="Text_Title" ><span  class="trans" tid='t98' >Model name</span><span>:</span><span id="ModelName" style="margin-left: 8px;">xxxxxxxxxx</span></div>
-		   <div><span id="ModelAthorType" class="trans" tid='t92'>Model Author</span><span>:</span><span id="ModelAuthorName" style="margin-left: 8px;" class="Text_Value">xxxxxxx</span></div>
+		   <div><span id="ModelAuthorType" class="trans" tid='t92'>Model Author</span><span>:</span><span id="ModelAuthorName" style="margin-left: 8px;" class="Text_Value">xxxxxxx</span></div>
 		</div>
 	    <div id="ModelLicenceImg"><img src="img/by-nc-nd.png"></div>
 		</div>
diff --git a/resources/web/model/model.css b/resources/web/model/model.css
index fba044b35d..6f7d3b92ac 100644
--- a/resources/web/model/model.css
+++ b/resources/web/model/model.css
@@ -44,6 +44,27 @@ body
 	display: none;
 }
 
+.ZScrol::-webkit-scrollbar {/*滚动条整体样式*/
+    width: 8px;     /*高宽分别对应横竖滚动条的尺寸*/
+    height: 8px;
+	padding: 2px;
+}
+
+.ZScrol::-webkit-scrollbar-thumb {/*滚动条里面小方块*/
+    border-radius: 6px;
+    -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+	box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+    background-color: #AAAAAA;
+}
+
+.ZScrol::-webkit-scrollbar-track {/*滚动条里面轨道*/
+        -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+	    box-shadow: inset 0 0 5px rgba(0,0,0,0.2);
+        border-radius: 10px;
+        background: #EDEDED;
+}
+
+
 .TopBottomBar
 {
 	height: 24px;
@@ -51,7 +72,7 @@ body
 
 .FloorBottomBar
 {
-	height: 300px;
+	height: 100px;
 }
 
 
diff --git a/resources/web/model/model.js b/resources/web/model/model.js
index fc6135d10b..caa91d29d5 100644
--- a/resources/web/model/model.js
+++ b/resources/web/model/model.js
@@ -203,7 +203,7 @@ function ShowModelInfo( pModel )
 	//==========Model Info==========
 	let sModelName=decodeURIComponent(pModel.name);
 	let sModelAuthor=decodeURIComponent(pModel.author);
-	let UploadType=pModel.upload_type.toUpperCase();
+	let UploadType=pModel.upload_type.toLowerCase();
 	let sLicence=pModel.license.toUpperCase();
 	let sModelDesc=decodeURIComponent(pModel.description);
 	
@@ -215,15 +215,15 @@ function ShowModelInfo( pModel )
 	switch(UploadType)
 	{
 		case 'remix':
-			$('#ModelAthorType').attr('tid','t93');
+			$('#ModelAuthorType').attr('tid','t93');
 			break;
 		case 'shared':
-			$('#ModelAthorType').attr('tid','t94');
+			$('#ModelAuthorType').attr('tid','t94');
 			break;			
 		case 'origin':
 		case 'profile':
 		default:
-			$('#ModelAthorType').attr('tid','t92');
+			$('#ModelAuthorType').attr('tid','t92');
 			break;			
 	}
 	
@@ -329,11 +329,11 @@ function ShowModelInfo( pModel )
 			});
 		}			
 			
-		
+		$('#Model_Preview_Image').show();
 	}
 	else
 	{
-		$('#ModelPreviewList').hide();
+		$('#Model_Preview_Image').hide();
 	}	
 }
 			
@@ -465,6 +465,9 @@ function ConstructFileHtml( ID, pItem )
 	}
 	
 	$('#'+ID+'  .FileListBoard').html(strHtml);
+	
+    if( fTotal>0 )
+		$('#'+ID).show();
 }
 
 
@@ -543,10 +546,12 @@ function ShowProfilelInfo( pProfile )
 			}		
 			});
 		}
+		
+		$('#Profile_Preview_Image').show();
 	}
 	else
 	{
-		$('#ProfilePreviewList').hide();
+		$('#Profile_Preview_Image').hide();
 	}				
 }