From 0b33cbddb6af31d52f3ce9b60a71c2b861ba889f Mon Sep 17 00:00:00 2001 From: neverland Date: Tue, 9 Jan 2018 11:31:44 +0800 Subject: [PATCH 1/6] [bugfix] Area: should valid data before get area list (#520) --- packages/area/index.vue | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/packages/area/index.vue b/packages/area/index.vue index e7551f316..b01e9cf6f 100644 --- a/packages/area/index.vue +++ b/packages/area/index.vue @@ -35,11 +35,14 @@ export default create({ }, computed: { + listValid() { + return this.areaList && typeof this.areaList.province_list === 'object'; + }, + columns() { const columns = []; - const { areaList } = this; - if (!areaList || typeof areaList.province_list !== 'object') { + if (!this.listValid) { return columns; } @@ -91,6 +94,10 @@ export default create({ // 根据省市县类型和对应的`code`获取对应列表 getList(type, code) { + if (!this.listValid) { + return []; + } + const { areaList } = this; const list = type === 'province' @@ -118,11 +125,10 @@ export default create({ getIndex(type, code) { const compareNum = type === 'province' ? 2 : type === 'city' ? 4 : 6; const areaList = this.getList(type, code.slice(0, compareNum - 2)); + code = code.slice(0, compareNum); for (let i = 0; i < areaList.length; i++) { - if ( - +areaList[i].code.slice(0, compareNum) === +code.slice(0, compareNum) - ) { + if (areaList[i].code.slice(0, compareNum) === code) { return i; } } From 7278d90c1204bc959e5fb5a3685851e19eb5f3e6 Mon Sep 17 00:00:00 2001 From: ZhiRu <753689171@qq.com> Date: Tue, 9 Jan 2018 16:35:52 +0800 Subject: [PATCH 2/6] [bugfix] PullRefresh: only triggered when drag vertical direction --- packages/pull-refresh/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pull-refresh/index.vue b/packages/pull-refresh/index.vue index 2e8b35bcb..82587b256 100644 --- a/packages/pull-refresh/index.vue +++ b/packages/pull-refresh/index.vue @@ -111,9 +111,9 @@ export default create({ if (this.ceiling && this.deltaY >= 0) { if (this.direction === 'vertical') { + this.getStatus(this.ease(this.deltaY)); event.preventDefault(); } - this.getStatus(this.ease(this.deltaY)); } }, From 0bb1fe69a34429b641bd28b344d81ac220d0f282 Mon Sep 17 00:00:00 2001 From: neverland Date: Wed, 10 Jan 2018 14:14:06 +0800 Subject: [PATCH 3/6] [bugfix] AddressEdit: setAreaCode now work (#524) --- packages/address-edit/index.vue | 10 ++++++---- packages/locale/lang/zh-CN.js | 6 +++--- test/unit/specs/address-edit.spec.js | 6 +++--- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/packages/address-edit/index.vue b/packages/address-edit/index.vue index a7146ae85..86ae309cc 100644 --- a/packages/address-edit/index.vue +++ b/packages/address-edit/index.vue @@ -263,10 +263,12 @@ export default create({ setAreaCode(code) { this.currentInfo.area_code = code; this.$nextTick(() => { - const { area } = this.$refs; - if (area) { - this.assignAreaValues(area.getValues()); - } + this.$nextTick(() => { + const { area } = this.$refs; + if (area) { + this.assignAreaValues(area.getValues()); + } + }); }); } } diff --git a/packages/locale/lang/zh-CN.js b/packages/locale/lang/zh-CN.js index ebd5cf04c..074fa1f3c 100644 --- a/packages/locale/lang/zh-CN.js +++ b/packages/locale/lang/zh-CN.js @@ -86,9 +86,9 @@ export default { name: '名字', tel: '手机或固定电话', postal: '邮政编码(选填)', - province: '选择省', - city: '选择市', - county: '选择区' + province: '选择省份', + city: '选择城市', + county: '选择地区' } }, vanAddressEditDetail: { diff --git a/test/unit/specs/address-edit.spec.js b/test/unit/specs/address-edit.spec.js index 14d9805f8..a7765506d 100644 --- a/test/unit/specs/address-edit.spec.js +++ b/test/unit/specs/address-edit.spec.js @@ -17,13 +17,13 @@ describe('AddressEdit', () => { expect(wrapper.find('.van-field__control')[2].element.value).to.equal(''); expect( wrapper.find('.van-address-edit__area .van-cell__value span')[0].text() - ).to.equal('选择省'); + ).to.equal('选择省份'); expect( wrapper.find('.van-address-edit__area .van-cell__value span')[1].text() - ).to.equal('选择市'); + ).to.equal('选择城市'); expect( wrapper.find('.van-address-edit__area .van-cell__value span')[2].text() - ).to.equal('选择区'); + ).to.equal('选择地区'); }); it('create a AddressEdit with props', () => { From a6dc2912ee8ce8ea6d51519ac2da30be2a87ea99 Mon Sep 17 00:00:00 2001 From: neverland Date: Wed, 10 Jan 2018 14:37:59 +0800 Subject: [PATCH 4/6] [Improvement] NavBar: add zIndex prop (#525) --- docs/markdown/en-US/nav-bar.md | 1 + docs/markdown/zh-CN/nav-bar.md | 1 + packages/nav-bar/index.vue | 20 ++++++++++++++++++-- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/docs/markdown/en-US/nav-bar.md b/docs/markdown/en-US/nav-bar.md index aaf2948ee..60d26d88a 100644 --- a/docs/markdown/en-US/nav-bar.md +++ b/docs/markdown/en-US/nav-bar.md @@ -52,6 +52,7 @@ export default { | right-text | Right Text | `String` | `''` | - | | left-arrow | Whether to show left arrow | `Boolean` | `false` | - | | fixed | Whether to fixed top | `Boolean` | `false` | - | +| z-index | Z-index | `Number` | `1` | - | ### Slot diff --git a/docs/markdown/zh-CN/nav-bar.md b/docs/markdown/zh-CN/nav-bar.md index 073856423..d9d00a927 100644 --- a/docs/markdown/zh-CN/nav-bar.md +++ b/docs/markdown/zh-CN/nav-bar.md @@ -53,6 +53,7 @@ export default { | right-text | 右侧文案 | `String` | `''` | - | | left-arrow | 是否显示左侧箭头 | `Boolean` | `false` | - | | fixed | 是否固定在顶部 | `Boolean` | `false` | - | +| z-index | 元素 z-index | `Number` | `1` | - | ### Slot diff --git a/packages/nav-bar/index.vue b/packages/nav-bar/index.vue index 36329689e..3bf32636d 100644 --- a/packages/nav-bar/index.vue +++ b/packages/nav-bar/index.vue @@ -1,5 +1,9 @@