waibu-bootstrap 1.0.11 → 1.0.13

package/package.json

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

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

@@ -23,8 +23,8 @@ async function img () {
       if (isString(this.params.attr['@mouseleave'])) mouseleave.push(...this.params.attr['@mouseleave'].split('\n'))
       if (isString(this.params.attr.srcHover)) {
         this.params.attr.srcStby = this.params.attr.src
-        mouseenter.unshift(`$el.src = $el.getAttribute('src-hover')`)
-        mouseleave.unshift(`$el.src = $el.getAttribute('src-stby')`)
+        mouseenter.unshift("$el.src = $el.getAttribute('src-hover')")
+        mouseleave.unshift("$el.src = $el.getAttribute('src-stby')")
       }
       if (mouseenter.length > 0) this.params.attr['@mouseenter'] = mouseenter.join('\n')
       if (mouseleave.length > 0) this.params.attr['@mouseleave'] = mouseleave.join('\n')

package/waibuMpa/theme/component/factory/nav-divider.js

@@ -14,7 +14,7 @@ async function navDivider () {
         class: ['vr'],
         display: 'type:none type:flex-lg',
         dim: 'height:100',
-        margin: 'x-2'
+        margin: this.params.attr.margin ?? 'x-2'
       }
       this.params.html = await this.component.buildTag({ tag: 'div', attr })
     }

package/waibuMpa/theme/component/factory/nav-dropdown-user.js

@@ -3,11 +3,13 @@ async function navDropdownUser () {
     async build () {
       const { routePath } = this.plugin.app.waibu
       const icon = this.component.req.iconset ? await this.component.buildTag({ tag: 'icon', attr: { name: 'person' } }) : ''
-      const text = this.component.req.user ? `${this.component.req.user.firstName} ${this.component.req.user.lastName}` : this.component.req.t('Guest')
+      let text = this.component.req.user ? `${this.component.req.user.firstName} ${this.component.req.user.lastName}` : this.component.req.t('Guest')
+      if (this.params.attr.noText) text = ''
       const html = []
       const attr = {
         dropdown: true,
-        dropdownMenu: this.params.attr.dropdownMenu,
+        dropdownDir: this.params.attr.dropdownDir,
+        dropdownMenudir: this.params.attr.dropdownMenudir,
         content: `${icon} ${text}`
       }
       if (this.params.attr.noMenu) {

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

@@ -13,7 +13,7 @@ async function navItem () {
       const { isString } = this.plugin.app.bajo.lib._
       const { groupAttrs } = this.plugin.app.waibuMpa
       const { $ } = this.component
-      const group = groupAttrs(this.params.attr, ['dropdown'])
+      const group = groupAttrs(this.params.attr, ['dropdown', 'badge'])
       if (group.dropdown) {
         this.params.attr = group._
         this.params.attr.class.push('dropdown-toggle')
@@ -35,6 +35,12 @@ async function navItem () {
       }
       this.params.prepend = `<li class="${cls}${group.dropdown ? ' dropdown' : ''}${(group.dropdown ?? {}).dir ? (' drop' + group.dropdown.dir) : ''}">`
       this.params.append = '</li>'
+      if (group.badge) {
+        group.badge.color = group.badge.color ?? 'danger'
+        group.badge.content = group.badge.content ?? ''
+        const badge = await this.component.buildSentence(`<c:badge position="relative top-0 start-0 true" rounded="type:pill" background="color:${group.badge.color}" t:content="${group.badge.content}" />`)
+        this.params.html += badge
+      }
       delete this.params.attr.dropdown
     }