waibu-db 2.18.0 → 2.18.1

package/extend/waibuBootstrap/theme/component/widget/data-table.js

@@ -123,15 +123,14 @@ async function table () {
         }
         for (const f of schema.view.fields) {
           if (!fields.includes(f)) continue
-          let prop = find(schema.properties, { name: f })
-          if (!prop) prop = find(schema.view.calcFields, { name: f })
+          const prop = find(schema.properties, { name: f })
           if (!prop) continue
           let dataValue = d[f]
           if (['datetime'].includes(prop.type) && dataValue instanceof Date && !isNaN(dataValue)) dataValue = escape(dataValue.toISOString())
           else if (['string', 'text'].includes(prop.type)) dataValue = escape(dataValue)
           else if (['array', 'object'].includes(prop.type)) dataValue = escape(JSON.stringify(dataValue))
           const refName = get(schema, `view.widget.${f}.attr.refName`)
-          let value = this.getRefValue({ field: f, data: d, refName }) ?? get(d, `_fmt.${f}`)
+          let value = this.getRefValue({ field: f, data: d, refName }) ?? get(d, `_fmt.${f}`, d[f])
           if (!get(schema, 'view.noEscape', []).includes(f)) value = escape(value)
           const attr = { dataValue, dataKey: prop.name, dataType: prop.type }
           if (!disableds.includes('get')) attr.style = { cursor: 'pointer' }

package/extend/waibuBootstrap/theme/component/widget/form.js

@@ -12,11 +12,10 @@ async function form () {
       const { get, has } = this.app.lib._
       const { stringifyAttribs } = this.app.waibuMpa
       attr.dataType = prop.type
-      const cmp = prop.ref ? 'wdb-lookup-select' : widget.component
       if (has(attr, 'name') && !has(attr, 'value')) {
-        attr.value = cmp === 'form-plaintext' ? get(this, `oldData.${attr.name}`, attr.dataValue) : attr.dataValue
+        attr.value = widget.component === 'form-plaintext' ? get(this, `oldData.${attr.name}`, attr.dataValue) : attr.dataValue
       }
-      return `<c:${cmp} ${stringifyAttribs(attr)} />`
+      return `<c:${widget.component} ${stringifyAttribs(attr)} />`
     }
 
     build = async () => {

package/index.js

@@ -167,49 +167,6 @@ async function factory (pkgName) {
       return await this.findAllRecord({ model, req, options })
     }
 
-    formatRecord = async ({ data, req, schema, options = {} }) => {
-      const { isArray } = this.app.lib._
-      if (!isArray(data)) return await this.formatRow({ data, req, schema, options })
-      const items = []
-      for (const d of data) {
-        const item = await this.formatRow({ data: d, req, schema, options })
-        items.push(item)
-      }
-      return items
-    }
-
-    formatRow = async ({ data, req, schema, options = {} }) => {
-      const { get, find, isFunction, cloneDeep } = this.app.lib._
-      const { format, callHandler } = this.app.bajo
-      const { escape } = this.app.waibu
-      const fields = get(schema, 'view.fields', Object.keys(schema.properties))
-      const rec = cloneDeep(data)
-      const lang = get(req, 'lang')
-      const unitSys = get(req, 'site.setting.sumba.unitSys')
-      const timeZone = get(req, 'site.setting.sumba.timeZone', this.app.bajo.config.intl.format.datetime.timeZone)
-      for (const f of fields) {
-        if (f === '_ref') continue
-        let prop = find(schema.properties, { name: f })
-        if (!prop) prop = find(schema.view.calcFields, { name: f })
-        if (!prop) continue
-        const opts = {
-          lang: options.lang ?? lang,
-          longitude: ['lng', 'longitude'].includes(f),
-          latitude: ['lat', 'latitude'].includes(f),
-          speed: ['speed'].includes(f),
-          degree: ['course', 'heading'].includes(f),
-          distance: ['distance'].includes(f),
-          unitSys: options.unitSys ?? unitSys,
-          datetime: options.datetime ?? { timeZone },
-          date: options.date ?? { timeZone },
-          time: options.time ?? { timeZone }
-        }
-        rec[f] = format(data[f], prop.type, opts)
-        if (['string', 'text'].includes(prop.type)) rec[f] = escape(rec[f])
-      }
-      return rec
-    }
-
     countRecord = countRecord
     createAggregate = createAggregate
     createHistogram = createHistogram

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

@@ -7,7 +7,6 @@ const defFormatter = {}
 function getCommons (action, schema, ext, options = {}) {
   const { defaultsDeep } = this.app.lib.aneka
   const { merge, map, get, set, without, uniq, pull } = this.app.lib._
-  const calcFields = get(ext, `view.${action}.calcFields`, get(ext, 'common.calcFields', []))
   const forceVisible = get(ext, `view.${action}.forceVisible`, get(ext, 'common.forceVisible', []))
   const widget = defaultsDeep(get(ext, `view.${action}.widget`), get(ext, 'common.widget', {}))
   const noEscape = get(ext, `view.${action}.noEscape`, get(ext, 'common.noEscape', []))
@@ -19,7 +18,7 @@ function getCommons (action, schema, ext, options = {}) {
   const disabled = get(ext, `view.${action}.disabled`, get(ext, 'common.disabled', []))
   const x = defaultsDeep(get(ext, `view.${action}.x`), get(ext, 'common.x', {}))
   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))
+  let attachment = get(ext, `view.${action}.attachment`, get(ext, 'common.attachment', schema.attachment))
   if (!schema.attachment || action === 'list') attachment = false
   hidden.push('siteId', ...schema.hidden, ...(options.hidden ?? []))
   hidden = uniq(hidden)
@@ -27,7 +26,6 @@ function getCommons (action, schema, ext, options = {}) {
   const allFields = without(map(schema.properties, 'name'), ...hidden)
   const forFields = get(ext, `view.${action}.fields`, get(ext, 'common.fields', allFields))
   set(schema, 'view.attachment', attachment)
-  set(schema, 'view.calcFields', calcFields)
   set(schema, 'view.noEscape', noEscape)
   set(schema, 'view.widget', widget)
   set(schema, 'view.formatCell', formatCell)
@@ -38,9 +36,8 @@ 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 (calcFieldNames.includes(f) || allFields.includes(f)) fields.push(f)
+    if (allFields.includes(f)) fields.push(f)
   }
   fields = uniq(without(fields, ...hidden))
 
@@ -50,7 +47,7 @@ function getCommons (action, schema, ext, options = {}) {
   if (noWrap === true) noWrap = fields
   else if (noWrap === false) noWrap = []
   set(schema, 'view.noWrap', noWrap)
-  return { fields, allFields, card, calcFields }
+  return { fields, allFields, card }
 }
 
 function autoLayout ({ action, schema, ext, layout }) {
@@ -89,14 +86,13 @@ function customLayout ({ action, schema, ext, layout, readonly }) {
 
 function applyLayout (action, schema, ext) {
   const { defaultsDeep } = this.app.lib.aneka
-  const { set, get, isEmpty, find, kebabCase } = this.app.lib._
-  const { fields, card, calcFields } = getCommons.call(this, action, schema, ext)
+  const { set, get, isEmpty, find } = this.app.lib._
+  const { fields, card } = 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))
   const widget = {}
   for (const f of fields) {
-    let prop = find(schema.properties, { name: f })
-    if (!prop) prop = find(calcFields, { name: f })
+    const prop = find(schema.properties, { name: f })
     if (!prop) continue
     const result = schema.view.widget[f] ?? {}
     result.name = result.name ?? f
@@ -109,8 +105,11 @@ function applyLayout (action, schema, ext) {
     if (action === 'details') {
       result.component = 'form-plaintext'
     } else {
+      if (prop.ref) {
+        result.component = result.component ?? 'wdb-lookup-select'
+      }
       if (prop.type === 'boolean') {
-        result.component = 'form-select'
+        result.component = result.component ?? 'form-select'
         result.attr.options = 'false:no;true:yes'
       }
       if (prop.values) {
@@ -124,6 +123,7 @@ function applyLayout (action, schema, ext) {
       if (readonly.includes(f)) result.component = 'form-plaintext'
       if (!result.component) result.component = 'form-input'
     }
+    /*
     for (const k in result.attr ?? {}) {
       const newKey = kebabCase(k)
       if (k !== newKey) {
@@ -131,6 +131,7 @@ function applyLayout (action, schema, ext) {
         delete result.attr[k]
       }
     }
+    */
     widget[f] = result
   }
   set(schema, 'view.widget', widget)
@@ -180,7 +181,7 @@ async function getSchemaExt (modelName, view, options = {}) {
 
   const model = isString(modelName) ? this.app.dobo.getModel(modelName) : modelName
   const ns = model.plugin.ns
-  const schema = pick(model, ['name', 'properties', 'indexes', 'disabled', 'attachment', 'sortables', 'scanables', 'view', 'hidden'])
+  const schema = pick(model, ['name', 'properties', 'indexes', 'disabled', 'attachment', 'sortables', 'scanables', 'view', 'hidden', 'attachment'])
   const base = options.base ?? path.basename(model.file, path.extname(model.file))
   const parserOpts = { args: options.args }
   let ext = await readConfig(`${ns}:/extend/waibuDb/schema/${base}.*`, { ns, baseNs: 'waibuDb', parserOpts })

package/package.json

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