From 7d97a2fd853172d91dd0011354a8b0fed9c20579 Mon Sep 17 00:00:00 2001 From: neverland Date: Thu, 28 Jun 2018 17:46:58 +0800 Subject: [PATCH] [Improvement] Field: add is-link prop (#1347) --- packages/field/en-US.md | 1 + packages/field/index.vue | 2 ++ packages/field/zh-CN.md | 1 + packages/list/test/index.spec.js | 12 ++++++++++++ packages/vant-css/src/field.css | 3 ++- 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/packages/field/en-US.md b/packages/field/en-US.md index 59d89a6f7..1885bb85f 100644 --- a/packages/field/en-US.md +++ b/packages/field/en-US.md @@ -125,6 +125,7 @@ Field support all native properties of input tag,such as `maxlength`、`placeh | autosize | Textarea auto resize,can accpet an object, e.g. { maxHeight: 100, minHeight: 50 } | `Boolean | Object` | `false` | | icon | Right side icon name | `String` | - | | left-icon | Left side icon name | `String` | - | +| is-link | Whether to show link icon | `Boolean` | `false` | ### Event diff --git a/packages/field/index.vue b/packages/field/index.vue index bb751f64c..5c102022e 100644 --- a/packages/field/index.vue +++ b/packages/field/index.vue @@ -4,6 +4,7 @@ :title="label" :center="center" :border="border" + :is-link="isLink" :required="required" :class="b({ error, @@ -68,6 +69,7 @@ export default create({ label: String, error: Boolean, center: Boolean, + isLink: Boolean, leftIcon: String, required: Boolean, clearable: Boolean, diff --git a/packages/field/zh-CN.md b/packages/field/zh-CN.md index 2a977b791..b0c35aef2 100644 --- a/packages/field/zh-CN.md +++ b/packages/field/zh-CN.md @@ -127,6 +127,7 @@ Field 默认支持 Input 标签所有的原生属性,比如 `maxlength`、`pla | autosize | 自适应内容高度,只对 textarea 有效,可传入对象,如 { maxHeight: 100, minHeight: 50 },单位为 px | `Boolean | Object` | `false` | | icon | 输入框尾部图标 (可选值见 Icon 组件) | `String` | - | | left-icon | 输入框左侧图标 (可选值见 Icon 组件) | `String` | - | +| is-link | 是否展示右侧箭头并开启点击反馈 | `Boolean` | `false` | ### Event diff --git a/packages/list/test/index.spec.js b/packages/list/test/index.spec.js index 3c8c47a79..5abebe202 100644 --- a/packages/list/test/index.spec.js +++ b/packages/list/test/index.spec.js @@ -1,6 +1,14 @@ import List from '..'; import { mount, later } from '../../../test/utils'; +function mockOffsetParent(el) { + Object.defineProperty(el, 'offsetParent', { + get() { + return {}; + } + }); +} + test('load event', async() => { const wrapper = mount(List); @@ -8,6 +16,8 @@ test('load event', async() => { wrapper.vm.loading = value; }); + mockOffsetParent(wrapper.vm.$el); + await later(); expect(wrapper.emitted('load')).toBeTruthy(); expect(wrapper.emitted('input')).toBeTruthy(); @@ -26,6 +36,8 @@ test('finished', async() => { } }); + mockOffsetParent(wrapper.vm.$el); + await later(); expect(wrapper.emitted('load')).toBeFalsy(); expect(wrapper.emitted('input')).toBeFalsy(); diff --git a/packages/vant-css/src/field.css b/packages/vant-css/src/field.css index fa981d853..306793e7d 100644 --- a/packages/vant-css/src/field.css +++ b/packages/vant-css/src/field.css @@ -18,10 +18,11 @@ border: 0; margin: 0; padding: 0; - display: block; width: 100%; resize: none; + display: block; box-sizing: border-box; + background-color: transparent; &:disabled { opacity: 1;