waibu-db 2.12.6 → 2.13.0

package/extend/bajoTemplate/partial/crud/_list-warnings.html

@@ -0,0 +1,10 @@
+<% if ((list.warnings ?? []).length > 0) { %>
+<c:div padding="all-3">
+  <c:div><%= _t('warning') %>:</c:div>
+  <c:ul>
+    <% list.warnings.forEach(warning => { %>
+      <c:li><%= warning %></c:li>
+    <% }) %>
+  </c:ul>
+</c:div>
+<% } %>

package/extend/bajoTemplate/partial/crud/list-handler.html

@@ -1,4 +1,5 @@
 <!-- include waibuDb.partial:/crud/_list-btns.html -->
 <c:wdb-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/_addons.html -->
+<!-- include waibuDb.partial:/crud/_list-warnings.html -->

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

@@ -33,7 +33,7 @@ async function form () {
             attr.push(`@${o.bind}="${o.handler}"`)
           }
           if (w.componentOpts) attr.push(`c-opts="${base64JsonEncode(w.componentOpts)}"`)
-          if (schema.view.valueFormatter[f] && this.params.attr.method !== 'POST') {
+          if (schema.view.valueFormatter[f] && (w.component === 'form-plaintext' || this.params.attr.method !== 'POST')) {
             const value = await schema.view.valueFormatter[f].call(this, data[f], data, { req })
             body.push(`<c:${w.component} ${w.attr.label ? ('t:label="' + w.attr.label + '"') : ''} value="${value}" label-floating name="${w.name}" ${attr.join(' ')} />`)
           } else {

package/lib/crud/add-handler.js

@@ -6,7 +6,8 @@ async function addHandler ({ req, reply, model, params = {}, template, addOnsHan
   const { pick, map, merge, omit } = this.app.lib._
   const opts = merge({}, options.modelOpts)
   model = pascalCase(model ?? req.params.model)
-  const { schema } = await getSchemaExt(model, 'add', merge({ args: [req] }, { params }, options))
+  const mdl = this.app.dobo.getModel(model)
+  const { schema } = await getSchemaExt(model, 'add', merge({ args: [{ req, model: mdl }] }, { params }, options))
   if (schema.disabled.includes('create')) return await reply.view(templateDisabled, { action: 'add' })
   // req.query.attachment = true
   opts.fields = schema.view.fields

package/lib/crud/delete-handler.js

@@ -5,7 +5,8 @@ async function deleteHandler ({ req, reply, model, params = {}, templateDisabled
   const { reduce, merge } = this.app.lib._
   const opts = merge({}, options.modelOpts)
   model = pascalCase(model ?? req.params.model)
-  const { schema } = await getSchemaExt(model, 'delete', merge({ args: [req] }, { params }, options))
+  const mdl = this.app.dobo.getModel(model)
+  const { schema } = await getSchemaExt(model, 'delete', merge({ args: [{ req, model: mdl }] }, { params }, options))
   if (schema.disabled.includes('remove')) return await reply.view(templateDisabled, { action: 'delete' })
   opts.fields = schema.view.fields
   delete req.query.query

package/lib/crud/details-handler.js

@@ -6,7 +6,8 @@ async function detailsHandler ({ req, reply, model, params = {}, id, template, a
   const { merge, isEmpty } = this.app.lib._
   const opts = merge({ refs: '*' }, options.modelOpts)
   model = pascalCase(model ?? req.params.model)
-  const { schema } = await getSchemaExt(model, 'details', merge({ args: [req] }, { params }, options))
+  const mdl = this.app.dobo.getModel(model)
+  const { schema } = await getSchemaExt(model, 'details', merge({ args: [{ req, model: mdl }] }, { params }, options))
   if (schema.disabled.includes('get')) return await reply.view(templateDisabled, { action: 'details' })
   // req.query.attachment = true
   opts.fields = schema.view.fields

package/lib/crud/edit-handler.js

@@ -13,7 +13,8 @@ async function editHandler ({ req, reply, model, id, params = {}, template, addO
   let resp
   let form
   model = pascalCase(model ?? req.params.model)
-  const { schema } = await getSchemaExt(model, 'edit', merge({ args: [req] }, { params }, options))
+  const mdl = this.app.dobo.getModel(model)
+  const { schema } = await getSchemaExt(model, 'edit', merge({ args: [{ req, model: mdl }] }, { params }, options))
   if (schema.disabled.includes('update')) return await reply.view(templateDisabled, { action: 'edit' })
   // req.query.attachment = true
   opts.fields = schema.view.fields

package/lib/crud/export-handler.js

@@ -9,7 +9,8 @@ async function exportHandler ({ req, reply, model, params = {}, templateDisabled
   const { buildUrl } = this.app.waibuMpa
   const { pushDownload } = getPlugin('sumba')
   model = pascalCase(model ?? req.params.model)
-  const { schema } = await getSchemaExt(model, 'add', merge({ args: [req] }, { params }, options))
+  const mdl = this.app.dobo.getModel(model)
+  const { schema } = await getSchemaExt(model, 'add', merge({ args: [{ req, model: mdl }] }, { params }, options))
   if (schema.disabled.includes('find')) return await reply.view(templateDisabled, { action: 'list' })
   const data = await prepCrud.call(getPlugin('waibuDb'), { model, req, reply, args: ['model'] })
   data.opts = omit(data.opts, ['req', 'reply'])

package/lib/crud/list-handler.js

@@ -6,7 +6,8 @@ async function listHandler ({ req, reply, model, template, params = {}, addOnsHa
 
   const opts = merge({}, { count: true, refs: '*' }, options.modelOpts)
   model = pascalCase(model ?? req.params.model)
-  const { schema } = await getSchemaExt(model, 'list', merge({ args: [req] }, { params }, options))
+  const mdl = this.app.dobo.getModel(model)
+  const { schema } = await getSchemaExt(model, 'list', merge({ args: [{ req, model: mdl }] }, { params }, options))
   if (schema.disabled.includes('find')) return await reply.view(templateDisabled, { action: 'list' })
   for (const key of ['sort', 'limit', 'fields']) {
     const sessKey = `wdb${model}${upperFirst(key)}`

package/package.json

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

package/wiki/CHANGES.md

@@ -3,6 +3,9 @@
 ## 2026-04-02
 
 - [2.12.6] Bug fix in ```wdb-query``` widget
+- [2.13.0] Add warnings template
+- [2.13.0] Changes in all crud handlers, now the first parameter is an object of ```req``` and ```model```
+- [2.13.0] Bug fix in ```wdb-form``` widget
 
 ## 2026-04-01