waibu-mpa 1.1.21 → 1.1.23

package/bajoTemplate/template/wmpa.js

@@ -43,7 +43,7 @@ class Wmpa {
       },
       nautical: {
         speedFn: (val) => val / 1.852,
-        speedUnit: 'nmh',
+        speedUnit: 'knot',
         distanceFn: (val) => val / 1.852,
         distanceUnit: 'nm',
         areaFn: (val) => val / 2.92,

package/lib/build-page.js

@@ -13,10 +13,18 @@ function alert (text, message, opts = {}) {
   return `${text}\n${error}`
 }
 
+const reqAsset = {}
+
 async function buildPage ({ text, locals = {}, opts = {} } = {}) {
   const { find, cloneDeep } = this.lib._
   const { runHook } = this.app.bajo
   const { req, reply } = opts
+  if (!reqAsset[req.id]) {
+    reqAsset[req.id] = {
+      scriptBlock: { root: [] },
+      styleBlock: { root: [] }
+    }
+  }
   const theme = find(this.themes, { name: opts.theme })
   if (!theme) text = alert.call(this, text, req.t('unknownTheme%s', req.theme), opts)
   const iconset = find(this.iconsets, { name: opts.iconset })
@@ -26,7 +34,7 @@ async function buildPage ({ text, locals = {}, opts = {} } = {}) {
   if (partial) $('c\\:page-start, c\\:page-end').remove()
   await runHook(`${this.name}:beforeBuildPage${partial ? 'Partial' : ''}`, { $, theme, iconset, req, reply, locals, ns, text })
   await attrsMutation.call(this, { $, el: $.root(), req })
-  const cmp = await theme.createComponent({ $, iconset, req, reply, locals: cloneDeep(locals) })
+  const cmp = await theme.createComponent({ $, iconset, req, reply, locals: cloneDeep(locals), scriptBlock: reqAsset[req.id].scriptBlock, styleBlock: reqAsset[req.id].styleBlock })
   await replaceTag.call(this, { el: $.root(), cmp, opts })
   text = applyInclude.call(this, $)
   if (!opts.partial) {
@@ -36,6 +44,7 @@ async function buildPage ({ text, locals = {}, opts = {} } = {}) {
     await concatResources.call(this, { $, theme, iconset, req })
     await runHook(`${this.name}:afterBuildPage`, { $, theme, iconset, req, reply, locals, ns, text })
     text = $.root().html()
+    delete reqAsset[req.id]
   }
   return text
 }

package/lib/class/component.js

@@ -16,7 +16,7 @@ class Component {
    * @param {Object} options.reply - The reply object.
    * @param {Object} options.req - The request object.
    */
-  constructor ({ plugin, $, theme, iconset, locals, reply, req } = {}) {
+  constructor ({ plugin, $, theme, iconset, locals, reply, req, scriptBlock, styleBlock } = {}) {
     const { get } = plugin.app.bajo.lib._
     this.baseFactory = baseFactory
     this.plugin = plugin
@@ -29,8 +29,8 @@ class Component {
     this.cacheMaxAge = get(plugin, 'app.waibuMpa.config.theme.component.cacheMaxAgeDur', 0)
     this.namespace = 'c:'
     this.noTags = []
-    this.scriptBlock = { root: [] }
-    this.styleBlock = { root: [] }
+    this.scriptBlock = scriptBlock
+    this.styleBlock = styleBlock
     this.factory = {}
   }
 

package/lib/class/theme.js

@@ -18,7 +18,7 @@ class Theme {
     return find(this.plugin.app.waibuMpa.themes, { name: this.framework })
   }
 
-  createComponent = async ($) => {}
+  createComponent = async (options) => {}
 }
 
 export default Theme

package/lib/collect-themes.js

@@ -40,8 +40,8 @@ async function build (mod, fw) {
   Object.assign(theme, omit(mod, ['name']))
   await loadItems.call(mod.plugin, 'factory', theme)
   await loadItems.call(mod.plugin, 'method', theme)
-  theme.createComponent = async function ({ $, iconset, req, reply, locals }) {
-    const cmp = new Component({ plugin: fw ? fw.plugin : mod.plugin, $, theme, iconset, req, reply, locals })
+  theme.createComponent = async function ({ $, iconset, req, reply, locals, scriptBlock, styleBlock }) {
+    const cmp = new Component({ plugin: fw ? fw.plugin : mod.plugin, $, theme, iconset, req, reply, locals, scriptBlock, styleBlock })
     await cmp.loadBaseFactories()
     const framework = theme.framework ? find(me.themes, { name: theme.framework }) : undefined
     merge(cmp.factory, framework ? framework.factory : theme.factory)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waibu-mpa",
-  "version": "1.1.21",
+  "version": "1.1.23",
   "description": "MPA support for Waibu Framework",
   "main": "index.js",
   "scripts": {