waibu 1.1.12 → 1.1.14

package/lib/build-locals.js

@@ -1,4 +1,4 @@
-function buildHomesMenu () {
+function buildHomesMenu (req) {
   const { get, find, orderBy } = this.lib._
   const routes = []
   for (const ns of this.app.bajo.pluginNames) {
@@ -10,13 +10,33 @@ function buildHomesMenu () {
   return orderBy(routes, ['title'])
 }
 
-function buildPagesMenu () {
-  const { get, orderBy } = this.lib._
-  const all = [{ icon: 'house', href: '/', title: 'home', level: 1 }]
+function buildPagesMenu (req) {
+  const { orderBy } = this.lib._
+  const all = [{ icon: 'house', href: '/', level: 1 }]
   for (const ns of this.app.bajo.pluginNames) {
-    const pages = get(this, `app.${ns}.config.waibuMpa.pages`, [])
+    const items = []
+    const pages = this.app[ns].getConfig('waibuMpa.pages', { defValue: [] })
     if (pages.length === 0) continue
-    all.push(...pages)
+    for (const page of pages) {
+      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)
+        continue
+      }
+      const children = []
+      for (const child of page.children) {
+        if (child.visible === 'auth' && !req.user) continue
+        if (child.visible === 'anon' && req.user) continue
+        children.push(child)
+      }
+      if (children.length > 0) {
+        page.children = children
+        items.push(page)
+      }
+    }
+    all.push(...items)
   }
   return orderBy(all, ['level', 'title'])
 }
@@ -54,8 +74,8 @@ async function buildLocals ({ tpl, params = {}, opts = {} } = {}) {
     if (this.app.bajo.config.env === 'dev') console.log(params.error)
   }
   if (reply && req.session && req.flash && !opts.partial) _meta.flash = reply.flash()
-  set(params, 'menu.homes', buildHomesMenu.call(this))
-  set(params, 'menu.pages', buildPagesMenu.call(this))
+  set(params, 'menu.homes', buildHomesMenu.call(this, req))
+  set(params, 'menu.pages', buildPagesMenu.call(this, req))
   const merged = merge({}, params, { _meta })
   await runHook(`${this.name}:afterBuildLocals`, merged, req)
   if (!isEmpty(routeOpts.ns)) await runHook(`${this.name}.${routeOpts.ns}:afterBuildLocals`, merged, req)

package/package.json

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

package/plugin/factory.js

@@ -142,7 +142,8 @@ async function factory (pkgName) {
       })
     }
 
-    escape = (text) => {
+    escape = (text = '') => {
+      if (typeof text !== 'string') return text
       const { forOwn } = this.lib._
       forOwn(this.escapeChars, (v, k) => {
         text = text.replaceAll(k, v)
@@ -173,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') => {