ui/vant
1
0
Fork 0
mirror of https://github.com/youzan/vant.git synced 2025-10-20 02:31:21 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch '1.x' into 'dev'

Browse Source
This commit is contained in:
陈嘉涵
2019-05-10 14:24:48 +08:00
parent 4505e16fea 4119b5b3c7
commit 1f92219e5a
15 changed files with 43 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/picker/index.js
View File

@@ -1,5 +1,5 @@
import { use } from '../utils';
import { prevent } from '../utils/event';
import { preventDefault } from '../utils/event';
import { deepClone } from '../utils/deep-clone';
import { pickerProps } from './shared';
import { BLUE } from '../utils/color';
@@ -172,7 +172,7 @@ export default sfc({
<div class={bem()}>
{Toolbar}
{this.loading ? <Loading class={bem('loading')} color={BLUE} /> : h()}
<div class={bem('columns')} style={columnsStyle} onTouchmove={prevent}>
<div class={bem('columns')} style={columnsStyle} onTouchmove={preventDefault}>
{columns.map((item, index) => (
<PickerColumn
valueKey={this.valueKey}