diff --git a/components/collapse/Collapse.vue b/components/collapse/Collapse.vue index a1f39fbc4..3ba718b4e 100644 --- a/components/collapse/Collapse.vue +++ b/components/collapse/Collapse.vue @@ -3,24 +3,13 @@ import PropTypes from '../_util/vue-types' import animation from '../_util/openAnimation' import { getOptionProps } from '../_util/props-util' import RcCollapse from './src' +import { collapseProps } from './src/commonProps' export default { props: { - prefixCls: PropTypes.string.def('ant-collapse'), + ...collapseProps, bordered: PropTypes.bool.def(true), openAnimation: PropTypes.any.def({ ...animation, appear () { } }), - activeKey: PropTypes.oneOfType([ - PropTypes.string, - PropTypes.arrayOf(PropTypes.string), - ]), - defaultValue: PropTypes.oneOfType([ - PropTypes.string, - PropTypes.arrayOf(PropTypes.string), - ]), - value: PropTypes.oneOfType([ - PropTypes.string, - PropTypes.arrayOf(PropTypes.string), - ]), change: PropTypes.func.def(() => {}), accordion: PropTypes.bool, }, diff --git a/components/collapse/demo/accordion.md b/components/collapse/demo/accordion.md index 90e2f6ca9..7345efb1b 100644 --- a/components/collapse/demo/accordion.md +++ b/components/collapse/demo/accordion.md @@ -26,11 +26,11 @@ Accordion mode, only one panel can be expanded at a time. The first panel will b ``` diff --git a/components/collapse/demo/basic.md b/components/collapse/demo/basic.md index 6d3037988..767dd1043 100644 --- a/components/collapse/demo/basic.md +++ b/components/collapse/demo/basic.md @@ -26,17 +26,17 @@ More than one panel can be expanded at a time, the first panel is initialized to ``` diff --git a/components/collapse/demo/borderless.md b/components/collapse/demo/borderless.md index 80ded4270..e99c50bb6 100644 --- a/components/collapse/demo/borderless.md +++ b/components/collapse/demo/borderless.md @@ -26,11 +26,11 @@ A borderless style of Collapse. ``` diff --git a/components/collapse/demo/custom.md b/components/collapse/demo/custom.md index ae19e02d2..dc37400e5 100644 --- a/components/collapse/demo/custom.md +++ b/components/collapse/demo/custom.md @@ -26,12 +26,12 @@ Customize the background, border and margin styles for each panel. ``` diff --git a/components/collapse/demo/mix.md b/components/collapse/demo/mix.md index bd7a3fdc1..27cf763ec 100644 --- a/components/collapse/demo/mix.md +++ b/components/collapse/demo/mix.md @@ -30,16 +30,16 @@ ``` diff --git a/components/collapse/demo/noarrow.md b/components/collapse/demo/noarrow.md index eb9a805d9..8b4b6e59e 100644 --- a/components/collapse/demo/noarrow.md +++ b/components/collapse/demo/noarrow.md @@ -23,16 +23,16 @@ You can disable showing arrow icon by passing `:showArrow="false"` to `a-collaps ``` diff --git a/components/collapse/src/commonProps.js b/components/collapse/src/commonProps.js index a4cb6d14a..13008a9a2 100644 --- a/components/collapse/src/commonProps.js +++ b/components/collapse/src/commonProps.js @@ -1,7 +1,7 @@ import PropTypes from '../../_util/vue-types' const collapseProps = { - prefixCls: PropTypes.string, + prefixCls: PropTypes.string.def('ant-collapse'), value: PropTypes.oneOfType([ PropTypes.string, PropTypes.arrayOf(PropTypes.string), @@ -16,7 +16,7 @@ const collapseProps = { const panelProps = { openAnimation: PropTypes.object, - prefixCls: PropTypes.string, + prefixCls: PropTypes.string.def('ant-collapse'), header: PropTypes.oneOfType([ PropTypes.string, PropTypes.number,