From 45606550beddda31ede7fba943eae80a6fb8fe96 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Wed, 4 Sep 2019 09:44:00 +0800
Subject: [PATCH] =?UTF-8?q?=09=09=09//=20=E7=BB=9F=E4=B8=80=E8=BD=AC?=
 =?UTF-8?q?=E6=88=90\r\n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/tpm/challengesnew/TPMevaluation.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/react/src/modules/tpm/challengesnew/TPMevaluation.js b/public/react/src/modules/tpm/challengesnew/TPMevaluation.js
index 60161d829..491751b6a 100644
--- a/public/react/src/modules/tpm/challengesnew/TPMevaluation.js
+++ b/public/react/src/modules/tpm/challengesnew/TPMevaluation.js
@@ -561,7 +561,8 @@ export default class TPMevaluation extends Component {
 		if(type==="sr"){
 			newevaluationlist[key].input=e.target.value
 		}else if(type==="yq"){
-			newevaluationlist[key].output=e.target.value
+			// 统一转成\r\n
+			newevaluationlist[key].output= e.target.value ? e.target.value.replace(/\r?\n/g, "\r\n") : e.target.value
 		}
 		this.setevaluationlist(newevaluationlist);
 	}