waibu-db 1.1.18 → 1.1.19

package/bajoTemplate/partial/crud/_addons.html

@@ -1,4 +1,4 @@
-<% for (const ao of addOns) { %>
+<% for (const ao of arguments[0].addOns ?? []) { %>
 <c:div append-to="#sb-addons" margin="bottom-3">
   <!-- include <%= ao.resource %>|<%= JSON.stringify(ao.data) %> -->
 </c:div>

package/bajoTemplate/partial/crud/_details-btns.html

@@ -1,17 +1,29 @@
 <c:grid-row gutter="2">
   <c:grid-col col="6-lg">
-    <c:wdb-btn-back />
+    <% if (!schema.view.control.noBackBtn) { %>
+    <c:wdb-btn-back href="<%= schema.view.control.backHref ?? 'undefined' %>" />
+    <% } %>
     <% if (schema.disabled.includes('remove') && schema.disabled.includes('update')) { %>
-    <c:wdb-btn-export selector="#main-form" handler="details" launch-margin="start-1"/>
+      <% if (!schema.view.control.noExportBtn) { %>
+      <c:wdb-btn-export selector="#main-form" handler="details" launch-margin="start-1" />
+      <% } %>
     <% } else { %>
     <c:btn-group margin="start-1">
-      <c:wdb-btn-edit />
-      <c:wdb-btn-clone />
+      <% if (!schema.view.control.noEditBtn) { %>
+      <c:wdb-btn-edit href="<%= schema.view.control.editHref ?? 'undefined' %>" />
+      <% } %>
+      <% if (!schema.view.control.noCloneBtn) { %>
+      <c:wdb-btn-clone href="<%= schema.view.control.cloneHref ?? 'undefined' %>" />
+      <% } %>
+      <% if (!schema.view.control.noExportBtn) { %>
       <c:wdb-btn-export selector="#main-form" handler="details" launch-on-end/>
+      <% } %>
     </c:btn-group>
     <% } %>
   </c:grid-col>
   <c:grid-col col="6-lg" flex="justify-content:end-lg align-items:center">
-    <c:wdb-btn-delete/>
+    <% if (!schema.view.control.noDeleteBtn) { %>
+    <c:wdb-btn-delete href="<%= schema.view.control.deleteHref ?? 'undefined' %>" />
+    <% } %>
   </c:grid-col>
 </c:grid-row>

package/bajoTemplate/partial/crud/_edit-btns.html

@@ -1,15 +1,27 @@
 <c:grid-row gutter="2">
   <c:grid-col col="6-lg">
-    <c:wdb-btn-back />
+    <% if (!schema.view.control.noBackBtn) { %>
+    <c:wdb-btn-back href="<%= schema.view.control.backHref ?? 'undefined' %>"/>
+    <% } %>
     <c:btn-group margin="start-1">
-      <c:wdb-btn-details />
-      <c:wdb-btn-clone/>
+      <% if (!schema.view.control.noDetailsBtn) { %>
+      <c:wdb-btn-details href="<%= schema.view.control.detailsHref ?? 'undefined' %>" />
+      <% } %>
+      <% if (!schema.view.control.noCloneBtn) { %>
+      <c:wdb-btn-clone href="<%= schema.view.control.cloneHref ?? 'undefined' %>" />
+      <% } %>
       <c:wdb-btn-export selector="#main-form" handler="edit" launch-on-end/>
     </c:btn-group>
   </c:grid-col>
   <c:grid-col col="6-lg" flex="justify-content:end-lg align-items:center">
-    <c:wdb-btn-delete/>
+    <% if (!schema.view.control.noDeleteBtn) { %>
+    <c:wdb-btn-delete href="<%= schema.view.control.deleteHref ?? 'undefined' %>"/>
+    <% } %>
+    <% if (!schema.view.control.noResetBtn) { %>
     <c:btn type="reset" color="secondary" t:content="reset" margin="start-2"/>
+    <% } %>
+    <% if (!schema.view.control.noSubmitBtn) { %>
     <c:btn type="submit" color="primary" t:content="submit" margin="start-2"/>
+    <% } %>
   </c:grid-col>
 </c:grid-row>

package/lib/crud/details-handler.js

@@ -1,4 +1,4 @@
-async function detailsHandler ({ req, reply, model, params = {}, template, addOnsHandler, templateDisabled = 'waibuDb.template:/disabled.html' } = {}) {
+async function detailsHandler ({ req, reply, model, params = {}, id, template, addOnsHandler, templateDisabled = 'waibuDb.template:/disabled.html' } = {}) {
   const { pascalCase } = this.app.bajo
   const { recordGet, getSchemaExt } = this.app.waibuDb
   const { merge } = this.lib._
@@ -8,7 +8,8 @@ async function detailsHandler ({ req, reply, model, params = {}, template, addOn
   if (schema.disabled.includes('get')) return reply.view(templateDisabled, { action: 'details' })
   // req.query.attachment = true
   options.fields = schema.view.fields
-  const resp = await recordGet({ model, req, options })
+  id = id ?? req.params.id ?? req.query.id
+  const resp = await recordGet({ model, req, id, options })
   const form = resp.data
   const addOns = addOnsHandler ? await addOnsHandler.call(this.app[req.ns], { req, reply, params, data: resp, schema }) : undefined
   merge(params, { form, schema, addOns })

package/lib/crud/edit-handler.js

@@ -1,4 +1,4 @@
-async function editHandler ({ req, reply, model, params = {}, template, addOnsHandler, templateDisabled = 'waibuDb.template:/disabled.html' } = {}) {
+async function editHandler ({ req, reply, model, id, params = {}, template, addOnsHandler, templateDisabled = 'waibuDb.template:/disabled.html' } = {}) {
   const { pascalCase } = this.app.bajo
   const { recordUpdate, recordGet, getSchemaExt } = this.app.waibuDb
   const { buildUrl } = this.app.waibuMpa
@@ -12,15 +12,16 @@ async function editHandler ({ req, reply, model, params = {}, template, addOnsHa
   let error
   let resp
   let form
+  id = id ?? req.params.id ?? req.query.id
   if (req.method === 'GET') {
-    const old = await recordGet({ model, req, id: req.query.id, options })
+    const old = await recordGet({ model, req, id, options })
     form = defaultsDeep(req.body, old.data)
   } else {
     form = req.body
     try {
-      resp = await recordUpdate({ model, req, id: req.query.id, reply, options })
+      resp = await recordUpdate({ model, req, id, reply, options })
       form = resp.data
-      return reply.redirectTo(buildUrl({ url: req.url, base: 'list', params: { page: 1 }, exclude: ['id'] }))
+      return reply.redirectTo(buildUrl({ url: req.url, base: req.params.base ?? req.query.base ?? 'list', params: { page: 1 }, exclude: ['id'] }))
     } catch (err) {
       error = err
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waibu-db",
-  "version": "1.1.18",
+  "version": "1.1.19",
   "description": "DB Helper",
   "main": "index.js",
   "scripts": {

package/plugin/method/get-schema-ext.js

@@ -5,32 +5,40 @@ const defReadonly = ['id', 'createdAt', 'updatedAt']
 const defFormatter = {}
 
 function getCommons (action, schema, ext, opts = {}) {
-  const { merge, map, get, set, without, uniq } = this.lib._
+  const { defaultsDeep } = this.app.bajo
+  const { merge, map, get, set, without, uniq, pull } = this.lib._
   const calcFields = get(ext, `view.${action}.calcFields`, get(ext, 'common.calcFields', []))
+  const forceVisible = get(ext, `view.${action}.forceVisible`, get(ext, 'common.forceVisible', []))
+  const widget = defaultsDeep(get(ext, `view.${action}.widget`), get(ext, 'common.widget', {}))
   const noEscape = get(ext, `view.${action}.noEscape`, get(ext, 'common.noEscape', []))
-  const valueFormatter = get(ext, `view.${action}.valueFormatter`, get(ext, 'common.valueFormatter', {}))
-  const formatter = get(ext, `view.${action}.formatter`, get(ext, 'common.formatter', {}))
-  const label = get(ext, `view.${action}.label`, get(ext, 'common.label', {}))
+  const control = defaultsDeep(get(ext, `view.${action}.control`), get(ext, 'common.control', {}))
+  const valueFormatter = defaultsDeep(get(ext, `view.${action}.valueFormatter`), get(ext, 'common.valueFormatter', {}))
+  const formatter = defaultsDeep(get(ext, `view.${action}.formatter`), get(ext, 'common.formatter', {}))
   const card = get(ext, `view.${action}.card`, get(ext, 'common.card', true))
-  const hidden = get(ext, `view.${action}.hidden`, get(ext, 'common.hidden', []))
+  let hidden = get(ext, `view.${action}.hidden`, get(ext, 'common.hidden', []))
   const disabled = get(ext, `view.${action}.disabled`, get(ext, 'common.disabled', []))
-  const x = get(ext, `view.${action}.x`, get(ext, 'common.x', {}))
+  const x = defaultsDeep(get(ext, `view.${action}.x`), get(ext, 'common.x', {}))
   const aggregate = get(ext, `view.${action}.stat.aggregate`, get(ext, 'common.stat.aggregate', []))
-  hidden.push(...schema.hidden, ...(opts.hidden ?? []))
+  hidden.push('siteId', ...schema.hidden, ...(opts.hidden ?? []))
+  hidden = uniq(hidden)
+  pull(hidden, ...forceVisible)
   const allFields = without(map(schema.properties, 'name'), ...hidden)
   const forFields = get(ext, `view.${action}.fields`, get(ext, 'common.fields', allFields))
   set(schema, 'view.calcFields', calcFields)
   set(schema, 'view.noEscape', noEscape)
+  set(schema, 'view.widget', widget)
   set(schema, 'view.valueFormatter', valueFormatter)
   set(schema, 'view.formatter', merge({}, defFormatter, formatter))
   set(schema, 'view.stat.aggregate', aggregate)
   set(schema, 'view.disabled', disabled)
+  set(schema, 'view.control', control)
   set(schema, 'view.x', x)
   if (schema.disabled.length > 0) schema.view.disabled.push(...schema.disabled)
   let fields = []
   for (const f of forFields) {
-    if (allFields.includes(f) || map(calcFields, 'name').includes(f)) fields.push(f)
+    if (allFields.includes(f)) fields.push(f)
   }
+  if (calcFields.length > 0) fields.push(...map(calcFields, 'name'))
   fields = uniq(without(fields, ...hidden))
 
   if (action !== 'add' && !fields.includes('id')) fields.unshift('id')
@@ -38,59 +46,58 @@ function getCommons (action, schema, ext, opts = {}) {
   if (noWrap === true) noWrap = fields
   else if (noWrap === false) noWrap = []
   set(schema, 'view.noWrap', noWrap)
-  return { fields, allFields, label, card }
+  return { fields, allFields, card, calcFields }
 }
 
-function autoLayout ({ action, schema, ext, layout, allWidgets }) {
+function autoLayout ({ action, schema, ext, layout }) {
+  const { forOwn, keys } = this.lib._
   const matches = ['id', 'createdAt', 'updatedAt']
   const meta = []
   const general = []
-  for (const w of allWidgets) {
-    if (matches.includes(w.name)) meta.push(w)
-    else general.push(w)
-  }
-  if (meta.length <= 1) layout.push({ name: '_common', widgets: allWidgets })
+  forOwn(schema.view.widget, (w, f) => {
+    if (matches.includes(f)) meta.push(f)
+    else general.push(f)
+  })
+  if (meta.length <= 1) layout.push({ name: '_common', fields: keys(schema.view.widget) })
   else {
-    layout.push({ name: 'Meta', widgets: meta })
-    layout.push({ name: 'General', widgets: general })
+    layout.push({ name: 'Meta', fields: meta })
+    layout.push({ name: 'General', fields: general })
   }
 }
 
-function customLayout ({ action, schema, ext, layout, allWidgets, readonly }) {
-  const { find, omit, merge, isString, isEmpty } = this.lib._
+function customLayout ({ action, schema, ext, layout, readonly }) {
+  const { defaultsDeep } = this.app.bajo
+  const { isEmpty } = this.lib._
   const items = [...layout]
-  layout.splice(0, layout.length)
   for (const item of items) {
-    const widgets = []
-    for (let f of item.fields) {
-      if (isString(f)) {
-        const [name, col, label, component] = f.split(':')
-        f = { name }
-        f.label = isEmpty(label) ? `field.${name}` : label
-        if (!isEmpty(col)) f.col = col
-        if (!isEmpty(component)) f.component = component
-      }
-      const widget = find(allWidgets, { name: f.name })
-      if (!widget && !f.component) continue
-      widget.attr = merge({}, widget.attr, omit(f, ['component', 'componentOpts']))
-      if (f.component && !readonly.includes(f.name) && action !== 'details') {
-        widget.component = f.component
-        widget.componentOpts = f.componentOpts
-      }
-      widgets.push(widget)
+    for (const idx in item.fields) {
+      const f = item.fields[idx]
+      const [name, col, label, component] = f.split(':')
+      item.fields[idx] = name
+      const w = { name, attr: {} }
+      w.attr.label = isEmpty(label) ? `field.${name}` : label
+      if (!isEmpty(col)) w.attr.col = col
+      if (!isEmpty(component)) w.component = component
+      schema.view.widget[name] = defaultsDeep(w, schema.view.widget[w.name])
     }
-    if (widgets.length > 0) layout.push({ name: item.name, widgets })
   }
 }
 
 function applyLayout (action, schema, ext) {
-  const { set, get, isEmpty, map, find } = this.lib._
-  const { fields, label, card } = getCommons.call(this, action, schema, ext)
+  const { defaultsDeep } = this.app.bajo
+  const { set, get, isEmpty, find } = this.lib._
+  const { fields, card, calcFields } = getCommons.call(this, action, schema, ext)
   const layout = get(ext, `view.${action}.layout`, get(ext, 'common.layout', []))
   const readonly = get(ext, `view.${action}.readonly`, get(ext, 'common.readonly', defReadonly))
-  const allWidgets = map(fields, f => {
-    const prop = find(schema.properties, { name: f })
-    const result = { name: f, component: 'form-input', attr: { col: '4-md' } }
+  const widget = {}
+  for (const f of fields) {
+    let prop = find(schema.properties, { name: f })
+    if (!prop) prop = find(calcFields, { name: f })
+    if (!prop) continue
+    const result = schema.view.widget[f] ?? {}
+    result.name = result.name ?? f
+    result.component = result.component ?? 'form-input'
+    result.attr = defaultsDeep(result.attr, { col: '4-md', label: `field.${f}` })
     if (['array', 'object', 'text'].includes(prop.type)) {
       result.attr.col = '12'
       result.component = 'form-textarea'
@@ -110,20 +117,20 @@ function applyLayout (action, schema, ext) {
       if (['string', 'text'].includes(prop.type) && prop.maxLength) set(result, 'attr.maxlength', prop.maxLength)
       if (readonly.includes(f)) result.component = 'form-plaintext'
     }
-    return result
-  })
-  if (isEmpty(layout)) autoLayout.call(this, { layout, allWidgets, schema, action, ext })
-  else customLayout.call(this, { layout, allWidgets, schema, action, ext, readonly })
+    widget[f] = result
+  }
+  set(schema, 'view.widget', widget)
+  if (isEmpty(layout)) autoLayout.call(this, { layout, schema, action, ext })
+  else customLayout.call(this, { layout, schema, action, ext, readonly })
   set(schema, 'view.layout', layout)
   set(schema, 'view.fields', fields)
-  set(schema, 'view.label', label)
   set(schema, 'view.card', card)
 }
 
 const handler = {
   list: async function (schema, ext, opts) {
     const { get, set } = this.lib._
-    const { fields, label } = getCommons.call(this, 'list', schema, ext, opts)
+    const { fields } = getCommons.call(this, 'list', schema, ext, opts)
     const qsFields = []
     for (const f of get(schema, 'view.qs.fields', '').split(',')) {
       if (fields.includes(f)) qsFields.push(f)
@@ -135,7 +142,6 @@ const handler = {
       if (!['1', '-1'].includes(dir)) dir = '1'
       set(schema, 'view.qs.sort', `${col}:${dir}`)
     }
-    set(schema, 'view.label', label)
     set(schema, 'view.fields', fields)
     set(schema, 'view.qs.fields', qsFields.join(','))
   },
@@ -159,7 +165,7 @@ async function getSchemaExt (model, view, opts) {
   const base = path.basename(schema.file, path.extname(schema.file))
   let ext = await readConfig(`${schema.ns}:/waibuDb/schema/${base}.*`, { ignoreError: true, opts })
   const over = await readConfig(`main:/waibuDb/extend/${schema.ns}/schema/${base}.*`, { ignoreError: true, opts })
-  ext = defaultsDeep(over, ext)
+  ext = defaultsDeep(opts.schema ?? {}, over, ext)
   await handler[view].call(this, schema, ext, opts)
   schema = pick(schema, ['name', 'properties', 'indexes', 'disabled', 'attachment', 'sortables', 'view'])
   return { schema, ext }

package/waibuBootstrap/theme/component/factory/btn-details.js

@@ -31,7 +31,8 @@ async function btnDetails () {
           $refs.details.href = path + '&id=' + recId
         `
       } else {
-        this.params.attr.href += '&id=' + req.query.id
+        const prefix = this.params.attr.href.includes('?') ? '' : '?'
+        this.params.attr.href += prefix + '&id=' + req.query.id
       }
       this.params.html = await this.component.buildTag({ tag: 'btn', attr: this.params.attr, html: this.params.html })
     }

package/waibuBootstrap/theme/component/factory/btn-edit.js

@@ -58,7 +58,8 @@ async function btnEdit () {
           this.params.html = await this.component.buildTag({ tag: 'dropdown', attr: this.params.attr, html: html.join('\n') })
         }
       } else {
-        this.params.attr.href += '&id=' + req.query.id
+        const prefix = this.params.attr.href.includes('?') ? '' : '?'
+        this.params.attr.href += prefix + '&id=' + req.query.id
         this.params.html = await this.component.buildTag({ tag: 'btn', attr: this.params.attr, html: this.params.html })
       }
     }

package/waibuBootstrap/theme/component/factory/form.js

@@ -13,8 +13,11 @@ async function form () {
       const xOns = get(schema, 'view.x.on', [])
       for (const l of schema.view.layout) {
         body.push(`<c:fieldset ${schema.view.card === false ? '' : 'card'} ${l.name[0] !== '_' ? ('t:legend="' + l.name + '"') : ''} grid-gutter="2">`)
-        for (const w of l.widgets) {
-          const prop = find(schema.properties, { name: w.name })
+        for (const f of l.fields) {
+          const w = schema.view.widget[f]
+          let prop = find(schema.properties, { name: f })
+          if (!prop) prop = find(schema.view.calcFields, { name: f })
+          if (!prop) continue
           const attr = [`x-ref="${w.name}"`]
           if (xModels.includes(w.name)) attr.push(`x-model="${w.name}"`)
           forOwn(w.attr, (v, k) => {