@dolphinweex/weex-vue-render 0.2.101 → 0.2.103
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.common.js +13 -8
- package/package.json +1 -1
package/dist/index.common.js
CHANGED
|
@@ -4102,7 +4102,7 @@ function initEnv (viewportInfo, envInfo) {
|
|
|
4102
4102
|
appVersion: device_display.appVersion,
|
|
4103
4103
|
osName: osName,
|
|
4104
4104
|
osVersion: osVersion,
|
|
4105
|
-
|
|
4105
|
+
mallEnv: device_display.mallEnv || "",
|
|
4106
4106
|
deviceModel: device_display.deviceModel || "",
|
|
4107
4107
|
appEnv: device_display.appEnv,
|
|
4108
4108
|
versionCode: device_display.versionCode,
|
|
@@ -7185,12 +7185,17 @@ function getWaterfall (weex) {
|
|
|
7185
7185
|
if (totalWidth < ctWidth) {
|
|
7186
7186
|
width += (ctWidth - totalWidth) / cnt;
|
|
7187
7187
|
}
|
|
7188
|
-
else if (totalWidth > ctWidth
|
|
7189
|
-
cnt
|
|
7190
|
-
|
|
7191
|
-
|
|
7192
|
-
|
|
7193
|
-
|
|
7188
|
+
else if (totalWidth > ctWidth) {
|
|
7189
|
+
if (explicitColumnCount && cnt > 1) {
|
|
7190
|
+
width = (ctWidth - (cnt - 1) * gap - leftGap - rightGap) / cnt;
|
|
7191
|
+
}
|
|
7192
|
+
else if (cnt > 1) {
|
|
7193
|
+
cnt--;
|
|
7194
|
+
adjustCountAndWidth();
|
|
7195
|
+
}
|
|
7196
|
+
else {
|
|
7197
|
+
width = ctWidth;
|
|
7198
|
+
}
|
|
7194
7199
|
}
|
|
7195
7200
|
};
|
|
7196
7201
|
adjustCountAndWidth();
|
|
@@ -7324,7 +7329,7 @@ function getWaterfall (weex) {
|
|
|
7324
7329
|
leftAndRightGapStyle.paddingLeft = this.leftGap / rate + 'px';
|
|
7325
7330
|
}
|
|
7326
7331
|
if (this.rightGap) {
|
|
7327
|
-
leftAndRightGapStyle.paddingRight = this.
|
|
7332
|
+
leftAndRightGapStyle.paddingRight = this.rightGap / rate + 'px';
|
|
7328
7333
|
}
|
|
7329
7334
|
|
|
7330
7335
|
return createElement('main', {
|
package/package.json
CHANGED