diff --git a/dist/datetime-picker/index.js b/dist/datetime-picker/index.js
index c0820ee7..06d4f328 100644
--- a/dist/datetime-picker/index.js
+++ b/dist/datetime-picker/index.js
@@ -20,6 +20,9 @@ function times(n, iteratee) {
return result;
}
function getTrueValue(formattedValue) {
+ if (formattedValue === undefined) {
+ formattedValue = '1';
+ }
while (isNaN(parseInt(formattedValue, 10))) {
formattedValue = formattedValue.slice(1);
}
diff --git a/dist/icon/computed.wxs b/dist/icon/computed.wxs
new file mode 100644
index 00000000..4fde5f08
--- /dev/null
+++ b/dist/icon/computed.wxs
@@ -0,0 +1,50 @@
+/* eslint-disable */
+var utils = require('../wxs/utils.wxs');
+
+function isImage(name) {
+ return name.indexOf('/') !== -1;
+}
+
+function rootClass(data) {
+ var classes = ['custom-class'];
+
+ if (data.classPrefix != null) {
+ classes.push(data.classPrefix);
+ }
+
+ if (isImage(data.name)) {
+ classes.push('van-icon--image');
+ } else if (data.classPrefix != null) {
+ classes.push(data.classPrefix + '-' + data.name);
+ }
+
+ return classes.join(' ');
+}
+
+function rootStyle(data) {
+ var styles = [];
+
+ if (data.color) {
+ styles.push(['color', data.color]);
+ }
+
+ if (data.size) {
+ styles.push(['font-size', utils.addUnit(data.size)]);
+ }
+
+ if (data.customStyle) {
+ styles.push([data.customStyle]);
+ }
+
+ return styles
+ .map(function (pair) {
+ return pair.join(':');
+ })
+ .join(';');
+}
+
+module.exports = {
+ isImage: isImage,
+ rootClass: rootClass,
+ rootStyle: rootStyle,
+};
diff --git a/dist/icon/index.js b/dist/icon/index.js
index bee576cb..75f2c946 100644
--- a/dist/icon/index.js
+++ b/dist/icon/index.js
@@ -10,14 +10,7 @@ VantComponent({
type: String,
value: 'van-icon',
},
- name: {
- type: String,
- observer(val) {
- this.setData({
- isImageName: val.indexOf('/') !== -1,
- });
- },
- },
+ name: String,
},
methods: {
onClick() {
diff --git a/dist/icon/index.wxml b/dist/icon/index.wxml
index fe4065a4..62eff360 100644
--- a/dist/icon/index.wxml
+++ b/dist/icon/index.wxml
@@ -1,8 +1,9 @@
+
0
- ? this.set(patch)
- : Promise.resolve();
+ if (Object.keys(patch).length > 0) {
+ this.setData(patch);
+ }
},
},
});
diff --git a/dist/tabbar-item/index.wxml b/dist/tabbar-item/index.wxml
index d83b061f..524728f3 100644
--- a/dist/tabbar-item/index.wxml
+++ b/dist/tabbar-item/index.wxml
@@ -3,19 +3,17 @@
-
+
child.updateFromParent()));
+ children.forEach((child) => child.updateFromParent());
},
- onChange(child) {
- const index = this.children.indexOf(child);
- const active = child.data.name || index;
- if (active !== this.data.active) {
- this.$emit('change', active);
+ setHeight() {
+ if (!this.data.fixed || !this.data.placeholder) {
+ return;
}
+ wx.nextTick(() => {
+ getRect.call(this, '.van-tabbar').then((res) => {
+ this.setData({ height: res.height });
+ });
+ });
},
},
});
diff --git a/dist/tabbar/index.wxml b/dist/tabbar/index.wxml
index c49b9d98..43bb1111 100644
--- a/dist/tabbar/index.wxml
+++ b/dist/tabbar/index.wxml
@@ -1,8 +1,10 @@
+
+
diff --git a/dist/tabs/index.js b/dist/tabs/index.js
index 0198f0eb..8f1c081b 100644
--- a/dist/tabs/index.js
+++ b/dist/tabs/index.js
@@ -193,7 +193,7 @@ VantComponent({
if (this.data.type !== 'line') {
return;
}
- const { currentIndex } = this.data;
+ const { currentIndex, ellipsis } = this.data;
Promise.all([
getAllRect.call(this, '.van-tab'),
getRect.call(this, '.van-tabs__line'),
@@ -205,7 +205,8 @@ VantComponent({
let lineOffsetLeft = rects
.slice(0, currentIndex)
.reduce((prev, curr) => prev + curr.width, 0);
- lineOffsetLeft += (rect.width - lineRect.width) / 2;
+ lineOffsetLeft +=
+ (rect.width - lineRect.width) / 2 + (ellipsis ? 0 : 8);
this.setData({
lineOffsetLeft,
skipTransition,
diff --git a/lib/datetime-picker/index.js b/lib/datetime-picker/index.js
index 801c5984..2690f368 100644
--- a/lib/datetime-picker/index.js
+++ b/lib/datetime-picker/index.js
@@ -47,6 +47,9 @@ function times(n, iteratee) {
return result;
}
function getTrueValue(formattedValue) {
+ if (formattedValue === undefined) {
+ formattedValue = '1';
+ }
while (isNaN(parseInt(formattedValue, 10))) {
formattedValue = formattedValue.slice(1);
}
diff --git a/lib/icon/computed.wxs b/lib/icon/computed.wxs
new file mode 100644
index 00000000..4fde5f08
--- /dev/null
+++ b/lib/icon/computed.wxs
@@ -0,0 +1,50 @@
+/* eslint-disable */
+var utils = require('../wxs/utils.wxs');
+
+function isImage(name) {
+ return name.indexOf('/') !== -1;
+}
+
+function rootClass(data) {
+ var classes = ['custom-class'];
+
+ if (data.classPrefix != null) {
+ classes.push(data.classPrefix);
+ }
+
+ if (isImage(data.name)) {
+ classes.push('van-icon--image');
+ } else if (data.classPrefix != null) {
+ classes.push(data.classPrefix + '-' + data.name);
+ }
+
+ return classes.join(' ');
+}
+
+function rootStyle(data) {
+ var styles = [];
+
+ if (data.color) {
+ styles.push(['color', data.color]);
+ }
+
+ if (data.size) {
+ styles.push(['font-size', utils.addUnit(data.size)]);
+ }
+
+ if (data.customStyle) {
+ styles.push([data.customStyle]);
+ }
+
+ return styles
+ .map(function (pair) {
+ return pair.join(':');
+ })
+ .join(';');
+}
+
+module.exports = {
+ isImage: isImage,
+ rootClass: rootClass,
+ rootStyle: rootStyle,
+};
diff --git a/lib/icon/index.js b/lib/icon/index.js
index 0f06f9e7..28839c38 100644
--- a/lib/icon/index.js
+++ b/lib/icon/index.js
@@ -12,14 +12,7 @@ component_1.VantComponent({
type: String,
value: 'van-icon',
},
- name: {
- type: String,
- observer: function (val) {
- this.setData({
- isImageName: val.indexOf('/') !== -1,
- });
- },
- },
+ name: String,
},
methods: {
onClick: function () {
diff --git a/lib/icon/index.wxml b/lib/icon/index.wxml
index fe4065a4..62eff360 100644
--- a/lib/icon/index.wxml
+++ b/lib/icon/index.wxml
@@ -1,8 +1,9 @@
+
0
- ? this.set(patch)
- : Promise.resolve();
+ if (Object.keys(patch).length > 0) {
+ this.setData(patch);
+ }
},
},
});
diff --git a/lib/tabbar-item/index.wxml b/lib/tabbar-item/index.wxml
index d83b061f..524728f3 100644
--- a/lib/tabbar-item/index.wxml
+++ b/lib/tabbar-item/index.wxml
@@ -3,19 +3,17 @@
-
+
+
+
diff --git a/lib/tabs/index.js b/lib/tabs/index.js
index 8a96f8a9..d5c32af8 100644
--- a/lib/tabs/index.js
+++ b/lib/tabs/index.js
@@ -215,7 +215,9 @@ component_1.VantComponent({
if (this.data.type !== 'line') {
return;
}
- var currentIndex = this.data.currentIndex;
+ var _a = this.data,
+ currentIndex = _a.currentIndex,
+ ellipsis = _a.ellipsis;
Promise.all([
utils_1.getAllRect.call(this, '.van-tab'),
utils_1.getRect.call(this, '.van-tabs__line'),
@@ -232,7 +234,8 @@ component_1.VantComponent({
.reduce(function (prev, curr) {
return prev + curr.width;
}, 0);
- lineOffsetLeft += (rect.width - lineRect.width) / 2;
+ lineOffsetLeft +=
+ (rect.width - lineRect.width) / 2 + (ellipsis ? 0 : 8);
_this.setData({
lineOffsetLeft: lineOffsetLeft,
skipTransition: skipTransition,