Skip to content

Commit dbc0b2e

Browse files
committed
fix: Cascader option.value supports String Number type
1 parent dfc46a0 commit dbc0b2e

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

components/cascader/index.en-US.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
| allowClear | whether allow clear | boolean | true |
1111
| autoFocus | get focus when component mounted | boolean | false |
1212
| changeOnSelect | change value on each selection if set to true, see above demo for details | boolean | false |
13-
| defaultValue | initial selected value | string\[] | \[] |
13+
| defaultValue | initial selected value | string\[] \| number\[] | \[] |
1414
| disabled | whether disabled select | boolean | false |
1515
| displayRender | render function of displaying selected options, you can use slot="displayRender" and slot-scope="{labels, selectedOptions}" | `({labels, selectedOptions}) => vNode` | `labels => labels.join(' / ')` |
1616
| expandTrigger | expand current item when click or hover, one of 'click' 'hover' | string | 'click' |
@@ -27,7 +27,7 @@
2727
| showSearch | Whether show search input in single mode. | boolean\|object | false |
2828
| size | input size, one of `large` `default` `small` | string | `default` |
2929
| suffixIcon | The custom suffix icon | string \| VNode \| slot | - |
30-
| value(v-model) | selected value | string\[] | - |
30+
| value(v-model) | selected value | string\[] \| number\[] | - |
3131

3232
Fields in `showSearch`:
3333

components/cascader/index.jsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ import { cloneElement } from '../_util/vnode';
2121
import warning from '../_util/warning';
2222

2323
const CascaderOptionType = PropTypes.shape({
24-
value: PropTypes.string,
24+
value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
2525
label: PropTypes.any,
2626
disabled: PropTypes.bool,
2727
children: PropTypes.array,
28-
key: PropTypes.string,
28+
key: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
2929
}).loose;
3030

3131
const FieldNamesType = PropTypes.shape({
@@ -49,9 +49,9 @@ const CascaderProps = {
4949
/** 可选项数据源 */
5050
options: PropTypes.arrayOf(CascaderOptionType).def([]),
5151
/** 默认的选中项 */
52-
defaultValue: PropTypes.arrayOf(PropTypes.string),
52+
defaultValue: PropTypes.array,
5353
/** 指定选中项 */
54-
value: PropTypes.arrayOf(PropTypes.string),
54+
value: PropTypes.array,
5555
/** 选择完成后的回调 */
5656
// onChange?: (value: string[], selectedOptions?: CascaderOptionType[]) => void;
5757
/** 选择后展示的渲染函数 */

components/cascader/index.zh-CN.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
| allowClear | 是否支持清除 | boolean | true |
1111
| autoFocus | 自动获取焦点 | boolean | false |
1212
| changeOnSelect | 当此项为 true 时,点选每级菜单选项值都会发生变化,具体见上面的演示 | boolean | false |
13-
| defaultValue | 默认的选中项 | string\[] | \[] |
13+
| defaultValue | 默认的选中项 | string\[] \| number\[] | \[] |
1414
| disabled | 禁用 | boolean | false |
1515
| displayRender | 选择后展示的渲染函数,可使用slot="displayRender" 和 slot-scope="{labels, selectedOptions}" | `({labels, selectedOptions}) => vNode` | `labels => labels.join(' / ')` |
1616
| expandTrigger | 次级菜单的展开方式,可选 'click' 和 'hover' | string | 'click' |
@@ -27,7 +27,7 @@
2727
| showSearch | 在选择框中显示搜索框 | boolean | false |
2828
| size | 输入框大小,可选 `large` `default` `small` | string | `default` |
2929
| suffixIcon | 自定义的选择框后缀图标 | string \| VNode \| slot | - |
30-
| value(v-model) | 指定选中项 | string\[] | - |
30+
| value(v-model) | 指定选中项 | string\[] \| number\[] | - |
3131

3232
`showSearch` 为对象时,其中的字段:
3333

components/menu/index.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export const menuProps = {
2121
theme: PropTypes.oneOf(['light', 'dark']).def('light'),
2222
mode: MenuMode.def('vertical'),
2323
selectable: PropTypes.bool,
24-
selectedKeys: PropTypes.arrayOf(PropTypes.string),
24+
selectedKeys: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
2525
defaultSelectedKeys: PropTypes.array,
2626
openKeys: PropTypes.array,
2727
defaultOpenKeys: PropTypes.array,

0 commit comments

Comments
 (0)