waibu-db 2.22.0 → 2.23.0

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

@@ -20,7 +20,7 @@ async function table () {
     }
 
     build = async () => {
-      const { req } = this.component
+      const { req, buildTag, buildSentence, buildUrl, locals = {} } = this.component
       const { escape, attrToArray } = this.app.waibu
       const { groupAttrs } = this.app.waibuMpa
       const { isHtmlLink } = this.app.bajoExtra
@@ -31,14 +31,14 @@ async function table () {
       this.params.attr = group._
       const prettyUrl = this.params.attr.prettyUrl
 
-      const schema = get(this, 'component.locals.schema', {})
-      const data = get(this, 'component.locals.list.data', [])
-      const filter = get(this, 'component.locals.list.filter', {})
-      const count = get(this, 'component.locals.list.count', 0)
+      const schema = get(locals, 'schema', {})
+      const data = get(locals, 'list.data', [])
+      const filter = get(locals, 'list.filter', {})
+      const count = get(locals, 'list.count', 0)
       if (count === 0 || data.length === 0) {
         const alert = '<c:alert color="warning" t:content="noRecordFound" margin="top-4"/>'
         this.params.noTag = true
-        this.params.html = await this.component.buildSentence(alert)
+        this.params.html = await buildSentence(alert)
         return
       }
       const disableds = get(schema, 'view.disabled', [])
@@ -47,12 +47,12 @@ async function table () {
         return
       }
       const qsKey = this.app.waibu.config.qsKey
-      let fields = without(get(this, `component.locals._meta.query.${qsKey.fields}`, '').split(','), '')
+      let fields = without(get(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}`, '')
+      let sort = this.params.attr.sort ? attrToArray(this.params.attr.sort) : get(locals, `_meta.query.${qsKey.sort}`, '')
       if (isEmpty(sort) && filter.sort) {
         const keys = Object.keys(filter.sort)
         if (keys.length > 0) sort = `${keys[0]}:${filter.sort[keys[0]]}`
@@ -89,34 +89,34 @@ async function table () {
             icon = sortDir === '1' ? (this.params.attr.sortUpIcon ?? 'caretUp') : (this.params.attr.sortDownIcon ?? 'caretDown')
           }
           const item = set({ page: 1 }, qsKey.sort, sortItem)
-          const href = this.component.buildUrl({ params: item })
+          const href = buildUrl({ params: item })
           const attr = this.isRightAligned(f, schema) ? { text: 'align:end' } : {}
           const content = [
-            await this.component.buildTag({ tag: 'div', attr, html: head }),
-            await this.component.buildTag({ tag: 'a', attr: { icon, href, noIconLink: true }, prepend: '<div class="ms-1">', append: '</div>' })
+            await buildTag({ tag: 'div', attr, html: head }),
+            await buildTag({ tag: 'a', attr: { icon, href, noIconLink: true }, prepend: '<div class="ms-1">', append: '</div>' })
           ]
-          head = await this.component.buildTag({ tag: 'div', attr: { flex: 'justify-content:between align-items:end' }, html: content.join('\n') })
+          head = await buildTag({ tag: 'div', attr: { flex: 'justify-content:between align-items:end' }, html: content.join('\n') })
         }
         let text = this.params.attr.headerNowrap ? '' : 'nowrap'
         if (text === '' && this.isNoWrap(f, schema, group.body.nowrap)) text = 'nowrap'
         if (this.isRightAligned(f, schema)) text += ' align:end'
         const attr = { dataKey: f, dataType: prop.type, text }
-        items.push(await this.component.buildTag({ tag: 'th', attr, html: head }))
+        items.push(await buildTag({ tag: 'th', attr, html: head }))
       }
       if (items.length > 0 && selection) {
         let item = '<th></th>'
         if (selection === 'multi') {
           const attr = { 'x-model': 'toggleAll', name: '_rtm', noWrapper: true, noLabel: true }
-          item = await this.component.buildTag({ tag: 'formCheck', attr, prepend: '<th>', append: '</th>' })
+          item = await buildTag({ tag: 'formCheck', attr, prepend: '<th>', append: '</th>' })
         } else {
           const attr = { name: 'remove', '@click': 'selected = \'\'' }
           if (!disableds.includes('get')) attr.style = { cursor: 'pointer' }
-          item = await this.component.buildTag({ tag: 'icon', attr, prepend: '<th>', append: '</th>' })
+          item = await buildTag({ tag: 'icon', attr, prepend: '<th>', append: '</th>' })
         }
         items.unshift(item)
       }
-      const header = await this.component.buildTag({ tag: 'tr', html: items.join('\n') })
-      html.push(await this.component.buildTag({ tag: 'thead', attr: group.head, html: header }))
+      const header = await buildTag({ tag: 'tr', html: items.join('\n') })
+      html.push(await buildTag({ tag: 'thead', attr: group.head, html: header }))
       // body
       items = []
       for (const idx in data) {
@@ -127,7 +127,7 @@ async function table () {
           const attr = { 'x-model': 'selected', name: '_rt', value: d.id, noLabel: true, noWrapper: true }
           const type = find(schema.properties, { name: 'id' }).type
           const prepend = `<td data-value="${d.id}" data-key="id" data-type="${type}">`
-          lines.push(await this.component.buildTag({ tag, attr, prepend, append: '</td>' }))
+          lines.push(await buildTag({ tag, attr, prepend, append: '</td>' }))
         }
         for (const f of schema.view.fields) {
           if (!fields.includes(f)) continue
@@ -148,23 +148,31 @@ async function table () {
           const format = get(schema, `view.format.${f}`)
           if (format) {
             const formatted = await format.call(this, value, d, { params: this.params, req })
-            value = isPlainObject(formatted) ? `<a href="${formatted.href}">${formatted.value}</a>` : formatted
+            if (isPlainObject(formatted) && formatted.href) {
+              const text = await buildTag({ tag: 'div', attr: {}, html: formatted.value })
+              const link = await buildTag({ tag: 'a', attr: { text: 'color:white', icon: 'link', href: formatted.href, noIconLink: true } })
+              const badge = await buildTag({ tag: 'badge', attr: { text: 'background:primary', rounded: 'type:pill' }, html: link, prepend: '<div class="ms-2">', append: '</div>' })
+              const line = await buildTag({ tag: 'div', attr: { flex: 'justify-content:between align-items:end' }, html: `${text}\n${badge}` })
+              lines.push(await buildTag({ tag: 'td', attr, html: line }))
+              continue
+            }
+            value = formatted
           }
           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 })
+          const line = await buildTag({ tag: 'td', attr, html: value })
           lines.push(line)
         }
         const attr = { id: `rec-${d.id}` }
         if (!disableds.includes('update') || !disableds.includes('remove') || !disableds.includes('get')) attr['@click'] = `toggle('${d.id}')`
         if (!disableds.includes('get')) attr['@dblclick'] = `goDetails('${d.id}')`
-        items.push(await this.component.buildTag({ tag: 'tr', attr, html: lines.join('\n') }))
+        items.push(await buildTag({ tag: 'tr', attr, html: lines.join('\n') }))
       }
-      html.push(await this.component.buildTag({ tag: 'tbody', attr: group.body, html: items.join('\n') }))
+      html.push(await buildTag({ tag: 'tbody', attr: group.body, html: items.join('\n') }))
       this.params.attr = omit(this.params.attr, ['sortUpIcon', 'sortDownIcon', 'noSort', 'selection', 'headerNowrap'])
       let xData = `
         goDetails (id) {
-          let url = '${this.params.attr.detailsHref ?? this.component.buildUrl({ base: 'details', prettyUrl })}'
+          let url = '${this.params.attr.detailsHref ?? buildUrl({ base: 'details', prettyUrl })}'
           if (url === '#') return
           if (url.indexOf('/:id') > -1) url = url.replace('/:id', '/' + id)
           else url += '&id=' + id
@@ -220,7 +228,7 @@ async function table () {
       this.params.attr['x-data'] = xData
       this.params.attr['x-init'] = xInit
       this.params.attr.responsive = true
-      this.params.html = await this.component.buildTag({ tag: 'table', attr: this.params.attr, html: html.join('\n') })
+      this.params.html = await buildTag({ tag: 'table', attr: this.params.attr, html: html.join('\n') })
     }
   }
 }

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

@@ -9,13 +9,14 @@ async function form () {
     }
 
     static async handleRw ({ attr = {}, prop = {}, widget = {} } = {}) {
-      const { get, has } = this.app.lib._
-      const { stringifyAttribs } = this.app.waibuMpa
+      const { get, has, camelCase } = this.app.lib._
+      // const { stringifyAttribs } = this.app.waibuMpa
       attr.dataType = prop.type
       if (has(attr, 'name') && !has(attr, 'value')) {
         attr.value = widget.component === 'form-plaintext' ? get(this, `oldData.${attr.name}`, attr.dataValue) : attr.dataValue
       }
-      return `<c:${widget.component} ${stringifyAttribs(attr)} />`
+      return await this.component.buildTag({ tag: camelCase(widget.component), attr, addons: widget.addons, selfCosing: true, noEscape: true }, { prop, widget })
+      // return `<c:${widget.component} ${stringifyAttribs(attr)} />`
     }
 
     build = async () => {

package/extend/waibuMpa/extend/waibuAdmin/route/@model/@action.js

@@ -3,10 +3,13 @@ const action = {
   title: 'Model Database',
   handler: async function (req, reply) {
     const { importModule } = this.app.bajo
+    const { pascalCase } = this.app.lib.aneka
     const handler = await importModule('waibuDb:/lib/crud/all-handler.js')
     const { model, action } = req.params
     const template = `waibuDb.template:/crud/${action}.html`
     const params = { page: { layout: `waibuAdmin.layout:/crud/${action === 'list' ? 'wide' : 'default'}.html` } }
+    const models = this.app.waibuDb.getAutoModels().map(m => m.name)
+    if (!models.includes(pascalCase(model))) throw this.error('_notFound')
     return handler.call(this, { model, req, reply, action, params, template })
   }
 }

package/extend/waibuMpa/extend/waibuAdmin/route/index.js

@@ -0,0 +1,11 @@
+async function index (req, reply) {
+  const { kebabCase } = this.app.lib._
+  const plugin = this.app.waibuDb
+  const models = plugin.getAutoModels().map(m => m.name)
+  const prefix = this.app.waibu.getPluginPrefix(plugin.ns)
+  const params = { model: kebabCase(models[0]), action: 'list' }
+  if (models.length > 0) return reply.redirectTo(`waibuAdmin:/${prefix}/:model/:action`, { params })
+  throw this.error('_notFound')
+}
+
+export default index

package/index.js

@@ -100,13 +100,9 @@ async function factory (pkgName) {
       }
     }
 
-    adminMenu = async (locals, req) => {
-      const { getPluginPrefix } = this.app.waibu
+    getAutoModels = () => {
+      const { filter, get, map, isArray } = this.app.lib._
       const { pascalCase } = this.app.lib.aneka
-      const { getPluginTitle } = this.app.waibuMpa
-      const { camelCase, map, groupBy, keys, kebabCase, filter, get, isArray } = this.app.lib._
-
-      const prefix = getPluginPrefix(this.ns)
       const allModels = this.app.dobo.models
       const models = filter(allModels, s => {
         const byModelFind = !s.disabled.includes('find')
@@ -117,6 +113,16 @@ async function factory (pkgName) {
         const byDbDisabled = !modelDisabled.includes(s.name)
         return byModelFind && byDbDisabled
       })
+      return models
+    }
+
+    adminMenu = async (locals, req) => {
+      const { getPluginPrefix } = this.app.waibu
+      const { getPluginTitle } = this.app.waibuMpa
+      const { camelCase, map, groupBy, keys, kebabCase } = this.app.lib._
+
+      const prefix = getPluginPrefix(this.ns)
+      const models = this.getAutoModels()
       const omenu = groupBy(map(models, s => {
         const item = { name: s.name, ns: s.plugin.ns }
         item.nsTitle = getPluginTitle(s.plugin.ns, req)

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

@@ -83,13 +83,15 @@ function customLayout ({ action, schema, ext, layout, readonly }) {
   }
 }
 
-function applyLayout (action, schema, ext) {
+async function applyLayout (action, schema, ext, options) {
   const { defaultsDeep } = this.app.lib.aneka
   const { set, get, isEmpty, find } = this.app.lib._
   const { fields, card } = getCommons.call(this, action, schema, ext)
   const layout = get(ext, `view.${action}.layout`, get(ext, 'common.layout', []))
   const readonly = get(ext, `view.${action}.readonly`, get(ext, 'common.readonly', defReadonly))
   const widget = {}
+  let { req, model } = (options.args ?? [])[0] ?? {}
+  if (!model) model = this.app.dobo.getModel(schema.name)
   for (const f of fields) {
     const prop = find(schema.properties, { name: f })
     if (!prop) continue
@@ -123,6 +125,7 @@ function applyLayout (action, schema, ext) {
         }
       }
       if (prop.values) {
+        const values = await model.buildPropValues(prop, { req })
         result.component = orgCmp ?? 'form-select'
         if (prop.type === 'array') {
           result.component = 'form-select-ext'
@@ -130,8 +133,7 @@ function applyLayout (action, schema, ext) {
           result.attr.removeBtn = true
           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(';')
+        result.attr.options = values.map(item => `${item.value}:${item.text}`).join(';')
         if (result.attr.options.split(';').length > 8 && !orgCmp) result.component = 'form-select-ext'
       }
       if (['string', 'text'].includes(prop.type) && prop.maxLength) set(result, 'attr.maxlength', prop.maxLength)
@@ -176,16 +178,16 @@ const handler = {
     set(schema, 'view.qs.fields', qsFields.join(','))
   },
   details: async function (schema, ext, options) {
-    applyLayout.call(this, 'details', schema, ext, options)
+    await applyLayout.call(this, 'details', schema, ext, options)
   },
   add: async function (schema, ext, options) {
-    applyLayout.call(this, 'add', schema, ext, options)
+    await applyLayout.call(this, 'add', schema, ext, options)
   },
   edit: async function (schema, ext, options) {
-    applyLayout.call(this, 'edit', schema, ext, options)
+    await applyLayout.call(this, 'edit', schema, ext, options)
   },
   delete: async function (schema, ext, options) {
-    applyLayout.call(this, 'delete', schema, ext, options)
+    await applyLayout.call(this, 'delete', schema, ext, options)
   }
 }
 

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,14 @@
 # Changes
 
+## 2026-06-03
+
+- [2.23.0] Add ```getAutoModels()```
+- [2.23.0] Display link in ```data-table``` widget as separate link inside a ```badge```
+- [2.23.0] Bug fix in ```form.js```
+- [2.23.0] Add folder redirection
+- [2.23.0] Bug fix in model route, now correctly works for allowed models only
+- [2.23.0] Bug fix in ```get-schema-ext.js```
+
 ## 2026-06-01
 
 - [2.21.3] Bug fix in ```wdb-form``` widget