waibu-db 2.6.1 → 2.7.0

package/extend/bajo/intl/en-US.json

@@ -36,6 +36,7 @@
   "exportInQueue": "Data export in queue. Please check your download list for progress",
   "tsv": "TSV",
   "ndjson": "NDJSON",
+  "dataValue": "Data value",
   "op": {
     "equals": "Equals",
     "notEquals": "Not Equals",

package/extend/bajo/intl/id.json

@@ -36,6 +36,7 @@
   "exportInQueue": "Ekspor data sedang dalam antrian. Silahkan cek daftar unduh Anda untuk perkembangan terakhir",
   "tsv": "TSV",
   "ndjson": "NDJSON",
+  "dataValue": "Nilai data",
   "op": {
     "equals": "Sama Dengan",
     "notEquals": "Tidak Sama Dengan",

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

@@ -26,10 +26,12 @@ async function btnColumns () {
         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/btn-delete.js

@@ -47,8 +47,8 @@ async function btnDelete () {
           ok: '${this.params.attr.id}:remove',
           close: 'y',
           opts: selected,
-          theme: '${this.component.theme.name}',
-          iconset: '${this.component.iconset.name}'
+          theme: '${get(this, 'component.theme.name', 'default')}',
+          iconset: '${get(this, 'component.iconset.name', 'default')}'
         })
       `
       this.params.html = await this.component.buildTag({ tag: 'btn', attr: this.params.attr, html: this.params.html })

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

@@ -4,6 +4,8 @@ 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 })
@@ -20,13 +22,19 @@ async function table () {
     }
 
     _defFormatter = async ({ req, key, value, data, schema }) => {
-      const { get, find } = this.app.lib._
+      const { get, find, camelCase, isEmpty } = this.app.lib._
       const { escape } = this.app.waibu
       const prop = find(schema.properties, { name: key })
       if (!prop) return value
       if (prop.type === 'boolean') {
         value = (await this.component.buildTag({ tag: 'icon', attr: { name: `circle${data[key] ? 'Check' : 'Cross'}` } })) +
           ' ' + (req.t(data[key] ? 'Yes' : 'No'))
+      } else if (prop.values) {
+        const values = typeof prop.values === 'string' ? this.propValues[key] : prop.values
+        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>`
       } else if (['string', 'text'].includes(prop.type)) {
         if (!get(schema, 'view.noEscape', []).includes(key)) value = escape(value)
       }
@@ -34,6 +42,7 @@ async function table () {
     }
 
     build = async () => {
+      const { callHandler } = this.app.bajo
       const { req } = this.component
       const { escape, attrToArray } = this.app.waibu
       const { formatRecord } = this.app.waibuDb
@@ -48,6 +57,10 @@ async function table () {
       const fdata = await formatRecord.call(this.plugin, { data, req, schema })
       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)
+      }
       if (count === 0) {
         const alert = '<c:alert color="warning" t:content="noRecordFound" margin="top-4"/>'
         this.params.noTag = true

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

@@ -115,7 +115,8 @@ function applyLayout (action, schema, ext) {
       }
       if (prop.values) {
         result.component = result.component ?? 'form-select'
-        result.attr.options = prop.values.map(item => `${item.value}:${item.text}`).join(';')
+        if (typeof prop.values === 'string') result.attr.options = prop.values
+        else result.attr.options = prop.values.map(item => `${item.value}:${item.text}`).join(';')
       }
       if (['string', 'text'].includes(prop.type) && prop.maxLength) set(result, 'attr.maxlength', prop.maxLength)
       if (readonly.includes(f)) result.component = 'form-plaintext'

package/lib/util.js

@@ -1,9 +1,12 @@
 export async function prepCrud ({ model, body, id, req, reply, options = {}, args }) {
   const { isSet } = this.app.lib.aneka
+  const { importModule } = this.app.bajo
   const { parseFilter } = this.app.waibu
   const { pascalCase } = this.app.lib.aneka
   const { cloneDeep, has, isString } = this.app.lib._
   const { parseObject } = this.app.lib
+  const { buildFilterQuery } = await importModule('dobo:/lib/factory/model/_util.js', { asDefaultImport: false })
+
   const cfgWeb = this.app.waibu.getConfig()
   const opts = cloneDeep(options)
   const params = this.getParams(req, ...args)
@@ -37,7 +40,8 @@ export async function prepCrud ({ model, body, id, req, reply, options = {}, arg
 
   opts.bboxLatField = req.query[cfgWeb.qsKey.bboxLatField]
   opts.bboxLngField = req.query[cfgWeb.qsKey.bboxLngField]
-  const filter = parseFilter(req)
+  let filter = parseFilter(req)
+  filter = buildFilterQuery.call(mdl, filter)
   if (options.query) filter.query = cloneDeep(options.query)
   if (options.limit) filter.limit = options.limit
   if (options.sort) filter.sort = options.sort

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,13 @@
 # Changes
 
+## 2026-02-20
+
+- [2.7.0] Update ```WdbBtnColumns``` to allow untick ID field too
+- [2.7.0] Bug fix on theme & iconset resolver
+- [2.7.0] Add capability to set value from ```prop.values``` in ```WdbTable```
+- [2.7.0] Bug fix on query builder
+- [2.7.0] Add capability to handle value from ```prop.values``` in ```getSchemaExt()```
+
 ## 2026-02-18
 
 - [2.6.0] Update attribute functions from ```waibu```