waibu-db 2.32.2 → 2.33.1

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

@@ -101,7 +101,7 @@ async function btnExport () {
               if (_.isEmpty(selector)) {
                 await wbs.notify('Cant get data selector', { type: 'danger' })
               } else {
-                const item = handler === 'list' ? this.extractTable(selector) : this.extractForm(selector)
+                const item = ['list', ''].includes(handler) ? this.extractTable(selector) : this.extractForm(selector)
                 await wbs.copyToClipboard(item)
               }
               instance.hide()

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

@@ -4,12 +4,141 @@ async function query () {
   const WdbBase = await wdbBase.call(this)
 
   return class WdbQuery extends WdbBase {
+    modal = ({ container, models, columns, fields, id }) => {
+      const { jsonStringify } = this.app.waibuMpa
+      const { upperFirst } = this.app.lib._
+      const qsKey = this.app.waibu.config.qsKey
+      const icon = this.params.attr.mini ? 'search' : (this.params.attr.icon ?? 'dotsThree')
+      const applyBtn = !this.params.attr.mini ? '<c:btn color="primary" t:content="apply" margin="start-2" @click="submit()" />' : ''
+      let parse = 'parse () {},'
+      if (!this.params.attr.mini) {
+        parse = `parse () {
+            this.builder = document.getElementById('${id}').value
+            if (!this.builder.includes(':')) this.builder = ''
+            if (_.isEmpty(this.builder)) return
+            const tokens = _.merge({}, this.ops, {
+              in: ':[',
+              between: ':{',
+              contains: ':~',
+              starts: ':~^',
+              ends: ':~$$',
+              '!in': ':-[',
+              '!between': ':-{',
+              '!contains': ':-~',
+              '!starts': ':-~^',
+              '!ends': ':-~$$'
+            })
+            for (const part of this.builder.split('+')) {
+              let [f, ...opv] = part.split(':')
+              opv = ':' + opv.join(':')
+              this.selected.push(f)
+              let op
+              let val
+              _.each(tokens, (v, k) => {
+                if (opv.slice(0, v.length) === v) {
+                  op = k
+                  val = opv.slice(v.length).replaceAll('[', '').replaceAll('{', '').replaceAll(']', '').replaceAll('}', '').replaceAll('\\'', '')
+                }
+              })
+              if (_.isEmpty(op)) continue
+              this[f + 'Op'] = op
+              if (op === 'between') {
+                const vals = val.split(',')
+                this[f + 'Val'] = vals[0]
+                this[f + 'Val2'] = vals[1]
+              } else {
+                this[f + 'Val'] = val
+              }
+            }
+          },
+        `
+      }
+      return `
+        <c:${container} trigger-color="secondary-outline" trigger-icon="${icon}" trigger-on-end t:title="queryBuilder" x-ref="query" x-data="{
+          fields: ${jsonStringify(fields, true)},
+          builder: '',
+          selected: [],
+          ${models.join(',\n')},
+          ops: { eq: ':', neq: ':-', gt: ':>', gte: ':>=', lt: ':<', lte: ':<=' },
+          opsIn (v, neg) { return ':' + (neg ? '-' : '') + '[' + this.expandArray(v) + ']' },
+          opsBetween (v, v2, neg) { return ':' + (neg ? '-' : '') + '{' + this.expandArray(v) + ',' + this.expandArray(v2) + '}' },
+          opsExt (v, neg, ext) {
+            let prefix = (neg ? '-' : '') + '~'
+            if (ext) prefix += ext
+            return ':' + prefix + '\\'' + v + '\\''
+          },
+          ${parse}
+          expandArray (val = '') {
+            return _.map(val.split(','), item => {
+              item = _.trim(item)
+              if (Number(item)) return item
+              return '\\'' + item + '\\''
+            })
+          },
+          rebuild () {
+            const items = []
+            for (const sel of this.selected) {
+              const key = this[sel + 'Op']
+              let val = this[sel + 'Val']
+              let val2 = this[sel + 'Val2']
+              if (_.isEmpty(val)) continue
+              if (key === 'between' && _.isEmpty(val2)) continue
+              let item
+              if (key === 'in') item = this.opsIn(val)
+              else if (key === '!in') item = this.opsIn(val, true)
+              else if (key === 'between') item = this.opsBetween(val, val2, false)
+              else if (key === '!between') item = this.opsBetween(val, val2, true)
+              else if (key === 'contains') item = this.opsExt(val)
+              else if (key === '!contains') item = this.opsExt(val, true)
+              else if (key === 'starts') item = this.opsExt(val, false, '^')
+              else if (key === '!starts') item = this.opsExt(val, true, '^')
+              else if (key === 'ends') item = this.opsExt(val, false, '$$')
+              else if (key === '!ends') item = this.opsExt(val, true, '$$')
+              else if (val.includes(' ')) item = this.ops[key] + '\\'' + val + '\\''
+              else item = this.ops[key] + val
+              items.push(sel + item)
+            }
+            this.builder = items.join('+')
+          },
+          submit (run) {
+            if (run) {
+              const url = new URL(window.location.href)
+              const params = new URLSearchParams(url.search)
+              params.set('${qsKey.page}', 1)
+              params.set('${qsKey.query}', this.builder ?? '')
+              window.location.href = '?' + params.toString()
+            } else $dispatch('on-query', this.builder)
+            const instance = wbs.getInstance('${upperFirst(container)}', $refs.query)
+            instance.hide()
+          }
+        }" x-init="
+          parse()
+          const ops = _.map(fields, f => (f + 'Op'))
+          const vals = _.map(fields, f => (f + 'Val'))
+          const vals2 = _.map(fields, f => (f + 'Val2'))
+          const watcher = ['selected', ...ops, ...vals, ...vals2].join(',')
+          $watch(watcher, v => rebuild())
+        " ${this.params.attr.modal ? '' : 'style="width:600px;"'}>
+          <c:grid-row gutter="2">
+            <c:grid-col col="12">
+              <c:form-textarea x-model="builder" readonly rows="4"/>
+            </c:grid-col>
+            ${columns.join('\n')}
+          </c:grid-row>
+          <c:div flex="justify-content:end" margin="top-3">
+            <c:btn color="secondary" t:content="close" dismiss="${container}" />
+            ${applyBtn}
+            <c:btn color="primary" t:content="submitQuery" margin="start-2" @click="submit(true)" />
+          </c:div>
+        </c:${container}>
+      `
+    }
+
     build = async () => {
       const { req } = this.component
       const { generateId } = this.app.lib.aneka
       const { join } = this.app.bajo
-      const { jsonStringify } = this.app.waibuMpa
-      const { find, get, without, isEmpty, filter, upperFirst } = this.app.lib._
+      const { find, get, without, isEmpty, filter } = this.app.lib._
       const qsKey = this.app.waibu.config.qsKey
       const schema = get(this, 'component.locals.schema', {})
       if (schema.view.disabled.includes('find')) {
@@ -62,144 +191,36 @@ async function query () {
       this.params.noTag = true
       const container = this.params.attr.modal ? 'modal' : 'drawer'
       const scanables = (this.schema.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, { 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)
-          query = url.searchParams.get('${qsKey.query}') ?? ''
-        " x-model="query" @on-query.window="query = $event.detail ?? ''" @keyup.enter="$dispatch('on-submit')">
-          <c:form-input-addon>
-            <c:${container} trigger-icon="${this.params.attr.icon ?? 'dotsThree'}" trigger-on-end t:title="queryBuilder" x-ref="query" x-data="{
-              fields: ${jsonStringify(fields, true)},
-              builder: '',
-              selected: [],
-              ${models.join(',\n')},
-              ops: { eq: ':', neq: ':-', gt: ':>', gte: ':>=', lt: ':<', lte: ':<=' },
-              opsIn (v, neg) { return ':' + (neg ? '-' : '') + '[' + this.expandArray(v) + ']' },
-              opsBetween (v, v2, neg) { return ':' + (neg ? '-' : '') + '{' + this.expandArray(v) + ',' + this.expandArray(v2) + '}' },
-              opsExt (v, neg, ext) {
-                let prefix = (neg ? '-' : '') + '~'
-                if (ext) prefix += ext
-                return ':' + prefix + '\\'' + v + '\\''
-              },
-              parse () {
-                this.builder = document.getElementById('${id}').value
-                if (!this.builder.includes(':')) this.builder = ''
-                if (_.isEmpty(this.builder)) return
-                const tokens = _.merge({}, this.ops, {
-                  in: ':[',
-                  between: ':{',
-                  contains: ':~',
-                  starts: ':~^',
-                  ends: ':~$$',
-                  '!in': ':-[',
-                  '!between': ':-{',
-                  '!contains': ':-~',
-                  '!starts': ':-~^',
-                  '!ends': ':-~$$'
-                })
-                for (const part of this.builder.split('+')) {
-                  let [f, ...opv] = part.split(':')
-                  opv = ':' + opv.join(':')
-                  this.selected.push(f)
-                  let op
-                  let val
-                  _.each(tokens, (v, k) => {
-                    if (opv.slice(0, v.length) === v) {
-                      op = k
-                      val = opv.slice(v.length).replaceAll('[', '').replaceAll('{', '').replaceAll(']', '').replaceAll('}', '').replaceAll('\\'', '')
-                    }
-                  })
-                  if (_.isEmpty(op)) continue
-                  this[f + 'Op'] = op
-                  if (op === 'between') {
-                    const vals = val.split(',')
-                    this[f + 'Val'] = vals[0]
-                    this[f + 'Val2'] = vals[1]
-                  } else {
-                    this[f + 'Val'] = val
-                  }
-                }
-              },
-              expandArray (val = '') {
-                return _.map(val.split(','), item => {
-                  item = _.trim(item)
-                  if (Number(item)) return item
-                  return '\\'' + item + '\\''
-                })
-              },
-              rebuild () {
-                const items = []
-                for (const sel of this.selected) {
-                  const key = this[sel + 'Op']
-                  let val = this[sel + 'Val']
-                  let val2 = this[sel + 'Val2']
-                  if (_.isEmpty(val)) continue
-                  if (key === 'between' && _.isEmpty(val2)) continue
-                  let item
-                  if (key === 'in') item = this.opsIn(val)
-                  else if (key === '!in') item = this.opsIn(val, true)
-                  else if (key === 'between') item = this.opsBetween(val, val2, false)
-                  else if (key === '!between') item = this.opsBetween(val, val2, true)
-                  else if (key === 'contains') item = this.opsExt(val)
-                  else if (key === '!contains') item = this.opsExt(val, true)
-                  else if (key === 'starts') item = this.opsExt(val, false, '^')
-                  else if (key === '!starts') item = this.opsExt(val, true, '^')
-                  else if (key === 'ends') item = this.opsExt(val, false, '$$')
-                  else if (key === '!ends') item = this.opsExt(val, true, '$$')
-                  else if (val.includes(' ')) item = this.ops[key] + '\\'' + val + '\\''
-                  else item = this.ops[key] + val
-                  items.push(sel + item)
-                }
-                this.builder = items.join('+')
-              },
-              submit (run) {
-                if (run) {
+      if (this.params.attr.mini) {
+        this.params.html = await this.component.buildSentence(`
+          ${this.modal({ container, models, columns, fields, id })}
+        `)
+      } else {
+        let placeholder = this.params.attr.placeholder
+        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)
+            query = url.searchParams.get('${qsKey.query}') ?? ''
+          " x-model="query" @on-query.window="query = $event.detail ?? ''" @keyup.enter="$dispatch('on-submit')">
+            <c:form-input-addon>
+              ${this.modal({ container, models, columns, fields, id })}
+            </c:form-input-addon>
+            <c:form-input-addon>
+              <c:btn t:content="submit" x-data="{
+                submit () {
+                  const val = document.getElementById('${id}').value ?? ''
                   const url = new URL(window.location.href)
                   const params = new URLSearchParams(url.search)
                   params.set('${qsKey.page}', 1)
-                  params.set('${qsKey.query}', this.builder ?? '')
+                  params.set('${qsKey.query}', val)
                   window.location.href = '?' + params.toString()
-                } else $dispatch('on-query', this.builder)
-                const instance = wbs.getInstance('${upperFirst(container)}', $refs.query)
-                instance.hide()
-              }
-            }" x-init="
-              parse()
-              const ops = _.map(fields, f => (f + 'Op'))
-              const vals = _.map(fields, f => (f + 'Val'))
-              const vals2 = _.map(fields, f => (f + 'Val2'))
-              const watcher = ['selected', ...ops, ...vals, ...vals2].join(',')
-              $watch(watcher, v => rebuild())
-            " ${this.params.attr.modal ? '' : 'style="width:600px;"'}>
-              <c:grid-row gutter="2">
-                <c:grid-col col="12">
-                  <c:form-textarea x-model="builder" readonly rows="4"/>
-                </c:grid-col>
-                ${columns.join('\n')}
-              </c:grid-row>
-              <c:div flex="justify-content:end" margin="top-3">
-                <c:btn color="secondary" t:content="close" dismiss="${container}" />
-                <c:btn color="primary" t:content="apply" margin="start-2" @click="submit()" />
-                <c:btn color="primary" t:content="submitQuery" margin="start-2" @click="submit(true)" />
-              </c:div>
-            </c:${container}>
-          </c:form-input-addon>
-          <c:form-input-addon>
-            <c:btn t:content="submit" x-data="{
-              submit () {
-                const val = document.getElementById('${id}').value ?? ''
-                const url = new URL(window.location.href)
-                const params = new URLSearchParams(url.search)
-                params.set('${qsKey.page}', 1)
-                params.set('${qsKey.query}', val)
-                window.location.href = '?' + params.toString()
-              }
-            }" @click="submit" @on-submit.window="submit()" />
-          </c:form-input-addon>
-        </c:form-input>
-      `)
+                }
+              }" @click="submit" @on-submit.window="submit()" />
+            </c:form-input-addon>
+          </c:form-input>
+        `)
+      }
     }
   }
 }

package/extend/waibuBootstrap/theme/component/widget/recs-info.js

@@ -23,9 +23,9 @@ async function recsInfo () {
         this.params.html = ''
         return
       }
-      page = page ?? get(this, 'component.locals.list.page', 1)
-      limit = limit ?? get(this, 'component.locals.list.limit', 25)
-      pages = pages ?? get(this, 'component.locals.list.pages', 0)
+      page = get(this, 'component.locals.list.page', page ?? 1)
+      limit = get(this, 'component.locals.list.limit', limit ?? 25)
+      pages = get(this, 'component.locals.list.pages', pages ?? 0)
 
       this.params.tag = 'div'
       this.params.attr.flex = 'justify-center:start align-items:center'

package/index.js

@@ -1,6 +1,6 @@
 import countRecord from './lib/method/count-record.js'
-import createAggregate from './lib/method/create-aggregate.js'
-import createHistogram from './lib/method/create-histogram.js'
+import aggregate from './lib/method/aggregate.js'
+import histogram from './lib/method/histogram.js'
 import createRecord from './lib/method/create-record.js'
 import findOneRecord from './lib/method/find-one-record.js'
 import findRecord from './lib/method/find-record.js'
@@ -59,8 +59,8 @@ async function factory (pkgName) {
 
       this.bindThis(
         countRecord,
-        createAggregate,
-        createHistogram,
+        aggregate,
+        histogram,
         createRecord,
         findOneRecord,
         findRecord,

package/lib/crud/export-handler.js

@@ -36,7 +36,7 @@ async function exportHandler (opts = {}) {
   const mdl = this.app.dobo.getModel(model)
   const { schema } = await getSchemaExt(model, 'add', merge({ args: [{ req, model: mdl }] }, { params }, options))
   if (schema.disabled.includes('find')) return await reply.view(templateDisabled, { action: 'list' })
-  const crud = await prepCrud.call(this.app.getPlugin('waibuDb'), { model, req, reply, args: ['model'] })
+  const crud = await prepCrud.call(this.app.getPlugin('waibuDb'), { model, req, reply, args: ['model'], options })
   const data = {
     name: model,
     filter: crud.filter,

package/lib/crud/helper.js

@@ -22,7 +22,7 @@ export async function addOnsHandler (opts = {}) {
   const { req, reply, schema } = opts
   const { escape } = this.app.waibu
   const { base64JsonEncode } = this.app.waibu
-  const { createAggregate } = this.app.waibuDb
+  const { aggregate } = this.app.waibuDb
   const { get, map, pick, pullAt } = this.app.lib._
   const _opts = map(get(schema, 'view.stat.aggregate', []), item => {
     const dbOpts = pick(item, ['fields', 'group', 'aggregate'])
@@ -34,7 +34,7 @@ export async function addOnsHandler (opts = {}) {
   for (const idx in _opts) {
     const o = _opts[idx]
     try {
-      const resp = await createAggregate({ model: schema.name, req, reply, options: o.dbOpts })
+      const resp = await aggregate({ model: schema.name, req, reply, options: o.dbOpts })
       const data = []
       for (const d of resp.data) {
         const key = o.dbOpts.fields[0]

package/lib/method/{create-aggregate.js → aggregate.js}

@@ -1,7 +1,7 @@
 import { prepCrud, processHandler } from '../util.js'
 
-async function createAggregate ({ model, req, reply, options = {}, transaction } = {}) {
-  const { model: mdl, opts, filter } = await prepCrud.call(this, { model, req, reply, options, args: ['model'], transaction })
+async function aggregate ({ model, req, reply, options = {}, noAutoFilter, transaction } = {}) {
+  const { model: mdl, opts, filter } = await prepCrud.call(this, { model, req, reply, options, args: ['model'], noAutoFilter, transaction })
   const params = {}
   for (const item of ['group', 'field', 'aggregates']) {
     params[item] = options[item] ?? req.params[item] ?? req.query[item]
@@ -10,10 +10,10 @@ async function createAggregate ({ model, req, reply, options = {}, transaction }
 
   async function handler (trx) {
     if (opts.trx === true) opts.trx = trx
-    return await mdl.createAggregate(filter, params, opts)
+    return await mdl.aggregate(filter, params, opts)
   }
 
-  return await processHandler.call(this, { action: 'createAggregate', model: mdl, handler, options: opts })
+  return await processHandler.call(this, { action: 'aggregate', model: mdl, handler, options: opts })
 }
 
-export default createAggregate
+export default aggregate

package/lib/method/count-record.js

@@ -1,7 +1,7 @@
 import { prepCrud, processHandler } from '../util.js'
 
-async function countRecord ({ model, req, reply, options = {}, transaction } = {}) {
-  const { model: mdl, opts, filter } = await prepCrud.call(this, { model, req, reply, options, args: ['model'], transaction })
+async function countRecord ({ model, req, reply, options = {}, noAutoFilter, transaction } = {}) {
+  const { model: mdl, opts, filter } = await prepCrud.call(this, { model, req, reply, options, args: ['model'], noAutoFilter, transaction })
 
   async function handler (trx) {
     if (opts.trx === true) opts.trx = trx

package/lib/method/find-all-record.js

@@ -1,7 +1,7 @@
 import { prepCrud, processHandler } from '../util.js'
 
-async function findAllRecord ({ model, req, reply, options = {}, transaction } = {}) {
-  const { model: mdl, opts, filter, attachment, stats, mimeType } = await prepCrud.call(this, { model, req, reply, options, args: ['model'], transaction })
+async function findAllRecord ({ model, req, reply, options = {}, noAutoFilter, transaction } = {}) {
+  const { model: mdl, opts, filter, attachment, stats, mimeType } = await prepCrud.call(this, { model, req, reply, options, args: ['model'], noAutoFilter, transaction })
 
   async function handler (trx) {
     if (opts.trx === true) opts.trx = trx

package/lib/method/find-one-record.js

@@ -1,7 +1,7 @@
 import { prepCrud, processHandler } from '../util.js'
 
-async function findOneRecord ({ model, req, reply, options = {}, transaction } = {}) {
-  const { model: mdl, opts, filter, attachment, stats, mimeType } = await prepCrud.call(this, { model, req, reply, options, args: ['model'], transaction })
+async function findOneRecord ({ model, req, reply, options = {}, noAutoFilter, transaction } = {}) {
+  const { model: mdl, opts, filter, attachment, stats, mimeType } = await prepCrud.call(this, { model, req, reply, options, args: ['model'], noAutoFilter, transaction })
 
   async function handler (trx) {
     if (opts.trx === true) opts.trx = trx

package/lib/method/find-record.js

@@ -1,7 +1,7 @@
 import { prepCrud, processHandler } from '../util.js'
 
-async function findRecord ({ model, req, reply, options = {}, transaction } = {}) {
-  const { model: mdl, opts, filter, attachment, stats, mimeType } = await prepCrud.call(this, { model, req, reply, options, args: ['model'], transaction })
+async function findRecord ({ model, req, reply, noAutoFilter, options = {}, transaction } = {}) {
+  const { model: mdl, opts, filter, attachment, stats, mimeType } = await prepCrud.call(this, { model, req, reply, options, args: ['model'], noAutoFilter, transaction })
 
   async function handler (trx) {
     if (opts.trx === true) opts.trx = trx

package/lib/method/get-record.js

@@ -1,7 +1,7 @@
 import { prepCrud, getOneRecord, processHandler } from '../util.js'
 
-async function getRecord ({ model, req, reply, id, options = {}, transaction } = {}) {
-  const { model: mdl, recId, filter, attachment, stats, mimeType, opts } = await prepCrud.call(this, { model, req, reply, id, options, args: ['model', 'id'], transaction })
+async function getRecord ({ model, req, reply, id, options = {}, transaction, noAutoFilter } = {}) {
+  const { model: mdl, recId, filter, attachment, stats, mimeType, opts } = await prepCrud.call(this, { model, req, reply, id, options, args: ['model', 'id'], transaction, noAutoFilter })
   const me = this
 
   async function handler (trx) {

package/lib/method/{create-histogram.js → histogram.js}

@@ -1,7 +1,7 @@
 import { prepCrud, processHandler } from '../util.js'
 
-async function createHistogram ({ model, req, reply, options = {}, transaction } = {}) {
-  const { model: mdl, opts, filter } = await prepCrud.call(this, { model, req, reply, options, args: ['model'], transaction })
+async function histogram ({ model, req, reply, options = {}, noAutoFilter, transaction } = {}) {
+  const { model: mdl, opts, filter } = await prepCrud.call(this, { model, req, reply, options, args: ['model'], noAutoFilter, transaction })
   const params = {}
   for (const item of ['type', 'group', 'field', 'aggregates']) {
     params[item] = options[item] ?? req.params[item] ?? req.query[item]
@@ -10,10 +10,10 @@ async function createHistogram ({ model, req, reply, options = {}, transaction }
 
   async function handler (trx) {
     if (opts.trx === true) opts.trx = trx
-    return await mdl.createHistogram(filter, params, opts)
+    return await mdl.histogram(filter, params, opts)
   }
 
-  return await processHandler.call(this, { action: 'createHistogram', model: mdl, handler, options: opts })
+  return await processHandler.call(this, { action: 'histogram', model: mdl, handler, options: opts })
 }
 
-export default createHistogram
+export default histogram

package/lib/util.js

@@ -22,8 +22,8 @@
  * @typedef TActions
  * @type {Object}
  * @property {number} 0='countRecord' - Count the number of records
- * @property {number} 1='createAggregate' - Create an aggregate record
- * @property {number} 2='createHistogram' - Create a histogram record
+ * @property {number} 1='aggregate' - Create an aggregate record
+ * @property {number} 2='histogram' - Create a histogram record
  * @property {number} 3='createRecord' - Create a new record
  * @property {number} 4='findAllRecord' - Find all records
  * @property {number} 5='findOneRecord' - Find one record
@@ -32,7 +32,7 @@
  * @property {number} 8='removeRecord' - Remove a record
  * @property {number} 9='updateRecord' - Update a record
  */
-export const actions = ['countRecord', 'createAggregate', 'createHistogram', 'createRecord', 'findAllRecord', 'findOneRecord', 'findRecord', 'getRecord', 'removeRecord', 'updateRecord']
+export const actions = ['countRecord', 'aggregate', 'histogram', 'createRecord', 'findAllRecord', 'findOneRecord', 'findRecord', 'getRecord', 'removeRecord', 'updateRecord']
 
 /**
  * Prepare CRUD operation parameters.
@@ -43,12 +43,13 @@ export const actions = ['countRecord', 'createAggregate', 'createHistogram', 'cr
  * @param {Object} [options.req] - The request object
  * @param {Object} [options.reply] - The reply object
  * @param {Object} [options.transaction] - The transaction object
+ * @param {boolean} [options.noAutoFilter] - Disable automatic filter parsing from `req.query`
  * @param {Object} [options.options] - Additional options
  * @param {Array} [options.args] - Additional arguments
  * @returns {Object} Prepared CRUD parameters
  */
 export async function prepCrud (options = {}) {
-  let { model, id, req, reply, transaction, options: _options = {}, args } = options
+  let { model, id, req, reply, transaction, options: _options = {}, args, noAutoFilter } = options
   const { isSet } = this.app.lib.aneka
   const { importModule } = this.app.bajo
   const { parseFilter } = this.app.waibu
@@ -93,9 +94,12 @@ export async function prepCrud (options = {}) {
   }
   opts.bboxLatField = req.query[cfgWeb.qsKey.bboxLatField]
   opts.bboxLngField = req.query[cfgWeb.qsKey.bboxLngField]
-  const filter = parseFilter(req)
-  filter.query = buildFilterQuery.call(mdl, filter)
-  filter.search = buildFilterSearch.call(mdl, filter)
+  let filter = { query: {}, search: {} }
+  if (!noAutoFilter) {
+    filter = parseFilter(req)
+    filter.query = buildFilterQuery.call(mdl, filter)
+    filter.search = buildFilterSearch.call(mdl, filter)
+  }
   if (_options.query) filter.query = cloneDeep(_options.query)
   if (_options.search) filter.search = cloneDeep(_options.search)
   if (_options.limit) filter.limit = _options.limit
@@ -143,7 +147,7 @@ export async function processHandler (opts = {}) {
     if (!(req.method === 'POST' && req.body._action === 'export' && options.allowExport)) return
     const { importModule } = this.app.bajo
     const exportHandler = await importModule('waibuDb:/lib/crud/export-handler.js')
-    await exportHandler.call(this, { model: model.name, req, reply })
+    await exportHandler.call(this, { model: model.name, req, reply, options })
   }
 
   function suppressedReturn (err) {

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,15 @@
 # Changes
 
+## 2026-08-19
+
+- [2.33.1] Bug fix in `wdb-btn-export` widget
+- [2.33.1] Bug fix in `export-handler.js`
+- [2.33.1] Bug fix in `util.js`
+
+## 2026-08-18
+
+- [2.33.0] Update things to match `dobo@2.38.0`
+
 ## 2026-07-29
 
 - [2.32.2] Bug fix in `export-handler.js`