waibu-bootstrap 2.9.0 → 2.9.1

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

@@ -6,6 +6,14 @@ async function getInputAttr (group, formControl = true, ro) {
   const { req } = this.component
   const { escape } = this.app.waibu
 
+  const buildOptions = (v, prop) => {
+    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
+  }
+
   if (formControl) group._.class.push('form-control')
   const attr = omit(group._, ['hint', 'label', 'wrapper'])
   if (has(attr, 'name') && !has(attr, 'value')) {
@@ -14,20 +22,17 @@ async function getInputAttr (group, formControl = true, ro) {
       const prop = this.getProp(attr.name)
       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.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
+        attr.options = (isString(prop.values) ? await callHandler(prop.values) : [...prop.values]).map(v => buildOptions(v, prop))
+      } else if (isPlainObject(attr.dataValue)) {
+        attr.dataValue = JSON.stringify(attr.dataValue)
+        attr.value = attr.dataValue
+      } else if (isArray(attr.dataValue)) {
+        attr.options = attr.dataValue.map(v => buildOptions(v, prop))
+      } else {
+        attr.value = attr.dataValue
       }
+      attr.dataValue = escape(attr.dataValue)
     }
   }
   if (sizes.includes(attr.size) && formControl) attr.class.push(`form-control-${attr.size}`)
@@ -133,6 +138,7 @@ export async function buildFormSelect (group, params) {
   const { $ } = this.component
   const { unescape } = this.app.waibu
   let attr = await getInputAttr.call(this, group, false)
+  if (attr.remoteUrl) delete attr.options
   try {
     attr.dataValue = JSON.parse(unescape(attr.dataValue)).join('|')
   } catch (err) {}

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

@@ -25,13 +25,20 @@ async function formSelectExt () {
       this.params.attr.id = this.params.attr.id ?? generateId('alpha')
       this.params.attr['x-ref'] = xref
       const xData = ['instance: null', 'value: null']
-      const plugins = ['drag_drop']
-      if (!this.params.attr.noDropdownInput) plugins.push('dropdown_input')
-      if (this.params.attr.removeBtn) plugins.push('remove_button')
-      if (this.params.attr.clearBtn) plugins.push('clear_button')
-      if (this.params.attr.optgroupColumns) plugins.push('optgroup_columns')
+      const plugins = {
+        drag_drop: {}
+      }
+      if (!this.params.attr.noDropdownInput) plugins.dropdown_input = {}
+      // if (this.params.attr.removeBtn) plugins.remove_button = {}
+      if (this.params.attr.clearBtn) plugins.clear_button = {}
+      if (this.params.attr.optgroupColumns) plugins.optgroup_columns = {}
+      if (this.params.attr.multiple) {
+        plugins.checkbox_options = {}
+        plugins.clear_button = {}
+      }
       if (this.params.attr.noCaret) this.params.attr.class.push('no-caret') // TODO: no caret remove caret on ALL instances, need to make it instance specific
       let opts = { plugins }
+      if (this.params.attr.allowCreate) opts.create = true
       let cOpts = {}
       if (this.params.attr.cOpts) {
         try {
@@ -124,6 +131,11 @@ async function formSelectExt () {
               })
           }
         `
+      } else {
+        text += `if (!_.isEmpty(this.value)) {
+          if (!_.isArray(this.value)) this.value = [this.value]
+          this.instance.setValue(this.value)
+        }`
       }
       text += '}'
       xData.push(text)
@@ -131,6 +143,7 @@ async function formSelectExt () {
       // this.params.attr['@load.window'] = 'onLoad()'
       this.params.attr['x-init'] = 'onLoad()'
       await build.call(this, buildFormSelect, this.params)
+      /*
       let options = []
       if (this.params.attr.options) {
         try {
@@ -140,6 +153,7 @@ async function formSelectExt () {
         }
       }
       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', 'remoteQuery', 'remoteApiKey'])
     }
   }

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,10 @@
 # Changes
 
+## 2026-05-16
+
+- [2.9.1] Bug fix in ```form-select-ext``` widget
+- [2.9.1] Bug fix in ```util.getInputAttr``` helper
+
 ## 2026-05-11
 
 - [2.9.0] Updates to match ```dobo@2.23.0``` specs