blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-04-06 03:57:59 +08:00
Code Issues Projects Releases Wiki Activity

fix(PickerGroup): only filter Comment vnode (#12402)

Browse Source
This commit is contained in:
ShuGang Zhou 2023-10-28 22:24:27 +08:00 committed by GitHub
parent c1d32e953f
commit e2081c8890
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/vant/src/picker-group/PickerGroup.tsx
View File

@ -1,4 +1,9 @@
import { defineComponent, type InjectionKey, type ExtractPropTypes } from 'vue'; import {
defineComponent,
Comment,
type InjectionKey,
type ExtractPropTypes,
} from 'vue';
// Utils // Utils
import { import {
@ -71,7 +76,10 @@ export default defineComponent({
const onCancel = () => emit('cancel'); const onCancel = () => emit('cancel');
return () => { return () => {
const childNodes = slots.default?.(); const childNodes = slots
.default?.()
?.filter((node) => node.type !== Comment);
const confirmButtonText = showNextButton() const confirmButtonText = showNextButton()
? props.nextStepText ? props.nextStepText
: props.confirmButtonText; : props.confirmButtonText;

2
packages/vant/src/picker-group/demo/SelectDateTime.vue
View File

@ -39,11 +39,13 @@ const onCancel = () => {
@confirm="onConfirm" @confirm="onConfirm"
@cancel="onCancel" @cancel="onCancel"
> >
<!-- Date -->
<van-date-picker <van-date-picker
v-model="currentDate" v-model="currentDate"
:min-date="minDate" :min-date="minDate"
:max-date="maxDate" :max-date="maxDate"
/> />
<!-- Time -->
<van-time-picker v-model="currentTime" /> <van-time-picker v-model="currentTime" />
</van-picker-group> </van-picker-group>
</template> </template>