waibu-bootstrap 1.1.7 → 1.1.9

package/package.json

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

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

@@ -25,7 +25,7 @@ function getInputAttr (group, formControl = true, ro) {
 export async function buildFormHint (group, tag, cls) {
   if (!group.hint.id && group._.id) group.hint.id = group._.id + '-hint'
   group.hint.class.push(cls ?? 'form-text')
-  return await this.component.render({ tag: tag ?? 'div', attr: group.hint, html: group._.hint })
+  return await this.component.buildTag({ tag: tag ?? 'div', attr: group.hint, html: group._.hint })
 }
 
 export async function buildFormLabel (group, tag, cls) {
@@ -33,12 +33,12 @@ export async function buildFormLabel (group, tag, cls) {
   group.label.for = group._.id
   if (!group.label.floating) group.label.class.push(cls ?? 'form-label')
   group.label = omit(group.label, ['floating'])
-  return await this.component.render({ tag: tag ?? 'label', attr: group.label, html: group._.label })
+  return await this.component.buildTag({ tag: tag ?? 'label', attr: group.label, html: group._.label })
 }
 
 export async function buildFormInput (group, params) {
   const attr = getInputAttr.call(this, group)
-  return await this.component.render({ tag: 'input', attr, selfClosing: true })
+  return await this.component.buildTag({ tag: 'input', attr, selfClosing: true })
 }
 
 export async function buildFormCheck (group, params) {
@@ -48,7 +48,7 @@ export async function buildFormCheck (group, params) {
   attr.class.push('form-check-input')
   if (has(attr, 'name') && !attr.value) attr.value = 'true'
   if (has(attr, 'name') && !has(attr, 'checked') && attr.value === get(this, `locals.form.${attr.name}`)) attr.checked = true
-  return await this.component.render({ tag: 'input', attr, selfClosing: true })
+  return await this.component.buildTag({ tag: 'input', attr, selfClosing: true })
 }
 
 export async function buildFormSwitch (group, params) {
@@ -59,14 +59,14 @@ export async function buildFormSwitch (group, params) {
   attr.role = 'switch'
   if (has(attr, 'name') && !attr.value) attr.value = 'true'
   if (has(attr, 'name') && !has(attr, 'checked') && attr.value === get(this, `locals.form.${attr.name}`)) attr.checked = true
-  return await this.component.render({ tag: 'input', attr, selfClosing: true })
+  return await this.component.buildTag({ tag: 'input', attr, selfClosing: true })
 }
 
 export async function buildFormRadio (group, params) {
   const attr = getInputAttr.call(this, group, false)
   attr.type = 'radio'
   attr.class.push('form-check-input')
-  return await this.component.render({ tag: 'input', attr, selfClosing: true })
+  return await this.component.buildTag({ tag: 'input', attr, selfClosing: true })
 }
 
 export async function buildFormCheckToggle (group, params) {
@@ -74,7 +74,7 @@ export async function buildFormCheckToggle (group, params) {
   attr.type = 'checkbox'
   attr.autocomplete = 'off'
   attr.class.push('btn-check')
-  return await this.component.render({ tag: 'input', attr, selfClosing: true })
+  return await this.component.buildTag({ tag: 'input', attr, selfClosing: true })
 }
 
 export async function buildFormRadioToggle (group, params) {
@@ -82,34 +82,35 @@ export async function buildFormRadioToggle (group, params) {
   attr.type = 'radio'
   attr.autocomplete = 'off'
   attr.class.push('btn-check')
-  return await this.component.render({ tag: 'input', attr, selfClosing: true })
+  return await this.component.buildTag({ tag: 'input', attr, selfClosing: true })
 }
 
 export async function buildFormPlaintext (group, params) {
   const attr = getInputAttr.call(this, group, false, true)
   attr.class.push('form-control-plaintext')
   attr.readonly = ''
-  return await this.component.render({ tag: 'input', attr, selfClosing: true })
+  return await this.component.buildTag({ tag: 'input', attr, selfClosing: true })
 }
 
 export async function buildFormColor (group, params) {
   const attr = getInputAttr.call(this, group)
   attr.class.push('form-control-color')
   attr.type = 'color'
-  return await this.component.render({ tag: 'input', attr, selfClosing: true })
+  if (!attr.dim) attr.dim = 'width:100'
+  return await this.component.buildTag({ tag: 'input', attr, selfClosing: true })
 }
 
 export async function buildFormFile (group, params) {
   const attr = getInputAttr.call(this, group)
   attr.type = 'file'
-  return await this.component.render({ tag: 'input', attr, selfClosing: true })
+  return await this.component.buildTag({ tag: 'input', attr, selfClosing: true })
 }
 
 export async function buildFormTextarea (group, params) {
   const attr = getInputAttr.call(this, group)
   params.html = attr.value
   delete attr.value
-  return await this.component.render({ tag: 'textarea', attr, html: params.html })
+  return await this.component.buildTag({ tag: 'textarea', attr, html: params.html })
 }
 
 export async function buildFormSelect (group, params) {
@@ -129,12 +130,12 @@ export async function buildFormSelect (group, params) {
     html = items.join('\n')
   }
   attr = omit(attr, ['size', 'type', 'options', 'value'])
-  return await this.component.render({ tag: 'select', attr, html })
+  return await this.component.buildTag({ tag: 'select', attr, html })
 }
 
 export async function buildFormRange (group, params) {
   const attr = getInputAttr.call(this, group, false)
   attr.type = 'range'
   attr.class.push('form-range')
-  return await this.component.render({ tag: 'input', attr, selfClosing: true })
+  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-input.js

@@ -94,6 +94,7 @@ export async function build (handler, params = {}) {
   }
 
   const group = groupAttrs(this.params.attr, ['label', 'hint', 'wrapper', 'col'], false)
+  if (group.label && group.label.floating && this.params.tag === 'formColor') group.label.style.top = '-1px'
   let datalist
 
   if (group._.datalist && !['password', 'file', 'checkbox', 'radio'].includes(group._.type)) {

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 = [