waibu-db 1.0.11 → 1.0.12

package/bajo/method/get-lookup-data.js

@@ -0,0 +1,13 @@
+async function getLookupData ({ model, req, data, id = 'id', field, query }) {
+  const { set, map } = this.app.bajo.lib._
+  const $in = map(data, id)
+  const q = query ?? set({}, field, { $in })
+  const options = {
+    dataOnly: true,
+    limit: -1,
+    query: q
+  }
+  return await this.recordFind({ model, req, options })
+}
+
+export default getLookupData

package/package.json

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

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

@@ -10,6 +10,8 @@ async function btnColumns () {
       const { req } = this.component
       const qsKey = this.plugin.app.waibu.config.qsKey
       const schema = get(this, 'component.locals.schema', {})
+      const count = get(this, 'component.locals.list.count', 0)
+      if (count === 0) this.params.attr.triggerDisabled = true
       if (schema.view.disabled.includes('find')) {
         this.params.html = ''
         return

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

@@ -9,12 +9,14 @@ async function btnExport () {
       const { req } = this.component
       this.params.noTag = true
       const schema = get(this, 'component.locals.schema', {})
+      const count = get(this, 'component.locals.list.count', 0)
+      if (count === 0 && this.params.attr.handler === 'list') this.params.attr.triggerDisabled = true
       if (schema.view.disabled.includes('find')) {
         this.params.html = ''
         return
       }
-      if (isEmpty(this.params.attr.launch)) this.params.attr.launch = req.t('Export')
-      this.params.attr.launchColor = this.params.attr.launchColor ?? 'secondary-outline'
+      if (isEmpty(this.params.attr.trigger)) this.params.attr.trigger = req.t('Export')
+      this.params.attr.triggerColor = this.params.attr.triggerColor ?? 'secondary-outline'
       this.params.attr.title = req.t('Data Export')
       const html = await this.component.buildSentence(`
         <c:div x-data="{

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

@@ -26,6 +26,11 @@ async function pagination () {
       }
       let { count, limit, page } = attrToObject(this.params.attr.options)
       count = count ?? get(this, 'component.locals.list.count', 0)
+      if (count === 0) {
+        this.params.noTag = true
+        this.params.html = ''
+        return
+      }
       limit = limit ?? get(this, 'component.locals.list.limit', 25)
       page = page ?? get(this, 'component.locals.list.page', 1)
       const pages = paginationLayout(count, limit, page) ?? []

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

@@ -10,6 +10,7 @@ async function query () {
       const { find, get, without, isEmpty, filter, upperFirst } = this.plugin.app.bajo.lib._
       const qsKey = this.plugin.app.waibu.config.qsKey
       const schema = get(this, 'component.locals.schema', {})
+      const count = get(this, 'component.locals.list.count', 0)
       if (schema.view.disabled.includes('find')) {
         this.params.html = ''
         return
@@ -50,12 +51,12 @@ async function query () {
       this.params.noTag = true
       const container = this.params.attr.modal ? 'modal' : 'drawer'
       this.params.html = await this.component.buildSentence(`
-        <c:form-input type="search" t:placeholder="Query" id="${id}" x-data="{ query: '' }" x-init="
+        <c:form-input ${count === 0 ? 'disabled' : ''} type="search" t:placeholder="Query" id="${id}" x-data="{ query: '' }" x-init="
           const url = new URL(window.location.href)
           query = url.searchParams.get('${qsKey.query}') ?? ''
         " x-model="query" @on-query.window="query = $event.detail ?? ''" @keyup.enter="$dispatch('on-submit')">
           <c:form-input-addon>
-            <c:${container} launch-icon="${this.params.attr.icon ?? 'dotsThree'}" launch-on-end t:title="Query Builder" x-ref="query" x-data="{
+            <c:${container} ${count === 0 ? 'trigger-disabled' : ''} trigger-icon="${this.params.attr.icon ?? 'dotsThree'}" trigger-on-end t:title="Query Builder" x-ref="query" x-data="{
               fields: ${jsonStringify(fields, true)},
               builder: '',
               selected: [],
@@ -157,7 +158,7 @@ async function query () {
             </c:${container}>
           </c:form-input-addon>
           <c:form-input-addon>
-            <c:btn t:content="Submit" x-data="{
+            <c:btn ${count === 0 ? 'disabled' : ''} t:content="Submit" x-data="{
               submit () {
                 const val = document.getElementById('${id}').value ?? ''
                 const url = new URL(window.location.href)

package/waibuBootstrap/theme/component/factory/recs-info.js

@@ -16,16 +16,17 @@ async function recsInfo () {
       }
       let { count, limit, page, pages } = attrToObject(this.params.attr.options)
       count = count ?? get(this, 'component.locals.list.count', 0)
+      if (count === 0) {
+        this.params.noTag = true
+        this.params.html = ''
+        return
+      }
       page = page ?? get(this, 'component.locals.list.page', 1)
       limit = limit ?? get(this, 'component.locals.list.limit', 25)
       pages = pages ?? get(this, 'component.locals.list.pages', 0)
 
       this.params.tag = 'div'
       this.params.attr.flex = 'justify-center:start align-items:center'
-      if (count === 0) {
-        this.params.html = req.t('No record found')
-        return
-      }
       if (!this.params.attr.dropdown) this.params.attr.dropdown = true
       const group = groupAttrs(this.params.attr, ['dropdown'])
       const html = []

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

@@ -29,6 +29,13 @@ async function table () {
       const prettyUrl = this.params.attr.prettyUrl
 
       const data = get(this, 'component.locals.list.data', [])
+      const count = get(this, 'component.locals.list.count', 0)
+      if (count === 0) {
+        const alert = '<c:alert color="warning" t:content="No record found" margin="top-4"/>'
+        this.params.noTag = true
+        this.params.html = await this.component.buildSentence(alert)
+        return
+      }
       const schema = get(this, 'component.locals.schema', {})
       const disableds = get(schema, 'view.disabled', [])
       if (disableds.includes('find')) {
@@ -119,13 +126,18 @@ async function table () {
           let dataValue = d[f] ?? ''
           if (['string', 'text'].includes(prop.type)) dataValue = escape(dataValue)
           if (['array', 'object'].includes(prop.type)) dataValue = escape(JSON.stringify(d[f]))
-          const attr = { dataValue, dataKey: prop.name, dataType: prop.type }
+          const attr = { dataValue, dataKey: prop.name, dataType: prop.type, style: { cursor: 'pointer' } }
           if (!['object', 'array'].includes(prop.type)) {
             const noWrap = this.isNoWrap(f, schema) ? 'nowrap' : ''
             if (this.isRightAligned(f, schema)) attr.text = `align:end ${noWrap}`
             else attr.text = noWrap
           }
-          const formatter = get(schema, `formatter.${f}`)
+          const lookup = get(schema, `view.lookup.${f}`)
+          if (lookup) {
+            const item = find(lookup.values, set({}, lookup.id ?? 'id', value))
+            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)