waibu-db 1.2.10 → 1.2.12

package/index.js

@@ -42,6 +42,7 @@ async function factory (pkgName) {
         ensureDir: true,
         fields
       }
+      options.filter.sort = 'id:1'
       const dmodel = 'SumbaDownload'
       try {
         await recordUpdate(dmodel, id, { status: 'PROCESSING' })

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/package.json

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

package/plugin-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

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

@@ -12,8 +12,10 @@ async function form () {
       const xModels = get(schema, 'view.x.model', [])
       const xOns = get(schema, 'view.x.on', [])
       for (const l of schema.view.layout) {
+        const fields = filter(l.fields, f => schema.view.fields.includes(f))
+        if (fields.length === 0) continue
         body.push(`<c:fieldset ${schema.view.card === false ? '' : 'card'} ${l.name[0] !== '_' ? ('t:legend="' + l.name + '"') : ''} grid-gutter="2">`)
-        for (const f of l.fields) {
+        for (const f of fields) {
           const w = schema.view.widget[f]
           let prop = find(schema.properties, { name: f })
           if (!prop) prop = find(schema.view.calcFields, { name: f })
@@ -21,7 +23,8 @@ async function form () {
           const attr = [`x-ref="${w.name}"`]
           if (xModels.includes(w.name)) attr.push(`x-model="${w.name}"`)
           forOwn(w.attr, (v, k) => {
-            attr.push(`${k}="${v}"`)
+            if (v === true) attr.push(k)
+            else attr.push(`${k}="${v}"`)
           })
           const xon = filter(xOns, { field: w.name })
           for (const o of xon) {