waibu-bootstrap 2.6.3 → 2.6.5

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,11 +1,8 @@
 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 { omit, get, isPlainObject, isArray, has, forOwn, find } = this.app.lib._
   const { escape } = this.app.waibu
-  const { req } = this.component
   if (formControl) group._.class.push('form-control')
   const attr = omit(group._, ['hint', 'label', 'wrapper'])
   if (attr.href) {
@@ -17,31 +14,11 @@ async function getInputAttr (group, formControl = true, ro) {
     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, fieldName = 'id'] = attr.ref.split(':')
-        attr.value = get(this, `component.locals.form._ref.${ref}.${fieldName}`, 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(' ')
+    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'])
@@ -112,7 +89,7 @@ export async function buildFormRadioToggle (group, params) {
 
 export async function buildFormPlaintext (group, params) {
   const attr = await getInputAttr.call(this, group, false, true)
-  delete attr.dataValue
+  // delete attr.dataValue
   attr.class.push('form-control-plaintext')
   attr.readonly = ''
   if (['object', 'array', 'text'].includes(attr.dataType)) {
@@ -151,9 +128,10 @@ export async function buildFormTextarea (group, params) {
 
 export async function buildFormSelect (group, params) {
   const { omit, trim } = this.app.lib._
+  const { isSet } = this.app.lib.aneka
   const { $ } = this.component
   let attr = await getInputAttr.call(this, group, false)
-  attr.value = attr.value + ''
+  attr.value = isSet(attr.value) ? (attr.value + '') : undefined
   attr.class.push('form-select')
   let html = params.html
   if (sizes.includes(attr.size)) attr.class.push(`form-select-${attr.size}`)

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

@@ -14,7 +14,7 @@ async function formSelectExt () {
 
     build = async () => {
       const { generateId } = this.app.lib.aneka
-      const { omit, merge, has } = this.app.lib._
+      const { omit, merge, has, isString } = this.app.lib._
       const { routePath } = this.app.waibu
       const { jsonStringify, groupAttrs } = this.app.waibuMpa
       const { base64JsonDecode } = this.app.waibu
@@ -55,6 +55,13 @@ async function formSelectExt () {
         group.remote.searchField = group.remote.searchField ?? 'id'
         group.remote.labelField = group.remote.labelField ?? 'id'
         group.remote.valueField = group.remote.valueField ?? 'id'
+        let query = `${group.remote.searchField}:~\\'{searchItem}\\'`
+        if (isString(group.remote.query)) {
+          const q = base64JsonDecode(group.remote.query)
+          const u = new URLSearchParams()
+          u.set('q', JSON.stringify(q))
+          query = u.toString().slice(2)
+        }
         if (has(group.remote, 'apiKey')) {
           if (group.remote.apiKey === true) fetchOpts.headers.Authorization = `Bearer ${apiKey}` // TODO: get it from wmpa
           else fetchOpts.headers.Authorization = `Bearer ${group.remote.apiKey}`
@@ -63,8 +70,9 @@ async function formSelectExt () {
           searchField: '${group.remote.searchField}',
           labelField: '${group.remote.labelField}',
           valueField: '${group.remote.valueField}',
-          load: (query, callback) => {
-            fetch('${group.remote.url}?query=${group.remote.searchField}:~\\'' + query + '\\'', ${jsonStringify(fetchOpts, true)})
+          load: (search, callback) => {
+            const query = '${query}'.replace('{searchItem}', search).replace('%7BsearchItem%7D', search)
+            fetch('${group.remote.url}?query=' + query, ${jsonStringify(fetchOpts, true)})
               .then(resp => resp.json())
               .then(json => {
                 callback(json.data)
@@ -131,7 +139,7 @@ async function formSelectExt () {
       // this.params.attr['@load.window'] = 'onLoad()'
       this.params.attr['x-init'] = 'onLoad()'
       if (options.length > 0) this.params.attr.options = options
-      this.params.attr = omit(this.params.attr, ['noDropdownInput', 'removeBtn', 'clearBtn', 'c-opts', 'remoteUrl', 'remoteSearchField', 'remoteLabelField', 'remoteValueField'])
+      this.params.attr = omit(this.params.attr, ['noDropdownInput', 'removeBtn', 'clearBtn', 'c-opts', 'remoteUrl', 'remoteSearchField', 'remoteLabelField', 'remoteValueField', 'remoteQuery', 'remoteApiKey'])
       await build.call(this, buildFormSelect, this.params)
     }
   }

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,18 @@
 # Changes
 
+## 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```
+- [2.6.4] Bug fix on ```buildFormSelect()```
+
 ## 2026-04-01
 
 - [2.6.3] Bug fix on widget ```form-datetime```