waibu-mpa 2.14.2 → 2.15.0

package/index.js

@@ -343,7 +343,8 @@ async function factory (pkgName) {
 
       if (restOfDataTypes(obj)) {
         const passQuotes = isString(obj) ? "'" : ''
-        return `${passQuotes}${obj}${passQuotes}`
+        const item = isString(obj) ? obj.replaceAll("'", "\\'") : obj
+        return `${passQuotes}${item}${passQuotes}`
       }
 
       if (isArray(obj)) {

package/lib/build-page/inject-elements/css.js

@@ -2,7 +2,7 @@ import { collectInline, collectRegular } from './script.js'
 
 export function printLink (link) {
   const { routePath } = this.app.waibu
-  return `<link href="${routePath(link)}" rel="stylesheet" type="text/css" />`
+  return `<link href="${routePath(link.href)}" rel="stylesheet" type="text/css" />`
 }
 
 async function css (options) {

package/lib/build-page/inject-elements/link.js

@@ -2,10 +2,10 @@ import { collectRegular } from './script.js'
 
 export function printLink (link) {
   const { routePath } = this.app.waibu
-  const { isString } = this.app.lib._
-  const item = isString(link) ? { href: link, rel: 'stylesheet', type: 'text/css' } : link
-  if (item.href) item.href = routePath(item.href)
-  const attrs = this.stringifyAttribs(item)
+  link.rel = link.rel ?? 'stylesheet'
+  link.type = link.type ?? 'text/css'
+  link.href = routePath(link.href)
+  const attrs = this.stringifyAttribs(link)
   return `<link ${attrs} />`
 }
 

package/lib/build-page/inject-elements/script.js

@@ -1,14 +1,14 @@
 export function printScript (script) {
   const { routePath } = this.app.waibu
   const { stringifyAttribs } = this.app.waibuMpa
-  const { isString, omit } = this.app.lib._
-  if (isString(script)) script = { src: script }
-  return `<script src="${routePath(script.src)}" ${stringifyAttribs(omit(script, ['src']))}></script>`
+  script.src = routePath(script.src)
+  const result = `<script ${stringifyAttribs(script)}></script>`
+  return result
 }
 
 export async function collectRegular (type, transformer, options = {}) {
   const { runHook } = this.app.bajo
-  const { map, get, isString, camelCase, uniq } = this.app.lib._
+  const { map, get, set, isString, camelCase, uniq } = this.app.lib._
   const { arrangeArray } = this.app.lib.aneka
   const { req } = options
 
@@ -30,8 +30,21 @@ export async function collectRegular (type, transformer, options = {}) {
   items.push(...fm)
   // find in options
   items.push(...options[type])
-  items = arrangeArray(items)
-  return uniq(map(items, i => transformer.call(this, i)))
+  const key = type === 'scripts' ? 'src' : 'href'
+  items = items.map(item => {
+    if (isString(item)) return set({}, key, item)
+    return item
+  })
+  // arrange
+  let tmp = items.map(item => item[key])
+  tmp = arrangeArray(tmp)
+  const newItems = []
+  for (const t of tmp) {
+    const item = items.find(i => i[key].endsWith(t))
+    item[key] = t
+    newItems.push(item)
+  }
+  return uniq(map(newItems, i => transformer.call(this, i)))
 }
 
 export async function collectInline (type, options = {}) {

package/lib/class/component.js

@@ -216,7 +216,7 @@ async function componentFactory () {
       if (!has(params.attr, 'options')) return
       const items = []
       let input = params.attr.options
-      let values = attrToArray(params.attr.value)
+      let values = attrToArray(params.attr.dataValue ?? params.attr.value, '|')
       if (!has(params.attr, 'multiple')) {
         if (values.length > 0) values = [values[0]]
         else if (prop.default) values = [prop.default]

package/lib/class/widget/page-end.js

@@ -7,7 +7,7 @@ async function pageEndFactory () {
 
       this.params.tag = 'div'
       this.params.attr.c = 'page-end'
-      this.params.id = generateId()
+      this.params.id = generateId('alpha')
     }
 
     build = async () => {

package/lib/class/widget/page-start.js

@@ -13,7 +13,7 @@ async function pageStartFactory () {
       const groups = groupAttrs(this.params.attr, ['body'])
       this.params.attr = groups._
       this.params.attr.c = 'page-start'
-      this.params.attr.id = generateId()
+      this.params.attr.id = generateId('alpha')
       const body = `<body ${stringifyAttribs(groups.body)}>`
       this.params.attr.prepend = escape('<!DOCTYPE html><html><head>')
       this.params.attr.append = escape(`</head>${body}`)

package/lib/class/widget.js

@@ -118,10 +118,24 @@ async function widgetFactory () {
 
     getRefValue = ({ field, data, labelField, refName } = {}) => {
       const { get, isEmpty } = this.app.lib._
+      const { routePath, getPluginPrefix } = this.app.waibu
       const { ref, key } = this.getRef({ field, refName, returning: 'all' })
+
+      const format = (value, rValue) => {
+        let refUrl = get(this.schema, `view.widget.${field}.attr.refUrl`)
+        if (!refUrl) return value
+        refUrl = refUrl
+          .replaceAll('{prefix}', getPluginPrefix(this.schema.ns))
+          .replaceAll('{id}', rValue.id)
+        return `<a href="${routePath(refUrl)}">${value}</a>`
+      }
+
       if (isEmpty(ref)) return undefined
       labelField = labelField ?? ref.labelField ?? 'id'
-      return (get(data ?? this.formData, `_ref.${key}.${labelField}`))
+      const item = get(data ?? this.formData, `_ref.${key}`)
+      if (isEmpty(item)) return undefined
+      if (!Array.isArray(item)) return format(item[labelField], item)
+      return item.map(i => format(i[labelField], i)).join(', ')
     }
 
     getRefName = (field) => {

package/package.json

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

package/wiki/CHANGES.md

@@ -1,5 +1,12 @@
 # Changes
 
+## 2026-05-11
+
+- [2.15.0] Updates to match ```dobo@2.23.0``` specs
+- [2.15.0] Bug fix in ```jsonStringify()```
+- [2.15.0] Bug fix in ```component.js```
+- [2.15.0] Bug fix in ```widget.js```
+
 ## 2026-04-21
 
 - [2.14.2] Bug fix in ```Component.beforeBuildTag()```  and ```Component.afterBuildTag()```