Merge pull request #1484 from YYJeffrey/develop

fix(Album): 修复Album图片换行问题及外部样式类无效问题

Author: smileShirmy

src/album/index.js

@@ -100,7 +100,7 @@ Component({
 
       if (!this.data.customRowNumber) {
         let urlLength = this.data.showUrls.length;
-        if (urlLength > 1 && urlLength < 5) {
+        if (urlLength > 1 && urlLength < 5 && urlLength !== 3) {
           this.setData({
             everyRowNumber: 2
           });

src/album/index.wxml

@@ -1,10 +1,10 @@
 <wxs src="index.wxs" module="album"></wxs>
 <!-- 最外层 view 用于修复 issue 1100 -->
-<view style="display:flex">
+<view class="l-class" style="display:flex">
   <view style="{{album.gridStyle(gapRow, gapColumn, multipleSize, everyRowNumber)}}">
     <block wx:for="{{showUrls}}" wx:key="index" class="child">
       <view class="imageContainer {{album.dimBack(isLong, index, maxNumber, previewFullImage)}}" style="{{album.blockStyle(urls, horizontalScreen, shortSideValue, singleSize, multipleSize)}}">
-        <image class="{{album.dim(isLong, index, maxNumber, previewFullImage)}}}" id='{{index}}' bind:tap="onPreviewTap" style="{{album.blockStyle(urls, horizontalScreen, shortSideValue, singleSize, multipleSize)}}" src="{{newType?item[key]:item}}" mode="{{urls.length === 1?singleMode:multipleMode}}" />
+        <image class="{{album.blockClass(urls, horizontalScreen) + ' ' + album.dim(isLong, index, maxNumber, previewFullImage)}}" id='{{index}}' bind:tap="onPreviewTap" style="{{album.blockStyle(urls, horizontalScreen, shortSideValue, singleSize, multipleSize)}}" src="{{newType?item[key]:item}}" mode="{{urls.length === 1?singleMode:multipleMode}}" />
         <view wx:if="{{album.image(isLong, index, maxNumber, previewFullImage)}}" class="text">+{{urls.length-maxNumber}}</view>
       </view>
     </block>