waibu-db 2.33.2 → 2.34.1

package/extend/waibuBootstrap/theme/component/widget/echarts-bar.js

@@ -37,11 +37,11 @@ async function echartsBar () {
         }]
       })
       const onLoad = []
-      if (this.params.attr.remote) {
-        const remote = this._parseBase64Attr(this.params.attr.remote)
-        onLoad.push(`
+      const remote = this.params.attr.remote ? this._parseBase64Attr(this.params.attr.remote) : {}
+      const data = [
+        `async load (params) {
           this.chart.showLoading('default', { text: '' })
-          const remote = ${jsonStringify(remote, true)}
+          const remote = params ?? ${jsonStringify(remote, true)}
           const agg = remote.filter.aggregate ?? 'count'
           const recs = await wmpa.fetchApi(remote.url, { fetching: false }, remote.filter)
           this.chart.hideLoading()
@@ -49,9 +49,14 @@ async function echartsBar () {
             xAxis: { data: _.map(recs, remote.key.name) },
             series: [{ type: 'bar', data: _.map(recs, remote.key.value ?? agg ) }]
           }
+        }`
+      ]
+      if (!this.params.attr.noAutoLoad) {
+        onLoad.push(`
+          this.load()
         `)
       }
-      this._build({ onLoad })
+      this._build({ onLoad, data })
     }
   }
 }

package/extend/waibuBootstrap/theme/component/widget/echarts-pie.js

@@ -17,11 +17,11 @@ async function echartsPie () {
         }]
       })
       const onLoad = []
-      if (this.params.attr.remote) {
-        const remote = this._parseBase64Attr(this.params.attr.remote)
-        onLoad.push(`
+      const remote = this.params.attr.remote ? this._parseBase64Attr(this.params.attr.remote) : {}
+      const data = [
+        `async load (params) {
           this.chart.showLoading('default', { text: '' })
-          const remote = ${jsonStringify(remote, true)}
+          const remote = params ?? ${jsonStringify(remote, true)}
           const agg = remote.filter.aggregate ?? 'count'
           const keyName = remote.key.name ?? remote.filter.group
           const keyValue = remote.key.value ?? keyName + _.upperFirst(agg)
@@ -29,9 +29,14 @@ async function echartsPie () {
           const data = recs.map(r => ({ name: r[keyName], value: r[keyValue] }))
           this.chart.hideLoading()
           this.option = { series: [{ type: 'pie', data }]}
+        }`
+      ]
+      if (!this.params.attr.noAutoLoad) {
+        onLoad.push(`
+          this.load()
         `)
       }
-      this._build({ onLoad })
+      this._build({ onLoad, data })
     }
   }
 }

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

@@ -26,7 +26,7 @@ async function echarts () {
       this.params.attr['@load.window'] = 'await windowLoad()'
     }
 
-    _build = ({ setting = {}, onLoad = [] } = {}) => {
+    _build = ({ setting = {}, onLoad = [], data = [] } = {}) => {
       const { jsonStringify } = this.app.waibuMpa
       const { merge, isArray } = this.app.lib._
       if (!isArray(onLoad)) onLoad = [onLoad]
@@ -55,6 +55,7 @@ async function echarts () {
               ${onLoad.join('\n')}
             },
             option: ${jsonStringify(option, true)}
+            ${data.length > 0 ? (',' + data.join(',')) : ''}
           }
         })
       `)

package/lib/util.js

@@ -85,6 +85,7 @@ export async function prepCrud (options = {}) {
   if (isSet(headers['x-refs'])) refs = headers['x-refs']
   if (typeof refs === 'string' && !['*', 'all'].includes(refs)) refs = [refs]
   if (refs.length > 0) _options.refs = refs
+  _options.attachments = headers['x-attachments'] === 'true'
 
   const recId = id ?? params.id ?? req.query.id
   let mdl = model

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,15 @@
 # Changes
 
+## 2026-11-02
+
+- [2.34.1] Bug fix in `echarts.js`
+- [2.34.1] Bug fix in `echarts-bar.js`
+- [2.34.1] Bug fix in `echarts-pie.js`
+
+## 2026-10-21
+
+- [2.34.0] Add support for `_attachments`
+
 ## 2026-10-19
 
 - [2.33.2] Bug fix in `get-schema-ext.js`
@@ -355,4 +365,4 @@
 
 ## 2025-12-28
 
-- [2.1.0] Ported to ```bajo@2.2.x``` & ```dobo@2.2.x``` specs
+- [2.1.0] Ported to ```bajo@2.2.x``` & ```dobo@2.2.x``` specs