waibu-db 2.8.2 → 2.10.0

package/extend/waibuBootstrap/theme/component/widget/btn-columns.js

@@ -17,21 +17,14 @@ async function btnColumns () {
         return
       }
       let fields = without(get(this, `component.locals._meta.query.${qsKey.fields}`, '').split(','), '')
-      if (isEmpty(fields)) fields = schema.view.fields
+      if (isEmpty(fields)) fields = without(schema.view.fields, 'id')
       const items = []
       this.params.attr.color = this.params.attr.color ?? 'secondary-outline'
       if (isEmpty(this.params.attr.content)) this.params.attr.content = req.t('columns')
       for (const f of schema.view.fields) {
-        if (!fields.includes(f)) continue
         let prop = find(schema.properties, { name: f })
         if (!prop) prop = find(schema.view.calcFields, { name: f })
         if (!prop) continue
-        /*
-        if (f === 'id') {
-          items.push(await this.component.buildTag({ tag: 'formCheck', attr: { checked: true, label: req.t('ID'), value: f, disabled: true } }))
-          continue
-        }
-        */
         const attr = { 'x-model': 'selected', label: req.t(get(schema, `view.label.${f}`, `field.${f}`)), value: f }
         if (fields.includes(f)) attr.checked = true
         items.push(await this.component.buildTag({ tag: 'formCheck', attr }))

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

@@ -21,7 +21,7 @@ async function table () {
       return get(schema, 'view.noWrap', []).includes(field)
     }
 
-    _defFormatter = async ({ req, key, value, data, schema }) => {
+    _defFormatter = async ({ req, key, value, data, schema, params }) => {
       const { get, find, camelCase, isEmpty } = this.app.lib._
       const { escape } = this.app.waibu
       const prop = find(schema.properties, { name: key })
@@ -34,7 +34,7 @@ async function table () {
         const item = find(values, { value }) ?? {}
         const ttext = camelCase(`${prop.name} ${item.text}`)
         value = escape(req.format(!isEmpty(item) ? (req.te(ttext) ? req.t(ttext) : item.text) : value, prop.type))
-        if (item) value += ` <sup><a href="#" title="${req.t('dataValue')}: ${data[key]}">*</a></sup>`
+        if (item && !params.attr.noDataValueRef) value += ` <sup><a href="#" title="${req.t('dataValue')}: ${data[key]}">*</a></sup>`
       } else if (['string', 'text'].includes(prop.type)) {
         if (!get(schema, 'view.noEscape', []).includes(key)) value = escape(value)
       }
@@ -74,7 +74,7 @@ async function table () {
       }
       const qsKey = this.app.waibu.config.qsKey
       let fields = without(get(this, `component.locals._meta.query.${qsKey.fields}`, '').split(','), '')
-      if (isEmpty(fields)) fields = schema.view.fields
+      if (isEmpty(fields)) fields = without(schema.view.fields, 'id')
       let sort = this.params.attr.sort ? attrToArray(this.params.attr.sort) : get(this, `component.locals._meta.query.${qsKey.sort}`, '')
       if (isEmpty(sort) && filter.sort) {
         const keys = Object.keys(filter.sort)
@@ -175,8 +175,8 @@ async function table () {
             if (item) value = req.t(item[lookup.field ?? 'name'])
           }
           const formatter = get(schema, `view.formatter.${f}`)
-          if (formatter) value = await formatter.call(this, value, d)
-          else value = await this._defFormatter({ req, key: f, schema, value, data: d })
+          if (formatter) value = await formatter.call(this, value, d, { params: this.params })
+          else value = await this._defFormatter({ req, key: f, schema, value, data: d, params: this.params })
           const line = await this.component.buildTag({ tag: 'td', attr, html: value })
           lines.push(line)
         }

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

@@ -175,7 +175,7 @@ async function getSchemaExt (modelName, view, options = {}) {
 
   const model = isString(modelName) ? this.app.dobo.getModel(modelName) : modelName
   const schema = pick(model, ['name', 'properties', 'indexes', 'disabled', 'attachment', 'sortables', 'view', 'hidden'])
-  const base = path.basename(model.file, path.extname(model.file))
+  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)

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,15 @@
 # Changes
 
+## 2026-03-19
+
+- [2.10.0] Data value tooltip can now be turned off with ```no-data-value-ref```
+
+## 2026-03-15
+
+- [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
+
 ## 2026-03-08
 
 - [2.8.1] Bug fix in ```build-params.js```