waibu-bootstrap 1.2.6 → 1.2.8

package/package.json

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

package/waibuMpa/theme/component/factory/app-launcher.js

@@ -21,7 +21,7 @@ async function appLauncher () {
         launcher += '<c:navbar padding="y-0">\n<c:nav tag="ul" dim="width:100" flex="justify-content:end">\n'
         for (const t of toolbar) {
           if (t === 'home') launcher += '<c:nav-item href="/" icon="house" padding="end-2" />\n'
-          if (t === 'user') launcher += '<c:nav-dropdown-user padding="end-2" />\n'
+          if (t === 'user' && this.plugin.app.sumba) launcher += '<c:sumba-nav-dropdown-user padding="end-2" />\n'
           if (t === '-') launcher += '<c:nav-divider />\n'
           if (t === 'fullscreen') launcher += '<c:nav-toggle-fullscreen padding="end-2" />\n'
           if (t === 'darkmode') launcher += '<c:nav-dropdown-darkmode padding="end-2" dropdown-menudir="end" />\n'

package/waibuMpa/theme/component/factory/nav-toggle-fullscreen.js

@@ -36,7 +36,7 @@ async function navToggleFullscreen () {
         }
       }`
       this.params.noTag = true
-      this.params.html = await this.component.buildTag({ tag: 'navItem', attr: this.params.attr })
+      this.params.html = await this.component.buildTag({ tag: 'navItem', attr: this.params.attr, noEscape: true })
     }
   }
 }

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

@@ -1,64 +0,0 @@
-async function navDropdownUser () {
-  return class NavDropdownUser extends this.baseFactory {
-    build = async () => {
-      if (!this.plugin.app.sumba) {
-        this.params.noTag = true
-        this.params.html = ''
-        return
-      }
-      const { has, omit } = this.plugin.lib._
-      const { routePath } = this.plugin.app.waibu
-      const { req } = this.component
-      const icon = this.component.req.iconset ? await this.component.buildTag({ tag: 'icon', attr: { name: 'person' } }) : ''
-      let text = ''
-      if (has(this.params.attr, 'title')) {
-        if (req.user) {
-          if (this.params.attr.title === 'short') text = `${req.user.firstName} ${req.user.lastName[0]}.`
-          else if (['firstName', 'lastName', 'username'].includes(this.params.attr.title)) text = req.user[this.params.attr.title]
-          else text = `${req.user.firstName} ${req.user.lastName}`
-        } else text = req.t('guest')
-      }
-      const html = []
-      const attr = omit(this.params.attr, ['text'])
-      attr.dropdown = true
-      attr.content = `${icon} ${text}`
-      if (this.params.attr.noMenu) {
-        delete attr.dropdown
-        delete attr.dropdownMenu
-        attr.href = routePath(this.component.req.user ? 'sumba:/your-stuff/profile' : 'sumba:/signin')
-      } else {
-        if (req.user) {
-          if (this.params.attr.fancyProfile) {
-            const replacer = 'sumba.asset:/user-profile.png'
-            const profile = await this.component.buildSentence(`
-              <div>
-                <c:dropdown-item href="sumba:/your-stuff/profile">
-                  <c:img src="dobo:/attachment/SumbaUser/${req.user.id}/profile/main.png?notfound=${replacer}" responsive rounded />
-                  <c:div margin="top-1" text="align:center">${req.user.firstName} ${req.user.lastName}</c:div>
-                </c:dropdown-item>
-              </div>
-            `)
-            html.push(profile)
-            html.push(await this.component.buildTag({ tag: 'dropdownItem', attr: { divider: true } }))
-            html.push(await this.component.buildTag({ tag: 'dropdownItem', attr: { href: routePath('sumba:/your-stuff/change-password') }, html: this.component.req.t('changePassword') }))
-            html.push(await this.component.buildTag({ tag: 'dropdownItem', attr: { href: routePath('sumba:/signout') }, html: this.component.req.t('signout') }))
-          } else {
-            html.push(await this.component.buildTag({ tag: 'dropdownItem', attr: { href: routePath('sumba:/your-stuff/profile') }, html: this.component.req.t('yourProfile') }))
-            html.push(await this.component.buildTag({ tag: 'dropdownItem', attr: { href: routePath('sumba:/your-stuff/change-password') }, html: this.component.req.t('changePassword') }))
-            html.push(await this.component.buildTag({ tag: 'dropdownItem', attr: { divider: true } }))
-            html.push(await this.component.buildTag({ tag: 'dropdownItem', attr: { href: routePath('sumba:/signout') }, html: this.component.req.t('signout') }))
-          }
-        } else {
-          html.push(await this.component.buildTag({ tag: 'dropdownItem', attr: { href: routePath('sumba:/signin') }, html: this.component.req.t('signin') }))
-          html.push(await this.component.buildTag({ tag: 'dropdownItem', attr: { divider: true } }))
-          html.push(await this.component.buildTag({ tag: 'dropdownItem', attr: { href: routePath('sumba:/user/signup') }, html: this.component.req.t('signup') }))
-          html.push(await this.component.buildTag({ tag: 'dropdownItem', attr: { href: routePath('sumba:/user/forgot-password') }, html: this.component.req.t('forgotPassword') }))
-        }
-      }
-      this.params.noTag = true
-      this.params.html = await this.component.buildTag({ tag: 'navItem', attr, html: html.join('\n') })
-    }
-  }
-}
-
-export default navDropdownUser