From fb2f543d25a95115e8cac4c4994cb87a060b753c Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Sat, 6 Jul 2019 17:42:54 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20uni.showModal=20=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=B8=BB=E5=8A=A8=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../h5/components/app/popup/modal.vue         | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/platforms/h5/components/app/popup/modal.vue b/src/platforms/h5/components/app/popup/modal.vue
index 2404da5b..9c54ede7 100644
--- a/src/platforms/h5/components/app/popup/modal.vue
+++ b/src/platforms/h5/components/app/popup/modal.vue
@@ -1,27 +1,27 @@
 <template>
   <transition name="uni-fade">
-    <uni-modal
-      v-show="visible"
+    <uni-modal
+      v-show="visible"
       @touchmove.prevent>
       <div class="uni-mask"/>
       <div class="uni-modal">
-        <div
-          v-if="title"
+        <div
+          v-if="title"
           class="uni-modal__hd">
           <strong class="uni-modal__title">{{ title }}</strong>
         </div>
-        <div
-          class="uni-modal__bd"
+        <div
+          class="uni-modal__bd"
           @touchmove.stop>{{ content }}</div>
         <div class="uni-modal__ft">
-          <div
-            v-if="showCancel"
-            :style="{color:cancelColor}"
-            class="uni-modal__btn uni-modal__btn_default"
+          <div
+            v-if="showCancel"
+            :style="{color:cancelColor}"
+            class="uni-modal__btn uni-modal__btn_default"
             @click="_close('cancel')">{{ cancelText }}</div>
-          <div
-            :style="{color:confirmColor}"
-            class="uni-modal__btn uni-modal__btn_primary"
+          <div
+            :style="{color:confirmColor}"
+            class="uni-modal__btn uni-modal__btn_primary"
             @click="_close('confirm')">{{ confirmText }}</div>
         </div>
       </div>
@@ -113,6 +113,7 @@ export default {
 		font-size: 18px;
 		word-wrap:break-word;
 		word-break:break-all;
+		white-space: pre;
 		overflow : hidden;
 		text-overflow: ellipsis;
 		display: -webkit-box;
@@ -127,6 +128,7 @@ export default {
 		line-height: 1.4;
 		word-wrap: break-word;
 		word-break: break-all;
+		white-space: pre;
 		color: #999999;
 		max-height: 400px;
 		overflow-y: auto;
@@ -189,4 +191,4 @@ export default {
 	uni-modal .uni-modal__btn_primary {
 		color: #007aff;
 	}
-</style>
+</style>
-- 
GitLab