waibu-bootstrap 1.2.4 → 1.2.6

package/package.json

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

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

@@ -82,15 +82,15 @@ async function formSelectExt () {
       const group = groupAttrs(this.params.attr, ['remote'])
       if (group.remote) {
         group.remote.url = routePath(group.remote.url)
-        group.remote.searchField = group.remote.searchField ?? 'name'
-        group.remote.labelField = group.remote.labelField ?? 'name'
+        group.remote.searchField = group.remote.searchField ?? 'id'
+        group.remote.labelField = group.remote.labelField ?? 'id'
         group.remote.valueField = group.remote.valueField ?? 'id'
         opts = `{
           searchField: '${group.remote.searchField}',
           labelField: '${group.remote.labelField}',
           valueField: '${group.remote.valueField}',
           load: (query, callback) => {
-            fetch('${group.remote.url}?query=${group.remote.searchField}:~^\\'' + query + '\\'')
+            fetch('${group.remote.url}?query=${group.remote.searchField}:~\\'' + query + '\\'')
               .then(resp => resp.json())
               .then(json => {
                 callback(json.data)
@@ -101,11 +101,11 @@ async function formSelectExt () {
           },
           render: {
             option: (data, escape) => {
-              return '<div>' + escape(data.name) + '</div>'
+              return '<div>' + escape(data.${group.remote.labelField}) + '</div>'
             },
             item: (data, escape) => {
               $dispatch('formselectext', { id: '${this.params.attr.id}', data })
-              return '<div>' + escape(data.name) + '</div>'
+              return '<div>' + escape(data.${group.remote.labelField}) + '</div>'
             }
           }
         }`

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

@@ -13,6 +13,11 @@ async function heading () {
       }
       if (display) this.params.attr.class.push(`display-${type}`)
       delete this.params.attr.type
+      if (this.params.attr.href) {
+        this.params.prepend = `<a class="link-offset-2 link-underline link-underline-opacity-0 link-underline-opacity-75-hover" href="${this.params.attr.href}">`
+        this.params.append = '</a>'
+        delete this.params.attr.href
+      }
     }
   }
 }

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

@@ -54,15 +54,15 @@ async function navDropdownSetting () {
         <c:dropdown-item divider />
         <c:dropdown-item t:content="fullscreen"
           x-data="{
-            inText: '${this.component.req.t('fullscreen')}',
-            outText: '${this.component.req.t('exitFullscreen')}',
+            inText: \`${this.component.req.t('fullscreen')}\`,
+            outText: \`${this.component.req.t('exitFullscreen')}\`,
             async toggle () {
               const el = document.querySelector('body')
               if (!document.fullscreenElement) {
                 try {
                   await el.requestFullscreen()
                 } catch (err) {
-                  await wbs.notify('cantGoFullscreen', { type: 'danger' })
+                  await wbs.notify(\`${this.component.req.t('cantGoFullscreen')}\`, { type: 'danger' })
                 }
               } else {
                 document.exitFullscreen()
@@ -88,7 +88,7 @@ async function navDropdownSetting () {
             id="${id}"
             x-data="{
               async signout () {
-                await wbs.confirmation('${this.component.req.t('signoutWarning')}', { ok: '${id}:post', close: 'y' })
+                await wbs.confirmation(\`${this.component.req.t('signoutWarning')}\`, { ok: '${id}:post', close: 'y' })
               },
               post () {
                 wmpa.postForm({}, '${routePath('sumba:/signout')}')

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

@@ -39,7 +39,7 @@ async function navbar () {
         const id = generateId()
         if (this.params.group.drawer) this.params.group.drawer.id = id
         const btn = `<button class="navbar-toggler" type="button" data-bs-toggle="${type}" ` +
-          `data-bs-target="#${id}" aria-controls="${id}"${this.params.attr.drawer ? '' : ' aria-expanded="false"'} aria-label="${this.component.req.t('Toggle Navigation')}">` +
+          `data-bs-target="#${id}" aria-controls="${id}"${this.params.attr.drawer ? '' : ' aria-expanded="false"'} aria-label="${this.component.req.t('toggleNavigation')}">` +
           '<span class="navbar-toggler-icon"></span></button>'
         if (type === 'offcanvas') html = await this.component.buildTag({ tag: 'drawer', attr: this.params.group.drawer, html })
         else html = `<div class="collapse navbar-collapse justify-content-between" id="${id}">${html}</div>`