waibu-bootstrap 2.6.5 → 2.7.1

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

@@ -1,25 +1,39 @@
 import { sizes } from '../method/after-build-tag/_lib.js'
 
 async function getInputAttr (group, formControl = true, ro) {
-  const { omit, get, isPlainObject, isArray, has, forOwn, find } = this.app.lib._
+  const { has, omit, forOwn, isPlainObject, isArray, get, isString } = this.app.lib._
+  const { callHandler } = this.app.bajo
+  const { req } = this.component
   const { escape } = this.app.waibu
+
   if (formControl) group._.class.push('form-control')
   const attr = omit(group._, ['hint', 'label', 'wrapper'])
+  if (has(attr, 'name') && !has(attr, 'value')) {
+    if (ro) attr.value = this.formData[attr.name]
+    else {
+      const prop = this.getProp(attr.name)
+      attr.dataType = attr.dataType ?? prop.type
+      attr.dataValue = get(this.formData, `_orig.${attr.name}`, get(this.formData, attr.name))
+      if (isPlainObject(attr.dataValue) || isArray(attr.dataValue)) attr.dataValue = JSON.stringify(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 }
+          const { camelCase } = this.app.lib._
+          const key = camelCase(`${prop.name} ${v.text}`)
+          if (req.te(key)) v.text = req.t(key)
+          return v
+        })
+        attr.options = values
+      }
+    }
+  }
   if (attr.href) {
-    forOwn(this.component.locals.form, (v, k) => {
+    forOwn(this.formData, (v, k) => {
       attr.href = attr.href.replace(`%7B${k}%7D`, v)
     })
   }
-  if (has(attr, 'name') && !has(attr, 'value') && this.component.locals.form) {
-    let prop = {}
-    const schema = get(this, 'component.locals.schema')
-    if (schema) prop = find(schema.properties, { name: attr.name }) ?? {}
-    attr.dataType = attr.dataType ?? prop.type
-    attr.dataValue = get(this, `component.locals.form._orig.${attr.name}`)
-    if (isPlainObject(attr.dataValue) || isArray(attr.dataValue)) attr.dataValue = JSON.stringify(attr.dataValue)
-    attr.dataValue = escape(attr.dataValue)
-    attr.value = escape(get(this, `component.locals.form.${attr.name}`))
-  }
   if (sizes.includes(attr.size) && formControl) attr.class.push(`form-control-${attr.size}`)
   return omit(attr, ['size', 'col'])
 }
@@ -89,7 +103,6 @@ export async function buildFormRadioToggle (group, params) {
 
 export async function buildFormPlaintext (group, params) {
   const attr = await getInputAttr.call(this, group, false, true)
-  // delete attr.dataValue
   attr.class.push('form-control-plaintext')
   attr.readonly = ''
   if (['object', 'array', 'text'].includes(attr.dataType)) {
@@ -97,7 +110,7 @@ export async function buildFormPlaintext (group, params) {
     return await this.component.buildTag({ tag: 'textarea', attr, html: attr.value })
   }
   if (attr.href) {
-    const content = attr.value ? attr.value : 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 })
   }

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

@@ -4,8 +4,28 @@ import { build } from './form-input.js'
 async function formPlaintext () {
   return class FormPlaintext extends this.app.baseClass.MpaWidget {
     build = async () => {
+      const { isEmpty, get } = this.app.lib._
+      const { req } = this.component
+      const { escape } = this.app.waibu
       this.params.attr.disabled = true
+      const { name } = this.params.attr
       if (this.params.attr.labelFloating) this.params.attr.class.push('border', 'rounded')
+      if (!isEmpty(name) && isEmpty(this.params.attr.value)) {
+        const prop = this.getProp(name)
+        const dataValue = get(this.formData, `_orig.${name}`, '')
+        let value = get(this.oldData, name, get(this.formData, name, ''))
+        const format = get(this.schema, `view.format.${name}`)
+        const formatValue = get(this.schema, `view.formatValue.${name}`)
+        const labelField = get(this.schema, `view.widget.${name}.attr.labelField`)
+        if (formatValue) value = await formatValue.call(this, value, this.formData, { req })
+        else if (prop.ref) {
+          value = this.getRefValue({ field: name, labelField, refName: this.getRefName(name) })
+          if (format && !isEmpty(value)) this.params.attr.href = await format.call(this, value, this.formData, { linkOnly: true })
+        } else if (format && !isEmpty(value)) value = await format.call(this, value, this.formData)
+        this.params.attr.dataValue = escape(dataValue)
+        this.params.attr.value = escape(value)
+        this.params.attr.dataType = prop.type
+      }
       await build.call(this, buildFormPlaintext, this.params)
     }
   }

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,14 @@
 # Changes
 
+## 2026-04-17
+
+- [2.7.1] Bug fix in ```getInputAttr()```
+- [2.7.1] Bug fix in ```FormPlaintext``` widget
+
+## 2026-04-13
+
+- [2.7.0] Rewrite ```getInputAttr()``` to not dependent to any template data, rather only depend on attributes
+
 ## 2026-04-11
 
 - [2.6.5] Bug fix in ```form-select-ext``` widget