waibu-db 2.16.2 → 2.17.0

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

@@ -1,3 +1,5 @@
+<% if (schema && schema.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/bajoTemplate/partial/crud/list-handler.html

@@ -1,5 +1,5 @@
 <!-- include waibuDb.partial:/crud/_list-btns.html -->
-<c:wdb-table id="main-table" border body-divider strip responsive margin="top-3"/>
+<c:wdb-data-table id="main-table" border body-divider strip responsive margin="top-3"/>
 <!-- include waibuDb.partial:/crud/_list-footer.html -->
 <!-- include waibuDb.partial:/crud/_addons.html -->
 <!-- include waibuDb.partial:/crud/_list-warnings.html -->

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

@@ -3,7 +3,7 @@ import wdbBase from '../wdb-base.js'
 async function table () {
   const WdbBase = await wdbBase.call(this)
 
-  return class WdbTable extends WdbBase {
+  return class WdbDataTable extends WdbBase {
     isRightAligned = (field, schema) => {
       const { get, find } = this.app.lib._
       const prop = find(schema.properties, { name: field })
@@ -127,9 +127,9 @@ async function table () {
           if (!prop) prop = find(schema.view.calcFields, { name: f })
           if (!prop) continue
           let dataValue = d._orig[f]
-          if (['datetime'].includes(prop.type)) dataValue = escape(dataValue.toISOString())
+          if (['datetime'].includes(prop.type) && dataValue) dataValue = escape(dataValue.toISOString())
           else if (['string', 'text'].includes(prop.type)) dataValue = escape(dataValue)
-          else if (['array', 'object'].includes(prop.type)) dataValue = escape(JSON.stringify(d[f]))
+          else if (['array', 'object'].includes(prop.type)) dataValue = escape(JSON.stringify(dataValue))
           const refName = get(schema, `view.widget.${f}.attr.refName`)
           let value = this.getRefValue({ field: f, data: d, refName }) ?? d[f]
           const formatValue = get(schema, `view.formatValue.${f}`)

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

@@ -11,11 +11,11 @@ async function form () {
     static async handleRw ({ attr = {}, prop = {}, widget = {} } = {}) {
       const { get, has } = this.app.lib._
       const { stringifyAttribs } = this.app.waibuMpa
-      if (has(attr, 'name') && !has(attr, 'value')) {
-        attr.value = widget.component === 'form-plaintext' ? get(this, `oldData.${attr.name}`, attr.dataValue) : attr.dataValue
-      }
       attr.dataType = prop.type
       const cmp = prop.ref ? 'wdb-lookup-select' : widget.component
+      if (has(attr, 'name') && !has(attr, 'value')) {
+        attr.value = cmp === 'form-plaintext' ? get(this, `oldData.${attr.name}`, attr.dataValue) : attr.dataValue
+      }
       return `<c:${cmp} ${stringifyAttribs(attr)} />`
     }
 

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

@@ -61,7 +61,7 @@ async function query () {
       }
       this.params.noTag = true
       const container = this.params.attr.modal ? 'modal' : 'drawer'
-      const scanables = (this.model ? this.model.scanables : []).map(item => req.t(`field.${item}`))
+      const scanables = (this.schema.scanables ?? []).map(item => req.t(`field.${item}`))
       let placeholder = this.params.attr.placeholder
       if (!placeholder) placeholder = scanables.length > 0 ? req.t('queryHint%s', join(scanables, { separator: ', ', lastSeparator: 'or' })) : req.t('query')
       this.params.html = await this.component.buildSentence(`
@@ -111,7 +111,6 @@ async function query () {
                       val = opv.slice(v.length).replaceAll('[', '').replaceAll('{', '').replaceAll(']', '').replaceAll('}', '').replaceAll('\\'', '')
                     }
                   })
-                  console.log(op, val)
                   if (_.isEmpty(op)) continue
                   this[f + 'Op'] = op
                   if (op === 'between') {

package/lib/crud/add-handler.js

@@ -13,11 +13,17 @@ async function addHandler ({ req, reply, model, params = {}, template, addOnsHan
   opts.fields = schema.view.fields
   delete req.query.query
   let def = {}
-  if (req.method === 'GET' && req.query.mode === 'clone' && req.query.id) {
-    const resp = await getRecord({ model, req, id: req.query.id, options: { fields: map(schema.properties, 'name'), ...opts } })
-    def = omit(resp.data._orig, ['id', 'createdAt', 'updatedAt'])
+  if (req.method === 'GET') {
+    const omitted = ['id', 'createdAt', 'updatedAt']
+    if (req.query.mode === 'clone' && req.query.id) {
+      const resp = await getRecord({ model, req, id: req.query.id, options: { fields: map(schema.properties, 'name'), ...opts } })
+      def = omit(resp.data._orig, omitted)
+    } else {
+      const picked = map(schema.properties, 'name')
+      def = omit(pick(req.query, picked), omitted)
+    }
   }
-  let form = defaultsDeep(req.body, def)
+  let form = defaultsDeep({}, req.body, def)
   let error
   let resp
   if (req.method === 'POST') {

package/lib/crud/edit-handler.js

@@ -27,7 +27,7 @@ async function editHandler ({ req, reply, model, id, params = {}, template, addO
   for (const k in def) {
     if (isArray(def[k]) || isPlainObject(def[k])) def[k] = JSON.stringify(def[k])
   }
-  form = defaultsDeep(req.body, def)
+  form = defaultsDeep({}, req.body, def)
   if (req.method !== 'GET') {
     form = omit(form, ['_action', '_value'])
     try {

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

@@ -181,13 +181,13 @@ async function getSchemaExt (modelName, view, options = {}) {
   const { pick, isString } = this.app.lib._
 
   const model = isString(modelName) ? this.app.dobo.getModel(modelName) : modelName
-  const schema = pick(model, ['name', 'properties', 'indexes', 'disabled', 'attachment', 'sortables', 'view', 'hidden'])
+  const schema = pick(model, ['name', 'properties', 'indexes', 'disabled', 'attachment', 'sortables', 'scanables', 'view', 'hidden'])
   const base = options.base ?? path.basename(model.file, path.extname(model.file))
   let ext = await readConfig(`${model.plugin.ns}:/extend/waibuDb/schema/${base}.*`, { ignoreError: true, options })
   const over = await readConfig(`main:/extend/waibuDb/extend/${model.plugin.ns}/schema/${base}.*`, { ignoreError: true, options })
   ext = defaultsDeep(options.schema ?? {}, over, ext)
   await handler[view].call(this, schema, ext, options)
-  return { schema, ext }
+  return { schema, ext, model }
 }
 
 export default getSchemaExt

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,17 @@
 # Changes
 
+## 2026-04-19
+
+- [2.12.0] Rename ```WdbTable``` to ```WdbDataTable``` widget
+- [2.12.0] ```getSchemaExt()``` now include export related model too
+
+## 2026-04-18
+
+- [2.16.3] Bug fix in ```WdbForm``` widget
+- [2.16.3] Bug fix in ```WdbTable``` widget
+- [2.16.3] Bug fix in ```add-handler.js``` module
+- [2.16.3] Bug fix in ```edit-handler.js``` module
+
 ## 2026-04-17
 
 - [2.16.2] Bug fix in ```WdbTable``` widget
@@ -53,7 +65,7 @@
 - [2.12.5] Bug fix in ```wdb-pagination``` widget
 - [2.12.5] Bug fix in ```wdb-query``` widget
 - [2.12.5] Bug fix in ```wdb-recs-info``` widget
-- [2.12.5] Bug fix in ```wdb-table``` widget
+- [2.12.5] Bug fix in ```wdb-data-table``` widget
 - [2.12.5] Bug fix in remove attachment
 
 ## 2026-03-30
@@ -64,7 +76,7 @@
 ## 2026-03-27
 
 - [2.12.1] Bug fix in all ```view.format``` & ```view.formatValue```
-- [2.12.2] Bug fix in ```wdb-form``` & ```wdb-table``` widgets, now correctly use value from format if provided
+- [2.12.2] Bug fix in ```wdb-form``` & ```wdb-data-table``` widgets, now correctly use value from format if provided
 
 ## 2026-03-26
 
@@ -89,7 +101,7 @@
 
 - [2.9.0] Add ability to overwrite ```base``` through ```options```
 - [2.9.0] Bug fix in ```wdb-btn-columns``` widget
-- [2.9.0] Bug fix in ```wdb-table``` widget
+- [2.9.0] Bug fix in ```wdb-data-table``` widget
 
 ## 2026-03-08