waibu-db 1.2.4 → 1.2.5

package/lib/crud/export-handler.js

@@ -11,7 +11,7 @@ async function exportHandler ({ req, reply, model, params = {}, templateDisabled
   model = model ?? pascalCase(req.params.model)
   const { schema } = await getSchemaExt(model, 'add', { params })
   if (schema.disabled.includes('find')) return await reply.view(templateDisabled, { action: 'list' })
-  const data = prepCrud.call(this, { model, req, reply, args: ['model'] })
+  const data = prepCrud.call(getPlugin('waibuDb'), { model, req, reply, args: ['model'] })
   data.opts = omit(data.opts, ['req', 'reply'])
   const source = `${this.name}:/export-handler`
   const worker = 'waibuDb:exportData'

package/package.json

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

package/plugin-method/format-record.js

@@ -1,4 +1,4 @@
-async function formatRow ({ data, req, component, schema, options = {} }) {
+async function formatRow ({ data, req, schema, options = {} }) {
   const { get, find, isFunction, cloneDeep } = this.lib._
   const { format, callHandler } = this.app.bajo
   const fields = get(schema, 'view.fields', Object.keys(schema.properties))
@@ -19,25 +19,19 @@ async function formatRow ({ data, req, component, schema, options = {} }) {
     rec[f] = format(data[f], prop.type, opts)
     const vf = get(schema, `view.valueFormatter.${f}`)
     if (vf) {
-      if (isFunction(vf)) rec[f] = await vf.call(req ?? this, data[f], data)
-      else rec[f] = await callHandler(vf, req, data[f], data)
-    }
-    const formatter = get(schema, `view.formatter.${f}`)
-    if (formatter && component) {
-      if (isFunction(formatter)) rec[f] = await formatter.call(req ?? this, data[f], data)
-      else rec[f] = await callHandler(formatter, req, data[f], data)
-      rec[f] = await component.buildSentence(rec[f])
+      if (isFunction(vf)) rec[f] = await vf.call(this, data[f], data)
+      else rec[f] = await callHandler(vf, { req, value: data[f], data })
     }
   }
   return rec
 }
 
-async function formatRecord ({ data, req, schema, component, options = {} }) {
+async function formatRecord ({ data, req, schema, options = {} }) {
   const { isArray } = this.lib._
-  if (!isArray(data)) return await formatRow.call(this, { data, req, schema, component, options })
+  if (!isArray(data)) return await formatRow.call(this, { data, req, schema, options })
   const items = []
   for (const d of data) {
-    const item = await formatRow.call(this, { data: d, req, schema, component, options })
+    const item = await formatRow.call(this, { data: d, req, schema, options })
     items.push(item)
   }
   return items

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

@@ -19,19 +19,33 @@ async function table () {
       return get(schema, 'view.noWrap', []).includes(field)
     }
 
+    _defFormatter = async ({ req, key, value, data, schema }) => {
+      const { get, find } = this.plugin.lib._
+      const { escape } = this.plugin.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' : ''}` } })) +
+          ' ' + (req.t(data[key] ? 'Yes' : 'No'))
+      } else if (['string', 'text'].includes(prop.type)) {
+        if (!get(schema, 'view.noEscape', []).includes(key)) value = escape(value)
+      }
+      return value
+    }
+
     build = async () => {
       const { req } = this.component
       const { escape } = this.plugin.app.waibu
       const { formatRecord } = this.plugin.app.waibuDb
       const { attrToArray, groupAttrs } = this.plugin.app.waibuMpa
-      const { get, omit, set, find, isEmpty, without, merge } = this.plugin.app.bajo.lib._
+      const { get, omit, set, find, isEmpty, without, merge } = this.plugin.lib._
       const group = groupAttrs(this.params.attr, ['body', 'head', 'foot'])
       this.params.attr = group._
       const prettyUrl = this.params.attr.prettyUrl
 
       const schema = get(this, 'component.locals.schema', {})
       const data = get(this, 'component.locals.list.data', [])
-      const fdata = await formatRecord.call(this.plugin, { data, req, schema, component: this.component })
+      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)
       if (count === 0) {
@@ -136,16 +150,10 @@ async function table () {
             if (['array', 'object'].includes(prop.type)) dataValue = escape(JSON.stringify(d[f]))
           }
           let value = fd[f]
-          if (prop.type === 'boolean') {
-            value = (await this.component.buildTag({ tag: 'icon', attr: { name: `circle${d[f] ? 'Check' : ''}` } })) +
-              ' ' + (req.t(d[f] ? 'Yes' : 'No'))
-          } else {
-            if (!get(schema, 'view.noEscape', []).includes(f)) value = escape(value)
-          }
           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.call(req, dataValue, d))
+          if (cellFormatter) merge(attr, await cellFormatter.call(this, 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
@@ -154,6 +162,9 @@ async function table () {
             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) value = await formatter.call(this, value, d)
+          else value = await this._defFormatter({ req, key: f, schema, value, data: d })
           const line = await this.component.buildTag({ tag: 'td', attr, html: value })
           lines.push(line)
         }