waibu-db 2.19.0 → 2.20.1

package/extend/waibuBootstrap/theme/component/widget/btn-columns.js

@@ -5,11 +5,12 @@ async function btnColumns () {
 
   return class WdbBtnColumns extends WdbBase {
     build = async () => {
-      const { find, get, isEmpty, without } = this.app.lib._
+      const { find, get, isEmpty, without, intersection } = this.app.lib._
       const { jsonStringify } = this.app.waibuMpa
       const { req } = this.component
       const qsKey = this.app.waibu.config.qsKey
       const schema = get(this, 'component.locals.schema', {})
+      const data = get(this, 'component.locals.list.data', [])
       const count = get(this, 'component.locals.list.count', 0)
       if (count === 0) this.params.attr.triggerDisabled = true
       if (schema.view.disabled.includes('find')) {
@@ -18,12 +19,13 @@ async function btnColumns () {
       }
       let fields = without(get(this, `component.locals._meta.query.${qsKey.fields}`, '').split(','), '')
       if (isEmpty(fields)) fields = without(schema.view.fields, 'id')
+      const allFields = data.length > 0 ? intersection(schema.view.fields, Object.keys(data[0])) : []
       const items = []
       this.params.attr.color = this.params.attr.color ?? 'secondary-outline'
       if (isEmpty(this.params.attr.content)) this.params.attr.content = req.t('columns')
       for (const f of schema.view.fields) {
-        let prop = find(schema.properties, { name: f })
-        if (!prop) prop = find(schema.view.calcFields, { name: f })
+        if (allFields.length > 0 && !allFields.includes(f)) continue
+        const prop = find(schema.properties, { name: f })
         if (!prop) continue
         const attr = { 'x-model': 'selected', label: req.t(get(schema, `view.label.${f}`, `field.${f}`)), value: f, labelText: 'nowrap' }
         if (fields.includes(f)) attr.checked = true

package/extend/waibuBootstrap/theme/component/widget/data-table.js

@@ -24,7 +24,8 @@ async function table () {
       const { escape, attrToArray } = this.app.waibu
       const { groupAttrs } = this.app.waibuMpa
       const { isHtmlLink } = this.app.bajoExtra
-      const { get, omit, set, find, isEmpty, without, merge } = this.app.lib._
+      const { getTruncated } = this.app.bajoTemplate
+      const { get, omit, set, find, isEmpty, without, merge, intersection } = this.app.lib._
       const { isSet } = this.app.lib.aneka
       const group = groupAttrs(this.params.attr, ['body', 'head', 'foot'])
       this.params.attr = group._
@@ -48,6 +49,9 @@ async function table () {
       const qsKey = this.app.waibu.config.qsKey
       let fields = without(get(this, `component.locals._meta.query.${qsKey.fields}`, '').split(','), '')
       if (isEmpty(fields)) fields = without(schema.view.fields, 'id')
+      if (data.length > 0) {
+        fields = intersection(fields, Object.keys(data[0]))
+      }
       let sort = this.params.attr.sort ? attrToArray(this.params.attr.sort) : get(this, `component.locals._meta.query.${qsKey.sort}`, '')
       if (isEmpty(sort) && filter.sort) {
         const keys = Object.keys(filter.sort)
@@ -140,8 +144,10 @@ async function table () {
           const noWrap = this.isNoWrap(f, schema, group.body.nowrap) ? 'nowrap' : ''
           if (this.isRightAligned(f, schema)) attr.text = `align:end ${noWrap}`
           else attr.text = `${noWrap}`
+          if (d._immutable) attr.text += ' color:body-tertiary'
           const format = get(schema, `view.format.${f}`)
           if (format) value = await format.call(this, value, d, { params: this.params, req })
+          if (['object', 'array'].includes(prop.type) && !isHtmlLink(value)) value = getTruncated(value, 20) // TODO: should be handle by css instead
           if (!get(schema, 'view.noEscape', []).includes(f) && !isHtmlLink(value)) value = escape(value)
           const line = await this.component.buildTag({ tag: 'td', attr, html: value })
           lines.push(line)

package/extend/waibuBootstrap/theme/component/widget/form.js

@@ -4,8 +4,8 @@ async function form () {
   const WdbBase = await wdbBase.call(this)
 
   return class WdbForm extends WdbBase {
-    static async handleRo ({ attr = {}, prop = {} } = {}) {
-      return await this.component.buildTag({ tag: 'formPlaintext', attr, selfCosing: true, noEscape: true })
+    static async handleRo ({ attr = {}, prop = {}, widget = {} } = {}) {
+      return await this.component.buildTag({ tag: 'formPlaintext', attr, selfCosing: true, noEscape: true }, { prop, widget })
     }
 
     static async handleRw ({ attr = {}, prop = {}, widget = {} } = {}) {
@@ -44,6 +44,7 @@ async function form () {
             if (v === true) attr[k] = true
             else attr[k] = v
           })
+          if (['array', 'object'].includes(prop.type)) attr.col = '12-md'
           attr.label = this.component.req.t(attr.label)
           const xon = filter(xOns, { field: widget.name })
           for (const o of xon) {

package/extend/waibuBootstrap/theme/component/widget/lookup-select.js

@@ -21,7 +21,7 @@ async function lookupSelect () {
       }
 
       this.params.attr.url = this.params.attr.url ?? `waibuDb.restapi:/lookup/${kebabCase(ref.model)}`
-      const keys = ['url', 'searchField', 'labelField', 'valueField']
+      const keys = ['url', 'searchField', 'labelField', 'valueField', 'allowCreate']
       const attr = omit(this.params.attr, keys)
       for (const k of keys) {
         attr[camelCase(`remote ${k}`)] = this.params.attr[k] ?? ref[k] ?? ref.field

package/index.js

@@ -129,9 +129,14 @@ async function factory (pkgName) {
         menu.push({
           title: req.t(k),
           children: map(items, item => {
+            const params = {
+              model: kebabCase(item.name),
+              action: 'list'
+            }
             return {
               title: camelCase(item.name.slice(plugin.alias.length)),
-              href: `waibuAdmin:/${prefix}/${kebabCase(item.name)}/list`
+              href: `waibuAdmin:/${prefix}/:model/:action`,
+              params
             }
           })
         })

package/lib/method/get-schema-ext.js

@@ -37,6 +37,7 @@ function getCommons (action, schema, ext, options = {}) {
   if (schema.disabled.length > 0) schema.view.disabled.push(...schema.disabled)
   let fields = []
   for (const f of forFields) {
+    if (['_immutable'].includes(f)) continue
     if (allFields.includes(f)) fields.push(f)
   }
   fields = uniq(without(fields, ...hidden))
@@ -95,10 +96,11 @@ function applyLayout (action, schema, ext) {
     const prop = find(schema.properties, { name: f })
     if (!prop) continue
     const result = schema.view.widget[f] ?? {}
+    const orgCmp = result.component
     result.name = result.name ?? f
     result.attr = defaultsDeep(result.attr, { col: '4-md', label: `field.${f}` })
     const orgCol = result.attr.col
-    if (!prop.ref && ['array', 'object', 'text'].includes(prop.type)) {
+    if (!prop.ref && ['object', 'text'].includes(prop.type)) {
       result.attr.col = '12'
       result.component = 'form-textarea'
       result.attr.rows = '3'
@@ -107,26 +109,28 @@ function applyLayout (action, schema, ext) {
       result.component = 'form-plaintext'
       result.attr.col = orgCol
     } else {
+      if (prop.type === 'array') {
+        result.component = 'form-select-ext'
+        result.attr.multiple = true
+        result.attr.allowCreate = true
+      }
+      if (prop.type === 'boolean') {
+        result.component = orgCmp ?? 'form-select'
+        result.attr.options = 'false:no;true:yes'
+      }
       if (prop.ref) {
-        result.component = result.component ?? 'wdb-lookup-select'
+        result.component = orgCmp ?? 'wdb-lookup-select'
         if (prop.type === 'array') {
           result.attr.multiple = true
-          result.attr.removeBtn = true
         }
       }
-      if (prop.type === 'boolean') {
-        result.component = result.component ?? 'form-select'
-        result.attr.options = 'false:no;true:yes'
-      }
       if (prop.values) {
-        const orgCmp = result.component
         result.component = orgCmp ?? 'form-select'
         if (prop.type === 'array') {
           result.component = 'form-select-ext'
           result.attr.multiple = true
-          result.attr.col = orgCol
           result.attr.removeBtn = true
-          delete result.attr.rows
+          delete result.attr.allowCreate
         }
         if (typeof prop.values === 'string') result.attr.options = prop.values
         else result.attr.options = prop.values.map(item => `${item.value}:${item.text}`).join(';')

package/lib/util.js

@@ -78,7 +78,7 @@ export async function processHandler ({ action, model, handler, options } = {})
   }
 
   try {
-    if (options.trx === true) return await model.transaction(handler)
+    if (options.trx === true) return await model.transaction(handler, action, options)
     return await handler()
   } catch (err) {
     if (options.suppressError.includes(action)) return suppressedReturn.call(this, err)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waibu-db",
-  "version": "2.19.0",
+  "version": "2.20.1",
   "description": "DB Helper",
   "main": "index.js",
   "scripts": {

package/wiki/CHANGES.md

@@ -1,5 +1,18 @@
 # Changes
 
+## 2026-05-22
+
+- [2.20.1] Bug fix in admin menu
+- [2.20.1] Bug fix in ```wdb-btn-columns``` widget
+- [2.20.1] Bug fix in ```wdb-data-table``` widget
+- [2.20.1] Bug fix in ```wdb-form``` widget
+
+## 2026-05-16
+
+- [2.20.0] Change to ```wdb-data-table``` widget to handle immutable rows
+- [2.20.0] Change to ```wdb-lookup-select``` widget to allow new value creation
+- [2.20.0] Change to ```getSchemaExt()``` to allow auto widget creation
+
 ## 2026-05-11
 
 - [2.19.0] Updates to match ```dobo@2.23.0``` specs