waibu-db 1.1.12 → 1.1.14

package/package.json

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

package/plugin/method/format-record.js

@@ -0,0 +1,46 @@
+async function formatRow ({ data, req, component, 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))
+  const rec = cloneDeep(data)
+  for (const f of fields) {
+    if (f === '_rel') continue
+    let prop = find(schema.properties, { name: f })
+    if (!prop) prop = find(schema.view.calcFields, { name: f })
+    if (!prop) continue
+    const opts = {
+      lang: options.lang ?? (req ? req.lang : undefined),
+      longitude: ['lng', 'longitude'].includes(f),
+      latitude: ['lat', 'latitude'].includes(f),
+      speed: ['speed'].includes(f),
+      degree: ['course', 'heading'].includes(f),
+      distance: ['distance'].includes(f)
+    }
+    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])
+    }
+  }
+  return rec
+}
+
+async function formatRecord ({ data, req, schema, component, options = {} }) {
+  const { isArray } = this.lib._
+  if (!isArray(data)) return await formatRow.call(this, { data, req, schema, component, options })
+  const items = []
+  for (const d of data) {
+    const item = await formatRow.call(this, { data: d, req, schema, component, options })
+    items.push(item)
+  }
+  return items
+}
+
+export default formatRecord

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

@@ -2,36 +2,12 @@ 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 })
-  }
-}
+const defFormatter = {}
 
 function getCommons (action, schema, ext, opts = {}) {
   const { merge, map, get, set, without, uniq } = this.lib._
   const calcFields = get(ext, `view.${action}.calcFields`, get(ext, 'common.calcFields', []))
+  const noEscape = get(ext, `view.${action}.noEscape`, get(ext, 'common.noEscape', []))
   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', {}))
@@ -44,6 +20,7 @@ function getCommons (action, schema, ext, opts = {}) {
   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.noEscape', noEscape)
   set(schema, 'view.valueFormatter', valueFormatter)
   set(schema, 'view.formatter', merge({}, defFormatter, formatter))
   set(schema, 'view.stat.aggregate', aggregate)

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

@@ -21,15 +21,17 @@ async function table () {
 
     build = async () => {
       const { req } = this.component
-      const { callHandler } = this.plugin.app.bajo
       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, isFunction, merge } = this.plugin.app.bajo.lib._
+      const { get, omit, set, find, isEmpty, without, merge } = 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 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 filter = get(this, 'component.locals.list.filter', {})
       const count = get(this, 'component.locals.list.count', 0)
       if (count === 0) {
@@ -38,7 +40,6 @@ async function table () {
         this.params.html = await this.component.buildSentence(alert)
         return
       }
-      const schema = get(this, 'component.locals.schema', {})
       const disableds = get(schema, 'view.disabled', [])
       if (disableds.includes('find')) {
         this.params.html = ''
@@ -49,7 +50,7 @@ async function table () {
       if (isEmpty(fields)) fields = schema.view.fields
       if (!isEmpty(schema.view.hidden)) fields = without(fields, ...schema.view.hidden)
       let sort = this.params.attr.sort ? attrToArray(this.params.attr.sort) : get(this, `component.locals._meta.query.${qsKey.sort}`, '')
-      if (isEmpty(sort)) {
+      if (isEmpty(sort) && filter.sort) {
         const keys = Object.keys(filter.sort)
         if (keys.length > 0) sort = `${keys[0]}:${filter.sort[keys[0]]}`
       }
@@ -112,7 +113,9 @@ async function table () {
       html.push(await this.component.buildTag({ tag: 'thead', attr: group.head, html: header }))
       // body
       items = []
-      for (const d of data) {
+      for (const idx in data) {
+        const d = data[idx]
+        const fd = fdata[idx]
         const lines = []
         if (selection) {
           const tag = selection === 'single' ? 'formRadio' : 'formCheck'
@@ -127,20 +130,17 @@ async function table () {
           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 = {}
-          let value = req.format(d[f], prop.type, opts)
+          if (!isEmpty(dataValue)) {
+            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]))
+          }
+          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 value = escape(value)
-          const vf = get(schema, `view.valueFormatter.${f}`)
-          if (vf) {
-            if (isFunction(vf)) dataValue = escape(await vf.call(req, d[f], d))
-            else dataValue = await callHandler(vf, req, d[f], d)
-            value = dataValue
+          } 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' }
@@ -154,12 +154,6 @@ 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) {
-            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 })
           lines.push(line)
         }