waibu-bootstrap 1.1.8 → 1.1.10

package/package.json

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

package/waibuMpa/theme/component/factory/_lib.js

@@ -17,6 +17,7 @@ function getInputAttr (group, formControl = true, ro) {
       else if (has(attr, 'name') === 'lng') attr.value = escape(this.component.req.format(val, attr.dataType, { longitude: true }))
       else attr.value = escape(this.component.req.format(val, attr.dataType))
     } else attr.value = attr.dataValue
+    if (isArray(val)) attr.value = val.join(' ')
   }
   if (sizes.includes(attr.size) && formControl) attr.class.push(`form-control-${attr.size}`)
   return omit(attr, ['size', 'col'])
@@ -96,6 +97,7 @@ export async function buildFormColor (group, params) {
   const attr = getInputAttr.call(this, group)
   attr.class.push('form-control-color')
   attr.type = 'color'
+  if (!attr.dim) attr.dim = 'width:100'
   return await this.component.buildTag({ tag: 'input', attr, selfClosing: true })
 }
 

package/waibuMpa/theme/component/factory/accordion-item.js

@@ -22,7 +22,7 @@ async function accordionItem () {
         `aria-expanded="${this.params.attr.showOnStart}"`,
         'x-data',
         `@click="$dispatch('accordion-item', { id: $el.closest('.accordion').id, cls: '${clsList.join(' ')}' })"`,
-        `aria-controls="${this.params.attr.id}">${this.params.attr.header}</button></c:h2>`]
+        `aria-controls="${this.params.attr.id}"><c:span margin="end-2">${this.params.attr.header}</c:span></button></c:h2>`]
       const body = await this.component.buildTag({ tag: 'div', attr: group.body, html: this.params.html })
       const details = [`<div id="${this.params.attr.id}" class="accordion-collapse collapse${this.params.attr.showOnStart ? ' show' : ''}">`,
         body, '</div']

package/waibuMpa/theme/component/factory/dropdown-item.js

@@ -9,8 +9,7 @@ async function dropdownItem () {
     }
 
     build = async () => {
-      const { $ } = this.component
-      if ($(this.params.html).children().length === 0 && !this.params.attr.href) this.params.attr.href = '#'
+      if (!this.params.attr.href) this.params.attr.href = '#'
       if (this.params.attr.divider) {
         this.params.tag = 'hr'
         this.params.attr.class.push('dropdown-divider')

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

@@ -14,6 +14,21 @@ export const inlineCss = `
 .ts-control, .ts-control input, .ts-dropdown {
   color: inherit;
 }
+.form-floating > .ts-wrapper {
+  padding-top: 1.625rem !important;
+}
+
+.ts-wrapper.focus {
+  border-color: #86b7fe;
+  outline: 0;
+  box-shadow: 0 0 0 0.25rem rgba(13, 110, 253, 0.25);
+}
+
+.focus .ts-control {
+  box-shadow: none;
+  border: none;
+  box-shadow: none;
+}
 `
 export const css = 'waibuExtra.virtual:/tom-select/css/tom-select.bootstrap5.min.css'
 export const scripts = 'waibuExtra.virtual:/tom-select/js/tom-select.complete.min.js'
@@ -36,11 +51,21 @@ async function formSelectExt () {
       if (this.params.attr.removeBtn) plugins.push('remove_button')
       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
+      let options = []
+      if (this.params.attr.options) {
+        try {
+          options = base64JsonDecode(this.params.attr.options)
+        } catch (err) {
+          options = this.params.attr.options.split(' ').map(item => {
+            return { value: item, text: item }
+          })
+        }
+        this.params.attr.options = options
+      }
+      const opts = { plugins }
       this.params.attr['@load.window'] = `
-        const options = ${jsonStringify(this.params.attr.options, true)}
-        instance = new TomSelect($refs.select, options)
+        const opts = ${jsonStringify(opts, true)}
+        instance = new TomSelect($refs.select, opts)
       `
       await build.call(this, buildFormSelect, this.params)
       this.params.attr = omit(this.params.attr, ['noDropdownInput', 'removeBtn', 'clearBtn'])

package/waibuMpa/theme/component/method/after-build-tag.js

@@ -56,7 +56,7 @@ const styles = [
 async function afterBuildTag (tag, params) {
   const { omit, map, isEmpty } = this.plugin.lib._
   const keys = map(styles, 'key')
-  const excluded = []
+  let excluded = []
   params.attr = params.attr ?? {}
   tag = tag ?? params.tag
   if (tag === 'any') tag = params.tag
@@ -98,6 +98,7 @@ async function afterBuildTag (tag, params) {
       if (key.includes(k)) excluded.push(key)
     }
   }
+  if (!['btn'].includes(tag)) excluded = excluded.filter(item => !['disabled'].includes(item))
   params.attr = omit(params.attr, ['color', 'noDismiss', 'size', 'split', 'ordered',
     'dir', 'menu', 'divider', 'header', 'autoClose', 'offset', 'group', 'toggleAll',
     'showOnStart', 'autoPlay', 'fade', 'indicator', 'noNavigation', 'noTouch', 'alwaysOpen',

package/waibuStatic/asset/js/wbs.js

@@ -82,7 +82,7 @@ class Wbs {
           this.$el.closest('.modal-body').querySelector('button[type=submit]').click()
         }
       }" @keyup.enter="submit" value="` + (value ?? opts.value) + '"/>',
-      msg ? ('<c:div margin="top-3">' + msg + '</c:div>') : ''
+      msg ? ('<c:div margin="top-3"><c:t>' + msg + '</c:t></c:div>') : ''
     ].join('\n')
     opts.close = opts.close ?? ''
     opts.buttons = [