github
/
ant-design-vue
mirror of https://github.com/vueComponent/ant-design-vue
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(vc-collapse): `key` support number type #4405 (#4474) 

close #4405
pull/4479/head
John 2021-08-05 14:44:21 +08:00 committed by GitHub
parent 881a796afd
commit 093f07c500
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/vc-collapse/src/Collapse.jsx
View File

@ -11,11 +11,14 @@ import openAnimationFactory from './openAnimationFactory';
import { collapseProps } from './commonProps'; import { collapseProps } from './commonProps';
import { getDataAndAriaProps } from '../../_util/util'; import { getDataAndAriaProps } from '../../_util/util';
import { defineComponent } from 'vue'; import { defineComponent } from 'vue';
import isNil from 'lodash/isNil';
function _toArray(activeKey) { function _toArray(activeKey) {
let currentActiveKey = activeKey; let currentActiveKey = activeKey;
if (!Array.isArray(currentActiveKey)) { if (!Array.isArray(currentActiveKey)) {
currentActiveKey = currentActiveKey ? [currentActiveKey] : []; const activeKeyType = typeof currentActiveKey;
currentActiveKey =
activeKeyType === 'number' || activeKeyType === 'string' ? [currentActiveKey] : [];
} }
return currentActiveKey.map(key => String(key)); return currentActiveKey.map(key => String(key));
} }
@ -76,7 +79,7 @@ export default defineComponent({
const { prefixCls, accordion, destroyInactivePanel, expandIcon } = this.$props; const { prefixCls, accordion, destroyInactivePanel, expandIcon } = this.$props;
// If there is no key provide, use the panel order as default key // If there is no key provide, use the panel order as default key
const key = child.key || String(index); const key = !isNil(child.key) ? String(child.key) : String(index);
const { header, headerClass, disabled } = getPropsData(child); const { header, headerClass, disabled } = getPropsData(child);
let isActive = false; let isActive = false;