Эх сурвалжийг харах

处理后台传输的自定义的换行标志

sunyj 8 жил өмнө
parent
commit
be0824ec97

+ 1 - 1
src/main/webapp/WEB-INF/views/preview.html

@@ -71,7 +71,7 @@
 	<div id="errorMessageContainer" hidden="true">
 		<p id="message"></p>
 		<button id="detailedMessageButton" class="viewerContainerButton"
-			title="获取更多错误信息" hidden="true">更多信息</button>
+			title="获取更多错误信息" hidden="true">展开</button>
 		<p id="detailedMessage" hidden="true"></p>
 	</div>
 

+ 3 - 2
src/main/webapp/resources/css/preview.css

@@ -105,6 +105,7 @@ select::-ms-expand {
 }
 
 button.viewerContainerButton {
-	border-radius: 10%;
-	height: 25px;
+	padding: 5px 15px 5px 15px;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
 }

+ 18 - 6
src/main/webapp/resources/js/preview/app.js

@@ -197,18 +197,30 @@ function loadData() {
 			$("#theCanvas").remove();
 			spinner = hideLoading(spinner);
 			$("#errorMessageContainer").removeAttr("hidden");
-
-			// 处理后台传输的自定义的换行标志
 			var result = JSON.parse(XMLHttpRequest.responseText);
 			var message = result.message;
 			$("#message").html(message);
-			if (result.detailedMessage) {
+			var detailedMessage = result.detailedMessage;
+			if (detailedMessage) {
+				// 处理后台传输的自定义的换行标志
+				detailedMessage = detailedMessage.replace(/\n/g, '<br/>')
+						.replace(/\t/g, '&nbsp;&nbsp;&nbsp;&nbsp;');
 				$("#detailedMessageButton").removeAttr("hidden");
+				$("#detailedMessage").html(detailedMessage);
+			}
+			function hiddenDetailMessage() {
+				$("#detailedMessage").attr("hidden", "true");
+				$("#detailedMessageButton").html("展开");
+				$("#detailedMessageButton").unbind();
+				$("#detailedMessageButton").click(showDetailMessage);
 			}
-			$("#detailedMessageButton").click(function() {
-				$("#detailedMessage").html(result.detailedMessage);
+			function showDetailMessage() {
 				$("#detailedMessage").removeAttr("hidden");
-			});
+				$("#detailedMessageButton").html("收起");
+				$("#detailedMessageButton").unbind();
+				$("#detailedMessageButton").click(hiddenDetailMessage);
+			}
+			hiddenDetailMessage();
 		}
 	});
 };