waibu-db 2.29.1 → 2.31.0

package/extend/waibuBootstrap/theme/component/widget/btn-export.js

@@ -30,8 +30,8 @@ async function btnExport () {
           ftype: 'json',
           toggle (val) {
             if (val === 'clipboard') {
-              $refs.fkey.removeAttribute('disabled')
-              $refs.fvalue.removeAttribute('disabled')
+              // $refs.fkey.removeAttribute('disabled')
+              // $refs.fvalue.removeAttribute('disabled')
               $refs.zip.setAttribute('disabled', '')
               $refs.xlsx.setAttribute('disabled', '')
               $refs.tsv.setAttribute('disabled', '')
@@ -39,8 +39,8 @@ async function btnExport () {
               _.pull(this.options, 'zip')
               if (!['json', 'csv'].includes(this.ftype)) this.ftype = 'json'
             } else {
-              $refs.fkey.setAttribute('disabled', '')
-              $refs.fvalue.setAttribute('disabled', '')
+              // $refs.fkey.setAttribute('disabled', '')
+              // $refs.fvalue.setAttribute('disabled', '')
               $refs.zip.removeAttribute('disabled')
               $refs.xlsx.removeAttribute('disabled')
               $refs.tsv.removeAttribute('disabled')

package/index.js

@@ -92,23 +92,22 @@ async function factory (pkgName) {
       const model = get(params, 'payload.data.name')
       const fields = get(params, 'payload.data.opts.fields')
       const { id, file } = get(params, 'payload.data.download', {})
-      let dest = `${this.app.bajo.getDownloadDir()}/${file}`
       const options = {
         filter: get(params, 'payload.data.filter', {}),
-        ensureDir: true,
+        exportOpts: get(params, 'payload.data.exportOpts', []),
+        opts: get(params, 'payload.data.opts', {}),
         fields
       }
       options.filter.sort = 'id:1' // TODO: make this configurable
       if (!this.app.sumba || !id) {
-        const result = await exportTo(model, dest, options)
+        const result = await exportTo(model, file, options)
         return result.file
       }
-      const { downloadDir } = this.app.sumba
-      dest = `${downloadDir}/${file}`
       const dmodel = this.app.dobo.getModel('SumbaDownload')
+      let dest
       try {
         await dmodel.updateRecord(id, { status: 'PROCESSING' })
-        const result = await exportTo(model, dest, options)
+        const result = await exportTo(model, file, options)
         dest = result.file
         const { size } = fs.statSync(dest)
         await dmodel.updateRecord(id, { size, status: 'COMPLETE' })

package/lib/crud/export-handler.js

@@ -31,21 +31,26 @@ async function exportHandler (opts = {}) {
   const { pascalCase } = this.app.lib.aneka
   const { getSchemaExt } = this.app.waibuDb
   const { buildUrl } = this.app.waibuMpa
+  const { callHandler, importModule } = this.app.bajo
   model = pascalCase(model ?? req.params.model)
   const mdl = this.app.dobo.getModel(model)
   const { schema } = await getSchemaExt(model, 'add', merge({ args: [{ req, model: mdl }] }, { params }, options))
   if (schema.disabled.includes('find')) return await reply.view(templateDisabled, { action: 'list' })
   const data = await prepCrud.call(this.app.getPlugin('waibuDb'), { model, req, reply, args: ['model'] })
   data.opts = omit(data.opts, ['req', 'reply'])
+  data.opts.lang = req.lang
+  data.opts.timeZone = get(req, 'site.setting.sumba.timeZone', this.app.bajo.config.intl.format.datetime.timeZone)
+  data.opts.dateStyle = get(req, 'site.setting.sumba.dateStyle', this.app.bajo.config.intl.format.datetime.dateStyle)
+  data.opts.timeStyle = get(req, 'site.setting.sumba.timeStyle', this.app.bajo.config.intl.format.datetime.timeStyle)
   const source = `${this.name}:/export-handler`
   const worker = 'waibuDb:exportData'
   const type = get(data, 'input.ftype', 'json')
-  const settings = get(data, 'input.options', '').split(',')
-  const ext = settings.includes('zip') ? `${type}.gz` : type
+  data.exportOpts = get(data, 'input.options', '').split(',')
+  const ext = data.exportOpts.includes('zip') ? `${type}.gz` : type
   // const file = `${kebabCase(model)}_${dayjs().format('YYYYMMDDhhmmss')}.${ext}`
   const file = `${kebabCase(model)}.${ext}`
-  if (this.app.masohi && this.app.sumba) {
-    await this.app.sumba.pushDownload({ file, type, worker, source, data, req })
+  if (this.app.sumbaXXX) {
+    await this.app.sumba.download({ file, type, worker, source, data, req })
     req.flash('notify', req.t('exportInQueue'))
   } else {
     const _opts = {
@@ -53,15 +58,15 @@ async function exportHandler (opts = {}) {
         data: {
           name: model,
           opts: data.opts,
+          exportOpts: data.exportOpts,
           filter: data.filter,
-          download: { id: null, file }
+          download: { file }
         }
       }
     }
-    const destFile = await this.exportData(_opts)
-    const { importModule } = this.app.bajo
+    const destFile = await callHandler(worker, _opts)
     const { download } = await importModule('waibu:/lib/helper.js', { asDefaultImport: false })
-    await download.call(this, destFile, req, reply, true)
+    await download.call(this, destFile, req, reply, file)
   }
   const url = buildUrl({ url: req.url, base: req.body.handler })
   return reply.redirectTo(url)

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,12 @@
 # Changes
 
+## 2026-07-26
+
+- [2.30.0] Canges in `exportTo()`
+- [2.30.0] Bug fix in `btn-export.js`
+- [2.30.0] Bug fix in `export-handler.js`
+- [2.31.0] Add support for `i18n` options in `export-handler.js`
+
 ## 2026-07-25
 
 - [2.29.1] Bug fix in `exportData()`