waibu-db 2.18.1 → 2.18.3

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

@@ -23,6 +23,7 @@ async function table () {
       const { req } = this.component
       const { escape, attrToArray } = this.app.waibu
       const { groupAttrs } = this.app.waibuMpa
+      const { isHtmlLink } = this.app.bajoExtra
       const { get, omit, set, find, isEmpty, without, merge } = this.app.lib._
       const group = groupAttrs(this.params.attr, ['body', 'head', 'foot'])
       this.params.attr = group._
@@ -131,7 +132,6 @@ async function table () {
           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 }) ?? get(d, `_fmt.${f}`, d[f])
-          if (!get(schema, 'view.noEscape', []).includes(f)) value = escape(value)
           const attr = { dataValue, dataKey: prop.name, dataType: prop.type }
           if (!disableds.includes('get')) attr.style = { cursor: 'pointer' }
           const formatCell = get(schema, `view.formatCell.${f}`)
@@ -141,6 +141,7 @@ async function table () {
           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 (!get(schema, 'view.noEscape', []).includes(f) && !isHtmlLink(value)) value = escape(value)
           const line = await this.component.buildTag({ tag: 'td', attr, html: value })
           lines.push(line)
         }

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

@@ -15,6 +15,7 @@ async function form () {
       if (has(attr, 'name') && !has(attr, 'value')) {
         attr.value = widget.component === 'form-plaintext' ? get(this, `oldData.${attr.name}`, attr.dataValue) : attr.dataValue
       }
+      if (prop.virtual) widget.component = 'form-plaintext'
       return `<c:${widget.component} ${stringifyAttribs(attr)} />`
     }
 
@@ -30,9 +31,9 @@ async function form () {
         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 widget = this.schema.view.widget[f]
-          let prop = find(this.schema.properties, { name: f })
-          if (!prop) prop = find(this.schema.view.calcFields, { name: f })
+          const prop = find(this.schema.properties, { name: f })
           if (!prop) continue
+          if (['dobo:image'].includes(prop.feature)) continue
           const attr = {
             'x-ref': widget.name,
             labelFloating: true,

package/lib/crud/edit-handler.js

@@ -2,10 +2,8 @@ import { attachmentHandler, notFoundTpl } from './helper.js'
 
 async function editHandler ({ req, reply, model, id, params = {}, template, addOnsHandler, templateDisabled = 'waibuDb.template:/disabled.html', options = {} } = {}) {
   const { pascalCase } = this.app.lib.aneka
-  const { getPluginDataDir } = this.app.bajo
   const { updateRecord, getRecord, getSchemaExt } = this.app.waibuDb
   const { buildUrl } = this.app.waibuMpa
-  const { fs } = this.app.lib
   const { defaultsDeep } = this.app.lib.aneka
   const { merge, isEmpty, omit, cloneDeep, isArray, isPlainObject } = this.app.lib._
   const opts = merge({}, options.modelOpts)
@@ -34,12 +32,12 @@ async function editHandler ({ req, reply, model, id, params = {}, template, addO
       req.body._value = JSON.parse(req.body._value)
     } catch (err) {}
     if (req.body._action === 'removeatt' && !isEmpty(req.body._value)) {
-      const root = `${getPluginDataDir('dobo')}/attachment`
       for (const item of req.body._value) {
         try {
-          const file = `${root}/${item}`
-          await fs.unlink(file)
-        } catch (err) {}
+          const [,,, field, fname] = item.split('/')
+          await mdl.removeAttachment(id, field, fname)
+        } catch (err) {
+        }
       }
       if (req && req.flash) req.flash('notify', req.t('attachmentRemoved'))
     } else {

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,14 @@
 # Changes
 
+## 2026-05-03
+
+- [2.18.3] Bug fix in ```wdb-data-table``` widget
+
+## 2026-05-02
+
+- [2.18.2] Bug fix in ```wdb-data-table``` widget
+- [2.18.2] Bug fix in ```wdb-form``` widget
+
 ## 2026-04-25
 
 - [2.18.0] Change options to format value using the new key set by dobo