waibu-db 1.1.11 → 1.1.12

package/lib/crud/list-handler.js

@@ -3,7 +3,7 @@ async function listHandler ({ req, reply, model, template, params = {}, addOnsHa
   const { recordFind, getSchemaExt } = this.app.waibuDb
   const { get, merge, isArray, upperFirst } = this.lib._
   const qsKey = this.app.waibu.config.qsKey
-  const options = { count: true }
+  const options = { count: true, rels: '*' }
   model = model ?? pascalCase(req.params.model)
   const { schema } = await getSchemaExt(model, 'list', { params })
   if (schema.disabled.includes('find')) return reply.view(templateDisabled, { action: 'list' })

package/package.json

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

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

@@ -2,8 +2,38 @@ import path from 'path'
 
 const defReadonly = ['id', 'createdAt', 'updatedAt']
 
+const defFormatter = {
+  lat: function (val, rec) {
+    const format = this.format ?? this.app.bajo.format
+    return format(val, 'double', { latitude: true })
+  },
+  lng: function (val, rec) {
+    const format = this.format ?? this.app.bajo.format
+    return format(val, 'double', { longitude: true })
+  },
+  speed: function (val, rec) {
+    const format = this.format ?? this.app.bajo.format
+    return format(val, 'float', { speed: true, withType: true })
+  },
+  course: function (val, rec) {
+    const format = this.format ?? this.app.bajo.format
+    return format(val, 'float', { degree: true })
+  },
+  heading: function (val, rec) {
+    const format = this.format ?? this.app.bajo.format
+    return format(val, 'float', { degree: true })
+  },
+  distance: function (val, rec) {
+    const format = this.format ?? this.app.bajo.format
+    return format(val, 'float', { distance: true })
+  }
+}
+
 function getCommons (action, schema, ext, opts = {}) {
-  const { map, get, set, without, uniq } = this.lib._
+  const { merge, map, get, set, without, uniq } = this.lib._
+  const calcFields = get(ext, `view.${action}.calcFields`, get(ext, 'common.calcFields', []))
+  const valueFormatter = get(ext, `view.${action}.valueFormatter`, get(ext, 'common.valueFormatter', {}))
+  const formatter = get(ext, `view.${action}.formatter`, get(ext, 'common.formatter', {}))
   const label = get(ext, `view.${action}.label`, get(ext, 'common.label', {}))
   const card = get(ext, `view.${action}.card`, get(ext, 'common.card', true))
   const hidden = get(ext, `view.${action}.hidden`, get(ext, 'common.hidden', []))
@@ -13,15 +43,19 @@ function getCommons (action, schema, ext, opts = {}) {
   hidden.push(...schema.hidden, ...(opts.hidden ?? []))
   const allFields = without(map(schema.properties, 'name'), ...hidden)
   const forFields = get(ext, `view.${action}.fields`, get(ext, 'common.fields', allFields))
+  set(schema, 'view.calcFields', calcFields)
+  set(schema, 'view.valueFormatter', valueFormatter)
+  set(schema, 'view.formatter', merge({}, defFormatter, formatter))
   set(schema, 'view.stat.aggregate', aggregate)
   set(schema, 'view.disabled', disabled)
   set(schema, 'view.x', x)
   if (schema.disabled.length > 0) schema.view.disabled.push(...schema.disabled)
   let fields = []
   for (const f of forFields) {
-    if (allFields.includes(f)) fields.push(f)
+    if (allFields.includes(f) || map(calcFields, 'name').includes(f)) fields.push(f)
   }
   fields = uniq(without(fields, ...hidden))
+
   if (action !== 'add' && !fields.includes('id')) fields.unshift('id')
   let noWrap = get(ext, `view.${action}.noWrap`, get(ext, 'common.noWrap', true))
   if (noWrap === true) noWrap = fields

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

@@ -126,39 +126,38 @@ async function table () {
           let prop = find(schema.properties, { name: f })
           if (!prop) prop = find(schema.view.calcFields, { name: f })
           if (!prop) continue
+          let dataValue = d[f] ?? ''
+          if (['datetime'].includes(prop.type)) dataValue = escape(dataValue.toISOString())
+          if (['string', 'text'].includes(prop.type)) dataValue = escape(dataValue)
+          if (['array', 'object'].includes(prop.type)) dataValue = escape(JSON.stringify(d[f]))
           const opts = {}
-          if (f === 'lng') opts.longitude = true
-          else if (f === 'lat') opts.latitude = true
           let value = req.format(d[f], prop.type, opts)
           if (prop.type === 'boolean') {
             value = (await this.component.buildTag({ tag: 'icon', attr: { name: `circle${d[f] ? 'Check' : ''}` } })) +
               ' ' + (req.t(d[f] ? 'Yes' : 'No'))
           } else value = escape(value)
-          let dataValue = d[f] ?? ''
-          if (['datetime'].includes(prop.type)) dataValue = escape(dataValue.toISOString())
-          if (['string', 'text'].includes(prop.type)) dataValue = escape(dataValue)
-          if (['array', 'object'].includes(prop.type)) dataValue = escape(JSON.stringify(d[f]))
           const vf = get(schema, `view.valueFormatter.${f}`)
           if (vf) {
-            if (isFunction(vf)) dataValue = escape(await vf(d[f], d))
+            if (isFunction(vf)) dataValue = escape(await vf.call(req, d[f], d))
             else dataValue = await callHandler(vf, req, d[f], d)
+            value = dataValue
           }
           const attr = { dataValue, dataKey: prop.name, dataType: prop.type }
           if (!disableds.includes('get')) attr.style = { cursor: 'pointer' }
           const cellFormatter = get(schema, `view.cellFormatter.${f}`)
-          if (cellFormatter) merge(attr, await cellFormatter(dataValue, d))
+          if (cellFormatter) merge(attr, await cellFormatter.call(req, dataValue, d))
           const noWrap = this.isNoWrap(f, schema, group.body.nowrap) ? 'nowrap' : ''
           if (this.isRightAligned(f, schema)) attr.text = `align:end ${noWrap}`
           else attr.text = noWrap
           const lookup = get(schema, `view.lookup.${f}`)
           if (lookup) {
-            const item = find(lookup.values, set({}, lookup.id ?? 'id', value))
+            const item = find(lookup.values, set({}, lookup.id ?? 'id', d[f]))
             if (item) value = req.t(item[lookup.field ?? 'name'])
           }
           const formatter = get(schema, `view.formatter.${f}`)
           if (formatter) {
-            if (isFunction(formatter)) value = await formatter(dataValue, d)
-            else value = await callHandler(formatter, req, dataValue, d)
+            if (isFunction(formatter)) value = await formatter.call(req, d[f], d)
+            else value = await callHandler(formatter, req, d[f], d)
             value = await this.component.buildSentence(value)
           }
           const line = await this.component.buildTag({ tag: 'td', attr, html: value })