waibu-db 1.2.11 → 2.0.0

package/index.js

@@ -1,7 +1,7 @@
 async function factory (pkgName) {
   const me = this
 
-  return class WaibuDb extends this.lib.BajoPlugin {
+  return class WaibuDb extends this.lib.Plugin {
     constructor () {
       super(pkgName, me.app)
       this.alias = 'wdb'

package/lib/crud/details-handler.js

@@ -4,7 +4,7 @@ async function detailsHandler ({ req, reply, model, params = {}, id, template, a
   const { pascalCase } = this.lib.aneka
   const { recordGet, getSchemaExt } = this.app.waibuDb
   const { merge } = this.lib._
-  const opts = {}
+  const opts = { rels: '*' }
   model = model ?? pascalCase(req.params.model)
   const { schema } = await getSchemaExt(model, 'details', merge({}, { params }, options))
   if (schema.disabled.includes('get')) return await reply.view(templateDisabled, { action: 'details' })

package/{plugin-method → method}/get-schema-ext.js

@@ -38,10 +38,10 @@ function getCommons (action, schema, ext, options = {}) {
   set(schema, 'view.x', x)
   if (schema.disabled.length > 0) schema.view.disabled.push(...schema.disabled)
   let fields = []
+  const calcFieldNames = map(calcFields, 'name')
   for (const f of forFields) {
-    if (allFields.includes(f)) fields.push(f)
+    if (calcFieldNames.includes(f) || allFields.includes(f)) fields.push(f)
   }
-  if (calcFields.length > 0) fields.push(...map(calcFields, 'name'))
   fields = uniq(without(fields, ...hidden))
 
   options.forceShowId = options.forceShowId ?? true
@@ -175,8 +175,8 @@ async function getSchemaExt (model, view, options = {}) {
 
   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, options })
-  const over = await readConfig(`main:/waibuDb/extend/${schema.ns}/schema/${base}.*`, { ignoreError: true, options })
+  let ext = await readConfig(`${schema.ns}:/extend/waibuDb/schema/${base}.*`, { ignoreError: true, options })
+  const over = await readConfig(`main:/extend/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'])

package/package.json

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