waibu-db 2.15.0 → 2.16.0

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

@@ -1,29 +1,29 @@
 <c:grid-row gutter="2">
   <c:grid-col col="6-lg">
-    <% if (!_.get(schema, 'view.control.wdbBtnBack.disabled')) { %>
-    <c:wdb-btn-back href="<%= _.get(schema, 'view.control.wdbBtnBack.href', 'undefined') %>" />
+    <% if (!_getSetting('waibuDb:/control/wdbBtnBack/disabled')) { %>
+    <c:wdb-btn-back href="<%= _getSetting('waibuDb:/control/wdbBtnBack/href', 'undefined') %>" />
     <% } %>
     <% if (schema.disabled.includes('remove') && schema.disabled.includes('update')) { %>
-      <% if (!_.get(schema, 'view.control.wdbBtnExport.disabled')) { %>
+      <% if (!_getSetting('waibuDb:/control/wdbBtnExport/disabled')) { %>
       <c:wdb-btn-export selector="#main-form" handler="details" launch-margin="start-1" />
       <% } %>
     <% } else { %>
     <c:btn-group margin="start-1">
-      <% if (!_.get(schema, 'view.control.wdbBtnEdit.disabled')) { %>
-      <c:wdb-btn-edit href="<%= _.get(schema, 'view.control.wdbBtnEdit.href', 'undefined') %>" />
+      <% if (!_getSetting('waibuDb:/control/wdbBtnEdit/disabled')) { %>
+      <c:wdb-btn-edit href="<%= _getSetting('waibuDb:/control/wdbBtnEdit/href', 'undefined') %>" />
       <% } %>
-      <% if (!_.get(schema, 'view.control.wdbBtnClone.disabled')) { %>
-      <c:wdb-btn-clone href="<%= _.get(schema, 'view.control.wdbBtnClone.href', 'undefined') %>" />
+      <% if (!_getSetting('waibuDb:/control/wdbBtnClone/disabled')) { %>
+      <c:wdb-btn-clone href="<%= _getSetting('waibuDb:/control/wdbBtnClone/href', 'undefined') %>" />
       <% } %>
-      <% if (!_.get(schema, 'view.control.wdbBtnExport.disabled')) { %>
+      <% if (!_getSetting('waibuDb:/control/wdbBtnExport/disabled')) { %>
       <c:wdb-btn-export selector="#main-form" handler="details" launch-on-end no-save/>
       <% } %>
     </c:btn-group>
     <% } %>
   </c:grid-col>
   <c:grid-col col="6-lg" flex="justify-content:end-lg align-items:center">
-    <% if (!_.get(schema, 'view.control.wdbBtnDelete.disabled')) { %>
-    <c:wdb-btn-delete href="<%= _.get(schema, 'view.control.wdbBtnDelete.href', 'undefined') %>" />
+    <% if (!_getSetting('waibuDb:/control/wdbBtnDelete/disabled')) { %>
+    <c:wdb-btn-delete href="<%= _getSetting('waibuDb:/control/wdbBtnDelete/href', 'undefined') %>" />
     <% } %>
   </c:grid-col>
 </c:grid-row>

package/extend/bajoTemplate/partial/crud/_edit-btns.html

@@ -1,28 +1,28 @@
 <c:grid-row gutter="2">
   <c:grid-col col="6-lg">
-    <% if (!_.get(schema, 'view.control.wdbBtnBack.disabled')) { %>
-    <c:wdb-btn-back href="<%= _.get(schema, 'view.control.wdbBtnBack.href', 'undefined') %>"/>
+    <% if (!_getSetting('waibuDb:/control/wdbBtnBack/disabled')) { %>
+    <c:wdb-btn-back href="<%= _getSetting('waibuDb:/control/wdbBtnBack/href', 'undefined') %>"/>
     <% } %>
     <c:btn-group margin="start-1">
-      <% if (!_.get(schema, 'view.control.wdbBtnDetails.disabled')) { %>
-      <c:wdb-btn-details href="<%= _.get(schema, 'view.control.wdbBtnDetails.href', 'undefined') %>" />
+      <% if (!_getSetting('waibuDb:/control/wdbBtnDetails/disabled')) { %>
+      <c:wdb-btn-details href="<%= _getSetting('waibuDb:/control/wdbBtnDetails/href', 'undefined') %>" />
       <% } %>
-      <% if (!_.get(schema, 'view.control.wdbBtnClone.disabled')) { %>
-      <c:wdb-btn-clone href="<%= _.get(schema, 'view.control.wdbBtnClone.href', 'undefined') %>" />
+      <% if (!_getSetting('waibuDb:/control/wdbBtnClone/disabled')) { %>
+      <c:wdb-btn-clone href="<%= _getSetting('waibuDb:/control/wdbBtnClone/href', 'undefined') %>" />
       <% } %>
-      <% if (!_.get(schema, 'view.control.wdbBtnExport.disabled')) { %>
+      <% if (!_getSetting('waibuDb:/control/wdbBtnExport/disabled')) { %>
       <c:wdb-btn-export selector="#main-form" handler="edit" launch-on-end no-save />
       <% } %>
     </c:btn-group>
   </c:grid-col>
   <c:grid-col col="6-lg" flex="justify-content:end-lg align-items:center">
-    <% if (!_.get(schema, 'view.control.wdbBtnDelete.disabled')) { %>
-    <c:wdb-btn-delete href="<%= _.get(schema, 'view.control.wdbBtnDelete.href', 'undefined') %>"/>
+    <% if (!_getSetting('waibuDb:/control/wdbBtnDelete/disabled')) { %>
+    <c:wdb-btn-delete href="<%= _getSetting('waibuDb:/control/wdbBtnDelete/href', 'undefined') %>"/>
     <% } %>
-    <% if (!_.get(schema, 'view.control.wdbBtnReset.disabled')) { %>
+    <% if (!_getSetting('waibuDb:/control/wdbBtnReset/disabled')) { %>
     <c:btn type="reset" color="secondary" t:content="reset" margin="start-2"/>
     <% } %>
-    <% if (!_.get(schema, 'view.control.wdbBtnSubmit.disabled')) { %>
+    <% if (!_getSetting('waibuDb:/control/wdbBtnSubmit/disabled')) { %>
     <c:btn type="submit" color="primary" t:content="submit" margin="start-2"/>
     <% } %>
   </c:grid-col>

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

@@ -1,8 +1,8 @@
 <c:grid-row gutter="3">
-  <c:grid-col col="4-lg">
+  <c:grid-col col="5-lg">
     <c:wdb-query />
   </c:grid-col>
-  <c:grid-col col="8-lg" flex="justify-content:end-lg">
+  <c:grid-col col="7-lg" flex="justify-content:end-lg">
     <c:btn-group margin="end-2">
       <c:wdb-btn-add text="nowrap"/>
       <c:wdb-btn-details on-list text="nowrap"/>

package/extend/waibuBootstrap/theme/component/wdb-base.js

@@ -6,6 +6,7 @@ async function wdbBase () {
       const { get } = this.app.lib._
       this.schema = get(this, 'component.locals.schema', {})
       this.formData = get(this, 'component.locals.form', {})
+      this.oldData = get(this, 'component.locals.oldData', {})
       this.model = getModel(this.schema.name, true)
     }
 
@@ -37,13 +38,12 @@ async function wdbBase () {
       return refName
     }
 
-    getSetting = (key, defaultValue) => {
-      const { req } = this.component
+    getSetting = (key, defValue) => {
       const { get, camelCase } = this.app.lib._
       const widgetName = camelCase(this.constructor.name)
       key = key.replaceAll('{self}', widgetName)
-      const config = req.getSetting(`${this.plugin.ns}:${key}`, defaultValue)
-      return get(this.schema, `view.${key}`, config)
+      const cfg = this.app.waibu.getSetting(`${this.plugin.ns}:${key}`, { defValue, req: this.component.req })
+      return get(this.schema, `view.${key}`, cfg)
     }
   }
 }

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

@@ -1,5 +1,54 @@
 import wdbBase from '../wdb-base.js'
 
+async function handleRo (attr = {}, prop = {}, widget = {}) {
+  const { get, camelCase, isEmpty, isString } = this.app.lib._
+  const { callHandler } = this.app.bajo
+  const { escape } = this.app.waibu
+  const { req } = this.component
+  const dataValue = get(this.formData, `_orig.${prop.name}`, prop.dataValue ?? '')
+  let value = get(this.oldData, prop.name, get(this.formData, prop.name, prop.value ?? ''))
+  const format = get(this.schema, `view.format.${prop.name}`)
+  const formatValue = get(this.schema, `view.formatValue.${prop.name}`)
+  const labelField = get(this.schema, `view.widget.${prop.name}.attr.labelField`)
+  if (formatValue) value = await formatValue.call(this, value, this.formData, { req })
+  else if (prop.ref) {
+    value = this.getRefValue({ field: prop.name, labelField, refName: this.getRefName(prop.name) })
+    if (format && !isEmpty(value)) attr.href = await format.call(this, value, this.formData, { linkOnly: true })
+  } else if (prop.values) {
+    const values = isString(prop.values) ? (await callHandler(prop.values)) : prop.values
+    value = values.find(v => v.value === dataValue)
+    if (value) {
+      const key = camelCase(`${prop.name} ${value.text}`)
+      value = req.te(key) ? req.t(key) : value.text
+    }
+  } else if (format && !isEmpty(value)) value = await format.call(this, value, this.formData)
+  attr.dataValue = escape(dataValue)
+  attr.value = escape(value)
+  attr.dataType = prop.type
+
+  if (['object', 'array', 'text'].includes(prop.type)) {
+    attr.style = 'min-height: 100px'
+    return await this.component.buildTag({ tag: 'formTextarea', attr, html: value })
+  }
+  return await this.component.buildTag({ tag: 'formPlaintext', attr, selfCosing: true, noEscape: true })
+}
+
+async function handleRw (attr = {}, prop = {}, widget = {}) {
+  const { get, has, isPlainObject, isArray } = this.app.lib._
+  const { escape } = this.app.waibu
+  const { stringifyAttribs } = this.app.waibuMpa
+  if (has(attr, 'name') && !has(attr, 'value')) {
+    attr.dataType = attr.dataType ?? prop.type
+    attr.dataValue = get(this, `formData.${attr.name}`)
+    if (isPlainObject(attr.dataValue) || isArray(attr.dataValue)) attr.dataValue = JSON.stringify(attr.dataValue)
+    attr.dataValue = escape(attr.dataValue)
+    attr.value = widget.component === 'form-plaintext' ? get(this, `oldData.${attr.name}`, attr.dataValue) : attr.dataValue
+  }
+
+  const cmp = prop.ref ? 'wdb-lookup-select' : widget.component
+  return `<c:${cmp} ${stringifyAttribs(attr)} data-type="${prop.type}" />`
+}
+
 async function form () {
   const WdbBase = await wdbBase.call(this)
 
@@ -7,8 +56,6 @@ async function form () {
     build = async () => {
       const { get, find, filter, forOwn, isEmpty } = this.app.lib._
       const { base64JsonEncode } = this.app.waibu
-      const { req } = this.component
-      const data = get(this, 'component.locals.form', {})
       const body = []
       const xModels = get(this.schema, 'view.x.model', [])
       const xOns = get(this.schema, 'view.x.on', [])
@@ -17,36 +64,30 @@ async function form () {
         if (fields.length === 0) continue
         body.push(`<c:fieldset ${this.schema.view.card === false ? '' : 'card'} ${l.name[0] !== '_' ? ('t:legend="' + l.name + '"') : ''} grid-gutter="2">`)
         for (const f of fields) {
-          const w = this.schema.view.widget[f]
+          const widget = this.schema.view.widget[f]
           let prop = find(this.schema.properties, { name: f })
           if (!prop) prop = find(this.schema.view.calcFields, { name: f })
           if (!prop) continue
-          const attr = [`x-ref="${w.name}"`]
-          if (xModels.includes(w.name)) attr.push(`x-model="${w.name}"`)
-          forOwn(w.attr, (v, k) => {
-            if (v === true) attr.push(k)
-            else attr.push(`${k}="${v}"`)
+          const attr = {
+            'x-ref': widget.name,
+            labelFloating: true,
+            name: widget.name
+          }
+          if (xModels.includes(widget.name)) attr['x-model'] = widget.name
+          forOwn(widget.attr, (v, k) => {
+            if (v === true) attr[k] = true
+            else attr[k] = v
           })
-          const xon = filter(xOns, { field: w.name })
+          attr.label = this.component.req.t(attr.label)
+          const xon = filter(xOns, { field: widget.name })
           for (const o of xon) {
-            attr.push(`@${o.bind}="${o.handler}"`)
+            attr[`@${o.bind}`] = o.handler
           }
-          if (w.componentOpts) attr.push(`c-opts="${base64JsonEncode(w.componentOpts)}"`)
-          const attributes = `${w.attr.label ? ('t:label="' + w.attr.label + '"') : ''} label-floating name="${w.name}" ${attr.join(' ')}`
-          if (w.component === 'form-plaintext' || this.params.attr.method !== 'POST') {
-            let value
-            let link
-            if (this.schema.view.formatValue[f]) value = await this.schema.view.formatValue[f].call(this, data[f], data, { req })
-            else if (prop.ref) {
-              value = this.getRefValue({ field: f, labelField: w.attr.labelField, refName: this.getRefName(f) })
-              const format = get(this.schema, `view.format.${f}`)
-              if (format && !isEmpty(value)) link = await format.call(this.model, value, data, { linkOnly: true })
-            }
-            body.push(`<c:${w.component} ${attributes} data-type="${prop.type}" ${value ? `value="${value}"` : ''} ${link ? `href="${link}"` : ''} />`)
-          } else if (prop.ref) {
-            body.push(`<c:wdb-lookup-select ${attributes} />`)
+          if (widget.componentOpts) attr['c-opts'] = base64JsonEncode(widget.componentOpts)
+          if (widget.component === 'form-plaintext' || this.params.attr.method !== 'POST') {
+            body.push(await handleRo.call(this, attr, prop, widget))
           } else {
-            body.push(`<c:${w.component} ${attributes} data-type="${prop.type}" />`)
+            body.push(await handleRw.call(this, attr, prop, widget))
           }
         }
         body.push('</c:fieldset>')

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

@@ -63,7 +63,7 @@ async function query () {
       const container = this.params.attr.modal ? 'modal' : 'drawer'
       const scanables = (this.model ? this.model.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, { lastSeparator: 'or' })) : req.t('query')
+      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(`
         <c:form-input type="search" placeholder="${placeholder}" id="${id}" x-data="{ query: '' }" x-init="
           const url = new URL(window.location.href)

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

@@ -26,7 +26,7 @@ async function table () {
       const { req } = this.component
       const { escape, attrToArray } = this.app.waibu
       const { groupAttrs } = this.app.waibuMpa
-      const { get, omit, set, find, isEmpty, without, merge } = this.app.lib._
+      const { get, omit, set, find, isEmpty, without, merge, camelCase } = this.app.lib._
       const group = groupAttrs(this.params.attr, ['body', 'head', 'foot'])
       this.params.attr = group._
       const prettyUrl = this.params.attr.prettyUrl
@@ -38,6 +38,7 @@ async function table () {
       // collect prop.values for later use
       for (const prop of schema.properties) {
         if (typeof prop.values === 'string') this.propValues[prop.name] = await callHandler(prop.values)
+        else if (prop.values) this.propValues[prop.name] = prop.values
       }
       if (count === 0 || data.length === 0) {
         const alert = '<c:alert color="warning" t:content="noRecordFound" margin="top-4"/>'
@@ -156,11 +157,18 @@ async function table () {
           else attr.text = noWrap
           const lookup = get(schema, `view.lookup.${f}`)
           if (lookup) {
-            const item = find(lookup.values, set({}, lookup.id ?? 'id', d[f]))
+            const item = find(lookup.values, set({}, lookup.id ?? 'id', dataValue))
             if (item) value = req.t(item[lookup.field ?? 'name'])
           }
           const format = get(schema, `view.format.${f}`)
           if (format) value = await format.call(this, value, d, { params: this.params, req })
+          if (this.propValues[f]) {
+            const item = find(this.propValues[f], { value: dataValue })
+            if (item) {
+              const key = camelCase(`${f} ${item.text}`)
+              value = req.te(key) ? req.t(key) : item.text
+            }
+          }
           const line = await this.component.buildTag({ tag: 'td', attr, html: value })
           lines.push(line)
         }

package/lib/crud/add-handler.js

@@ -14,8 +14,8 @@ async function addHandler ({ req, reply, model, params = {}, template, addOnsHan
   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') } })
-    def = omit(resp.data, ['id', 'createdAt', 'updatedAt'])
+    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'])
   }
   let form = defaultsDeep(req.body, def)
   let error

package/lib/crud/edit-handler.js

@@ -7,7 +7,7 @@ async function editHandler ({ req, reply, model, id, params = {}, template, addO
   const { buildUrl } = this.app.waibuMpa
   const { fs } = this.app.lib
   const { defaultsDeep } = this.app.lib.aneka
-  const { merge, isEmpty, omit } = this.app.lib._
+  const { merge, isEmpty, omit, cloneDeep, isArray, isPlainObject } = this.app.lib._
   const opts = merge({}, options.modelOpts)
   let error
   let resp
@@ -22,7 +22,12 @@ async function editHandler ({ req, reply, model, id, params = {}, template, addO
   delete req.query.query
   const old = await getRecord({ model, req, id, options: opts })
   if (isEmpty(old.data)) return await reply.view(notFoundTpl, params)
-  form = defaultsDeep(req.body, old.data)
+  opts._data = old
+  const def = cloneDeep(old.data._orig)
+  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'])
     try {
@@ -49,7 +54,7 @@ async function editHandler ({ req, reply, model, id, params = {}, template, addO
   }
   const addOns = addOnsHandler ? await addOnsHandler.call(this.app[req.ns], { req, reply, params, data: resp, schema, error, options }) : undefined
   const attachments = await attachmentHandler.call(this, { schema, id, options })
-  merge(params, { form, schema, error, addOns, attachments })
+  merge(params, { oldData: old.data, form, schema, error, addOns, attachments })
   if (schema.template) template = schema.template
   if (schema.layout) params.page.layout = schema.layout
   return await reply.view(template, params)

package/lib/method/update-record.js

@@ -6,8 +6,10 @@ async function updateRecord ({ model, req, reply, id, body, options = {}, transa
 
   async function handler (trx) {
     if (opts.trx === true) opts.trx = trx
-    const resp = await getOneRecord.call(me, mdl, recId, filter, opts)
-    opts._data = resp.data
+    if (!opts._data) {
+      const resp = await getOneRecord.call(me, mdl, recId, filter, opts)
+      opts._data = resp.data
+    }
     const ret = await mdl.updateRecord(recId, input, opts)
     if (attachment) ret.data._attachment = await mdl.findAttachment(id, { stats, mimeType })
     return ret

package/lib/util.js

@@ -79,7 +79,8 @@ export async function processHandler ({ action, model, handler, options } = {})
   }
 
   try {
-    return options.trx === true ? (await model.transaction(handler)) : (await handler())
+    if (options.trx === true) return await model.transaction(handler)
+    return await handler()
   } catch (err) {
     if (options.suppressError.includes(action)) return suppressedReturn.call(this, err)
     throw err

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,12 @@
 # Changes
 
+## 2026-04-13
+
+- [2.16.0] Add ```oldData``` propety to ```WdbBase``` widget
+- [2.16.0] Change ```WdbBase.getSetting()``` to also respect setting from ```waibu.getSetting()```
+- [2.16.0] Rewrite ```WdbForm``` widget entirely
+- [2.16.0] Remove redundant call to get old record in ```updateRecord()```
+
 ## 2026-04-11
 
 - [2.15.0] Add ```control``` key in config object