waibu-db 2.16.1 → 2.16.3

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/waibuBootstrap/theme/component/wdb-base.js

@@ -1,50 +1,5 @@
 async function wdbBase () {
   return class WdbBase extends this.app.baseClass.MpaWidget {
-    constructor (options) {
-      super(options)
-      const { getModel } = this.app.dobo
-      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)
-    }
-
-    getRef = ({ field, refName, returning } = {}) => {
-      const { get } = this.app.lib._
-      if (!this.model) return {}
-      const prop = this.model.getProperty(field)
-      if (!prop) return {}
-      if (!refName && field.endsWith('Id')) refName = field.slice(0, -2)
-      const key = this.params.attr.refName ?? refName
-      const ref = get(prop, `ref.${key}`, {})
-      if (returning === 'all') return { ref, key }
-      else if (returning === 'key') return key
-      return ref
-    }
-
-    getRefValue = ({ field, data, labelField, refName } = {}) => {
-      const { get, isEmpty } = this.app.lib._
-      const { ref, key } = this.getRef({ field, refName, returning: 'all' })
-      if (isEmpty(ref)) return undefined
-      labelField = labelField ?? ref.labelField ?? 'id'
-      return (get(data ?? this.formData, `_ref.${key}.${labelField}`))
-    }
-
-    getRefName = (field) => {
-      const { get } = this.app.lib._
-      let refName = get(this.schema, `view.widget.${field}.attr.ref-name`, this.params.attr.refName)
-      if (!refName && this.params.attr[field] && this.params.attr[field].endsWith('Id')) refName = this.params.attr[field].slice(0, -2)
-      return refName
-    }
-
-    getSetting = (key, defValue) => {
-      const { get, camelCase } = this.app.lib._
-      const widgetName = camelCase(this.constructor.name)
-      key = key.replaceAll('{self}', widgetName)
-      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,59 +1,24 @@
 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'
-    attr.readonly = true
-    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)
 
   return class WdbForm extends WdbBase {
+    static async handleRo ({ attr = {}, prop = {} } = {}) {
+      return await this.component.buildTag({ tag: 'formPlaintext', attr, selfCosing: true, noEscape: true })
+    }
+
+    static async handleRw ({ attr = {}, prop = {}, widget = {} } = {}) {
+      const { get, has } = this.app.lib._
+      const { stringifyAttribs } = this.app.waibuMpa
+      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)} />`
+    }
+
     build = async () => {
       const { get, find, filter, forOwn, isEmpty } = this.app.lib._
       const { base64JsonEncode } = this.app.waibu
@@ -86,9 +51,9 @@ async function form () {
           }
           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))
+            body.push(await WdbForm.handleRo.call(this, { attr, prop, widget }))
           } else {
-            body.push(await handleRw.call(this, attr, prop, widget))
+            body.push(await WdbForm.handleRw.call(this, { attr, prop, widget }))
           }
         }
         body.push('</c:fieldset>')

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

@@ -4,8 +4,6 @@ async function table () {
   const WdbBase = await wdbBase.call(this)
 
   return class WdbTable extends WdbBase {
-    propValues = {}
-
     isRightAligned = (field, schema) => {
       const { get, find } = this.app.lib._
       const prop = find(schema.properties, { name: field })
@@ -22,11 +20,10 @@ async function table () {
     }
 
     build = async () => {
-      const { callHandler } = this.app.bajo
       const { req } = this.component
       const { escape, attrToArray } = this.app.waibu
       const { groupAttrs } = this.app.waibuMpa
-      const { get, omit, set, find, isEmpty, without, merge, camelCase } = this.app.lib._
+      const { get, omit, set, find, isEmpty, without, merge } = this.app.lib._
       const group = groupAttrs(this.params.attr, ['body', 'head', 'foot'])
       this.params.attr = group._
       const prettyUrl = this.params.attr.prettyUrl
@@ -35,11 +32,6 @@ async function table () {
       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)
-      // 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"/>'
         this.params.noTag = true
@@ -135,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}`)
@@ -152,21 +144,9 @@ async function table () {
           if (formatCell) merge(attr, await formatCell.call(this, value, d, { params: this.params, req }))
           const noWrap = this.isNoWrap(f, schema, group.body.nowrap) ? 'nowrap' : ''
           if (this.isRightAligned(f, schema)) attr.text = `align:end ${noWrap}`
-          else attr.text = noWrap
-          const lookup = get(schema, `view.lookup.${f}`)
-          if (lookup) {
-            const item = find(lookup.values, set({}, lookup.id ?? 'id', dataValue))
-            if (item) value = req.t(item[lookup.field ?? 'name'])
-          }
+          else attr.text = `${noWrap}`
           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

@@ -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/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,18 @@
 # Changes
 
+## 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
+- [2.16.2] Bug fix in ```WdbForm``` widget
+- [2.16.2] Remove reduncat codes in ```WdbBase``` widget
+
 ## 2026-04-16
 
 - [2.16.1] Bug fix in ```WdbBtnExport``` widget