From 08fd2a8184903781624676b81fceb4ac4e8c6de3 Mon Sep 17 00:00:00 2001 From: neverland Date: Mon, 2 May 2022 11:22:35 +0800 Subject: [PATCH 01/15] docs(Stepper): improve the description of allow-empty prop (#10571) --- packages/vant/src/stepper/README.md | 4 ++-- packages/vant/src/stepper/README.zh-CN.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/vant/src/stepper/README.md b/packages/vant/src/stepper/README.md index cce07a4e5..54b4732e4 100644 --- a/packages/vant/src/stepper/README.md +++ b/packages/vant/src/stepper/README.md @@ -143,8 +143,8 @@ export default { | show-plus | Whether to show plus button | _boolean_ | `true` | | show-minus | Whether to show minus button | _boolean_ | `true` | | show-input | Whether to show input | _boolean_ | `true` | -| long-press | Whether to allow long press | _boolean_ | `true` | -| allow-empty | Whether to allow the input to be empty | _boolean_ | `false` | +| long-press | Whether to enable the long press gesture, when enabled you can long press the increase and decrease buttons | _boolean_ | `true` | +| allow-empty | Whether to allow the input value to be empty, set to `true` to allow an empty string to be passed in | _boolean_ | `false` | ### Events diff --git a/packages/vant/src/stepper/README.zh-CN.md b/packages/vant/src/stepper/README.zh-CN.md index 5a7649306..50e017c5e 100644 --- a/packages/vant/src/stepper/README.zh-CN.md +++ b/packages/vant/src/stepper/README.zh-CN.md @@ -163,8 +163,8 @@ export default { | show-plus | 是否显示增加按钮 | _boolean_ | `true` | | show-minus | 是否显示减少按钮 | _boolean_ | `true` | | show-input | 是否显示输入框 | _boolean_ | `true` | -| long-press | 是否开启长按手势 | _boolean_ | `true` | -| allow-empty | 是否允许输入的值为空 | _boolean_ | `false` | +| long-press | 是否开启长按手势，开启后可以长按增加和减少按钮 | _boolean_ | `true` | +| allow-empty | 是否允许输入的值为空，设置为 `true` 后允许传入空字符串 | _boolean_ | `false` | ### Events From b122e3638f89da5b65a78f989e12fea1558448e9 Mon Sep 17 00:00:00 2001 From: neverland Date: Tue, 3 May 2022 14:06:08 +0800 Subject: [PATCH 02/15] feat(Switch): add node slot (#10573) * feat(Switch): add node slot * docs: add api --- packages/vant/src/switch/README.md | 37 +++++++++++++++++++ packages/vant/src/switch/README.zh-CN.md | 37 +++++++++++++++++++ packages/vant/src/switch/Switch.tsx | 5 ++- packages/vant/src/switch/demo/index.vue | 32 ++++++++++++++++ .../test/__snapshots__/demo.spec.ts.snap | 14 +++++++ 5 files changed, 124 insertions(+), 1 deletion(-) diff --git a/packages/vant/src/switch/README.md b/packages/vant/src/switch/README.md index 891f235f5..b4ade437a 100644 --- a/packages/vant/src/switch/README.md +++ b/packages/vant/src/switch/README.md @@ -59,6 +59,37 @@ export default { ``` +### Custom Node + +Using `node` slot to custom the content of the node. + +```html + +
+ +
+ + + +``` + ### Async Control ```html @@ -121,6 +152,12 @@ export default { | change | Emitted when check status changed | _value: any_ | | click | Emitted when component is clicked | _event: MouseEvent_ | +### Slots + +| Name | Description | SlotProps | +| ------------- | -------------------------- | --------- | +| node `v3.5.0` | Custom the content of node | - | + ### Types The component exports the following type definitions: diff --git a/packages/vant/src/switch/README.zh-CN.md b/packages/vant/src/switch/README.zh-CN.md index 1060bde00..371c5653e 100644 --- a/packages/vant/src/switch/README.zh-CN.md +++ b/packages/vant/src/switch/README.zh-CN.md @@ -69,6 +69,37 @@ export default { ``` +### 自定义按钮 + +通过 `node` 插槽自定义按钮的内容。 + +```html + +
+ +
+ + + +``` + ### 异步控制 需要异步控制开关时，可以使用 `modelValue` 属性和 `update:model-value` 事件代替 `v-model`，并在事件回调函数中手动处理开关状态。 @@ -133,6 +164,12 @@ export default { | change | 开关状态切换时触发 | _value: any_ | | click | 点击时触发 | _event: MouseEvent_ | +### Slots + +| 名称 | 说明 | 参数 | +| ------------- | ---------------- | ---- | +| node `v3.5.0` | 自定义按钮的内容 | - | + ### 类型定义 组件导出以下类型定义： diff --git a/packages/vant/src/switch/Switch.tsx b/packages/vant/src/switch/Switch.tsx index bfc337f80..73f18c997 100644 --- a/packages/vant/src/switch/Switch.tsx +++ b/packages/vant/src/switch/Switch.tsx @@ -31,7 +31,7 @@ export default defineComponent({ emits: ['change', 'update:modelValue'], - setup(props, { emit }) { + setup(props, { emit, slots }) { const isChecked = () => props.modelValue === props.activeValue; const onClick = () => { @@ -47,6 +47,9 @@ export default defineComponent({ const color = isChecked() ? props.activeColor : props.inactiveColor; return ; } + if (slots.node) { + return slots.node(); + } }; useCustomFieldValue(() => props.modelValue); diff --git a/packages/vant/src/switch/demo/index.vue b/packages/vant/src/switch/demo/index.vue index d25649edc..9786a5e43 100644 --- a/packages/vant/src/switch/demo/index.vue +++ b/packages/vant/src/switch/demo/index.vue @@ -1,6 +1,7 @@