waibu-bootstrap 1.1.8 → 1.1.9

package/package.json

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

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

@@ -96,6 +96,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/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)
     }
   }
+  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 = [