waibu-db 1.1.5 → 1.1.6

package/bajoTemplate/partial/crud/_list-footer.html

@@ -1,4 +1,4 @@
-<c:grid-row gutter="3" margin="bottom-4">
+<c:grid-row gutter="3">
   <c:grid-col col="6-lg">
     <c:wdb-recs-info pages recs-per-page recs-per-page-values="10 15 25 50" />
   </c:grid-col>

package/package.json

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

package/plugin/method/record/get.js

@@ -1,12 +1,12 @@
 import prepCrud from '../../../lib/prep-crud.js'
 
 async function get ({ model, req, reply, id, options = {} }) {
-  const { recordGet, attachmentFind } = this.app.dobo
-  const { parseFilter } = this.app.waibu
-  const { name, recId, opts, attachment, stats, mimeType } = prepCrud.call(this, { model, req, reply, id, options, args: ['model', 'id'] })
-  opts.filter = parseFilter(req)
-  const ret = await recordGet(name, recId, opts)
-  if (attachment) ret.data._attachment = await attachmentFind(name, id, { stats, mimeType })
+  const { recordFindOne, attachmentFind } = this.app.dobo
+  const { name, filter, opts, attachment, stats, mimeType } = prepCrud.call(this, { model, req, reply, id, options, args: ['model', 'id'] })
+  filter.query = { $and: [filter.query ?? {}, { id: id ?? req.params.id }] }
+  opts.dataOnly = true
+  const ret = await recordFindOne(name, filter, opts)
+  if (attachment) ret.data._attachment = await attachmentFind(name, ret.id, { stats, mimeType })
   return ret
 }
 

package/waibuBootstrap/theme/component/factory/btn-export.js

@@ -4,6 +4,10 @@ async function btnExport () {
   const WdbBase = await wdbBase.call(this)
 
   return class WdbBtnExport extends WdbBase {
+    static scripts = [...super.scripts,
+      'waibuMpa.virtual:/json2csv/json2csv.js'
+    ]
+
     build = async () => {
       const { isEmpty, get } = this.plugin.app.bajo.lib._
       const { req } = this.component
@@ -71,8 +75,15 @@ async function btnExport () {
             for (const el of els) {
               let data = []
               _.each(el.children, (v, i) => {
-                if ((i + '') === '0' && checker) return undefined
-                data.push(this.options.includes('fvalue') ? v.innerText : wmpa.parseValue(v.dataset.value, types[parseInt(i - 1)]))
+                i = i + ''
+                if (i === '0' && checker) return undefined
+                if (this.options.includes('fvalue')) data.push(v.innerText)
+                else {
+                  const type = types[parseInt(i)]
+                  let val = wmpa.parseValue(v.dataset.value, type)
+                  if (['datetime', 'date', 'time'].includes(type)) val = val.toISOString()
+                  data.push(val)
+                }
               })
               const item = {}
               for (const i in keys) {
@@ -107,7 +118,7 @@ async function btnExport () {
             <c:grid-col col="6-md">
               <c:fieldset t:legend="delivery" legend-type="6">
                 <c:form-radio x-model="delivery" value="file" t:label="saveAsFile" />
-                <c:form-radio x-model="delivery" value="clipboard" t:label="copyToClipboard" />
+                <c:form-radio x-model="delivery" value="clipboard" t:label="copyClipboard" />
               </c:fieldset>
               <c:fieldset t:legend="options" legend-type="6" margin="top-2">
                 <c:form-check x-ref="fkey" x-model="options" value="fkey" t:label="formattedField" />

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

@@ -29,6 +29,7 @@ async function table () {
       const prettyUrl = this.params.attr.prettyUrl
 
       const data = get(this, 'component.locals.list.data', [])
+      const filter = get(this, 'component.locals.list.filter', {})
       const count = get(this, 'component.locals.list.count', 0)
       if (count === 0) {
         const alert = '<c:alert color="warning" t:content="noRecordFound" margin="top-4"/>'
@@ -45,7 +46,11 @@ async function table () {
       const qsKey = this.plugin.app.waibu.config.qsKey
       let fields = without(get(this, `component.locals._meta.query.${qsKey.fields}`, '').split(','), '')
       if (isEmpty(fields)) fields = schema.view.fields
-      const sort = this.params.attr.sort ? attrToArray(this.params.attr.sort) : get(this, `component.locals._meta.query.${qsKey.sort}`, '')
+      let sort = this.params.attr.sort ? attrToArray(this.params.attr.sort) : get(this, `component.locals._meta.query.${qsKey.sort}`, '')
+      if (isEmpty(sort)) {
+        const keys = Object.keys(filter.sort)
+        if (keys.length > 0) sort = `${keys[0]}:${filter.sort[keys[0]]}`
+      }
 
       let [sortCol, sortDir] = sort.split(':')
       if (!['-1', '1'].includes(sortDir)) sortDir = '1'
@@ -63,7 +68,8 @@ async function table () {
       // head
       for (const f of schema.view.fields) {
         if (!fields.includes(f)) continue
-        const prop = find(schema.properties, { name: f })
+        let prop = find(schema.properties, { name: f })
+        if (!prop) prop = find(schema.view.calcFields, { name: f })
         if (!prop) continue
         let head = req.t(get(schema, `view.label.${f}`, `field.${f}`))
         if (!this.params.attr.noSort && (schema.sortables ?? []).includes(f)) {
@@ -113,7 +119,8 @@ async function table () {
         }
         for (const f of schema.view.fields) {
           if (!fields.includes(f)) continue
-          const prop = find(schema.properties, { name: f })
+          let prop = find(schema.properties, { name: f })
+          if (!prop) prop = find(schema.view.calcFields, { name: f })
           if (!prop) continue
           const opts = {}
           if (f === 'lng') opts.longitude = true
@@ -124,8 +131,14 @@ async function table () {
               ' ' + (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))
+            else dataValue = await callHandler(vf, req, d[f], d)
+          }
           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))
@@ -158,6 +171,7 @@ async function table () {
       const goDetails = `
         goDetails (id) {
           let url = '${this.params.attr.detailsHref ?? this.component.buildUrl({ base: 'details', prettyUrl })}'
+          if (url === '#') return
           if (url.indexOf('/:id') > -1) url = url.replace('/:id', '/' + id)
           else url += '&id=' + id
           window.location.href = url