waibu-db 1.1.10 → 1.1.12

package/bajoTemplate/partial/crud/add-handler.html

@@ -1,5 +1,4 @@
-<c:form>
-  <!-- include waibuDb.partial:/crud/_form.html -->
+<c:wdb-form id="main-form" method="POST" enctype="multipart/form-data">
   <!-- include waibuDb.partial:/crud/_add-btns.html -->
-</c:form>
+</c:wdb-form>
 <!-- include waibuDb.partial:/crud/_addons.html -->

package/bajoTemplate/partial/crud/details-handler.html

@@ -1,5 +1,3 @@
-<c:div id="main-form">
-  <!-- include waibuDb.partial:/crud/_form.html -->
-</c:div>
+<c:wdb-form tag="div" id="main-form" />
 <!-- include waibuDb.partial:/crud/_details-btns.html -->
 <!-- include waibuDb.partial:/crud/_addons.html -->

package/bajoTemplate/partial/crud/edit-handler.html

@@ -1,5 +1,4 @@
-<c:form id="main-form">
-  <!-- include waibuDb.partial:/crud/_form.html -->
+<c:wdb-form id="main-form" method="POST" enctype="multipart/form-data">
   <!-- include waibuDb.partial:/crud/_edit-btns.html -->
-</c:form>
+</c:wdb-form>
 <!-- include waibuDb.partial:/crud/_addons.html -->

package/lib/crud/add-handler.js

@@ -5,7 +5,7 @@ async function addHandler ({ req, reply, model, params = {}, template, addOnsHan
   const { pick, map, merge, defaultsDeep, omit, isEmpty } = this.lib._
   const options = {}
   model = model ?? pascalCase(req.params.model)
-  const { schema } = await getSchemaExt(model, 'add', options)
+  const { schema } = await getSchemaExt(model, 'add', { params })
   if (schema.disabled.includes('create')) return reply.view(templateDisabled, { action: 'add' })
   // req.query.attachment = true
   options.fields = schema.view.fields

package/lib/crud/delete-handler.js

@@ -5,7 +5,7 @@ async function deleteHandler ({ req, reply, model, params = {}, templateDisabled
   const { reduce } = this.lib._
   const options = {}
   model = model ?? pascalCase(req.params.model)
-  const { schema } = await getSchemaExt(model, 'add', options)
+  const { schema } = await getSchemaExt(model, 'add', { params })
   if (schema.disabled.includes('remove')) return reply.view(templateDisabled, { action: 'delete' })
   options.fields = schema.view.fields
   const ids = (req.body.ids ?? '').split(',')

package/lib/crud/details-handler.js

@@ -4,7 +4,7 @@ async function detailsHandler ({ req, reply, model, params = {}, template, addOn
   const { merge } = this.lib._
   const options = {}
   model = model ?? pascalCase(req.params.model)
-  const { schema } = await getSchemaExt(model, 'details', options)
+  const { schema } = await getSchemaExt(model, 'details', { params })
   if (schema.disabled.includes('get')) return reply.view(templateDisabled, { action: 'details' })
   // req.query.attachment = true
   options.fields = schema.view.fields

package/lib/crud/edit-handler.js

@@ -5,7 +5,7 @@ async function editHandler ({ req, reply, model, params = {}, template, addOnsHa
   const { merge, defaultsDeep } = this.lib._
   const options = {}
   model = model ?? pascalCase(req.params.model)
-  const { schema } = await getSchemaExt(model, 'edit', options)
+  const { schema } = await getSchemaExt(model, 'edit', options, { params })
   if (schema.disabled.includes('update')) return reply.view(templateDisabled, { action: 'edit' })
   // req.query.attachment = true
   options.fields = schema.view.fields

package/lib/crud/export-handler.js

@@ -4,7 +4,7 @@ async function exportHandler ({ req, reply, model, params = {}, templateDisabled
   const { buildUrl } = this.app.waibuMpa
   const options = {}
   model = model ?? pascalCase(req.params.model)
-  const { schema } = await getSchemaExt(model, 'add', options)
+  const { schema } = await getSchemaExt(model, 'add', options, { params })
   if (schema.disabled.includes('find')) return reply.view(templateDisabled, { action: 'list' })
   options.fields = schema.view.fields
   const url = buildUrl({ url: req.url, base: req.body.handler })

package/lib/crud/list-handler.js

@@ -3,9 +3,9 @@ async function listHandler ({ req, reply, model, template, params = {}, addOnsHa
   const { recordFind, getSchemaExt } = this.app.waibuDb
   const { get, merge, isArray, upperFirst } = this.lib._
   const qsKey = this.app.waibu.config.qsKey
-  const options = { count: true }
+  const options = { count: true, rels: '*' }
   model = model ?? pascalCase(req.params.model)
-  const { schema } = await getSchemaExt(model, 'list')
+  const { schema } = await getSchemaExt(model, 'list', { params })
   if (schema.disabled.includes('find')) return reply.view(templateDisabled, { action: 'list' })
   for (const key of ['sort', 'limit', 'fields']) {
     const sessKey = `wdb${model}${upperFirst(key)}`

package/package.json

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

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

@@ -2,24 +2,60 @@ 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 })
+  }
+}
+
 function getCommons (action, schema, ext, opts = {}) {
-  const { map, get, set, without, uniq } = this.lib._
+  const { merge, map, get, set, without, uniq } = this.lib._
+  const calcFields = get(ext, `view.${action}.calcFields`, get(ext, 'common.calcFields', []))
+  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', {}))
   const card = get(ext, `view.${action}.card`, get(ext, 'common.card', true))
   const hidden = get(ext, `view.${action}.hidden`, get(ext, 'common.hidden', []))
   const disabled = get(ext, `view.${action}.disabled`, get(ext, 'common.disabled', []))
+  const x = get(ext, `view.${action}.x`, get(ext, 'common.x', {}))
   const aggregate = get(ext, `view.${action}.stat.aggregate`, get(ext, 'common.stat.aggregate', []))
   hidden.push(...schema.hidden, ...(opts.hidden ?? []))
   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.valueFormatter', valueFormatter)
+  set(schema, 'view.formatter', merge({}, defFormatter, formatter))
   set(schema, 'view.stat.aggregate', aggregate)
   set(schema, 'view.disabled', disabled)
+  set(schema, 'view.x', x)
   if (schema.disabled.length > 0) schema.view.disabled.push(...schema.disabled)
   let fields = []
   for (const f of forFields) {
-    if (allFields.includes(f)) fields.push(f)
+    if (allFields.includes(f) || map(calcFields, 'name').includes(f)) fields.push(f)
   }
   fields = uniq(without(fields, ...hidden))
+
   if (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
@@ -59,8 +95,11 @@ function customLayout ({ action, schema, ext, layout, allWidgets, readonly }) {
       }
       const widget = find(allWidgets, { name: f.name })
       if (!widget && !f.component) continue
-      widget.attr = merge({}, widget.attr, omit(f, ['component']))
-      if (f.component && !readonly.includes(f.name) && action !== 'details') widget.component = f.component
+      widget.attr = merge({}, widget.attr, omit(f, ['component', 'componentOpts']))
+      if (f.component && !readonly.includes(f.name) && action !== 'details') {
+        widget.component = f.component
+        widget.componentOpts = f.componentOpts
+      }
       widgets.push(widget)
     }
     if (widgets.length > 0) layout.push({ name: item.name, widgets })
@@ -85,7 +124,7 @@ function applyLayout (action, schema, ext) {
     } else {
       if (prop.type === 'boolean') {
         result.component = 'form-select'
-        result.attr.options = 'false:No true:Yes'
+        result.attr.options = 'false|No true|Yes'
       }
       if (prop.values) {
         result.component = 'form-select'
@@ -112,13 +151,16 @@ const handler = {
     for (const f of get(schema, 'view.qs.fields', '').split(',')) {
       if (fields.includes(f)) qsFields.push(f)
     }
-    let [col, dir] = get(schema, 'view.qs.sort', '').split(':')
-    if (!fields.includes(col) || !col) col = 'id'
-    if (!['1', '-1'].includes(dir)) dir = '1'
+    const sort = get(schema, 'view.qs.sort')
+    if (sort) {
+      let [col, dir] = get(schema, 'view.qs.sort', '').split(':')
+      if (!fields.includes(col) || !col) col = 'id'
+      if (!['1', '-1'].includes(dir)) dir = '1'
+      set(schema, 'view.qs.sort', `${col}:${dir}`)
+    }
     set(schema, 'view.label', label)
     set(schema, 'view.fields', fields)
     set(schema, 'view.qs.fields', qsFields.join(','))
-    set(schema, 'view.qs.sort', `${col}:${dir}`)
   },
   details: async function (schema, ext, opts) {
     applyLayout.call(this, 'details', schema, ext, opts)
@@ -138,8 +180,8 @@ 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 })
-  const over = await readConfig(`main:/waibuDb/extend/${schema.ns}/schema/${base}.*`, { ignoreError: true })
+  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(over, ext)
   await handler[view].call(this, schema, ext, opts)
   schema = pick(schema, ['name', 'properties', 'indexes', 'disabled', 'attachment', 'sortables', 'view'])

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

@@ -0,0 +1,43 @@
+import wdbBase from '../wdb-base.js'
+
+async function form () {
+  const WdbBase = await wdbBase.call(this)
+
+  return class WdbForm extends WdbBase {
+    build = async () => {
+      const { get, find, filter, forOwn, isEmpty } = this.plugin.lib._
+      const { base64JsonEncode } = this.plugin.app.waibuMpa
+      const schema = get(this, 'component.locals.schema', {})
+      const body = []
+      const xModels = get(schema, 'view.x.model', [])
+      const xOns = get(schema, 'view.x.on', [])
+      for (const l of schema.view.layout) {
+        body.push(`<c:fieldset ${schema.view.card === false ? '' : 'card'} ${l.name[0] !== '_' ? ('t:legend="' + l.name + '"') : ''} grid-gutter="2">`)
+        for (const w of l.widgets) {
+          const prop = find(schema.properties, { name: w.name })
+          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}"`)
+          })
+          const xon = filter(xOns, { field: w.name })
+          for (const o of xon) {
+            attr.push(`@${o.bind}="${o.handler}"`)
+          }
+          if (w.componentOpts) attr.push(`c-opts="${base64JsonEncode(w.componentOpts)}"`)
+          body.push(`<c:${w.component} ${w.attr.label ? ('t:label="' + w.attr.label + '"') : ''} data-type="${prop.type}" label-floating name="${w.name}" ${attr.join(' ')} />`)
+        }
+        body.push('</c:fieldset>')
+      }
+      const html = await this.component.buildSentence(body, this.component.locals)
+      this.params.html = `${html}\n${this.params.html}`
+      const xData = get(schema, 'view.x.data', '')
+      this.params.attr['x-data'] = isEmpty(xData) ? '' : `{ ${xData} }`
+      this.params.attr['x-init'] = get(schema, 'view.x.init', '')
+
+      this.params.tag = this.params.attr.tag ?? 'form'
+    }
+  }
+}
+
+export default form

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

@@ -126,39 +126,38 @@ async function table () {
           let prop = find(schema.properties, { name: f })
           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 = {}
-          if (f === 'lng') opts.longitude = true
-          else if (f === 'lat') opts.latitude = true
           let value = req.format(d[f], prop.type, opts)
           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)
-          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 vf = get(schema, `view.valueFormatter.${f}`)
           if (vf) {
-            if (isFunction(vf)) dataValue = escape(await vf(d[f], d))
+            if (isFunction(vf)) dataValue = escape(await vf.call(req, d[f], d))
             else dataValue = await callHandler(vf, req, d[f], d)
+            value = dataValue
           }
           const attr = { dataValue, dataKey: prop.name, dataType: prop.type }
           if (!disableds.includes('get')) attr.style = { cursor: 'pointer' }
           const cellFormatter = get(schema, `view.cellFormatter.${f}`)
-          if (cellFormatter) merge(attr, await cellFormatter(dataValue, d))
+          if (cellFormatter) merge(attr, await cellFormatter.call(req, dataValue, d))
           const noWrap = this.isNoWrap(f, schema, group.body.nowrap) ? 'nowrap' : ''
           if (this.isRightAligned(f, schema)) attr.text = `align:end ${noWrap}`
           else attr.text = noWrap
           const lookup = get(schema, `view.lookup.${f}`)
           if (lookup) {
-            const item = find(lookup.values, set({}, lookup.id ?? 'id', value))
+            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(dataValue, d)
-            else value = await callHandler(formatter, req, dataValue, d)
+            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 })
@@ -171,7 +170,7 @@ async function table () {
       }
       html.push(await this.component.buildTag({ tag: 'tbody', attr: group.body, html: items.join('\n') }))
       this.params.attr = omit(this.params.attr, ['sortUpIcon', 'sortDownIcon', 'noSort', 'selection', 'headerNowrap'])
-      const goDetails = `
+      let xData = `
         goDetails (id) {
           let url = '${this.params.attr.detailsHref ?? this.component.buildUrl({ base: 'details', prettyUrl })}'
           if (url === '#') return
@@ -180,8 +179,15 @@ async function table () {
           window.location.href = url
         }
       `
+      const xDataView = get(schema, 'view.x.data', '')
+      if (!isEmpty(xDataView)) xData += `, ${xDataView}`
+      let xInit = ''
+      const xInitView = get(schema, 'view.x.init', '')
+      if (!isEmpty(xInitView)) xInit += `${xInitView}\n`
+
       if (selection === 'multi') {
-        this.params.attr['x-data'] = `{
+        xData = `{
+          ${xData},
           toggleAll: false,
           selected: [],
           toggle (id) {
@@ -189,10 +195,10 @@ async function table () {
               const idx = this.selected.indexOf(id)
               this.selected.splice(idx, 1)
             } else this.selected.push(id)
-          },
-          ${goDetails}
+          }
         }`
-        this.params.attr['x-init'] = `
+        xInit = `
+          ${xInit}
           $watch('toggleAll', val => {
             if (val) {
               const els = document.getElementsByName('_rt')
@@ -203,21 +209,24 @@ async function table () {
           $watch('selected', val => $dispatch('on-selection', val))
         `
       } else if (selection === 'single') {
-        this.params.attr['x-data'] = `{
+        xData = `{
+          ${xData},
           selected: '',
           toggle (id) {
             this.selected = id
-          },
-          ${goDetails}
+          }
         }`
-        this.params.attr['x-init'] = `
+        xInit = `
+          ${xInit}
           $watch('selected', val => $dispatch('on-selection', [val]))
         `
       } else {
-        this.params.attr['x-data'] = `{
-          ${goDetails}
+        xData = `{
+          ${xData}
         }`
       }
+      this.params.attr['x-data'] = xData
+      this.params.attr['x-init'] = xInit
       this.params.html = await this.component.buildTag({ tag: 'table', attr: this.params.attr, html: html.join('\n') })
     }
   }

package/bajoTemplate/partial/crud/_form.html

@@ -1,12 +0,0 @@
-<% for (const l of schema.view.layout) { %>
-<c:fieldset <%= schema.view.card === false ? '' : 'card' %> <% if (l.name[0] !== '_') print('t:legend="' + l.name + '"') %> grid-gutter="2">
-  <% for (const w of l.widgets) {
-    const prop = _.find(schema.properties, { name: w.name })
-    const attr = []
-    _.forOwn(w.attr, (v, k) => {
-      attr.push(`${k}="${v}"`)
-    })
-    print(`<c:${w.component} ${w.attr.label ? ('label="' + _t(w.attr.label) + '"') : ''} data-type="${prop.type}" label-floating name="${w.name}" ${attr.join(' ')} />`)
-  } %>
-</c:fieldset>
-<% } %>