waibu-bootstrap 1.0.4 → 1.0.6

package/bajo/.dependencies

@@ -0,0 +1,2 @@
+waibu-mpa
+waibu-extra

package/bajo/config.json

@@ -1,6 +1,5 @@
 {
   "waibu": {
     "prefix": "bootstrap"
-  },
-  "dependencies": ["waibu-mpa", "waibu-extra"]
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waibu-bootstrap",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Bootstrap suport for Waibu Framework",
   "main": "index.js",
   "scripts": {

package/waibuMpa/theme/component/factory/form-select-country.js

@@ -2,11 +2,14 @@ import { inlineCss, css, scripts } from './form-select-ext.js'
 
 async function formSelectCountry () {
   return class FormSelectCountry extends this.baseFactory {
+    static css = [...super.css, css]
+
+    static scripts = [...super.scripts, scripts]
+
+    static inlineCss = inlineCss
+
     constructor (options) {
       super(options)
-      this.css = css
-      this.inlineCss = inlineCss
-      this.scripts = scripts
       this.params.noTag = true
     }
 
@@ -16,7 +19,7 @@ async function formSelectCountry () {
       const { base64JsonEncode } = this.plugin.app.waibuMpa
       const countries = await readConfig('bajoCommonDb:/dobo/fixture/country.json', { ignoreError: true, defValue: [] })
       this.params.attr.options = base64JsonEncode(map(countries, c => {
-        return { value: c.id, text: c.name }
+        return { value: c.id, text: c.name.replaceAll('\'', '') }
       }))
       this.params.html = await this.component.buildTag({ tag: 'formSelectExt', attr: this.params.attr, html: '' })
     }

package/waibuMpa/theme/component/factory/form-select-ext.js

@@ -20,6 +20,12 @@ export const scripts = 'waibuExtra.virtual:/tom-select/js/tom-select.complete.mi
 
 async function formSelectExt () {
   return class FormSelectExt extends this.baseFactory {
+    static css = [...super.css, css]
+
+    static scripts = [...super.scripts, scripts]
+
+    static inlineCss = inlineCss
+
     constructor (options) {
       super(options)
       this.css = css
@@ -40,8 +46,9 @@ async function formSelectExt () {
       if (this.params.attr.clearBtn) plugins.push('clear_button')
       if (this.params.attr.optgroupColumns) plugins.push('optgroup_columns')
       const defOpts = { plugins }
+      this.params.attr.options = this.params.attr.options ? base64JsonDecode(this.params.attr.options) : defOpts
       this.params.attr['@load.window'] = `
-        const options = ${jsonStringify(this.params.attr.options ? base64JsonDecode(this.params.attr.options) : defOpts, true)}
+        const options = ${jsonStringify(this.params.attr.options, true)}
         instance = new TomSelect($refs.select, options)
       `
       await build.call(this, buildFormSelect, this.params)