waibu-db 2.20.0 → 2.21.0

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/btn-delete.js

@@ -46,9 +46,7 @@ async function btnDelete () {
         await wbs.confirmation(\`${req.t(msg)}\`, {
           ok: '${this.params.attr.id}:remove',
           close: 'y',
-          opts: selected,
-          theme: '${get(this, 'component.theme.name', 'default')}',
-          iconset: '${get(this, 'component.iconset.name', 'default')}'
+          opts: selected
         })
       `
       this.params.html = await this.component.buildTag({ tag: 'btn', attr: this.params.attr, html: this.params.html })

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)
@@ -143,6 +147,7 @@ async function table () {
           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/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/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,16 @@
 # Changes
 
+## 2026-05-25
+
+- [2.21.0] Auto detect theme & iconset
+
+## 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