diff --git a/packages/uni-components/src/nvue/components.ts b/packages/uni-components/src/nvue/components.ts index 987787729bf3ddd62ed59fb272dbe4b639e8f470..ca2fe557f6c873327491a0b19bf8413fd143e081 100644 --- a/packages/uni-components/src/nvue/components.ts +++ b/packages/uni-components/src/nvue/components.ts @@ -15,6 +15,8 @@ import Radio from './radio' import RadioGroup from './radio-group' import Form from './form' import Icon from './icon' +import Swiper from './swiper' +import SwiperItem from './swiper-item' export default { Navigator, Label, @@ -33,4 +35,6 @@ export default { RadioGroup, Form, Icon, + Swiper, + SwiperItem, } diff --git a/packages/uni-components/src/nvue/form/index.tsx b/packages/uni-components/src/nvue/form/index.tsx index 513cde7467571dd57da8532d808f33dfa772437e..04fa5a1a9ddb4b01cdeb91d5d2bbfeed96e8276e 100644 --- a/packages/uni-components/src/nvue/form/index.tsx +++ b/packages/uni-components/src/nvue/form/index.tsx @@ -15,14 +15,11 @@ export default defineComponent({ const rootRef = ref(null) const trigger = useCustomEvent>(rootRef, emit) - let so = slots.default && slots.default() - - console.log(so) - - provideForm(trigger, slots.default && (slots.default() as any)) + const vnodes = slots.default && slots.default() + provideForm(trigger, vnodes) return () => { - return {slots.default && slots.default()} + return {vnodes} } }, }) @@ -34,13 +31,13 @@ function provideForm(trigger: CustomEventTrigger, children: any) { nodes.forEach(function (node: any) { if ( NATIVE_COMPONENTS.indexOf(node.type) >= 0 && - node.data.attrs && - node.data.attrs.name + node.el.attr && + node.el.attr.name ) { if (outResult) { - outResult[node.attrs.name] = modulePlus.getValue(node.elm.nodeId) + outResult[node.el.attr.name] = modulePlus.getValue(node.el.nodeId) } else { - node.elm.setValue('') + node.el.setValue('') } } if ( diff --git a/packages/uni-components/src/nvue/swiper-item/index.tsx b/packages/uni-components/src/nvue/swiper-item/index.tsx index 032b12f92e236638e41b0725bbe40f95046f65a0..d6e63018e63025660e57d3b0143fd9a162a41a56 100644 --- a/packages/uni-components/src/nvue/swiper-item/index.tsx +++ b/packages/uni-components/src/nvue/swiper-item/index.tsx @@ -4,7 +4,7 @@ import { swiperItemProps } from '../../components/swiper-item' export default defineComponent({ name: 'SwiperItem', props: swiperItemProps, - setup(props, { emit }) { + setup(props, { slots }) { return () => { return (
+ > + {slots.default && slots.default()} + ) } }, diff --git a/packages/uni-components/src/nvue/swiper/index.tsx b/packages/uni-components/src/nvue/swiper/index.tsx index d746d1a40e675da4fbba0a07739876655840f112..4a81dab9426fa7530d7bfcbeef8f64402104155c 100644 --- a/packages/uni-components/src/nvue/swiper/index.tsx +++ b/packages/uni-components/src/nvue/swiper/index.tsx @@ -82,11 +82,24 @@ export default defineComponent({ return () => { const defaultSlots = slots.default && slots.default() - const { indicatorStyle } = state + const { indicatorStyle, currentSync } = state swiperItems = flatVNode(defaultSlots) return (
- + {swiperItems} @@ -195,9 +208,9 @@ function useSwiperListeners( ) const listeners = { - scroll: onScroll, - scrollend: onScrollEnd, - change: onChange, + onScroll, + onScrollEnd, + onChange, } return listeners