waibu-db 1.1.13 → 1.1.15

package/package.json

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

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

@@ -24,22 +24,13 @@ async function echarts () {
     build = async () => {
       const { generateId } = this.plugin.app.bajo
       const { base64JsonDecode, jsonStringify } = this.plugin.app.waibuMpa
-      const { merge, cloneDeep } = this.plugin.app.bajo.lib._
+      const { merge, cloneDeep, omit } = this.plugin.app.bajo.lib._
       this.params.attr.id = generateId('alpha')
       this.params.attr['x-data'] = `chart${this.params.attr.id}`
-      this.params.attr['@resize.window.debounce.500ms'] = `
-        if (chart) {
-          chart.resize()
-        }
-      `
+      this.params.attr['x-bind'] = 'resize'
       let option = cloneDeep(this.defOption)
       if (this.params.attr.option === true) this.params.attr.option = 'e30='
       if (this.params.attr.option) option = merge(option, base64JsonDecode(this.params.attr.option))
-      this.params.attr['x-init'] = `
-        $watch('option', val => {
-          if (chart) chart.setOption(val)
-        })
-      `
       this.params.append = `
         <script>
           document.addEventListener('alpine:init', () => {
@@ -50,16 +41,27 @@ async function echarts () {
                   const el = document.getElementById('${this.params.attr.id}')
                   chart = echarts.init(el, null, { renderer: 'canvas' })
                   chart.setOption(this.option)
+                  this.$watch('option', val => {
+                    chart.setOption(val)
+                  })
                 },
                 get chart () {
                   return chart
                 },
+                resize: {
+                  ['@resize.window.debounce.500ms']() {
+                    if (chart) {
+                      chart.resize()
+                    }
+                  }
+                },
                 option: ${jsonStringify(option, true)}
               }
             })
           })
         </script>
       `
+      this.params.attr = omit(this.params.attr, ['option'])
     }
   }
 }

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

@@ -50,7 +50,7 @@ async function table () {
       if (isEmpty(fields)) fields = schema.view.fields
       if (!isEmpty(schema.view.hidden)) fields = without(fields, ...schema.view.hidden)
       let sort = this.params.attr.sort ? attrToArray(this.params.attr.sort) : get(this, `component.locals._meta.query.${qsKey.sort}`, '')
-      if (isEmpty(sort)) {
+      if (isEmpty(sort) && filter.sort) {
         const keys = Object.keys(filter.sort)
         if (keys.length > 0) sort = `${keys[0]}:${filter.sort[keys[0]]}`
       }
@@ -130,9 +130,11 @@ async function table () {
           if (!prop) prop = find(schema.view.calcFields, { name: f })
           if (!prop) continue
           let dataValue = d[f] ?? ''
-          if (['datetime'].includes(prop.type)) dataValue = escape(dataValue.toISOString())
-          if (['string', 'text'].includes(prop.type)) dataValue = escape(dataValue)
-          if (['array', 'object'].includes(prop.type)) dataValue = escape(JSON.stringify(d[f]))
+          if (!isEmpty(dataValue)) {
+            if (['datetime'].includes(prop.type)) dataValue = escape(dataValue.toISOString())
+            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]
           if (prop.type === 'boolean') {
             value = (await this.component.buildTag({ tag: 'icon', attr: { name: `circle${d[f] ? 'Check' : ''}` } })) +