waibu-bootstrap 2.8.1 → 2.9.0

package/extend/waibuMpa/theme/component/widget/_lib.js

@@ -1,7 +1,7 @@
 import { sizes } from '../method/after-build-tag/_lib.js'
 
 async function getInputAttr (group, formControl = true, ro) {
-  const { has, omit, forOwn, isPlainObject, isArray, get, isString } = this.app.lib._
+  const { has, omit, isPlainObject, isArray, isString } = this.app.lib._
   const { callHandler } = this.app.bajo
   const { req } = this.component
   const { escape } = this.app.waibu
@@ -15,8 +15,9 @@ async function getInputAttr (group, formControl = true, ro) {
       attr.dataType = attr.dataType ?? prop.type
       attr.dataValue = this.formData[attr.name]
       if (isPlainObject(attr.dataValue) || isArray(attr.dataValue)) attr.dataValue = JSON.stringify(attr.dataValue)
-      attr.value = escape(get(this.formData, `_fmt.${attr.name}`, attr.dataValue))
+      // attr.value = escape(get(this.formData, `_fmt.${attr.name}`, attr.dataValue))
       attr.dataValue = escape(attr.dataValue)
+      attr.value = attr.dataValue
       if (prop.values) {
         const values = (isString(prop.values) ? await callHandler(prop.values) : [...prop.values]).map(v => {
           if (isString(v)) v = { value: v, text: v }
@@ -29,11 +30,6 @@ async function getInputAttr (group, formControl = true, ro) {
       }
     }
   }
-  if (attr.href) {
-    forOwn(this.formData, (v, k) => {
-      attr.href = attr.href.replace(`{${k}}`, v)
-    })
-  }
   if (sizes.includes(attr.size) && formControl) attr.class.push(`form-control-${attr.size}`)
   return omit(attr, ['size', 'col'])
 }
@@ -102,19 +98,11 @@ export async function buildFormRadioToggle (group, params) {
 }
 
 export async function buildFormPlaintext (group, params) {
+  const { omit } = this.app.lib._
   const attr = await getInputAttr.call(this, group, false, true)
   attr.class.push('form-control-plaintext')
   attr.readonly = ''
-  if (['object', 'array', 'text'].includes(attr.dataType)) {
-    attr.style.minHeight = '100px'
-    return await this.component.buildTag({ tag: 'textarea', attr, html: attr.value })
-  }
-  if (attr.href) {
-    const content = attr.value ? this.component.req.t(attr.value) : attr.href
-    const html = await this.component.buildTag({ tag: 'a', attr: { href: attr.href, content } })
-    return await this.component.buildTag({ tag: 'div', attr, html })
-  }
-  return await this.component.buildTag({ tag: 'input', attr, selfClosing: true })
+  return await this.component.buildTag({ tag: 'div', attr: omit(attr, ['value']), html: attr.value })
 }
 
 export async function buildFormColor (group, params) {
@@ -143,7 +131,11 @@ export async function buildFormSelect (group, params) {
   const { omit, trim } = this.app.lib._
   const { isSet } = this.app.lib.aneka
   const { $ } = this.component
+  const { unescape } = this.app.waibu
   let attr = await getInputAttr.call(this, group, false)
+  try {
+    attr.dataValue = JSON.parse(unescape(attr.dataValue)).join('|')
+  } catch (err) {}
   attr.value = isSet(attr.value) ? (attr.value + '') : undefined
   attr.class.push('form-select')
   let html = params.html

package/extend/waibuMpa/theme/component/widget/form-plaintext.js

@@ -4,6 +4,7 @@ import { build } from './form-input.js'
 async function formPlaintext () {
   return class FormPlaintext extends this.app.baseClass.MpaWidget {
     build = async () => {
+      const { req } = this.component
       const { isEmpty, get } = this.app.lib._
       const { escape } = this.app.waibu
       this.params.attr.disabled = true
@@ -16,11 +17,13 @@ async function formPlaintext () {
         const format = get(this.schema, `view.format.${name}`)
         const labelField = get(this.schema, `view.widget.${name}.attr.labelField`)
         if (prop.ref) {
-          const newValue = this.getRefValue({ field: name, labelField, refName: this.getRefName(name) })
-          if (format && !isEmpty(newValue)) this.params.attr.href = await format.call(this, newValue, this.formData, { linkOnly: true })
-        } else if (format && !isEmpty(value)) value = await format.call(this, value, this.formData)
+          const result = this.getRefValue({ field: name, labelField, refName: this.getRefName(name) })
+          if (result) {
+            value = format ? await format.call(this, value, this.formData, { req }) : result
+          }
+        } else if (format) value = await format.call(this, value, this.formData, { req })
         this.params.attr.dataValue = escape(dataValue)
-        this.params.attr.value = escape(value)
+        this.params.attr.value = value
         this.params.attr.dataType = prop.type
       }
       await build.call(this, buildFormPlaintext, this.params)

package/extend/waibuMpa/theme.js

@@ -7,7 +7,10 @@ async function theme () {
     'waibuBootstrap.virtual:/bootstrap/js/bootstrap.bundle.min.js',
     'bajo.virtual:/lodash/lodash.min.js',
     '$waibuMpa:/wmpa.js',
-    '$waibuBootstrap.asset:/js/wbs.js'
+    {
+      src: '$waibuBootstrap.asset:/js/wbs.js',
+      defer: true
+    }
   ]
   const meta = [{
     name: 'viewport',

package/extend/waibuStatic/asset/js/wbs.js

@@ -3,10 +3,6 @@
 class Wbs {
   constructor () {
     this.engine = window.mdb ?? window.bootstrap
-    this.init()
-  }
-
-  init () {
     window.addEventListener('load', evt => {
       const popoverTriggerList = document.querySelectorAll('[data-bs-toggle="popover"]')
       const popoverList = [...popoverTriggerList].map(popoverTriggerEl => new this.engine.Popover(popoverTriggerEl)) // eslint-disable-line no-unused-vars

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waibu-bootstrap",
-  "version": "2.8.1",
+  "version": "2.9.0",
   "description": "Bootstrap suport for Waibu Framework",
   "main": "index.js",
   "scripts": {

package/wiki/CHANGES.md

@@ -1,5 +1,15 @@
 # Changes
 
+## 2026-05-11
+
+- [2.9.0] Updates to match ```dobo@2.23.0``` specs
+- [2.9.0] Bug fix in ```theme.js```
+- [2.9.0] Auto link for widget bound to database with refs
+
+## 2026-05-03
+
+- [2.8.2] Bug fix in ```form-plaintext``` widgets
+
 ## 2026-04-25
 
 - [2.8.0] Change options to format value using the new key set by dobo