waibu-db 1.0.8 → 1.0.9

package/package.json

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

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

@@ -24,7 +24,7 @@ async function btnColumns () {
           items.push(await this.component.buildTag({ tag: 'formCheck', attr: { checked: true, label: req.t('ID'), value: f, disabled: true } }))
           continue
         }
-        const attr = { 'x-model': 'selected', label: req.t(`field.${f}`), value: f }
+        const attr = { 'x-model': 'selected', label: req.t(get(schema, `view.label.${f}`, `field.${f}`)), value: f }
         if (fields.includes(f)) attr.checked = true
         items.push(await this.component.buildTag({ tag: 'formCheck', attr }))
       }

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

@@ -22,6 +22,7 @@ async function btnDelete () {
         this.params.attr['x-data'] = `{
           selected: [],
           remove (modalId, ids) {
+            ids = JSON.parse(wmpa.fromBase64(ids)).join(',')
             wmpa.postForm({ ids }, '${this.component.buildUrl({ base: 'delete' })}')
           }
         }`

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

@@ -32,9 +32,10 @@ async function query () {
         if (ops.length === 0) continue
         const sels = ops.map(o => `<c:option>${o}</c:option>`)
         models.push(`${f}Op: 'eq'`, `${f}Val: ''`)
+        const label = this.component.req.t(get(schema, `view.label.${f}`, `field.${f}`))
         columns.push(`
           <c:grid-col col="4-md" flex="align-items:center">
-            <c:form-check x-model="selected" t:label="field.${f}" value="${f}" />
+            <c:form-check x-model="selected" t:label="${label}" value="${f}" />
           </c:grid-col>
           <c:grid-col col="3-md">
             <c:form-select x-model="${f}Op">

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

@@ -20,9 +20,10 @@ async function table () {
 
     async build () {
       const { req } = this.component
+      const { callHandler } = this.plugin.app.bajo
       const { escape } = this.plugin.app.waibu
       const { attrToArray, groupAttrs } = this.plugin.app.waibuMpa
-      const { get, omit, set, find, isEmpty, without } = this.plugin.app.bajo.lib._
+      const { get, omit, set, find, isEmpty, without, isFunction } = this.plugin.app.bajo.lib._
       const group = groupAttrs(this.params.attr, ['body', 'head', 'foot'])
       this.params.attr = group._
       const prettyUrl = this.params.attr.prettyUrl
@@ -69,7 +70,7 @@ async function table () {
           const href = this.component.buildUrl({ params: item })
           const attr = this.isRightAligned(f, schema) ? { text: 'align:end' } : {}
           const content = [
-            await this.component.buildTag({ tag: 'div', attr, html: req.t(`field.${f}`) }),
+            await this.component.buildTag({ tag: 'div', attr, html: head }),
             await this.component.buildTag({ tag: 'a', attr: { icon, href }, prepend: '<div class="ms-1">', append: '</div>' })
           ]
           head = await this.component.buildTag({ tag: 'div', attr: { flex: 'justify-content:between align-items:end' }, html: content.join('\n') })
@@ -125,7 +126,11 @@ async function table () {
             else attr.text = noWrap
           }
           const formatter = get(schema, `formatter.${f}`)
-          if (formatter) value = await this.component.buildSentence(formatter(value, d))
+          if (formatter) {
+            if (isFunction(formatter)) value = await formatter(dataValue, d)
+            else value = await callHandler(formatter, req, dataValue, d)
+            value = await this.component.buildSentence(value)
+          }
           const line = await this.component.buildTag({ tag: 'td', attr, html: value })
           lines.push(line)
         }