From 0c9e4df4fc92f8ed0a3452e5e5842fcfc3acea93 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Mon, 26 Nov 2018 21:49:05 +0800 Subject: [PATCH] chore: use vue-ref --- components/_util/proxyComponent.jsx | 10 +++++++--- components/form/index.jsx | 4 ++-- components/trigger/Trigger.jsx | 4 ++-- components/vc-drawer/src/Drawer.js | 5 +++-- components/vc-form/src/index.jsx | 5 +++-- components/vc-select/Select.jsx | 4 ++-- components/vc-slick/src/inner-slider.js | 4 ++-- components/vc-slick/src/slider.js | 5 +++-- package.json | 1 + 9 files changed, 25 insertions(+), 17 deletions(-) diff --git a/components/_util/proxyComponent.jsx b/components/_util/proxyComponent.jsx index 7a6099967..b913c5037 100644 --- a/components/_util/proxyComponent.jsx +++ b/components/_util/proxyComponent.jsx @@ -28,17 +28,21 @@ export default function wrapWithConnect (WrappedComponent) { props: { ...props, __propsSymbol__: Symbol(), + componentWillReceiveProps: { ...props }, children: $slots.default || props.children || [], }, on: $listeners, attrs: $attrs, - scopedSlots: $scopedSlots, } + if (Object.keys($scopedSlots).length) { + wrapProps.scopedSlots = $scopedSlots + } + const slotsKey = Object.keys($slots) return ( - {Object.keys($slots).map(name => { + {slotsKey.length ? slotsKey.map(name => { return - })} + }) : null} ) }, diff --git a/components/form/index.jsx b/components/form/index.jsx index 1c0b87c38..0062b6994 100644 --- a/components/form/index.jsx +++ b/components/form/index.jsx @@ -1,8 +1,8 @@ import Vue from 'vue' import Form from './Form' -import antRefDirective from '../_util/antRefDirective' +import ref from 'vue-ref' -Vue.use(antRefDirective) +Vue.use(ref, { name: 'ant-ref' }) export { FormProps, FormCreateOption, ValidationRule } from './Form' export { FormItemProps } from './FormItem' diff --git a/components/trigger/Trigger.jsx b/components/trigger/Trigger.jsx index fc676f7bc..3471180f4 100644 --- a/components/trigger/Trigger.jsx +++ b/components/trigger/Trigger.jsx @@ -1,6 +1,6 @@ import Vue from 'vue' -import antRefDirective from '../_util/antRefDirective' +import ref from 'vue-ref' import PropTypes from '../_util/vue-types' import contains from '../_util/Dom/contains' import { hasProp, getComponentFromProp, getEvents, filterEmpty } from '../_util/props-util' @@ -13,7 +13,7 @@ import BaseMixin from '../_util/BaseMixin' import { cloneElement } from '../_util/vnode' import ContainerRender from '../_util/ContainerRender' -Vue.use(antRefDirective) +Vue.use(ref, { name: 'ant-ref' }) function returnEmptyString () { return '' diff --git a/components/vc-drawer/src/Drawer.js b/components/vc-drawer/src/Drawer.js index bf6001d4c..a27394033 100644 --- a/components/vc-drawer/src/Drawer.js +++ b/components/vc-drawer/src/Drawer.js @@ -1,7 +1,7 @@ import classnames from 'classnames' import Vue from 'vue' +import ref from 'vue-ref' import BaseMixin from '../../_util/BaseMixin' -import antRefDirective from '../../_util/antRefDirective' import { initDefaultProps, getEvents } from '../../_util/props-util' import { cloneElement } from '../../_util/vnode' import ContainerRender from '../../_util/ContainerRender' @@ -25,7 +25,8 @@ const windowIsUndefined = !( window.document && window.document.createElement ) -Vue.use(antRefDirective) + +Vue.use(ref, { name: 'ant-ref' }) const Drawer = { mixins: [BaseMixin], props: initDefaultProps(drawerProps, { diff --git a/components/vc-form/src/index.jsx b/components/vc-form/src/index.jsx index 344a848c6..6959a4e5a 100644 --- a/components/vc-form/src/index.jsx +++ b/components/vc-form/src/index.jsx @@ -3,7 +3,8 @@ import createForm from './createForm' import createFormField from './createFormField' import formShape from './propTypes' import Vue from 'vue' -import antRefDirective from '../../_util/antRefDirective' -Vue.use(antRefDirective) +import ref from 'vue-ref' + +Vue.use(ref, { name: 'ant-ref' }) export { createForm, createFormField, formShape } diff --git a/components/vc-select/Select.jsx b/components/vc-select/Select.jsx index a5213414a..8d60115b7 100644 --- a/components/vc-select/Select.jsx +++ b/components/vc-select/Select.jsx @@ -12,9 +12,9 @@ import getTransitionProps from '../_util/getTransitionProps' import { cloneElement } from '../_util/vnode' import BaseMixin from '../_util/BaseMixin' import proxyComponent from '../_util/proxyComponent' -import antRefDirective from '../_util/antRefDirective' +import ref from 'vue-ref' -Vue.use(antRefDirective) +Vue.use(ref, { name: 'ant-ref' }) import { getPropValue, diff --git a/components/vc-slick/src/inner-slider.js b/components/vc-slick/src/inner-slider.js index 65190a769..54b1f8bb2 100644 --- a/components/vc-slick/src/inner-slider.js +++ b/components/vc-slick/src/inner-slider.js @@ -1,7 +1,7 @@ import debounce from 'lodash/debounce' import classnames from 'classnames' import Vue from 'vue' -import antRefDirective from '../../_util/antRefDirective' +import ref from 'vue-ref' import { getStyle } from '../../_util/props-util' import BaseMixin from '../../_util/BaseMixin' import defaultProps from './default-props' @@ -28,7 +28,7 @@ import Dots from './dots' import { PrevArrow, NextArrow } from './arrows' import ResizeObserver from 'resize-observer-polyfill' -Vue.use(antRefDirective) +Vue.use(ref, { name: 'ant-ref' }) function noop () {} diff --git a/components/vc-slick/src/slider.js b/components/vc-slick/src/slider.js index 0b0d9411e..e0ee6b6ac 100644 --- a/components/vc-slick/src/slider.js +++ b/components/vc-slick/src/slider.js @@ -1,6 +1,6 @@ import json2mq from 'json2mq' import Vue from 'vue' -import antRefDirective from '../../_util/antRefDirective' +import ref from 'vue-ref' import BaseMixin from '../../_util/BaseMixin' import { cloneElement } from '../../_util/vnode' import { getStyle } from '../../_util/props-util' @@ -9,7 +9,8 @@ import defaultProps from './default-props' import { canUseDOM } from './utils/innerSliderUtils' const enquire = canUseDOM() && require('enquire.js') -Vue.use(antRefDirective) +Vue.use(ref, { name: 'ant-ref' }) + export default { props: { ...defaultProps, diff --git a/package.json b/package.json index 8cc90a6f5..7e05d42f8 100644 --- a/package.json +++ b/package.json @@ -177,6 +177,7 @@ "resize-observer-polyfill": "^1.5.0", "shallow-equal": "^1.0.0", "shallowequal": "^1.0.2", + "vue-ref": "^1.0.1", "warning": "^3.0.0" } }