waibu-mpa 2.15.0 → 2.15.2

package/lib/build-routes.js

@@ -45,7 +45,7 @@ export async function build ({ files, pathPrefix, dir, ns, cfg, parent, urlPrefi
       m.config.prefix = getPluginPrefix(ns)
       m.config.pathSrc = m.url
       m.config.webApp = parent ?? ns
-      m.config.interSite = m.interSite
+      m.config.xSite = m.xSite
       m.config.ns = ns
       m.config.subNs = ''
       m.config.title = m.title ?? camelCase(last(m.url.split('/')))

package/lib/class/component.js

@@ -105,7 +105,7 @@ async function componentFactory () {
       await this.iconAttr(params, method)
       await this.beforeBuildTag(method, params)
       const Widget = await this.getWidget(method)
-      const widget = new Widget({ component: this, params })
+      const widget = new Widget({ component: this, params, options: opts })
       const resp = await widget.build()
       if (resp === false) {
         return false
@@ -243,7 +243,7 @@ async function componentFactory () {
           return { value: item, text: (item + '') }
         })
       }
-      if (!isEmpty(prop) && !prop.required) options.unshift({ value: '', text: '_blank_' })
+      if (!isEmpty(prop)) options.unshift({ value: '', text: '_blank_' })
       for (const opt of options) {
         const sel = find(values, v => opt.value === v)
         const ttext = camelCase(`${prop.name} ${opt.text}`)

package/lib/class/widget/page-end.js

@@ -23,7 +23,7 @@ async function pageEndFactory () {
       let tc = ''
       if (!this.params.attr.noToastContainer && widget.toastStack && widget.toast) {
         const toasts = []
-        if (get(locals, 'error')) {
+        if (get(locals, 'error') && get(locals, '_meta.flash.notify')) {
           const details = get(locals.error, 'details', [])
           if (details.length > 0) {
             const list = [`<ul class="m-0 ${details.length === 1 ? 'list-unstyled' : ''}">`]

package/lib/class/widget.js

@@ -10,7 +10,7 @@ async function widgetFactory () {
     static inlineScript = null
     static inlineCss = null
 
-    constructor ({ component = {}, params = {} } = {}) {
+    constructor ({ component = {}, params = {}, options = {} } = {}) {
       super(component.plugin)
       const names = kebabCase(this.constructor.name).split('-')
       const alias = names.length > 1 ? names[0] : 'wbs'
@@ -21,6 +21,7 @@ async function widgetFactory () {
       this.component = component
       this.params = params
       this.block = {}
+      this.options = options
       this.setting = this._parseBase64Attr(this.params.attr.setting)
       this.formData = get(this, `component.locals.${this.params.attr.keyLocals ?? 'form'}`, {})
       this.oldData = get(this, `component.locals.${this.params.attr.keyOldData ?? 'oldData'}`, {})

package/lib/error-handler.js

@@ -1,8 +1,7 @@
 import notFoundHandler from './not-found-handler.js'
 
 async function errorHandler (err, req, reply) {
-  const { fs } = this.app.lib
-  const { resolveTemplate, compile } = this.app.bajoTemplate
+  const { resolveTemplate } = this.app.bajoTemplate
   err.statusCode = err.statusCode ?? 500
   reply.code(err.statusCode)
   reply.header('Content-Type', `text/html; charset=${this.config.page.charset}`)
@@ -16,12 +15,11 @@ async function errorHandler (err, req, reply) {
   // let result
   let tpl = `${ns}.template:/${err.statusCode ?? 500}.html`
   try {
-    tpl = resolveTemplate(tpl)
+    resolveTemplate(tpl)
   } catch (err) {
-    tpl = resolveTemplate(`${this.ns}.template:/500.html`)
+    tpl = `${this.ns}.template:/500.html`
   }
-  const content = fs.readFileSync(tpl.file, 'utf8')
-  return await compile(content, { error: err })
+  return reply.view(tpl, { error: err }, { noFlash: true })
 }
 
 export default errorHandler

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,14 @@
 # Changes
 
+## 2026-05-22
+
+- [2.15.2] Bug fix in ```error-handler.js```
+- [2.15.2] Bug fix in ```component.buildTag()```
+
+## 2026-05-16
+
+- [2.15.1] Bug fix in ```component.js```
+
 ## 2026-05-11
 
 - [2.15.0] Updates to match ```dobo@2.23.0``` specs