waibu-bootstrap 1.2.12 → 2.0.0

package/{waibuMpa → extend/waibuMpa}/theme/component/factory/form-select-country.js

@@ -17,7 +17,7 @@ async function formSelectCountry () {
       const { readConfig } = this.plugin.app.bajo
       const { map } = this.plugin.lib._
       const { base64JsonEncode } = this.plugin.app.waibuMpa
-      const countries = await readConfig('bajoCommonDb:/dobo/fixture/country.json', { ignoreError: true, defValue: [] })
+      const countries = await readConfig('bajoCommonDb:/extend/dobo/fixture/country.json', { ignoreError: true, defValue: [] })
       this.params.attr.options = base64JsonEncode(map(countries, c => {
         return { value: c.id, text: c.name.replaceAll('\'', '') }
       }))

package/{waibuMpa → extend/waibuMpa}/theme/component/factory/form-select-ext.js

@@ -122,17 +122,21 @@ async function formSelectExt () {
         const opts = ${opts}
         instance = new TomSelect($refs.${xref}, opts)
         const val = $refs.${xref}.dataset.value
-        if (!_.isEmpty(val)) {
-          fetch('${group.remote.url}?query=${group.remote.valueField}:' + val, ${jsonStringify(fetchOpts, true)})
-            .then(resp => resp.json())
-            .then(json => {
-              if (json.data.length === 0) return
-              const opt = _.pick(json.data[0], ['${group.remote.valueField}', '${group.remote.labelField}'])
-              instance.addOption(opt)
-              instance.setValue(opt.${group.remote.valueField})
-            })
-        }
       `
+      if (group.remote) {
+        this.params.attr['@load.window'] += `
+          if (!_.isEmpty(val)) {
+            fetch('${group.remote.url}?query=${group.remote.valueField}:' + val, ${jsonStringify(fetchOpts, true)})
+              .then(resp => resp.json())
+              .then(json => {
+                if (json.data.length === 0) return
+                const opt = _.pick(json.data[0], ['${group.remote.valueField}', '${group.remote.labelField}'])
+                instance.addOption(opt)
+                instance.setValue(opt.${group.remote.valueField})
+              })
+          }
+        `
+      }
       this.params.attr.options = options
       this.params.attr = omit(this.params.attr, ['noDropdownInput', 'removeBtn', 'clearBtn', 'c-opts', 'remoteUrl', 'remoteSearchField', 'remoteLabelField', 'remoteValueField'])
       await build.call(this, buildFormSelect, this.params)

package/index.js

@@ -1,7 +1,7 @@
 async function factory (pkgName) {
   const me = this
 
-  return class WaibuBootstrap extends this.lib.BajoPlugin {
+  return class WaibuBootstrap extends this.lib.Plugin {
     constructor () {
       super(pkgName, me.app)
       this.alias = 'wbs'

package/package.json

@@ -1,36 +1,36 @@
-{
-  "name": "waibu-bootstrap",
-  "version": "1.2.12",
-  "description": "Bootstrap suport for Waibu Framework",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "type": "module",
-  "bajo": {
-    "type": "plugin"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/ardhi/waibu-bootstrap.git"
-  },
-  "keywords": [
-    "bootstrap",
-    "waibu",
-    "web",
-    "webserver",
-    "bajo",
-    "framework",
-    "fastify",
-    "modular"
-  ],
-  "author": "Ardhi Lukianto <ardhi@lukianto.com>",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/ardhi/waibu-bootstrap/issues"
-  },
-  "homepage": "https://github.com/ardhi/waibu-bootstrap#readme",
-  "dependencies": {
-    "bootstrap": "^5.3.3"
-  }
-}
+{
+  "name": "waibu-bootstrap",
+  "version": "2.0.0",
+  "description": "Bootstrap suport for Waibu Framework",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "type": "module",
+  "bajo": {
+    "type": "plugin"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ardhi/waibu-bootstrap.git"
+  },
+  "keywords": [
+    "bootstrap",
+    "waibu",
+    "web",
+    "webserver",
+    "bajo",
+    "framework",
+    "fastify",
+    "modular"
+  ],
+  "author": "Ardhi Lukianto <ardhi@lukianto.com>",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/ardhi/waibu-bootstrap/issues"
+  },
+  "homepage": "https://github.com/ardhi/waibu-bootstrap#readme",
+  "dependencies": {
+    "bootstrap": "^5.3.3"
+  }
+}