diff --git a/src/components/flex/item/index.scss b/src/components/flex/item/index.scss index bca33bec1..fdd3157ca 100644 --- a/src/components/flex/item/index.scss +++ b/src/components/flex/item/index.scss @@ -7,7 +7,6 @@ width: 100%; display: block; white-space: nowrap; - word-break: keep-all; box-sizing: border-box; @for $col from 1 through 12 { @@ -40,6 +39,7 @@ &--auto { max-width: initial; + word-break: keep-all; } &--wrap { diff --git a/src/pages/layout/flex/index.js b/src/pages/layout/flex/index.js index 5e4034e20..1c032ff33 100644 --- a/src/pages/layout/flex/index.js +++ b/src/pages/layout/flex/index.js @@ -17,8 +17,31 @@ export default class FlexPage extends Taro.Component { - + {/* + + 自动换行这样用就行了,可是换行换的不对,在有逗号的地方就换行了,后面还有很多空白 + + + + + + AAAAAAAAAAA,AAAAAAAAAA,AAAAAAAAAA,AAAAAAA,AAAAAAAA,AAAAAAAAA, + + + + + + AA,,A,,,,, + + + + + + 自动换行这样用就行了,可是换行换的不对,在有逗号的地方就换行了,后面还有很多空白 + + */} + {/* 基本案例 */} 基本案例 @@ -54,12 +77,8 @@ export default class FlexPage extends Taro.Component { - - A - - - B - + A + B C @@ -117,25 +136,33 @@ export default class FlexPage extends Taro.Component { - A + + A + 默认对齐方式 -- stretch - B + + B + 顶部对齐 -- start - C + + C + 居中对齐 -- center - D + + D + 底部对齐 -- end @@ -177,7 +204,6 @@ export default class FlexPage extends Taro.Component { - ) diff --git a/src/pages/layout/flex/index.scss b/src/pages/layout/flex/index.scss index 4696cd1b8..c1626b03a 100644 --- a/src/pages/layout/flex/index.scss +++ b/src/pages/layout/flex/index.scss @@ -3,8 +3,7 @@ .flex-page .at-row { margin-bottom: 40px; - .at-col, - at-flex-item { // stylelint-disable-line + .at-col { padding: $spacing-v-md $spacing-h-md; color: $color-white; font-size: $font-size-base;