From 03fa2d43893240bd286949e02a8198e1595b2ad2 Mon Sep 17 00:00:00 2001 From: neverland Date: Tue, 14 Dec 2021 09:54:27 +0800 Subject: [PATCH 1/2] fix(areaData): fix incorrect area code (#10041) --- packages/vant-area-data/package.json | 2 +- packages/vant-area-data/src/index.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/vant-area-data/package.json b/packages/vant-area-data/package.json index 54d7a255a..6881d2ed7 100644 --- a/packages/vant-area-data/package.json +++ b/packages/vant-area-data/package.json @@ -1,6 +1,6 @@ { "name": "@vant/area-data", - "version": "1.1.3", + "version": "1.1.5", "description": "Vant 省市区数据", "main": "./lib/index.js", "typings": "./lib/index.d.ts", diff --git a/packages/vant-area-data/src/index.ts b/packages/vant-area-data/src/index.ts index c332cb7ac..863a21e5b 100644 --- a/packages/vant-area-data/src/index.ts +++ b/packages/vant-area-data/src/index.ts @@ -1290,8 +1290,8 @@ export const areaList = { 330110: '余杭区', 330111: '富阳区', 330112: '临安区', - 330113: '钱塘区', - 330114: '临平区', + 330113: '临平区', + 330114: '钱塘区', 330122: '桐庐县', 330127: '淳安县', 330182: '建德市', From 0cdc99cdcac4c68a0da96f1907998b3b6aa5d607 Mon Sep 17 00:00:00 2001 From: neverland Date: Tue, 14 Dec 2021 10:32:06 +0800 Subject: [PATCH 2/2] types(Field): type prop allow all native types (#10042) --- packages/vant/src/field/README.md | 16 ++++++++-------- packages/vant/src/field/README.zh-CN.md | 16 ++++++++-------- packages/vant/src/field/types.ts | 19 ++++++++++++++++++- 3 files changed, 34 insertions(+), 17 deletions(-) diff --git a/packages/vant/src/field/README.md b/packages/vant/src/field/README.md index b9c014bdf..3aa306c53 100644 --- a/packages/vant/src/field/README.md +++ b/packages/vant/src/field/README.md @@ -251,7 +251,7 @@ Use `input-align` prop to align the input value. | label | Left side label | _string_ | - | | name | As the identifier when submitting the form | _string_ | - | | id `v3.2.2` | Input id, the for attribute of the label also will be set | _string_ | `van-field-n-input` | -| type | Input type, can be set to `tel` `digit`
`number` `textarea` `password` | _string_ | `text` | +| type | Input type, support all [native types](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#input_types) and `digit` type | _FieldType_ | `text` | | size | Size，can be set to `large` | _string_ | - | | maxlength | Max length of value | _number \| string_ | - | | placeholder | Input placeholder | _string_ | - | @@ -263,26 +263,26 @@ Use `input-align` prop to align the input value. | center | Whether to center content vertically | _boolean_ | `true` | | clearable | Whether to be clearable | _boolean_ | `false` | | clear-icon `v3.0.12` | Clear icon name | _string_ | `clear` | -| clear-trigger | When to display the clear icon, `always` means to display the icon when value is not empty, `focus` means to display the icon when input is focused | _string_ | `focus` | +| clear-trigger | When to display the clear icon, `always` means to display the icon when value is not empty, `focus` means to display the icon when input is focused | _FieldClearTrigger_ | `focus` | | clickable | Whether to show click feedback when clicked | _boolean_ | `false` | | is-link | Whether to show link icon | _boolean_ | `false` | | autofocus | Whether to auto focus, unsupported in iOS | _boolean_ | `false` | | show-word-limit | Whether to show word limit, need to set the `maxlength` prop | _boolean_ | `false` | | error | Whether to mark the input content in red | _boolean_ | `false` | | error-message | Error message | _string_ | - | -| error-message-align | Error message align, can be set to `center` `right` | _string_ | `left` | +| error-message-align | Error message align, can be set to `center` `right` | _FieldTextAlign_ | `left` | | formatter | Input value formatter | _(val: string) => string_ | - | -| format-trigger | When to format value，can be set to `onBlur` | _string_ | `onChange` | +| format-trigger | When to format value，can be set to `onBlur` | _FieldFormatTrigger_ | `onChange` | | arrow-direction | Can be set to `left` `up` `down` | _string_ | `right` | | label-class | Label className | _string \| Array \| object_ | - | | label-width | Label width | _number \| string_ | `6.2em` | -| label-align | Label align, can be set to `center` `right` | _string_ | `left` | -| input-align | Input align, can be set to `center` `right` | _string_ | `left` | -| autosize | Textarea auto resize，can accept an object,
e.g. { maxHeight: 100, minHeight: 50 } | _boolean \| object_ | `false` | +| label-align | Label align, can be set to `center` `right` | _FieldTextAlign_ | `left` | +| input-align | Input align, can be set to `center` `right` | _FieldTextAlign_ | `left` | +| autosize | Textarea auto resize，can accept an object,
e.g. { maxHeight: 100, minHeight: 50 } | _boolean \| FieldAutosizeConfig_ | `false` | | left-icon | Left side icon name | _string_ | - | | right-icon | Right side icon name | _string_ | - | | icon-prefix | Icon className prefix | _string_ | `van-icon` | -| rules | Form validation rules | _Rule[]_ | - | +| rules | Form validation rules | _FieldRule[]_ | - | | autocomplete `v3.0.3` | [autocomplete](https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/autocomplete) attribute of native input element | _string_ | - | ### Events diff --git a/packages/vant/src/field/README.zh-CN.md b/packages/vant/src/field/README.zh-CN.md index 16f5a4966..814a54ff6 100644 --- a/packages/vant/src/field/README.zh-CN.md +++ b/packages/vant/src/field/README.zh-CN.md @@ -270,7 +270,7 @@ export default { | label | 输入框左侧文本 | _string_ | - | | name | 名称，作为提交表单时的标识符 | _string_ | - | | id `v3.2.2` | 输入框 id，同时会设置 label 的 for 属性 | _string_ | `van-field-n-input` | -| type | 输入框类型, 可选值为 `tel` `digit`
`number` `textarea` `password` 等 | _string_ | `text` | +| type | 输入框类型, 支持原生 input 标签的所有 [type 属性](https://developer.mozilla.org/zh-CN/docs/Web/HTML/Element/input#%3Cinput%3E_types)，额外支持了 `digit` 类型 | _FieldType_ | `text` | | size | 大小，可选值为 `large` | _string_ | - | | maxlength | 输入的最大字符数 | _number \| string_ | - | | placeholder | 输入框占位提示文字 | _string_ | - | @@ -282,26 +282,26 @@ export default { | center | 是否使内容垂直居中 | _boolean_ | `false` | | clearable | 是否启用清除图标，点击清除图标后会清空输入框 | _boolean_ | `false` | | clear-icon `v3.0.12` | 清除[图标名称](#/zh-CN/icon)或图片链接 | _string_ | `clear` | -| clear-trigger | 显示清除图标的时机，`always` 表示输入框不为空时展示，
`focus` 表示输入框聚焦且不为空时展示 | _string_ | `focus` | +| clear-trigger | 显示清除图标的时机，`always` 表示输入框不为空时展示，
`focus` 表示输入框聚焦且不为空时展示 | _FieldClearTrigger_ | `focus` | | clickable | 是否开启点击反馈 | _boolean_ | `false` | | is-link | 是否展示右侧箭头并开启点击反馈 | _boolean_ | `false` | | autofocus | 是否自动聚焦，iOS 系统不支持该属性 | _boolean_ | `false` | | show-word-limit | 是否显示字数统计，需要设置 `maxlength` 属性 | _boolean_ | `false` | | error | 是否将输入内容标红 | _boolean_ | `false` | | error-message | 底部错误提示文案，为空时不展示 | _string_ | - | -| error-message-align | 错误提示文案对齐方式，可选值为 `center` `right` | _string_ | `left` | +| error-message-align | 错误提示文案对齐方式，可选值为 `center` `right` | _FieldTextAlign_ | `left` | | formatter | 输入内容格式化函数 | _(val: string) => string_ | - | -| format-trigger | 格式化函数触发的时机，可选值为 `onBlur` | _string_ | `onChange` | +| format-trigger | 格式化函数触发的时机，可选值为 `onBlur` | _FieldFormatTrigger_ | `onChange` | | arrow-direction | 箭头方向，可选值为 `left` `up` `down` | _string_ | `right` | | label-class | 左侧文本额外类名 | _string \| Array \| object_ | - | | label-width | 左侧文本宽度，默认单位为 `px` | _number \| string_ | `6.2em` | -| label-align | 左侧文本对齐方式，可选值为 `center` `right` | _string_ | `left` | -| input-align | 输入框对齐方式，可选值为 `center` `right` | _string_ | `left` | -| autosize | 是否自适应内容高度，只对 textarea 有效，
可传入对象,如 { maxHeight: 100, minHeight: 50 }，
单位为`px` | _boolean \| object_ | `false` | +| label-align | 左侧文本对齐方式，可选值为 `center` `right` | _FieldTextAlign_ | `left` | +| input-align | 输入框对齐方式，可选值为 `center` `right` | _FieldTextAlign_ | `left` | +| autosize | 是否自适应内容高度，只对 textarea 有效，
可传入对象,如 { maxHeight: 100, minHeight: 50 }，
单位为`px` | _boolean \| FieldAutosizeConfig_ | `false` | | left-icon | 左侧[图标名称](#/zh-CN/icon)或图片链接 | _string_ | - | | right-icon | 右侧[图标名称](#/zh-CN/icon)或图片链接 | _string_ | - | | icon-prefix | 图标类名前缀，等同于 Icon 组件的 [class-prefix 属性](#/zh-CN/icon#props) | _string_ | `van-icon` | -| rules | 表单校验规则，详见 [Form 组件](#/zh-CN/form#rule-shu-ju-jie-gou) | _Rule[]_ | - | +| rules | 表单校验规则，详见 [Form 组件](#/zh-CN/form#rule-shu-ju-jie-gou) | _FieldRule[]_ | - | | autocomplete `v3.0.3` | input 标签原生的[自动完成属性](https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/autocomplete) | _string_ | - | ### Events diff --git a/packages/vant/src/field/types.ts b/packages/vant/src/field/types.ts index 95cd23e0b..730de9b8f 100644 --- a/packages/vant/src/field/types.ts +++ b/packages/vant/src/field/types.ts @@ -4,12 +4,29 @@ import type { FieldProps } from './Field'; export type FieldType = | 'tel' + | 'url' + | 'date' + | 'file' | 'text' + | 'time' + | 'week' + | 'color' | 'digit' + | 'email' + | 'image' + | 'month' + | 'radio' + | 'range' + | 'reset' + | 'button' + | 'hidden' | 'number' | 'search' + | 'submit' + | 'checkbox' | 'password' - | 'textarea'; + | 'textarea' + | 'datetime-local'; export type FieldTextAlign = 'left' | 'center' | 'right';