waibu-bootstrap 1.2.1 → 1.2.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/waibuMpa/theme/component/factory/nav-dropdown-setting.js +1 -1
  3. package/waibuMpa/theme/component/factory/nav-item.js +5 -4
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "waibu-bootstrap",
3
- "version": "1.2.1",
3
+ "version": "1.2.3",
4
4
  "description": "Bootstrap suport for Waibu Framework",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/waibuMpa/theme/component/factory/nav-dropdown-setting.js CHANGED
@@ -6,7 +6,7 @@ async function navDropdownSetting () {
6
6
  const { groupAttrs } = this.plugin.app.waibuMpa
7
7
  const { generateId } = this.plugin.app.bajo
8
8
  const { routePath } = this.plugin.app.waibu
9
- const { isSet } = this.plugin.app.bajo
9
+ const { isSet } = this.plugin.lib.aneka
10
10
  const { req } = this.component
11
11
  const cfgWmpa = this.plugin.app.waibuMpa.config
12
12
 
package/waibuMpa/theme/component/factory/nav-item.js CHANGED
@@ -12,7 +12,8 @@ async function navItem () {
12
12
  build = async () => {
13
13
  const { isString } = this.plugin.lib._
14
14
  const { groupAttrs } = this.plugin.app.waibuMpa
15
- const { breakNsPath } = this.plugin.app.bajo
15
+ const { routePath, findRoute } = this.plugin.app.waibu
16
+ const { breakNsPath, buildNsPath } = this.plugin.app.bajo
16
17
  const { $ } = this.component
17
18
  const group = groupAttrs(this.params.attr, ['dropdown', 'badge'])
18
19
  this.params.attr = group._
@@ -23,14 +24,14 @@ async function navItem () {
23
24
  !this.params.attr.href.startsWith('#') &&
24
25
  !this.params.attr.href.startsWith('http://') &&
25
26
  !this.params.attr.href.startsWith('https://')) {
26
- const route = this.plugin.app.waibu.findRoute(this.params.attr.ohref)
27
+ const route = findRoute(this.params.attr.ohref)
27
28
  if (!route) {
28
29
  this.params.html = ''
29
30
  this.params.noTag = true
30
31
  return
31
32
  }
32
- const { realFullPath } = breakNsPath(this.params.attr.ohref)
33
- this.params.attr.href = realFullPath
33
+ const { ns, subNs, subSubNs, realFullPath } = breakNsPath(this.params.attr.ohref)
34
+ this.params.attr.href = routePath(buildNsPath({ ns, subNs, subSubNs, path: realFullPath }))
34
35
  }
35
36
  if (group.dropdown) {
36
37
  this.params.attr.class.push('dropdown-toggle')