fix(toolbar): add toolbar type

donotebase · Apr 30, 2020 · 3ea27cc · 3ea27cc
1 parent 0729de1
commit 3ea27cc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/components/menubars/OEditorMenuBar.vue b/src/components/menubars/OEditorMenuBar.vue
@@ -20,7 +20,7 @@
                        :opt="item.options"
                        :editor="editor"
                        v-bind="editorContext"
-                       v-else-if="typeof item === 'object' && typeof item.name === 'string'" />
+                       v-else-if="typeof item === 'object' && item.type === 'menu'" />
             <component :key="index"
                        :is="item"
                        :editor="editor"
@@ -46,7 +46,7 @@
                        :opt="item.options"
                        :editor="editor"
                        v-bind="editorContext"
-                       v-else-if="typeof item === 'object' && typeof item.name === 'string'" />
+                       v-else-if="typeof item === 'object' && item.type === 'menu'" />
             <component :key="index"
                        :is="item"
                        :editor="editor"

diff --git a/src/pages/examples/basic.vue b/src/pages/examples/basic.vue
@@ -54,6 +54,7 @@ export default {
         toolbar: [
           {
             name: 'add-more',
+            type: 'menu',
             options: {
               embed: {
                 video: ['youtube', 'bilibili', 'youku'],
@@ -65,6 +66,7 @@ export default {
               }
             }
           },
+          OAddMoreBtn,
           'separator',
           'bold',
           'italic',