waibu-db 2.13.0 → 2.14.0

package/extend/waibuBootstrap/theme/component/wdb-base.js

@@ -1,5 +1,34 @@
 async function wdbBase () {
   return class WdbBase extends this.app.baseClass.MpaWidget {
+    constructor (options) {
+      super(options)
+      const { getModel } = this.app.dobo
+      const { get } = this.app.lib._
+      this.schema = get(this, 'component.locals.schema', {})
+      this.formData = get(this, 'component.locals.form', {})
+      this.model = getModel(this.schema.name)
+    }
+
+    getRef = ({ field, refName, returning } = {}) => {
+      const { get } = this.app.lib._
+      if (!this.schema) return {}
+      const prop = this.model.getProperty(field)
+      if (!prop) return {}
+      refName = refName ?? this.params.attr['x-ref'] ?? field.slice(0, -2)
+      const key = this.params.attr.refName ?? refName
+      const ref = get(prop, `ref.${key}`, {})
+      if (returning === 'all') return { ref, key }
+      else if (returning === 'key') return key
+      return ref
+    }
+
+    getRefValue = ({ field, data, labelField, refName } = {}) => {
+      const { isEmpty } = this.app.lib._
+      const { ref, key } = this.getRef({ field, refName, returning: 'all' })
+      if (isEmpty(ref)) return undefined
+      labelField = labelField ?? ref.labelField ?? 'id'
+      return (data ?? this.formData)._ref[key][labelField]
+    }
   }
 }
 

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

@@ -33,11 +33,16 @@ async function form () {
             attr.push(`@${o.bind}="${o.handler}"`)
           }
           if (w.componentOpts) attr.push(`c-opts="${base64JsonEncode(w.componentOpts)}"`)
-          if (schema.view.valueFormatter[f] && (w.component === 'form-plaintext' || this.params.attr.method !== 'POST')) {
-            const value = await schema.view.valueFormatter[f].call(this, data[f], data, { req })
-            body.push(`<c:${w.component} ${w.attr.label ? ('t:label="' + w.attr.label + '"') : ''} value="${value}" label-floating name="${w.name}" ${attr.join(' ')} />`)
+          const attributes = `${w.attr.label ? ('t:label="' + w.attr.label + '"') : ''} label-floating name="${w.name}" ${attr.join(' ')}`
+          if (w.component === 'form-plaintext' || this.params.attr.method !== 'POST') {
+            let value
+            if (schema.view.valueFormatter[f]) value = await schema.view.valueFormatter[f].call(this, data[f], data, { req })
+            else if (prop.ref) value = this.getRefValue({ field: f, labelField: w.attr.labelField })
+            body.push(`<c:${w.component} ${attributes} data-type="${prop.type}" ${value ? `value="${value}"` : ''} />`)
+          } else if (prop.ref) {
+            body.push(`<c:wdb-lookup-select ${attributes} />`)
           } else {
-            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:${w.component} ${attributes} data-type="${prop.type}" />`)
           }
         }
         body.push('</c:fieldset>')

package/extend/waibuBootstrap/theme/component/widget/lookup-select.js

@@ -0,0 +1,42 @@
+import wdbBase from '../wdb-base.js'
+
+async function lookupSelect () {
+  const WdbBase = await wdbBase.call(this)
+
+  return class WdbLookupSelect extends WdbBase {
+    constructor (options) {
+      super(options)
+      this.params.noTag = true
+    }
+
+    returnEmpty = () => {
+      this.params.html = ''
+    }
+
+    build = async () => {
+      const { isEmpty, get, omit, set, camelCase, kebabCase } = this.app.lib._
+      const { parseQuery } = this.app.dobo
+      const { base64JsonEncode } = this.app.waibu
+      let refName = get(this.schema, `view.widget.${this.params.attr.name}.attr.refName`, this.params.attr.refName)
+      if (!refName && this.params.attr.name.endsWith('Id')) refName = this.params.attr.name.slice(0, -2)
+      const ref = this.getRef({ field: this.params.attr.name, refName })
+      if (isEmpty(ref)) return this.returnEmpty()
+
+      this.params.attr.url = this.params.attr.url ?? `waibuDb.restapi:/lookup/${kebabCase(ref.model)}`
+      const omitted = ['url', 'searchField', 'labelField', 'valueField']
+      const attr = omit(this.params.attr, omitted)
+      for (const k of omitted) {
+        attr[camelCase(`remote ${k}`)] = this.params.attr[k] ?? ref[k]
+      }
+      const q = set({}, this.params.attr.searchField ?? get(ref, 'searchField', 'id'), ['__REGEXP__', '{searchItem}', 'i'])
+      attr.remoteQuery = base64JsonEncode({ $and: [parseQuery(get(ref, 'query', {})), q] })
+      attr.remoteApiKey = true
+      attr.clearBtn = true
+      const sentence = `<c:form-select-ext ${Object.entries(attr).map(([k, v]) => `${kebabCase(k)}="${v}"`).join(' ')} />`
+      this.params.html = await this.component.buildSentence(sentence, this.component.locals)
+      this.params.attr = omit(this.params.attr, ['model', 'field', ...omitted])
+    }
+  }
+}
+
+export default lookupSelect

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

@@ -34,7 +34,7 @@ async function table () {
         const item = find(values, { value }) ?? {}
         const ttext = camelCase(`${prop.name} ${item.text}`)
         value = escape(req.format(!isEmpty(item) ? (req.te(ttext) ? req.t(ttext) : item.text) : value, prop.type))
-        if (item && !params.attr.noDataValueRef) value += ` <sup><a href="#" title="${req.t('dataValue')}: ${data[key]}">*</a></sup>`
+        if (item && !params.attr.noDataValueRef && !isEmpty(data[key])) value += ` <sup><a href="#" title="${req.t('dataValue')}: ${data[key]}">*</a></sup>`
       } else if (['string', 'text'].includes(prop.type)) {
         if (!get(schema, 'view.noEscape', []).includes(key)) value = escape(value)
       }
@@ -161,7 +161,7 @@ async function table () {
             if (['string', 'text'].includes(prop.type)) dataValue = escape(dataValue)
             if (['array', 'object'].includes(prop.type)) dataValue = escape(JSON.stringify(d[f]))
           }
-          let value = fd[f]
+          let value = this.getRefValue({ field: f, data: fd }) ?? fd[f]
           const attr = { dataValue, dataKey: prop.name, dataType: prop.type }
           if (!disableds.includes('get')) attr.style = { cursor: 'pointer' }
           const cellFormatter = get(schema, `view.cellFormatter.${f}`)

package/extend/waibuRestApi/route/lookup/@model/model-builder.json

@@ -0,0 +1,4 @@
+{
+  "model": ":model",
+  "disabled": ["create", "update", "remove"]
+}

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

@@ -114,9 +114,11 @@ function applyLayout (action, schema, ext) {
         result.attr.options = 'false:no;true:yes'
       }
       if (prop.values) {
-        result.component = result.component ?? 'form-select'
+        const orgCmp = result.component
+        result.component = orgCmp ?? 'form-select'
         if (typeof prop.values === 'string') result.attr.options = prop.values
         else result.attr.options = prop.values.map(item => `${item.value}:${item.text}`).join(';')
+        if (result.attr.options.split(';').length > 8 && !orgCmp) result.component = 'form-select-ext'
       }
       if (['string', 'text'].includes(prop.type) && prop.maxLength) set(result, 'attr.maxlength', prop.maxLength)
       if (readonly.includes(f)) result.component = 'form-plaintext'

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,13 @@
 # Changes
 
+## 2026-04-07
+
+- [2.14.0] Add ```wdb-lookup-select``` widget
+- [2.14.0] Add ```WdbBase.getRef()```
+- [2.14.0] Add ```WdbBase.getRefValue()```
+- [2.14.0] Rewrite necessary changes to use dobo's new lookup mechanism through model references
+
+
 ## 2026-04-02
 
 - [2.12.6] Bug fix in ```wdb-query``` widget