waibu-db 2.18.4 → 2.20.0

package/extend/bajoTemplate/partial/crud/_details-attachment.html

@@ -1,4 +1,4 @@
-<% if (schema && schema.attachment) { %>
+<% if (schema && schema.options.attachment) { %>
 <c:fieldset <%= schema.view.card === false ? '' : 'card' %> t:legend="attachment" grid-gutter="3">
   <!-- include waibuDb.partial:/crud/_list-attachment.html|<%= JSON.stringify({ readonly: true }) %> -->
 </c:fieldset>

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

@@ -51,7 +51,7 @@ async function btnExport () {
             let item = {}
             const els = document.querySelectorAll(selector + ' [data-value]')
             for (const el of els) {
-              const value = this.options.includes('fvalue') ? el.getAttribute('value') : wmpa.parseValue(el.dataset.value, el.dataset.type)
+              const value = this.options.includes('fvalue') ? el.innerText : wmpa.parseValue(el.dataset.value, el.dataset.type)
               let key = el.getAttribute('name')
               if (this.options.includes('fkey')) {
                 try {

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

@@ -25,6 +25,7 @@ async function table () {
       const { groupAttrs } = this.app.waibuMpa
       const { isHtmlLink } = this.app.bajoExtra
       const { get, omit, set, find, isEmpty, without, merge } = this.app.lib._
+      const { isSet } = this.app.lib.aneka
       const group = groupAttrs(this.params.attr, ['body', 'head', 'foot'])
       this.params.attr = group._
       const prettyUrl = this.params.attr.prettyUrl
@@ -56,13 +57,15 @@ async function table () {
       let [sortCol, sortDir] = sort.split(':')
       if (!['-1', '1'].includes(sortDir)) sortDir = '1'
 
-      let selection
-      const canDelete = !disableds.includes('remove')
-      const canEdit = !disableds.includes('update')
-      const canDetails = !disableds.includes('get')
-      if (canEdit || canDetails) selection = 'single'
-      if (canDelete) selection = 'multi'
-      if (selection) this.params.attr.hover = true
+      let selection = this.params.attr.selection
+      if (!isSet(selection)) {
+        const canDelete = !disableds.includes('remove')
+        const canEdit = !disableds.includes('update')
+        const canDetails = !disableds.includes('get')
+        if (canEdit || canDetails) selection = 'single'
+        if (canDelete) selection = 'multi'
+        if (selection) this.params.attr.hover = true
+      } else if (!['single', 'multi'].includes(selection)) selection = false
 
       this.params.noTag = true
       const html = []
@@ -129,8 +132,7 @@ async function table () {
           let dataValue = d[f]
           if (['datetime'].includes(prop.type) && dataValue instanceof Date && !isNaN(dataValue)) dataValue = escape(dataValue.toISOString())
           else if (['string', 'text', 'array', 'object'].includes(prop.type)) dataValue = escape(dataValue)
-          const refName = get(schema, `view.widget.${f}.attr.refName`)
-          let value = this.getRefValue({ field: f, data: d, refName }) ?? get(d, `_fmt.${f}`, d[f])
+          let value = this.getRefValue({ field: f, data: d, refName: this.getRefName(f) }) ?? get(d, `_fmt.${f}`, d[f])
           const attr = { dataValue, dataKey: prop.name, dataType: prop.type }
           if (!disableds.includes('get')) attr.style = { cursor: 'pointer' }
           const formatCell = get(schema, `view.formatCell.${f}`)
@@ -138,6 +140,7 @@ 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 (!get(schema, 'view.noEscape', []).includes(f) && !isHtmlLink(value)) value = escape(value)

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

@@ -20,7 +20,7 @@ async function form () {
     }
 
     build = async () => {
-      const { get, find, filter, forOwn, isEmpty } = this.app.lib._
+      const { get, find, filter, forOwn, isEmpty, omit } = this.app.lib._
       const { base64JsonEncode } = this.app.waibu
       const body = []
       const xModels = get(this.schema, 'view.x.model', [])
@@ -40,7 +40,7 @@ async function form () {
             name: widget.name
           }
           if (xModels.includes(widget.name)) attr['x-model'] = widget.name
-          forOwn(widget.attr, (v, k) => {
+          forOwn(omit(widget.attr, ['url', 'refUrl', 'refName']), (v, k) => {
             if (v === true) attr[k] = true
             else attr[k] = v
           })

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/lib/crud/edit-handler.js

@@ -5,7 +5,7 @@ async function editHandler ({ req, reply, model, id, params = {}, template, addO
   const { updateRecord, getRecord, getSchemaExt } = this.app.waibuDb
   const { buildUrl } = this.app.waibuMpa
   const { defaultsDeep } = this.app.lib.aneka
-  const { merge, isEmpty, omit, cloneDeep, isArray, isPlainObject } = this.app.lib._
+  const { merge, isEmpty, omit, cloneDeep } = this.app.lib._
   const opts = merge({}, options.modelOpts)
   let error
   let resp
@@ -22,9 +22,6 @@ async function editHandler ({ req, reply, model, id, params = {}, template, addO
   if (isEmpty(old.data)) return await reply.view(notFoundTpl, params)
   opts._data = old
   const def = cloneDeep(old.data)
-  for (const k in def) {
-    if (isArray(def[k]) || isPlainObject(def[k])) def[k] = JSON.stringify(def[k])
-  }
   form = defaultsDeep({}, req.body, def)
   if (req.method !== 'GET') {
     form = omit(form, ['_action', '_value'])

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

@@ -19,7 +19,7 @@ function getCommons (action, schema, ext, options = {}) {
   const x = defaultsDeep(get(ext, `view.${action}.x`), get(ext, 'common.x', {}))
   const aggregate = get(ext, `view.${action}.stat.aggregate`, get(ext, 'common.stat.aggregate', []))
   let attachment = get(ext, `view.${action}.attachment`, get(ext, 'common.attachment', schema.attachment))
-  if (!schema.attachment || action === 'list') attachment = false
+  if (!schema.options.attachment || action === 'list') attachment = false
   hidden.push('siteId', ...schema.hidden, ...(options.hidden ?? []))
   hidden = uniq(hidden)
   pull(hidden, ...forceVisible)
@@ -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,26 +96,42 @@ 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}` })
-    if (['array', 'object', 'text'].includes(prop.type)) {
+    const orgCol = result.attr.col
+    if (!prop.ref && ['object', 'text'].includes(prop.type)) {
       result.attr.col = '12'
       result.component = 'form-textarea'
       result.attr.rows = '3'
     }
     if (action === 'details') {
       result.component = 'form-plaintext'
+      result.attr.col = orgCol
     } else {
-      if (prop.ref) {
-        result.component = result.component ?? 'wdb-lookup-select'
+      if (prop.type === 'array') {
+        result.component = 'form-select-ext'
+        result.attr.multiple = true
+        result.attr.allowCreate = true
       }
       if (prop.type === 'boolean') {
-        result.component = result.component ?? 'form-select'
+        result.component = orgCmp ?? 'form-select'
         result.attr.options = 'false:no;true:yes'
       }
+      if (prop.ref) {
+        result.component = orgCmp ?? 'wdb-lookup-select'
+        if (prop.type === 'array') {
+          result.attr.multiple = true
+        }
+      }
       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.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(';')
         if (result.attr.options.split(';').length > 8 && !orgCmp) result.component = 'form-select-ext'
@@ -181,8 +198,9 @@ async function getSchemaExt (modelName, view, options = {}) {
 
   const model = isString(modelName) ? this.app.dobo.getModel(modelName) : modelName
   const ns = model.plugin.ns
-  const schema = pick(model, ['name', 'properties', 'indexes', 'disabled', 'attachment', 'sortables', 'scanables', 'view', 'hidden', 'attachment'])
-  const base = options.base ?? path.basename(model.file, path.extname(model.file))
+  const schema = pick(model, ['name', 'properties', 'indexes', 'disabled', 'sortables', 'scanables', 'view', 'hidden', 'options'])
+  schema.ns = ns
+  const base = options.base ?? path.basename(model.options.file, path.extname(model.options.file))
   const parserOpts = { args: options.args }
   let ext = await readConfig(`${ns}:/extend/waibuDb/schema/${base}.*`, { ns, baseNs: 'waibuDb', parserOpts })
   ext = defaultsDeep(options.schema ?? {}, ext)

package/lib/util.js

@@ -11,6 +11,7 @@ export async function prepCrud ({ model, id, req, reply, transaction, options =
 
   const cfgWeb = this.app.waibu.getConfig()
   const opts = cloneDeep(omit(options, ['trx']))
+  opts.throwNotFound = true
   if (opts.suppressError === true) opts.suppressError = actions
   else if (isString(opts.suppressError)) opts.suppressError = [opts.suppressError]
   else opts.suppressError = opts.suppressError ?? []
@@ -77,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.18.4",
+  "version": "2.20.0",
   "description": "DB Helper",
   "main": "index.js",
   "scripts": {

package/wiki/CHANGES.md

@@ -1,5 +1,16 @@
 # Changes
 
+## 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
+- [2.19.0] Bug fix in ```wdb-btn-export``` widget
+
 ## 2026-05-03
 
 - [2.18.3] Bug fix in ```wdb-data-table``` widget