waibu-bootstrap 2.4.0 → 2.5.0

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

@@ -3,8 +3,9 @@ import { sizes } from '../method/after-build-tag/_lib.js'
 const trueValues = ['true', 'on', 'yes', '1', 1, true]
 
 function getInputAttr (group, formControl = true, ro) {
-  const { omit, get, set, isPlainObject, isArray, isString, has, forOwn } = this.app.lib._
+  const { omit, get, set, isPlainObject, isArray, isString, 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) {
@@ -13,7 +14,10 @@ function getInputAttr (group, formControl = true, ro) {
     })
   }
   if (has(attr, 'name') && !has(attr, 'value') && this.component.locals.form) {
-    attr.dataType = attr.dataType ?? 'auto'
+    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)
@@ -26,10 +30,13 @@ function getInputAttr (group, formControl = true, 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 = this.component.req.t(val ? 'true' : 'false')
-      else if (has(attr, 'name') === 'lat') attr.value = escape(this.component.req.format(val, attr.dataType, { latitude: true }))
-      else if (has(attr, 'name') === 'lng') attr.value = escape(this.component.req.format(val, attr.dataType, { longitude: true }))
-      else attr.value = escape(this.component.req.format(val, attr.dataType))
+      } 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) {
+        const item = find(prop.values, { value: val })
+        attr.value = escape(req.format(item ? req.t(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(' ')
   }
@@ -110,7 +117,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 ? this.component.req.t(attr.value) : attr.href
+    const content = attr.value ? 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-select-ext.js

@@ -36,9 +36,7 @@ async function formSelectExt () {
         try {
           options = base64JsonDecode(this.params.attr.options)
         } catch (err) {
-          options = this.params.attr.options.split(' ').map(item => {
-            return { value: item, text: item }
-          })
+          options = this.params.attr.options
         }
       }
       let opts = { plugins }
@@ -132,7 +130,7 @@ async function formSelectExt () {
       this.params.attr['x-data'] = `{ ${xData.join(',\n')} }`
       // this.params.attr['@load.window'] = 'onLoad()'
       this.params.attr['x-init'] = 'onLoad()'
-      this.params.attr.options = options
+      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'])
       await build.call(this, buildFormSelect, this.params)
     }

package/package.json

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

package/wiki/CHANGES.md

@@ -5,6 +5,9 @@
 - [2.4.0] Update attribute functions from ```waibu```
 - [2.4.0] Bug fix on ```FormSelectExt``` 's static css
 - [2.4.0] Bug fix on ```FormSelectCountry``` 's static css
+- [2.5.0] Remove ```FormSelectCountry``` alltogther
+- [2.5.0] Bug fix on ```FormSelectExt```'s options
+- [2.5.0] In read only mode, auto detect value from model's values
 
 ## 2026-02-15
 

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

@@ -1,26 +0,0 @@
-import { css, scripts } from './form-select-ext.js'
-
-async function formSelectCountry () {
-  return class FormSelectCountry extends this.app.baseClass.MpaWidget {
-    static css = [...super.css, ...css]
-    static scripts = [...super.scripts, scripts]
-
-    constructor (options) {
-      super(options)
-      this.params.noTag = true
-    }
-
-    build = async () => {
-      const { readConfig } = this.app.bajo
-      const { map } = this.app.lib._
-      const { base64JsonEncode } = this.app.waibu
-      const countries = await readConfig('bajoCommonDb:/extend/dobo/fixture/country.json', { ignoreError: true, defValue: [] })
-      this.params.attr.options = base64JsonEncode(map(countries, c => {
-        return { value: c.id, text: c.name.replaceAll('\'', '') }
-      }))
-      this.params.html = await this.component.buildTag({ tag: 'formSelectExt', attr: this.params.attr, html: '' })
-    }
-  }
-}
-
-export default formSelectCountry