@dolphinweex/weex-vue-render 0.2.100 → 0.2.102
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
|
@@ -5695,7 +5695,7 @@ function getInput (weex) {
|
|
|
5695
5695
|
'returnKeyType': this.returnKeyType
|
|
5696
5696
|
},
|
|
5697
5697
|
domProps: {
|
|
5698
|
-
|
|
5698
|
+
value: (this.$el && this.$el.value !== undefined && this.$el.value !== displayValue) ? this.$el.value : displayValue
|
|
5699
5699
|
},
|
|
5700
5700
|
on: this.createKeyboardEvent(events),
|
|
5701
5701
|
staticClass: 'weex-input weex-el',
|
|
@@ -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