waibu-db 1.1.1 → 1.1.3

package/lib/crud/add-handler.js

@@ -2,7 +2,7 @@ async function addHandler ({ req, reply, model, params = {}, template, addOnsHan
   const { pascalCase } = this.app.bajo
   const { recordCreate, recordGet, getSchemaExt } = this.app.waibuDb
   const { buildUrl } = this.app.waibuMpa
-  const { pick, map, merge, defaultsDeep, omit, isEmpty } = this.app.bajo.lib._
+  const { pick, map, merge, defaultsDeep, omit, isEmpty } = this.lib._
   const options = {}
   model = model ?? pascalCase(req.params.model)
   const { schema } = await getSchemaExt(model, 'add', options)

package/lib/crud/all-handler.js

@@ -18,7 +18,7 @@ const handler = {
 }
 
 async function allHandler ({ model, action, req, reply, template, params = {} }) {
-  const { upperFirst, merge, keys } = this.app.bajo.lib._
+  const { upperFirst, merge, keys } = this.lib._
   if (!keys(handler).includes(action)) throw this.error('_notFound')
   if (['delete', 'export'].includes(action)) {
     if (req.method === 'GET') throw this.error('_notFound')

package/lib/crud/delete-handler.js

@@ -2,7 +2,7 @@ async function deleteHandler ({ req, reply, model, params = {}, templateDisabled
   const { pascalCase } = this.app.bajo
   const { recordRemove, getSchemaExt } = this.app.waibuDb
   const { buildUrl } = this.app.waibuMpa
-  const { reduce } = this.app.bajo.lib._
+  const { reduce } = this.lib._
   const options = {}
   model = model ?? pascalCase(req.params.model)
   const { schema } = await getSchemaExt(model, 'add', options)

package/lib/crud/details-handler.js

@@ -1,7 +1,7 @@
 async function detailsHandler ({ req, reply, model, params = {}, template, addOnsHandler, templateDisabled = 'waibuDb.template:/disabled.html' } = {}) {
   const { pascalCase } = this.app.bajo
   const { recordGet, getSchemaExt } = this.app.waibuDb
-  const { merge } = this.app.bajo.lib._
+  const { merge } = this.lib._
   const options = {}
   model = model ?? pascalCase(req.params.model)
   const { schema } = await getSchemaExt(model, 'details', options)

package/lib/crud/edit-handler.js

@@ -2,7 +2,7 @@ async function editHandler ({ req, reply, model, params = {}, template, addOnsHa
   const { pascalCase } = this.app.bajo
   const { recordUpdate, recordGet, getSchemaExt } = this.app.waibuDb
   const { buildUrl } = this.app.waibuMpa
-  const { merge, defaultsDeep } = this.app.bajo.lib._
+  const { merge, defaultsDeep } = this.lib._
   const options = {}
   model = model ?? pascalCase(req.params.model)
   const { schema } = await getSchemaExt(model, 'edit', options)

package/lib/crud/helper/add-ons-handler.js

@@ -1,7 +1,7 @@
 async function addOnsHandler ({ req, reply, data, schema }) {
   const { base64JsonEncode } = this.app.waibuMpa
   const { statAggregate } = this.app.waibuDb
-  const { get, map, pick, pullAt } = this.app.bajo.lib._
+  const { get, map, pick, pullAt } = this.lib._
   const opts = map(get(schema, 'view.stat.aggregate', []), item => {
     const dbOpts = pick(item, ['fields', 'group', 'aggregate'])
     const name = item.name ?? `field.${item.fields[0]}`

package/lib/crud/helper/build-params.js

@@ -1,5 +1,5 @@
 function buildParams ({ model, req, reply, action }) {
-  const { camelCase, kebabCase, map, upperFirst, get } = this.app.bajo.lib._
+  const { camelCase, kebabCase, map, upperFirst, get } = this.lib._
   const { getSchema } = this.app.dobo
   const [alias, ...names] = map(kebabCase(model).split('-'), n => upperFirst(n))
   const schema = getSchema(camelCase(model), false)

package/lib/crud/list-handler.js

@@ -1,7 +1,7 @@
 async function listHandler ({ req, reply, model, template, params = {}, addOnsHandler, templateDisabled = 'waibuDb.template:/disabled.html' } = {}) {
   const { pascalCase } = this.app.bajo
   const { recordFind, getSchemaExt } = this.app.waibuDb
-  const { get, merge, isArray, upperFirst } = this.app.bajo.lib._
+  const { get, merge, isArray, upperFirst } = this.lib._
   const qsKey = this.app.waibu.config.qsKey
   const options = { count: true }
   model = model ?? pascalCase(req.params.model)

package/lib/prep-crud.js

@@ -1,7 +1,7 @@
 function prepCrud ({ model, body, id, req, reply, options = {}, args }) {
   const { parseFilter } = this.app.waibu
   const { pascalCase } = this.app.bajo
-  const { cloneDeep, has } = this.app.bajo.lib._
+  const { cloneDeep, has } = this.lib._
   const cfgWeb = this.app.waibu.config
   const opts = cloneDeep(options)
   const params = this.getParams(req, ...args)

package/package.json

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

package/plugin/method/admin-menu.js

@@ -2,7 +2,7 @@ function modelsMenu (req) {
   const { getPluginPrefix } = this.app.waibu
   const { titleize, pascalCase } = this.app.bajo
   const { getAppTitle } = this.app.waibuMpa
-  const { map, pick, groupBy, keys, kebabCase, filter, get } = this.app.bajo.lib._
+  const { map, pick, groupBy, keys, kebabCase, filter, get } = this.lib._
 
   const prefix = getPluginPrefix(this.name)
   const schemas = filter(this.app.dobo.schemas, s => {

package/plugin/method/get-lookup-data.js

@@ -1,5 +1,5 @@
 async function getLookupData ({ model, req, data, id = 'id', field, query }) {
-  const { set, map } = this.app.bajo.lib._
+  const { set, map } = this.lib._
   const $in = map(data, id)
   const q = query ?? set({}, field, { $in })
   const options = {

package/plugin/method/get-params.js

@@ -1,5 +1,5 @@
 function getParams (req, ...items) {
-  const { map, trim, get } = this.app.bajo.lib._
+  const { map, trim, get } = this.lib._
   let fields
   req.query = req.query ?? {}
   req.params = req.params ?? {}

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

@@ -3,7 +3,7 @@ import path from 'path'
 const defReadonly = ['id', 'createdAt', 'updatedAt']
 
 function getCommons (action, schema, ext, opts = {}) {
-  const { map, get, set, without, uniq } = this.app.bajo.lib._
+  const { map, get, set, without, uniq } = this.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 ?? []))
@@ -37,7 +37,7 @@ function autoLayout ({ action, schema, ext, layout, allWidgets }) {
 }
 
 function customLayout ({ action, schema, ext, layout, allWidgets, readonly }) {
-  const { find, omit, merge, isString } = this.app.bajo.lib._
+  const { find, omit, merge, isString } = this.lib._
   const items = [...layout]
   layout.splice(0, layout.length)
   for (const item of items) {
@@ -58,7 +58,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 { set, get, isEmpty, map, find } = this.lib._
   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))
@@ -95,7 +95,7 @@ function applyLayout (action, schema, ext) {
 
 const handler = {
   list: async function (schema, ext, opts) {
-    const { get, set } = this.app.bajo.lib._
+    const { get, set } = this.lib._
     const { fields, label } = getCommons.call(this, 'list', schema, ext, opts)
     const qsFields = []
     for (const f of get(schema, 'view.qs.fields', '').split(',')) {
@@ -123,7 +123,7 @@ const handler = {
 async function getSchemaExt (model, view, opts) {
   const { readConfig } = this.app.bajo
   const { getSchema } = this.app.dobo
-  const { pick } = this.app.bajo.lib._
+  const { pick } = this.lib._
 
   let schema = getSchema(model)
   const base = path.basename(schema.file, path.extname(schema.file))

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

@@ -23,7 +23,7 @@ async function table () {
       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, isFunction } = this.plugin.app.bajo.lib._
+      const { get, omit, set, find, isEmpty, without, isFunction, 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
@@ -127,6 +127,8 @@ async function table () {
           if (['string', 'text'].includes(prop.type)) dataValue = escape(dataValue)
           if (['array', 'object'].includes(prop.type)) dataValue = escape(JSON.stringify(d[f]))
           const attr = { dataValue, dataKey: prop.name, dataType: prop.type, style: { cursor: 'pointer' } }
+          const cellFormatter = get(schema, `view.cellFormatter.${f}`)
+          if (cellFormatter) merge(attr, await cellFormatter(dataValue, d))
           if (!['object', 'array'].includes(prop.type)) {
             const noWrap = this.isNoWrap(f, schema) ? 'nowrap' : ''
             if (this.isRightAligned(f, schema)) attr.text = `align:end ${noWrap}`
@@ -140,13 +142,13 @@ async function table () {
           const formatter = get(schema, `view.formatter.${f}`)
           if (formatter) {
             if (isFunction(formatter)) value = await formatter(dataValue, d)
-            else value = await callHandler(this.plugin.app[schema.ns], formatter, req, 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 = {}
+        const attr = { id: `rec-${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') }))