Merge branch 'Dev' of http://10.1.1.202:3030/steve07s/BIM-Monitor into Dev

api-detail.php

@@ -16,7 +16,7 @@ if (!isset($_SESSION['loggedin'])) {
 	<script src="./script/js/global.js"></script>
 	<script type="application/javascript">
 		var i = 0;
-		var api;
+		var api = [];
 		var fileName;
 		var folder;
 		var software;
@@ -123,7 +123,7 @@ if (!isset($_SESSION['loggedin'])) {
 								<div class="col-md-6">
 									<section class="panel">
 										<div class="panel-body">
-											<h5 class="text-semibold text-dark text-uppercase">檔案一覽</h5>
+											<h5 class="text-semibold text-dark text-uppercase">參考檔案下載</h5>
 											<div id="treeAjaxHTML"></div>
 										</div>
 
@@ -133,13 +133,11 @@ if (!isset($_SESSION['loggedin'])) {
 								<div class="col-md-6">
 									<section class="panel">
 										<div class="panel-body">
-											<img v-if="table[1].includes('ynamo')" src="./assets/images/dynamo-icon.png" style="height:80px; display: inline-block;"></img>
-											<img v-else src="./assets/images/revit-icon.png" style="height:80px; display: inline-block;"></img>
+											<img v-if="table[1].includes('ynamo')" src="./assets/images/dynamo-icon.png" style="height:80px; display: inline-block; vertical-align: top;"></img>
+											<img v-else-if="table[1].includes('Revit')" src="./assets/images/revit-icon.png" style="height:80px; display: inline-block; vertical-align: top;"></img>
 											<div class="summary" style="display: inline-block;">
-												<div class="title"><strong>API下載</strong></div>
-												<div class="info">
-													<a download href="" id="api"></a>
-
+												<div class="title"><strong>程式下載</strong></div>
+												<div class="info" id="apiList">
 												</div>
 											</div>
 										</div>

assets/javascripts/ui-elements/examples.treeview.js

@@ -85,18 +85,17 @@
 		}).bind('loaded.jstree', function (e, data) {
 		// invoked after jstree has loaded
 		$('.jstree-anchor').each(function (index) {
-			if ($(this).attr('href').includes(".dll") || $(this).attr('href').includes(".dyn") || $(this).attr('href').includes(".exe")) {
-				api = $(this).attr('href');
+			if ($(this).attr('href').includes(".dll") || $(this).attr('href').includes(".dyn") || $(this).attr('href').includes(".exe") || $(this).attr('href').includes(".msi")) {
+				api.push($(this).attr('href'));
 			}
 		});
 		if (api != null) {
-			var fileNames = api.split("/");
-			fileName = fileNames[fileNames.length - 1];
-			$("#api").attr("href", api)
-			$("#api").append(fileName);
+			for(i = 0; i < api.length; i++){
+				var fileNames = api[i].split("/");
+				fileName = fileNames[fileNames.length - 1];
+				$("#apiList").append("<a download href='" + api[i] + "' id='api" + i + "'>" + fileName + "</a><br>");
+			}
 		}
-
-
 	});
 
 	/*

component-list.php

@@ -96,13 +96,15 @@ if (!isset($_SESSION['loggedin'])) {
 				for (var i = 0; i < data["categoryList"].length; i++) {
 					$("#filters").append('<li><a class="button" data-filter=".' + i + '">' + data['categoryList'][i] + '</a></li>');
 				}
-				$grid = $("#content").isotope({
-					itemSelector: ".isotope-item",
-					layoutMode: 'fitRows'
+
+				$.when(initThreeJS()).then(function() {
+					$grid = $("#content").isotope({
+						itemSelector: ".isotope-item",
+						layoutMode: 'fitRows'
+					});
+				}).then(function(){
+					setTimeout(function(){$grid.isotope()}, 100);
 				});
-				$.when(initThreeJS()).then(
-					$grid.isotope()
-				);
 				
 			}).error(function(error) {
 				console.log(error);
@@ -117,17 +119,17 @@ if (!isset($_SESSION['loggedin'])) {
 				dataType: "json"
 			}).done(function(data) {
 				for (var i = 0; i < data.length; i++) {
-					
 					$("#revitVersion").append('<label><input type="checkbox" value=".' + data[i] + '" />   ' + data[i] + '</label> ');
 				}
 			}).error(function(error) {
 				console.log(error);
 			});
 
+
 		});
 	</script>
 	<script src="script/js/3Dpic.js" type="module"></script>
-	
+
 </body>
 
 </html>