waibu-bootstrap 2.6.4 → 2.7.0

package/extend/waibuMpa/theme/component/method/after-build-tag/_lib.js

@@ -28,7 +28,7 @@ export const colorVariants = ['outline']
 export const placements = ['top', 'bottom', 'left', 'right']
 
 export function parseVariant ({ cls = '', value = '', values = [], variants = [], prepend } = {}) {
-  const { isEmpty } = this.app.lib._
+  const { isEmpty } = this.plugin.app.lib._
   if (value === true) return cls
   const [core, variant] = value.split('-')
   const items = []
@@ -41,7 +41,7 @@ export function parseVariant ({ cls = '', value = '', values = [], variants = []
 }
 
 export function parseSimple ({ cls = '', value = '', values = [], acceptTrue } = {}) {
-  const { isEmpty } = this.app.lib._
+  const { isEmpty } = this.plugin.app.lib._
   if (values.includes(value) || (acceptTrue && value === true)) {
     if (isEmpty(cls)) return value
     return acceptTrue && value === true ? cls : `${cls}-${value}`

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

@@ -1,48 +1,14 @@
 import { sizes } from '../method/after-build-tag/_lib.js'
 
-const trueValues = ['true', 'on', 'yes', '1', 1, true]
-
 async function getInputAttr (group, formControl = true, ro) {
-  const { omit, get, set, isPlainObject, isArray, isString, has, forOwn, find, camelCase, isEmpty } = this.app.lib._
-  const { escape } = this.app.waibu
-  const { req } = this.component
+  const { omit, get, forOwn } = this.app.lib._
   if (formControl) group._.class.push('form-control')
   const attr = omit(group._, ['hint', 'label', 'wrapper'])
   if (attr.href) {
-    forOwn(this.component.locals.form, (v, k) => {
+    forOwn(get(this, 'component.locals.form', {}), (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 ?? 'auto'
-    let val = get(this, `component.locals.form.${attr.name}`)
-    if (attr.dataType === 'boolean') {
-      val = trueValues.includes(val)
-      set(this, `component.locals.form.${attr.name}`, val)
-    }
-    if (isPlainObject(val) || isArray(val)) attr.dataValue = escape(JSON.stringify(val))
-    else if (isString(val)) attr.dataValue = escape(val)
-    else attr.dataValue = val
-    if (ro) {
-      if (attr.ref) {
-        const [ref, field = 'id'] = attr.ref.split(':')
-        attr.value = get(this, `component.locals.form._ref.${ref}.${field}`, val)
-      } else if (attr.dataType === 'boolean') attr.value = req.t(val ? 'true' : 'false')
-      else if (has(attr, 'name') === 'lat') attr.value = escape(req.format(val, attr.dataType, { latitude: true }))
-      else if (has(attr, 'name') === 'lng') attr.value = escape(req.format(val, attr.dataType, { longitude: true }))
-      else if (prop.values) {
-        let items = prop.values
-        if (typeof prop.values === 'string') items = await this.app.bajo.callHandler(prop.values)
-        const item = find(items, { value: val }) ?? {}
-        const ttext = camelCase(`${prop.name} ${item.text}`)
-        attr.value = escape(req.format(!isEmpty(item) ? (req.te(ttext) ? req.t(ttext) : item.text) : val, attr.dataType))
-      } else attr.value = escape(req.format(val, attr.dataType))
-    } else attr.value = attr.dataValue
-    if (isArray(val)) attr.value = val.join(' ')
-  }
   if (sizes.includes(attr.size) && formControl) attr.class.push(`form-control-${attr.size}`)
   return omit(attr, ['size', 'col'])
 }
@@ -112,7 +78,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)) {
@@ -120,7 +85,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/container.js

@@ -12,7 +12,7 @@ async function container () {
     build = async () => {
       const { has, omit } = this.app.lib._
       if (has(this.params.attr, 'responsive')) this.params.attr.class.push(`${cls}-fluid`)
-      else if (has(this.params.attr, 'breakpoint')) this.params.attr.class.push(parseSimple({ cls, value: this.params.attr.breakpoint, values: breakpoints }))
+      else if (has(this.params.attr, 'breakpoint')) this.params.attr.class.push(parseSimple.call(this, { cls, value: this.params.attr.breakpoint, values: breakpoints }))
       else this.params.attr.class.push(cls)
       this.params.attr = omit(this.params.attr, ['responsive', 'breakpoint'])
     }

package/extend/waibuMpa/theme/component/widget/form-select-ext.js

@@ -96,7 +96,6 @@ async function formSelectExt () {
         const opts = ${opts}
         this.instance = new TomSelect($refs.${xref}, opts)
         const val = $refs.${xref}.dataset.value
-        console.log(val)
         if (!_.isEmpty(val)) {
           this.value = val.split('|')
         }

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,17 @@
 # Changes
 
+## 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
+- [2.6.5] Bug fix in ```container``` widget
+- [2.6.5] Bug fix in ```getInputAttr()```
+- [2.6.5] Bug fix in ```parseVariant()```
+- [2.6.5] Bug fix in ```parseSimple()```
+
 ## 2026-04-07
 
 - [2.6.4] Bug fix on widget ```form-select-ext```