Merge remote-tracking branch 'origin/dev' into dev

163a7995 · rockyl · f0779f86 · df20e3c2 · 163a7995
Commit 163a7995 authored Nov 27, 2019 by rockyl
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

common.js src/utils/common.js +1 -1

No files found.
--- a/src/utils/common.js
+++ b/src/utils/common.js
@@ -314,7 +314,7 @@ export const styles = {
 		if (component.type === 'label' && !onlyOpera) {
 			// 如果是label类型，禁止自动换行
-			result += 'word-break: keep-all;'
+			result += 'word-break: keep-all;white-space: nowrap;'
 		}
 		// console.log('getComponentStyle',component.name, result);