waibu-mpa 1.2.13 → 1.2.15

package/index.js

@@ -15,6 +15,9 @@ async function factory (pkgName) {
         waibu: {
           prefix: ''
         },
+        waibuAdmin: {
+          modelDisabled: ['session']
+        },
         mountMainAsRoot: true,
         page: {
           charset: 'utf-8',
@@ -183,7 +186,7 @@ async function factory (pkgName) {
       const { get } = this.lib._
       const plugin = getPlugin(name, true)
       if (!plugin) return
-      return get(plugin, 'config.waibu.title', plugin.title ?? plugin.name)
+      return get(plugin, 'config.waibu.title', get(plugin, 'config.waibu.prefix', plugin.title, plugin.title ?? plugin.name))
     }
 
     getResource (name) {

package/lib/build-page/attrs-mutation.js

@@ -18,7 +18,9 @@ async function parseAttrib ({ $, el, req } = {}) {
       (['href', 'src', 'action'].includes(key) || key.includes('-href')) &&
       !(val.slice(1, 3) === '%=' && val[val.length - 2] === '%')) {
       el.attribs['o' + key] = val
-      el.attribs[key] = routePath(val)
+      try {
+        el.attribs[key] = routePath(val)
+      } catch (err) {}
     }
     // translate
     if (key.slice(0, 2) === 't:') {

package/lib/build-page/inject-elements/meta.js

@@ -1,14 +1,20 @@
+const omitted = ['css', 'style', 'scripts', 'ns', 'appTitle', 'title', 'fullTitle']
+const names = ['description', 'keywords', 'robots', 'viewport', 'author', 'publisher',
+  'application-name', 'generator', 'referrer', 'theme-color', 'googlebot'
+]
+
 async function meta (options) {
   const { runHook } = this.app.bajo
-  const { map, uniq, isArray, merge, kebabCase, keys, omit } = this.lib._
+  const { map, uniq, isArray, merge, kebabCase, keys, omit, get, isFunction } = this.lib._
+  const { sprintf } = this.lib
   const { $, theme, req, locals } = options ?? {}
   const { page = {} } = locals
   let items = []
   // meta
   const links = ['preconnect', 'dnsPrefetch']
-  const omitted = ['css', 'style', 'scripts', 'ns', 'appTitle', 'title', 'fullTitle']
   for (const attr of keys(omit(locals.page, [...links, ...omitted]))) {
     if (!page[attr]) continue
+    if (!names.includes(attr)) continue
     items.push({
       name: attr,
       content: isArray(page[attr]) ? page[attr].join(', ') : page[attr]
@@ -31,7 +37,13 @@ async function meta (options) {
     return `<${tag} ${attrs} />`
   })
   $('head').prepend(uniq(items).join('\n'))
-  $('head').append(`<title>${page.fullTitle ?? page.title}</title>`)
+  const mainTitle = get(this, 'app.main.config.waibu.title', 'Waibu App')
+  const formatter = get(this, 'app.waibu.pageTitleFormat', '%s : %s')
+  const title = page.fullTitle ?? page.title
+  let pageTitle
+  if (isFunction(formatter)) pageTitle = await formatter.call(this, title, mainTitle, locals)
+  else pageTitle = sprintf(formatter, title, mainTitle)
+  $('head').append(`<title>${pageTitle}</title>`)
 }
 
 export default meta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waibu-mpa",
-  "version": "1.2.13",
+  "version": "1.2.15",
   "description": "MPA support for Waibu Framework",
   "main": "index.js",
   "scripts": {

package/waibuDb/schema/session.json

@@ -1,3 +1,5 @@
 {
-  "disabled": ["create", "update"]
+  "common": {
+    "disabled": ["create", "update"]
+  }
 }

package/dobo/extend/sumba/fixture/site-settingxxx.json

@@ -1,11 +0,0 @@
-[{
-  "ns": "waibuMpa",
-  "key": "theme",
-  "value": "bootstrap",
-  "siteId": "?:SumbaSite::alias:default"
-}, {
-  "ns": "waibuMpa",
-  "key": "iconset",
-  "value": "bootstrap-icons",
-  "siteId": "?:SumbaSite::alias:default"
-}]