waibu-db 1.2.7 → 1.2.9

package/lib/crud/add-handler.js

@@ -1,15 +1,15 @@
-async function addHandler ({ req, reply, model, params = {}, template, addOnsHandler, templateDisabled = 'waibuDb.template:/disabled.html' } = {}) {
+async function addHandler ({ req, reply, model, params = {}, template, addOnsHandler, templateDisabled = 'waibuDb.template:/disabled.html', options = {} } = {}) {
   const { pascalCase } = this.lib.aneka
   const { recordCreate, recordGet, getSchemaExt } = this.app.waibuDb
   const { buildUrl } = this.app.waibuMpa
   const { defaultsDeep } = this.lib.aneka
   const { pick, map, merge, omit, isEmpty } = this.lib._
-  const options = {}
+  const opts = {}
   model = model ?? pascalCase(req.params.model)
-  const { schema } = await getSchemaExt(model, 'add', { params })
+  const { schema } = await getSchemaExt(model, 'add', merge({}, { params }, options))
   if (schema.disabled.includes('create')) return await reply.view(templateDisabled, { action: 'add' })
   // req.query.attachment = true
-  options.fields = schema.view.fields
+  opts.fields = schema.view.fields
   let def = {}
   if (req.method === 'GET' && req.query.mode === 'clone' && req.query.id) {
     const resp = await recordGet({ model, req, id: req.query.id, options: { fields: map(schema.properties, 'name') } })
@@ -22,7 +22,7 @@ async function addHandler ({ req, reply, model, params = {}, template, addOnsHan
     req.session[`wdb${model}AddMore`] = form._addmore
     req.session[`wdb${model}ClonePrev`] = form._cloneprev
     try {
-      resp = await recordCreate({ model, req, reply, options })
+      resp = await recordCreate({ model, req, reply, options: opts })
       if (isEmpty(form._addmore)) return reply.redirectTo(buildUrl({ url: req.url, base: 'list', params: { page: 1 }, exclude: ['id', 'mode'] }))
       if (isEmpty(form._cloneprev)) form = pick(form, ['_addmore', '_cloneprev'])
     } catch (err) {
@@ -32,7 +32,7 @@ async function addHandler ({ req, reply, model, params = {}, template, addOnsHan
     form._addmore = req.session[`wdb${model}AddMore`]
     form._cloneprev = req.session[`wdb${model}ClonePrev`]
   }
-  const addOns = addOnsHandler ? await addOnsHandler.call(this.app[req.ns], { req, reply, params, data: resp, schema, error }) : undefined
+  const addOns = addOnsHandler ? await addOnsHandler.call(this.app[req.ns], { req, reply, params, data: resp, schema, error, options }) : undefined
   merge(params, { form, schema, error, addOns })
   if (schema.template) template = schema.template
   if (schema.layout) params.page.layout = schema.layout

package/lib/crud/all-handler.js

@@ -17,15 +17,15 @@ const handler = {
   list: listHandler
 }
 
-async function allHandler ({ model, action, req, reply, template, params = {} }) {
+async function allHandler ({ model, action, req, reply, template, params = {}, options = {} }) {
   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')
-    return await handler[action].call(this, { model, req, reply })
+    return await handler[action].call(this, { model, req, reply, options })
   }
-  const allParams = merge(buildParams.call(this, { model, req, reply, action: upperFirst(action) }), params)
-  return await handler[action].call(this, { model, req, reply, params: allParams, template, addOnsHandler })
+  const allParams = merge(buildParams.call(this, { model, req, reply, action: upperFirst(action), options }), params)
+  return await handler[action].call(this, { model, req, reply, params: allParams, template, addOnsHandler, options })
 }
 
 export default allHandler

package/lib/crud/delete-handler.js

@@ -1,20 +1,21 @@
-async function deleteHandler ({ req, reply, model, params = {}, templateDisabled = 'waibuDb.template:/disabled.html' } = {}) {
+async function deleteHandler ({ req, reply, model, params = {}, templateDisabled = 'waibuDb.template:/disabled.html', options = {} } = {}) {
   const { pascalCase } = this.lib.aneka
   const { recordRemove, getSchemaExt } = this.app.waibuDb
   const { buildUrl } = this.app.waibuMpa
-  const { reduce } = this.lib._
-  const options = {}
+  const { reduce, merge } = this.lib._
+  const opts = {}
   model = model ?? pascalCase(req.params.model)
-  const { schema } = await getSchemaExt(model, 'add', { params })
+  const { schema } = await getSchemaExt(model, 'add', merge({}, { params }, options))
   if (schema.disabled.includes('remove')) return await reply.view(templateDisabled, { action: 'delete' })
-  options.fields = schema.view.fields
+  opts.fields = schema.view.fields
   const ids = (req.body.ids ?? '').split(',')
   if (ids.length > 0) {
     const result = []
-    const options = { noResult: true, noFlash: true }
+    opts.noResult = true
+    opts.noFlash = true
     for (const id of ids) {
       try {
-        await recordRemove({ model, id, req, reply, options })
+        await recordRemove({ model, id, req, reply, options: opts })
         result.push(true)
       } catch (err) {
         result.push(err.message)

package/lib/crud/details-handler.js

@@ -1,20 +1,20 @@
 import attachmentHandler from './helper/attachment-handler.js'
 
-async function detailsHandler ({ req, reply, model, params = {}, id, template, addOnsHandler, templateDisabled = 'waibuDb.template:/disabled.html' } = {}) {
+async function detailsHandler ({ req, reply, model, params = {}, id, template, addOnsHandler, templateDisabled = 'waibuDb.template:/disabled.html', options } = {}) {
   const { pascalCase } = this.lib.aneka
   const { recordGet, getSchemaExt } = this.app.waibuDb
   const { merge } = this.lib._
-  const options = {}
+  const opts = {}
   model = model ?? pascalCase(req.params.model)
-  const { schema } = await getSchemaExt(model, 'details', { params })
+  const { schema } = await getSchemaExt(model, 'details', merge({}, { params }, options))
   if (schema.disabled.includes('get')) return await reply.view(templateDisabled, { action: 'details' })
   // req.query.attachment = true
-  options.fields = schema.view.fields
+  opts.fields = schema.view.fields
   id = id ?? req.params.id ?? req.query.id
-  const resp = await recordGet({ model, req, id, options })
+  const resp = await recordGet({ model, req, id, options: opts })
   const form = resp.data
-  const addOns = addOnsHandler ? await addOnsHandler.call(this.app[req.ns], { req, reply, params, data: resp, schema }) : undefined
-  const attachments = await attachmentHandler.call(this, { schema, id })
+  const addOns = addOnsHandler ? await addOnsHandler.call(this.app[req.ns], { req, reply, params, data: resp, schema, options }) : undefined
+  const attachments = await attachmentHandler.call(this, { schema, id, options })
   merge(params, { form, schema, addOns, attachments })
   if (schema.template) template = schema.template
   if (schema.layout) params.page.layout = schema.layout

package/lib/crud/edit-handler.js

@@ -1,6 +1,6 @@
 import attachmentHandler from './helper/attachment-handler.js'
 
-async function editHandler ({ req, reply, model, id, params = {}, template, addOnsHandler, templateDisabled = 'waibuDb.template:/disabled.html' } = {}) {
+async function editHandler ({ req, reply, model, id, params = {}, template, addOnsHandler, templateDisabled = 'waibuDb.template:/disabled.html', options = {} } = {}) {
   const { pascalCase } = this.lib.aneka
   const { getPluginDataDir } = this.app.bajo
   const { recordUpdate, recordGet, getSchemaExt } = this.app.waibuDb
@@ -8,18 +8,18 @@ async function editHandler ({ req, reply, model, id, params = {}, template, addO
   const { fs } = this.lib
   const { defaultsDeep } = this.lib.aneka
   const { merge, isEmpty, omit } = this.lib._
-  const options = {}
+  const opts = {}
   let error
   let resp
   let form
   model = model ?? pascalCase(req.params.model)
-  const { schema } = await getSchemaExt(model, 'edit', options, { params })
+  const { schema } = await getSchemaExt(model, 'edit', merge({}, { params }, options))
   if (schema.disabled.includes('update')) return await reply.view(templateDisabled, { action: 'edit' })
   // req.query.attachment = true
-  options.fields = schema.view.fields
+  opts.fields = schema.view.fields
   id = id ?? req.params.id ?? req.query.id
   if (req.method === 'GET') {
-    const old = await recordGet({ model, req, id, options })
+    const old = await recordGet({ model, req, id, options: opts })
     form = defaultsDeep(req.body, old.data)
   } else {
     form = omit(req.body, ['_action', '_value'])
@@ -34,7 +34,7 @@ async function editHandler ({ req, reply, model, id, params = {}, template, addO
       if (req && req.flash) req.flash('notify', req.t('attachmentRemoved'))
     } else {
       try {
-        resp = await recordUpdate({ model, req, id, reply, options })
+        resp = await recordUpdate({ model, req, id, reply, options: opts })
         form = resp.data
         return reply.redirectTo(buildUrl({ url: req.url, base: req.params.base ?? req.query.base ?? 'list', params: { page: 1 }, exclude: ['id'] }))
       } catch (err) {
@@ -42,8 +42,8 @@ async function editHandler ({ req, reply, model, id, params = {}, template, addO
       }
     }
   }
-  const addOns = addOnsHandler ? await addOnsHandler.call(this.app[req.ns], { req, reply, params, data: resp, schema, error }) : undefined
-  const attachments = await attachmentHandler.call(this, { schema, id })
+  const addOns = addOnsHandler ? await addOnsHandler.call(this.app[req.ns], { req, reply, params, data: resp, schema, error, options }) : undefined
+  const attachments = await attachmentHandler.call(this, { schema, id, options })
   merge(params, { form, schema, error, addOns, attachments })
   if (schema.template) template = schema.template
   if (schema.layout) params.page.layout = schema.layout

package/lib/crud/export-handler.js

@@ -1,15 +1,15 @@
 import prepCrud from '../prep-crud.js'
 
-async function exportHandler ({ req, reply, model, params = {}, templateDisabled = 'waibuDb.template:/disabled.html' } = {}) {
+async function exportHandler ({ req, reply, model, params = {}, templateDisabled = 'waibuDb.template:/disabled.html', options = {} } = {}) {
   const { getPlugin } = this.app.bajo
   const { dayjs } = this.lib
-  const { omit, kebabCase, get } = this.lib._
+  const { omit, kebabCase, get, merge } = this.lib._
   const { pascalCase } = this.lib.aneka
   const { getSchemaExt } = this.app.waibuDb
   const { buildUrl } = this.app.waibuMpa
   const { pushDownload } = getPlugin('sumba')
   model = model ?? pascalCase(req.params.model)
-  const { schema } = await getSchemaExt(model, 'add', { params })
+  const { schema } = await getSchemaExt(model, 'add', merge({}, { params }, options))
   if (schema.disabled.includes('find')) return await reply.view(templateDisabled, { action: 'list' })
   const data = prepCrud.call(getPlugin('waibuDb'), { model, req, reply, args: ['model'] })
   data.opts = omit(data.opts, ['req', 'reply'])

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

@@ -1,4 +1,4 @@
-async function addOnsHandler ({ req, reply, data, schema }) {
+async function addOnsHandler ({ req, reply, data, schema, options = {} }) {
   const { escape } = this.app.waibu
   const { base64JsonEncode } = this.app.waibuMpa
   const { statAggregate } = this.app.waibuDb

package/lib/crud/helper/attachment-handler.js

@@ -1,4 +1,4 @@
-async function attachmentHandler ({ schema, id }) {
+async function attachmentHandler ({ schema, id, options = {} }) {
   const { listAttachments } = this.app.dobo
   if (!schema.view.attachment) return []
   return await listAttachments({ model: schema.name, id })

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

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

package/lib/crud/list-handler.js

@@ -1,11 +1,10 @@
-async function listHandler ({ req, reply, model, template, params = {}, addOnsHandler, templateDisabled = 'waibuDb.template:/disabled.html' } = {}) {
+async function listHandler ({ req, reply, model, template, params = {}, addOnsHandler, templateDisabled = 'waibuDb.template:/disabled.html', options = {} } = {}) {
   const { pascalCase } = this.lib.aneka
   const { recordFind, getSchemaExt } = this.app.waibuDb
   const { get, merge, isArray, upperFirst } = this.lib._
   const qsKey = this.app.waibu.config.qsKey
-  const options = { count: true, rels: '*' }
   model = model ?? pascalCase(req.params.model)
-  const { schema } = await getSchemaExt(model, 'list', { params })
+  const { schema } = await getSchemaExt(model, 'list', merge({}, { params }, options))
   if (schema.disabled.includes('find')) return await reply.view(templateDisabled, { action: 'list' })
   for (const key of ['sort', 'limit', 'fields']) {
     const sessKey = `wdb${model}${upperFirst(key)}`
@@ -14,10 +13,10 @@ async function listHandler ({ req, reply, model, template, params = {}, addOnsHa
   }
   if (!req.query[qsKey.page]) req.query[qsKey.page] = 1
   // req.query.attachment = true
-  const list = await recordFind({ model, req, options })
+  const list = await recordFind({ model, req, options: { count: true, rels: '*' } })
   let addOns = []
   if (addOnsHandler) {
-    addOns = await addOnsHandler.call(this.app[req.ns], { req, reply, params, data: list, schema })
+    addOns = await addOnsHandler.call(this.app[req.ns], { req, reply, params, data: list, schema, options })
     if (!isArray(addOns)) addOns = [addOns]
   }
   merge(params, { list, schema, addOns })

package/package.json

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

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

@@ -4,7 +4,7 @@ const defReadonly = ['id', 'createdAt', 'updatedAt']
 
 const defFormatter = {}
 
-function getCommons (action, schema, ext, opts = {}) {
+function getCommons (action, schema, ext, options = {}) {
   const { defaultsDeep } = this.lib.aneka
   const { merge, map, get, set, without, uniq, pull } = this.lib._
   const calcFields = get(ext, `view.${action}.calcFields`, get(ext, 'common.calcFields', []))
@@ -21,7 +21,7 @@ function getCommons (action, schema, ext, opts = {}) {
   const aggregate = get(ext, `view.${action}.stat.aggregate`, get(ext, 'common.stat.aggregate', []))
   let attachment = get(ext, `view.${action}.attachment`, get(ext, 'common.attachment', false))
   if (!schema.attachment || action === 'list') attachment = false
-  hidden.push('siteId', ...schema.hidden, ...(opts.hidden ?? []))
+  hidden.push('siteId', ...schema.hidden, ...(options.hidden ?? []))
   hidden = uniq(hidden)
   pull(hidden, ...forceVisible)
   const allFields = without(map(schema.properties, 'name'), ...hidden)
@@ -44,7 +44,8 @@ function getCommons (action, schema, ext, opts = {}) {
   if (calcFields.length > 0) fields.push(...map(calcFields, 'name'))
   fields = uniq(without(fields, ...hidden))
 
-  if (action !== 'add' && !fields.includes('id')) fields.unshift('id')
+  options.forceShowId = options.forceShowId ?? true
+  if (options.forceShowId && 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
   else if (noWrap === false) noWrap = []
@@ -88,7 +89,7 @@ function customLayout ({ action, schema, ext, layout, readonly }) {
 
 function applyLayout (action, schema, ext) {
   const { defaultsDeep } = this.lib.aneka
-  const { set, get, isEmpty, find } = this.lib._
+  const { set, get, isEmpty, find, kebabCase } = this.lib._
   const { fields, card, calcFields } = 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))
@@ -120,6 +121,13 @@ function applyLayout (action, schema, ext) {
       if (['string', 'text'].includes(prop.type) && prop.maxLength) set(result, 'attr.maxlength', prop.maxLength)
       if (readonly.includes(f)) result.component = 'form-plaintext'
     }
+    for (const k in result.attr ?? {}) {
+      const newKey = kebabCase(k)
+      if (k !== newKey) {
+        result.attr[newKey] = result.attr[k]
+        delete result.attr[k]
+      }
+    }
     widget[f] = result
   }
   set(schema, 'view.widget', widget)
@@ -131,9 +139,9 @@ function applyLayout (action, schema, ext) {
 }
 
 const handler = {
-  list: async function (schema, ext, opts) {
+  list: async function (schema, ext, options) {
     const { get, set } = this.lib._
-    const { fields } = getCommons.call(this, 'list', schema, ext, opts)
+    const { fields } = getCommons.call(this, 'list', schema, ext, options)
     const qsFields = []
     for (const f of get(schema, 'view.qs.fields', '').split(',')) {
       if (fields.includes(f)) qsFields.push(f)
@@ -148,18 +156,18 @@ const handler = {
     set(schema, 'view.fields', fields)
     set(schema, 'view.qs.fields', qsFields.join(','))
   },
-  details: async function (schema, ext, opts) {
-    applyLayout.call(this, 'details', schema, ext, opts)
+  details: async function (schema, ext, options) {
+    applyLayout.call(this, 'details', schema, ext, options)
   },
-  add: async function (schema, ext, opts) {
-    applyLayout.call(this, 'add', schema, ext, opts)
+  add: async function (schema, ext, options) {
+    applyLayout.call(this, 'add', schema, ext, options)
   },
-  edit: async function (schema, ext, opts) {
-    applyLayout.call(this, 'edit', schema, ext, opts)
+  edit: async function (schema, ext, options) {
+    applyLayout.call(this, 'edit', schema, ext, options)
   }
 }
 
-async function getSchemaExt (model, view, opts = {}) {
+async function getSchemaExt (model, view, options = {}) {
   const { readConfig } = this.app.bajo
   const { defaultsDeep } = this.lib.aneka
   const { getSchema } = this.app.dobo
@@ -167,10 +175,10 @@ async function getSchemaExt (model, view, opts = {}) {
 
   let schema = getSchema(model)
   const base = path.basename(schema.file, path.extname(schema.file))
-  let ext = await readConfig(`${schema.ns}:/waibuDb/schema/${base}.*`, { ignoreError: true, opts })
-  const over = await readConfig(`main:/waibuDb/extend/${schema.ns}/schema/${base}.*`, { ignoreError: true, opts })
-  ext = defaultsDeep(opts.schema ?? {}, over, ext)
-  await handler[view].call(this, schema, ext, opts)
+  let ext = await readConfig(`${schema.ns}:/waibuDb/schema/${base}.*`, { ignoreError: true, options })
+  const over = await readConfig(`main:/waibuDb/extend/${schema.ns}/schema/${base}.*`, { ignoreError: true, options })
+  ext = defaultsDeep(options.schema ?? {}, over, ext)
+  await handler[view].call(this, schema, ext, options)
   schema = pick(schema, ['name', 'properties', 'indexes', 'disabled', 'attachment', 'sortables', 'view'])
   return { schema, ext }
 }