waibu-db 1.1.14 → 1.1.16

package/bajo/intl/en-US.json

@@ -28,6 +28,7 @@
   "addMoreAfterSubmit": "Add more after submit",
   "clonePrevious": "Clone previous",
   "actionPermanentlyDisabled%s": "Sorry, action '%s' is permanently disabled at database level. For more information, please contact your Admin immediately, thank you!",
+  "dbModels": "Database Models",
   "op": {
     "equals": "Equals",
     "notEquals": "Not Equals",

package/bajo/intl/id.json

@@ -28,6 +28,7 @@
   "addMoreAfterSubmit": "Tambah lagi setelah kirim",
   "clonePrevious": "Duplikasi sebelumnya",
   "actionPermanentlyDisabled%s": "Sorry, action '%s' is permanently disabled at database level. For more information, please contact your Admin immediately, thank you!",
+  "dbModels": "Model Database",
   "op": {
     "equals": "Sama Dengan",
     "notEquals": "Tidak Sama Dengan",

package/package.json

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

package/plugin/config.json

@@ -1,9 +1,10 @@
 {
   "waibu": {
     "prefix": "db",
-    "title": "Model Database"
+    "title": "dbModels"
   },
   "waibuAdmin": {
+    "menuCollapsible": true,
     "menuHandler": "waibuDb:adminMenu"
   },
   "waibuMpa": {

package/plugin/method/admin-menu.js

@@ -39,8 +39,7 @@ function modelsMenu (locals, req) {
 }
 
 async function adminMenu (locals, req) {
-  const { buildAccordionMenu } = this.app.waibuAdmin
-  return buildAccordionMenu(modelsMenu.call(this, locals, req), locals, req)
+  return modelsMenu.call(this, locals, req)
 }
 
 export default adminMenu

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'])
     }
   }
 }