waibu-db 1.0.7 → 1.0.9

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

@@ -4,6 +4,7 @@ const defReadonly = ['id', 'createdAt', 'updatedAt']
 
 function getCommons (action, schema, ext, opts = {}) {
   const { map, get, set, without, uniq } = this.app.bajo.lib._
+  const label = get(ext, `view.${action}.label`, get(ext, 'common.label', {}))
   const hidden = get(ext, `view.${action}.hidden`, get(ext, 'common.hidden', []))
   hidden.push(...schema.hidden, ...(opts.hidden ?? []))
   const allFields = without(map(schema.properties, 'name'), ...hidden)
@@ -17,7 +18,7 @@ function getCommons (action, schema, ext, opts = {}) {
   }
   fields = uniq(without(fields, ...hidden))
   if (action !== 'add' && !fields.includes('id')) fields.unshift('id')
-  return { fields, allFields }
+  return { fields, allFields, label }
 }
 
 function autoLayout ({ action, schema, ext, layout, allWidgets }) {
@@ -58,7 +59,7 @@ function customLayout ({ action, schema, ext, layout, allWidgets, readonly }) {
 
 function applyLayout (action, schema, ext) {
   const { set, get, isEmpty, map, find } = this.app.bajo.lib._
-  const { fields } = getCommons.call(this, action, schema, ext)
+  const { fields, label } = getCommons.call(this, action, schema, ext)
   const layout = get(ext, `view.${action}.layout`, get(ext, 'common.layout', []))
   const readonly = get(ext, `view.${action}.readonly`, get(ext, 'common.readonly', defReadonly))
   const allWidgets = map(fields, f => {
@@ -89,12 +90,13 @@ function applyLayout (action, schema, ext) {
   else customLayout.call(this, { layout, allWidgets, schema, action, ext, readonly })
   set(schema, 'view.layout', layout)
   set(schema, 'view.fields', fields)
+  set(schema, 'view.label', label)
 }
 
 const handler = {
   list: async function (schema, ext, opts) {
     const { get, set } = this.app.bajo.lib._
-    const { fields } = getCommons.call(this, 'list', schema, ext, opts)
+    const { fields, label } = getCommons.call(this, 'list', schema, ext, opts)
     const qsFields = []
     for (const f of get(schema, 'view.qs.fields', '').split(',')) {
       if (fields.includes(f)) qsFields.push(f)
@@ -102,6 +104,7 @@ const handler = {
     let [col, dir] = get(schema, 'view.qs.sort', '').split(':')
     if (!fields.includes(col) || !col) col = 'id'
     if (!['1', '-1'].includes(dir)) dir = '1'
+    set(schema, 'view.label', label)
     set(schema, 'view.fields', fields)
     set(schema, 'view.qs.fields', qsFields.join(','))
     set(schema, 'view.qs.sort', `${col}:${dir}`)

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

@@ -2,17 +2,13 @@ import prepCrud from '../../../lib/prep-crud.js'
 
 async function find ({ model, req, reply, options = {} }) {
   const { recordFindOne, attachmentFind } = this.app.dobo
-  const { parseFilter } = this.app.waibu
-  const { name, opts } = prepCrud.call(this, { model, req, options, args: ['model'] })
-  const cfgWeb = this.app.waibu.config
-  opts.bboxLatField = req.query[cfgWeb.qsKey.bboxLatField]
-  opts.bboxLngField = req.query[cfgWeb.qsKey.bboxLngField]
-  const filter = parseFilter(req)
+  const { name, opts, filter } = prepCrud.call(this, { model, req, options, args: ['model'] })
   const ret = await recordFindOne(name, filter, opts)
-  ret.filter = filter
   const { attachment, stats, mimeType } = req.query
   if (attachment) {
-    ret.data._attachment = await attachmentFind(name, ret.data.id, { stats, mimeType })
+    for (const d of ret.data) {
+      d._attachment = await attachmentFind(name, d.id, { stats, mimeType })
+    }
   }
   return ret
 }

package/package.json

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

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

@@ -24,7 +24,7 @@ async function btnColumns () {
           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(`field.${f}`), value: f }
+        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 }))
       }
@@ -46,6 +46,7 @@ async function btnColumns () {
       html.push('</form>')
       this.params.attr.autoClose = 'outside'
       this.params.attr.triggerColor = this.params.attr.color
+      this.params.attr.menudir = this.params.attr.menudir ?? 'end'
       this.params.html = await this.component.buildTag({ tag: 'dropdown', attr: this.params.attr, html: html.join('\n') })
       this.params.noTag = true
     }

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

@@ -22,6 +22,7 @@ async function btnDelete () {
         this.params.attr['x-data'] = `{
           selected: [],
           remove (modalId, ids) {
+            ids = JSON.parse(wmpa.fromBase64(ids)).join(',')
             wmpa.postForm({ ids }, '${this.component.buildUrl({ base: 'delete' })}')
           }
         }`

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

@@ -32,9 +32,10 @@ async function query () {
         if (ops.length === 0) continue
         const sels = ops.map(o => `<c:option>${o}</c:option>`)
         models.push(`${f}Op: 'eq'`, `${f}Val: ''`)
+        const label = this.component.req.t(get(schema, `view.label.${f}`, `field.${f}`))
         columns.push(`
           <c:grid-col col="4-md" flex="align-items:center">
-            <c:form-check x-model="selected" t:label="field.${f}" value="${f}" />
+            <c:form-check x-model="selected" t:label="${label}" value="${f}" />
           </c:grid-col>
           <c:grid-col col="3-md">
             <c:form-select x-model="${f}Op">

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

@@ -6,9 +6,10 @@ async function table () {
   return class WdbTable extends WdbBase {
     isRightAligned (field, schema) {
       const { get, find } = this.plugin.app.bajo.lib._
-      const type = find(schema.properties, { name: field }).type
+      const prop = find(schema.properties, { name: field })
+      if (!prop) return false
       let value = get(schema, 'view.alignEnd', []).includes(field)
-      if (!value) value = ['smallint', 'integer', 'float', 'double'].includes(type)
+      if (!value) value = ['smallint', 'integer', 'float', 'double'].includes(prop.type)
       return value
     }
 
@@ -19,15 +20,18 @@ async function table () {
 
     async build () {
       const { req } = this.component
+      const { callHandler } = this.plugin.app.bajo
       const { escape } = this.plugin.app.waibu
       const { attrToArray, groupAttrs } = this.plugin.app.waibuMpa
-      const { get, omit, set, find, isEmpty, without } = this.plugin.app.bajo.lib._
+      const { get, omit, set, find, isEmpty, without, isFunction } = this.plugin.app.bajo.lib._
       const group = groupAttrs(this.params.attr, ['body', 'head', 'foot'])
       this.params.attr = group._
+      const prettyUrl = this.params.attr.prettyUrl
 
       const data = get(this, 'component.locals.list.data', [])
       const schema = get(this, 'component.locals.schema', {})
-      if (schema.view.disabled.includes('find')) {
+      const disableds = get(schema, 'view.disabled', [])
+      if (disableds.includes('find')) {
         this.params.html = ''
         return
       }
@@ -40,8 +44,8 @@ async function table () {
       if (!['-1', '1'].includes(sortDir)) sortDir = '1'
 
       let selection
-      const canDelete = !schema.view.disabled.includes('remove')
-      const canEdit = !schema.view.disabled.includes('update')
+      const canDelete = !disableds.includes('remove')
+      const canEdit = !disableds.includes('update')
       if (canEdit) selection = 'single'
       if (canDelete) selection = 'multi'
       if (selection) this.params.attr.hover = true
@@ -53,7 +57,8 @@ async function table () {
       for (const f of schema.view.fields) {
         if (!fields.includes(f)) continue
         const prop = find(schema.properties, { name: f })
-        let head = req.t(`field.${f}`)
+        if (!prop) continue
+        let head = req.t(get(schema, `view.label.${f}`, `field.${f}`))
         if (!this.params.attr.noSort && (schema.sortables ?? []).includes(f)) {
           let sortItem = `${f}:-1`
           let icon = this.params.attr.sortUpIcon ?? 'caretUp'
@@ -65,7 +70,7 @@ async function table () {
           const href = this.component.buildUrl({ params: item })
           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: 'div', attr, html: head }),
             await this.component.buildTag({ tag: 'a', attr: { icon, href }, prepend: '<div class="ms-1">', append: '</div>' })
           ]
           head = await this.component.buildTag({ tag: 'div', attr: { flex: 'justify-content:between align-items:end' }, html: content.join('\n') })
@@ -95,11 +100,14 @@ async function table () {
         if (selection) {
           const tag = selection === 'single' ? 'formRadio' : 'formCheck'
           const attr = { 'x-model': 'selected', name: '_rt', value: d.id, noLabel: true, noWrapper: true }
-          lines.push(await this.component.buildTag({ tag, attr, prepend: '<td>', append: '</td>' }))
+          const type = find(schema.properties, { name: 'id' }).type
+          const prepend = `<td data-value="${d.id}" data-key="id" data-type="${type}">`
+          lines.push(await this.component.buildTag({ tag, attr, prepend, append: '</td>' }))
         }
         for (const f of schema.view.fields) {
-          const prop = find(schema.properties, { name: f })
           if (!fields.includes(f)) continue
+          const prop = find(schema.properties, { name: f })
+          if (!prop) continue
           const opts = {}
           if (f === 'lng') opts.longitude = true
           else if (f === 'lat') opts.latitude = true
@@ -111,27 +119,31 @@ async function table () {
           let dataValue = d[f] ?? ''
           if (['string', 'text'].includes(prop.type)) dataValue = escape(dataValue)
           if (['array', 'object'].includes(prop.type)) dataValue = escape(JSON.stringify(d[f]))
-          const attr = { dataValue }
+          const attr = { dataValue, dataKey: prop.name, dataType: prop.type }
           if (!['object', 'array'].includes(prop.type)) {
             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))
+          if (formatter) {
+            if (isFunction(formatter)) value = await formatter(dataValue, d)
+            else value = await callHandler(formatter, req, dataValue, d)
+            value = await this.component.buildSentence(value)
+          }
           const line = await this.component.buildTag({ tag: 'td', attr, html: value })
           lines.push(line)
         }
         const attr = {}
-        if (!schema.view.disabled.includes('update') || !schema.view.disabled.includes('remove')) attr['@click'] = `toggle('${d.id}')`
-        if (!schema.view.disabled.includes('get')) attr['@dblclick'] = `goDetails('${d.id}')`
+        if (!disableds.includes('update') || !disableds.includes('remove')) attr['@click'] = `toggle('${d.id}')`
+        if (!disableds.includes('get')) attr['@dblclick'] = `goDetails('${d.id}')`
         items.push(await this.component.buildTag({ tag: 'tr', attr, html: lines.join('\n') }))
       }
       html.push(await this.component.buildTag({ tag: 'tbody', attr: group.body, html: items.join('\n') }))
       this.params.attr = omit(this.params.attr, ['sortUpIcon', 'sortDownIcon', 'noSort', 'selection', 'headerNowrap'])
       const goDetails = `
         goDetails (id) {
-          window.location.href = '${this.component.buildUrl({ base: 'details' })}&id=' + id
+          window.location.href = '${this.component.buildUrl({ base: 'details', prettyUrl })}&id=' + id
         }
       `
       if (selection === 'multi') {

package/waibuMpa/partial/crud/_list-footer.html

@@ -0,0 +1,8 @@
+<c:grid-row gutter="3" margin="top-2">
+  <c:grid-col col="6-lg">
+    <c:wdb-recs-info pages recs-per-page recs-per-page-values="10 15 25 50" />
+  </c:grid-col>
+  <c:grid-col col="6-lg" flex="justify-content:end-lg">
+    <c:wdb-pagination />
+  </c:grid-col>
+</c:grid-row>

package/waibuMpa/partial/crud/list-handler.html

@@ -15,12 +15,5 @@
   </c:grid-col>
 </c:grid-row>
 <c:wdb-table id="main-table" border body-divider strip responsive />
-<c:grid-row gutter="3" margin="top-2">
-  <c:grid-col col="6-lg">
-    <c:wdb-recs-info pages recs-per-page recs-per-page-values="10 15 25 50" />
-  </c:grid-col>
-  <c:grid-col col="6-lg" flex="justify-content:end-lg">
-    <c:wdb-pagination />
-  </c:grid-col>
-</c:grid-row>
+<c:include resource="waibuDb.partial:/crud/_list-footer.html" />
 <c:include resource="waibuDb.partial:/crud/_addons.html" />