waibu 1.1.13 → 1.1.15

package/lib/build-locals.js

@@ -11,17 +11,20 @@ function buildHomesMenu (req) {
 }
 
 function buildPagesMenu (req) {
-  const { orderBy } = this.lib._
+  const { find, orderBy, merge } = this.lib._
   const all = [{ icon: 'house', href: '/', level: 1 }]
   for (const ns of this.app.bajo.pluginNames) {
     const items = []
     const pages = this.app[ns].getConfig('waibuMpa.pages', { defValue: [] })
     if (pages.length === 0) continue
     for (const page of pages) {
+      const existing = find(all, { title: page.title })
+      page.level = page.level ?? 1000
       if (page.visible === 'auth' && !req.user) continue
       if (page.visible === 'anon' && req.user) continue
       if (!page.children) {
-        items.push(page)
+        if (existing) merge(existing, page)
+        else items.push(page)
         continue
       }
       const children = []
@@ -32,7 +35,8 @@ function buildPagesMenu (req) {
       }
       if (children.length > 0) {
         page.children = children
-        items.push(page)
+        if (existing) existing.children.push(...page.children)
+        else items.push(page)
       }
     }
     all.push(...items)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waibu",
-  "version": "1.1.13",
+  "version": "1.1.15",
   "description": "Web Framework for Bajo",
   "main": "index.js",
   "scripts": {

package/plugin/factory.js

@@ -174,15 +174,12 @@ async function factory (pkgName) {
     }
 
     getPluginByPrefix = (prefix) => {
-      const { get } = this.lib._
-      let plugin
-      for (const p of this.app.bajo.pluginNames) {
-        if (get(this, `app.${p}.config.waibu.prefix`) === prefix) {
-          plugin = this.app[p]
-          break
-        }
-      }
-      return plugin
+      const { get, find } = this.lib._
+      const item = find(this.app.waibu.routes, r => {
+        return get(r, 'config.prefix') === prefix
+      })
+      const ns = get(item, 'config.ns')
+      if (ns) return this.app[ns]
     }
 
     getPluginPrefix = (base, webApp = 'waibuMpa') => {