Merge branch 'dev' into next

2020-09-07 20:41:50 +08:00
parent b9dbb1bc8a 601277fbe8
commit 7f87c57d12
8 changed files with 20 additions and 22 deletions
@@ -1,4 +1,4 @@
-import { isDef, createNamespace } from '../utils';
+import { createNamespace } from '../utils';
 import { ChildrenMixin } from '../mixins/relation';
 import { routeProps } from '../composition/use-route';

@@ -25,7 +25,7 @@ export default createComponent({

  computed: {
    computedName() {
-      return isDef(this.name) ? this.name : this.index;
+      return this.name ?? this.index;
    },

    isActive() {