Merge branch 'dev' into next

This commit is contained in:
chenjiahan
2020-09-07 20:41:50 +08:00
8 changed files with 20 additions and 22 deletions
+2 -4
View File
@@ -1,7 +1,7 @@
import { ref, watch, computed, nextTick } from 'vue';
// Utils
import { createNamespace, isDef } from '../utils';
import { createNamespace } from '../utils';
import { raf, doubleRaf } from '../utils/dom/raf';
// Composition
@@ -31,9 +31,7 @@ export default createComponent({
const contentRef = ref();
const { parent, index } = useParent(COLLAPSE_KEY);
const currentName = computed(() =>
isDef(props.name) ? props.name : index.value
);
const currentName = computed(() => props.name ?? index.value);
const expanded = computed(() => {
if (parent) {