waibu-db 2.21.2 → 2.22.0

package/extend/waibuBootstrap/theme/component/widget/data-table.js

@@ -25,7 +25,7 @@ async function table () {
       const { groupAttrs } = this.app.waibuMpa
       const { isHtmlLink } = this.app.bajoExtra
       const { getTruncated } = this.app.bajoTemplate
-      const { get, omit, set, find, isEmpty, without, merge, intersection } = this.app.lib._
+      const { get, omit, set, find, isEmpty, without, merge, intersection, isPlainObject } = this.app.lib._
       const { isSet } = this.app.lib.aneka
       const group = groupAttrs(this.params.attr, ['body', 'head', 'foot'])
       this.params.attr = group._
@@ -146,7 +146,10 @@ async function table () {
           else attr.text = `${noWrap}`
           if (d._immutable) attr.text += ' color:body-tertiary'
           const format = get(schema, `view.format.${f}`)
-          if (format) value = await format.call(this, value, d, { params: this.params, req })
+          if (format) {
+            const formatted = await format.call(this, value, d, { params: this.params, req })
+            value = isPlainObject(formatted) ? `<a href="${formatted.href}">${formatted.value}</a>` : formatted
+          }
           if (['object', 'array'].includes(prop.type) && !isHtmlLink(value)) value = getTruncated(value, 20) // TODO: should be handle by css instead
           if (!get(schema, 'view.noEscape', []).includes(f) && !isHtmlLink(value)) value = escape(value)
           const line = await this.component.buildTag({ tag: 'td', attr, html: value })

package/extend/waibuBootstrap/theme/component/widget/form.js

@@ -5,7 +5,7 @@ async function form () {
 
   return class WdbForm extends WdbBase {
     static async handleRo ({ attr = {}, prop = {}, widget = {} } = {}) {
-      return await this.component.buildTag({ tag: 'formPlaintext', attr, selfCosing: true, noEscape: true }, { prop, widget })
+      return await this.component.buildTag({ tag: 'formPlaintext', attr, addons: widget.addons, selfCosing: true, noEscape: true }, { prop, widget })
     }
 
     static async handleRw ({ attr = {}, prop = {}, widget = {} } = {}) {
@@ -15,12 +15,11 @@ async function form () {
       if (has(attr, 'name') && !has(attr, 'value')) {
         attr.value = widget.component === 'form-plaintext' ? get(this, `oldData.${attr.name}`, attr.dataValue) : attr.dataValue
       }
-      if (prop.virtual) widget.component = 'form-plaintext'
       return `<c:${widget.component} ${stringifyAttribs(attr)} />`
     }
 
     build = async () => {
-      const { get, find, filter, forOwn, isEmpty, omit } = this.app.lib._
+      const { get, find, filter, forOwn, isEmpty, omit, isArray } = this.app.lib._
       const { base64JsonEncode } = this.app.waibu
       const body = []
       const xModels = get(this.schema, 'view.x.model', [])
@@ -51,11 +50,21 @@ async function form () {
             attr[`@${o.bind}`] = o.handler
           }
           if (widget.componentOpts) attr['c-opts'] = base64JsonEncode(widget.componentOpts)
+          if (prop.virtual) widget.component = 'form-plaintext'
+          widget.addons = widget.addons ?? []
+          if (!isArray(widget.addons)) widget.addons = [widget.addons]
+          for (const ao of widget.addons) {
+            const tag = ao.type === 'button' ? 'btn' : 'formInputAddon'
+            ao.html = await this.component.buildTag({ tag, attr: ao.attr, html: ao.html })
+            ao.position = ao.position ?? 'append'
+          }
+          let html
           if (widget.component === 'form-plaintext' || this.params.attr.method !== 'POST') {
-            body.push(await WdbForm.handleRo.call(this, { attr, prop, widget }))
+            html = await WdbForm.handleRo.call(this, { attr, prop, widget })
           } else {
-            body.push(await WdbForm.handleRw.call(this, { attr, prop, widget }))
+            html = await WdbForm.handleRw.call(this, { attr, prop, widget })
           }
+          body.push(html)
         }
         body.push('</c:fieldset>')
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waibu-db",
-  "version": "2.21.2",
+  "version": "2.22.0",
   "description": "DB Helper",
   "main": "index.js",
   "scripts": {

package/wiki/CHANGES.md

@@ -1,5 +1,10 @@
 # Changes
 
+## 2026-06-01
+
+- [2.21.3] Bug fix in ```wdb-form``` widget
+- [2.22.0] Now use the new ```format``` definition for ```virtual``` column in ```wdb-data-table``` widget
+
 ## 2026-05-28
 
 - [2.21.1] Bug fix in ```get-schema-ext.js```