waibu-bootstrap 2.7.2 → 2.8.1

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

@@ -13,10 +13,10 @@ async function getInputAttr (group, formControl = true, ro) {
     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))
+      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 }

package/extend/waibuMpa/theme/component/widget/form-check-toggle.js

@@ -9,7 +9,7 @@ export async function build (handler, params = {}) {
   if (!this.params.attr.label && this.params.attr.name) this.params.attr.label = this.component.req.t(`field.${this.params.attr.name}`)
   const attr = groupAttrs(this.params.attr, ['label', 'hint', 'wrapper'])
   const contents = []
-  attr._.id = this.params.attr.id ?? generateId()
+  attr._.id = this.params.attr.id ?? generateId('alpha')
   if (attr._.color) attr.label.class.push(parseVariant.call(this, { cls: 'btn', value: attr._.color, values: colors, variants, prepend: true }))
   delete attr._.color
 

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

@@ -10,7 +10,7 @@ export async function build (handler, params = {}) {
   if (this.params.attr.noLabel) this.params.attr.label = undefined
   const group = groupAttrs(this.params.attr, ['label', 'hint', 'wrapper', 'col'], false)
   const contents = []
-  group._.id = this.params.attr.id ?? generateId()
+  group._.id = this.params.attr.id ?? generateId('alpha')
   if (!isEmpty(group._.label)) {
     group.wrapper.class.push('form-check')
     if (group.wrapper.inline) group.wrapper.class.push('form-check-inline')

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

@@ -98,7 +98,7 @@ export async function build (handler, params = {}) {
 
   if (group._.datalist && !['password', 'file', 'checkbox', 'radio'].includes(group._.type)) {
     datalist = group._.datalist
-    group._.list = generateId()
+    group._.list = generateId('alpha')
   }
   const contents = await handleInput.call(this, { handler, params, group })
   if (datalist) {

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

@@ -5,22 +5,19 @@ 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 dataValue = this.formData[name] ?? ''
+        let value = get(this.oldData, `_fmt.${name}`, get(this.formData, `_fmt.${name}`, dataValue))
         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 })
+        if (prop.ref) {
+          const newValue = this.getRefValue({ field: name, labelField, refName: this.getRefName(name) })
+          if (format && !isEmpty(newValue)) this.params.attr.href = await format.call(this, newValue, 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)

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

@@ -21,7 +21,7 @@ async function formSelectExt () {
       const { req } = this.component
       let apiKey = ''
       if (req.user && this.app.sumba) apiKey = await this.app.sumba.getApiKeyFromUserId(req.user.id)
-      const xref = this.params.attr['x-ref'] ?? 'select'
+      const xref = this.params.attr['x-ref'] ?? this.params.attr.name
       this.params.attr.id = this.params.attr.id ?? generateId('alpha')
       this.params.attr['x-ref'] = xref
       const xData = ['instance: null', 'value: null']
@@ -31,14 +31,6 @@ async function formSelectExt () {
       if (this.params.attr.clearBtn) plugins.push('clear_button')
       if (this.params.attr.optgroupColumns) plugins.push('optgroup_columns')
       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 options = []
-      if (this.params.attr.options) {
-        try {
-          options = base64JsonDecode(this.params.attr.options)
-        } catch (err) {
-          options = this.params.attr.options
-        }
-      }
       let opts = { plugins }
       let cOpts = {}
       if (this.params.attr.cOpts) {
@@ -138,9 +130,17 @@ async function formSelectExt () {
       this.params.attr['x-data'] = `{ ${xData.join(',\n')} }`
       // 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 {
+          options = base64JsonDecode(this.params.attr.options)
+        } catch (err) {
+          options = this.params.attr.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', 'remoteQuery', 'remoteApiKey'])
-      await build.call(this, buildFormSelect, this.params)
     }
   }
 }

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

@@ -37,7 +37,7 @@ async function navbar () {
         if (this.params.attr.scroll) el.prop('style', `--bs-scroll-height: ${numUnit(this.params.attr.scroll, 'px')};`)
         html = el.removeClass('nav').parent().html()
         this.params.attr.class.push(parseSimple.call(this, { cls: `${cls}-expand`, value: this.params.attr.expandable, values: breakpoints }))
-        const id = generateId()
+        const id = generateId('alpha')
         if (this.params.group.drawer) this.params.group.drawer.id = id
         const btn = `<button class="navbar-toggler" type="button" data-bs-toggle="${type}" ` +
           `data-bs-target="#${id}" aria-controls="${id}"${this.params.attr.drawer ? '' : ' aria-expanded="false"'} aria-label="${this.component.req.t('toggleNavigation')}">` +

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

@@ -10,7 +10,7 @@ async function scrollspy () {
     build = async () => {
       const { isString } = this.app.lib._
       const { generateId } = this.app.lib.aneka
-      const target = isString(this.params.attr.target) ? this.params.attr.target : generateId()
+      const target = isString(this.params.attr.target) ? this.params.attr.target : generateId('alpha')
       this.component.normalizeAttr(this.params, {
         tag: 'div',
         dataBsSpy: 'scroll',

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,10 @@
 # Changes
 
+## 2026-04-25
+
+- [2.8.0] Change options to format value using the new key set by dobo
+- [2.8.0] Use ```generateId('alpha')``` to make sure all generated id in widget doesn;t start with number
+
 ## 2026-04-18
 
 - [2.7.2] Bug fix in ```getInputAttr()``` of ```_lib.js```