waibu-db 1.0.4 → 1.0.6

package/bajo/method/record/count.js

@@ -0,0 +1,10 @@
+import prepCrud from '../../../lib/prep-crud.js'
+
+async function count ({ model, req, reply, options = {} }) {
+  const { recordCount } = this.app.dobo
+  const { name, opts, filter } = prepCrud.call(this, { model, req, options, args: ['model'] })
+  const ret = await recordCount(name, filter, opts)
+  return ret
+}
+
+export default count

package/bajo/method/record/find.js

@@ -2,17 +2,7 @@ import prepCrud from '../../../lib/prep-crud.js'
 
 async function find ({ model, req, reply, options = {} }) {
   const { recordFind, attachmentFind } = this.app.dobo
-  const { cloneDeep } = this.app.bajo.lib._
-  const { name, opts } = prepCrud.call(this, { model, req, options, args: ['model'] })
-  const { parseFilter } = this.app.waibu
-  const cfgWeb = this.app.waibu.config
-  opts.bboxLatField = req.query[cfgWeb.qsKey.bboxLatField]
-  opts.bboxLngField = req.query[cfgWeb.qsKey.bboxLngField]
-  const filter = parseFilter(req)
-  if (options.query) {
-    filter.query = cloneDeep(options.query)
-    delete options.query
-  }
+  const { name, opts, filter } = prepCrud.call(this, { model, req, options, args: ['model'] })
   const ret = await recordFind(name, filter, opts)
   const { attachment, stats, mimeType } = req.query
   if (attachment) {

package/lib/prep-crud.js

@@ -1,17 +1,26 @@
 function prepCrud ({ model, body, id, req, options, args }) {
+  const { parseFilter } = this.app.waibu
   const { pascalCase } = this.app.bajo
-  const { cloneDeep } = this.app.bajo.lib._
+  const { cloneDeep, has } = this.app.bajo.lib._
+  const cfgWeb = this.app.waibu.config
   const opts = cloneDeep(options)
   const params = this.getParams(req, ...args)
   for (const k of ['count', 'fields']) {
     opts[k] = opts[k] ?? params[k]
   }
-  opts.dataOnly = false
+  if (has(options, 'count')) opts.count = options.count
+  opts.dataOnly = opts.dataOnly ?? false
   opts.req = req
   const recId = id ?? params.id ?? req.query.id
   const name = pascalCase(model ?? params.model)
   const input = body ?? params.body
-  return { name, recId, input, opts }
+  opts.bboxLatField = req.query[cfgWeb.qsKey.bboxLatField]
+  opts.bboxLngField = req.query[cfgWeb.qsKey.bboxLngField]
+  const filter = parseFilter(req)
+  if (options.query) filter.query = cloneDeep(options.query)
+  if (options.limit) filter.limit = options.limit
+  if (options.sort) filter.sort = options.sort
+  return { name, recId, input, opts, filter }
 }
 
 export default prepCrud

package/package.json

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

package/waibuBootstrap/theme/component/factory/btn-delete.js

@@ -10,7 +10,7 @@ async function btnDelete () {
       const { isEmpty, get } = this.plugin.app.bajo.lib._
       this.params.noTag = true
       const schema = get(this, 'component.locals.schema', {})
-      if (schema.view.disabled.includes('remove')) {
+      if (schema.view.disabled.includes('delete')) {
         this.params.html = ''
         return
       }

package/waibuBootstrap/theme/component/factory/table.js

@@ -4,8 +4,17 @@ async function table () {
   const WdbBase = await wdbBase.call(this)
 
   return class WdbTable extends WdbBase {
-    isRightAligned (type) {
-      return ['smallint', 'integer', 'float', 'double'].includes(type)
+    isRightAligned (field, schema) {
+      const { get, find } = this.plugin.app.bajo.lib._
+      const type = find(schema.properties, { name: field }).type
+      let value = get(schema, 'view.alignEnd', []).includes(field)
+      if (!value) value = ['smallint', 'integer', 'float', 'double'].includes(type)
+      return value
+    }
+
+    isNoWrap (field, schema) {
+      const { get } = this.plugin.app.bajo.lib._
+      return get(schema, 'view.noWrap', []).includes(field)
     }
 
     async build () {
@@ -54,7 +63,7 @@ async function table () {
           }
           const item = set({ page: 1 }, qsKey.sort, sortItem)
           const href = this.component.buildUrl({ params: item })
-          const attr = this.isRightAligned(prop.type) ? { text: 'align:end' } : {}
+          const attr = this.isRightAligned(f, schema) ? { text: 'align:end' } : {}
           const content = [
             await this.component.buildTag({ tag: 'div', attr, html: req.t(`field.${f}`) }),
             await this.component.buildTag({ tag: 'a', attr: { icon, href }, prepend: '<div class="ms-1">', append: '</div>' })
@@ -62,7 +71,7 @@ async function table () {
           head = await this.component.buildTag({ tag: 'div', attr: { flex: 'justify-content:between align-items:end' }, html: content.join('\n') })
         }
         let text = this.params.attr.headerNowrap ? '' : 'nowrap'
-        if (this.isRightAligned(prop.type)) text += ' align:end'
+        if (this.isRightAligned(f, schema)) text += ' align:end'
         const attr = { dataKey: f, dataType: prop.type, text }
         items.push(await this.component.buildTag({ tag: 'th', attr, html: head }))
       }
@@ -104,9 +113,12 @@ async function table () {
           if (['array', 'object'].includes(prop.type)) dataValue = escape(JSON.stringify(d[f]))
           const attr = { dataValue }
           if (!['object', 'array'].includes(prop.type)) {
-            if (this.isRightAligned(prop.type)) attr.text = 'align:end nowrap'
-            else attr.text = 'nowrap'
+            const noWrap = this.isNoWrap(f, schema) ? 'nowrap' : ''
+            if (this.isRightAligned(f, schema)) attr.text = `align:end ${noWrap}`
+            else attr.text = noWrap
           }
+          const formatter = get(schema, `formatter.${f}`)
+          if (formatter) value = await this.component.buildSentence(formatter(value, d))
           const line = await this.component.buildTag({ tag: 'td', attr, html: value })
           lines.push(line)
         }