waibu-db 1.1.8 → 1.1.10

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

@@ -0,0 +1,15 @@
+<c:grid-row gutter="2">
+  <c:grid-col col="6-md">
+    <c:wdb-btn-back />
+  </c:grid-col>
+  <c:grid-col col="6-md">
+    <c:div flex="justify-content:end-md align-items:center">
+      <c:btn type="reset" color="secondary" t:content="reset" />
+      <c:btn type="submit" color="primary" t:content="submit" margin="start-2"/>
+    </c:div>
+  </c:grid-col>
+  <c:grid-col col="12" margin="top-4">
+    <c:form-switch name="_addmore" t:label="addMoreAfterSubmit"/>
+    <c:form-switch name="_cloneprev" t:label="clonePrevious"/>
+  </c:grid-col>
+</c:grid-row>

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

@@ -0,0 +1,17 @@
+<c:grid-row gutter="2">
+  <c:grid-col col="6-lg">
+    <c:wdb-btn-back />
+    <% if (schema.disabled.includes('remove') && schema.disabled.includes('update')) { %>
+    <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 />
+      <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/>
+  </c:grid-col>
+</c:grid-row>

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

@@ -0,0 +1,15 @@
+<c:grid-row gutter="2">
+  <c:grid-col col="6-lg">
+    <c:wdb-btn-back />
+    <c:btn-group margin="start-1">
+      <c:wdb-btn-details />
+      <c:wdb-btn-clone/>
+      <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/>
+    <c:btn type="reset" color="secondary" t:content="reset" margin="start-2"/>
+    <c:btn type="submit" color="primary" t:content="submit" margin="start-2"/>
+  </c:grid-col>
+</c:grid-row>

package/bajoTemplate/partial/crud/_form.html

@@ -1,5 +1,5 @@
 <% for (const l of schema.view.layout) { %>
-<c:fieldset card <% if (l.name[0] !== '_') print('t:legend="' + l.name + '"') %> grid-gutter="2">
+<c:fieldset <%= schema.view.card === false ? '' : 'card' %> <% if (l.name[0] !== '_') print('t:legend="' + l.name + '"') %> grid-gutter="2">
   <% for (const w of l.widgets) {
     const prop = _.find(schema.properties, { name: w.name })
     const attr = []

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

@@ -0,0 +1,16 @@
+<c:grid-row gutter="3">
+  <c:grid-col col="4-lg">
+    <c:wdb-query />
+  </c:grid-col>
+  <c:grid-col col="8-lg" flex="justify-content:end-lg">
+    <c:btn-group margin="end-2">
+      <c:wdb-btn-add text="nowrap"/>
+      <c:wdb-btn-edit on-list menu="end"/>
+    </c:btn-group>
+    <c:wdb-btn-delete on-list margin="end-2" />
+    <c:btn-group>
+      <c:wdb-btn-export selector="#main-table" handler="list"/>
+      <c:wdb-btn-columns menu="end"/>
+    </c:btn-group>
+  </c:grid-col>
+</c:grid-row>

package/bajoTemplate/partial/crud/add-handler.html

@@ -1,19 +1,5 @@
 <c:form>
   <!-- include waibuDb.partial:/crud/_form.html -->
-  <c:grid-row gutter="2" margin="top-2">
-    <c:grid-col col="6-md">
-      <c:wdb-btn-back />
-    </c:grid-col>
-    <c:grid-col col="6-md">
-      <c:div flex="justify-content:end-md align-items:center">
-        <c:btn type="reset" color="secondary" t:content="reset" />
-        <c:btn type="submit" color="primary" t:content="submit" margin="start-2"/>
-      </c:div>
-    </c:grid-col>
-    <c:grid-col col="12" margin="top-4">
-      <c:form-switch name="_addmore" t:label="addMoreAfterSubmit"/>
-      <c:form-switch name="_cloneprev" t:label="clonePrevious"/>
-    </c:grid-col>
-  </c:grid-row>
+  <!-- include waibuDb.partial:/crud/_add-btns.html -->
 </c:form>
 <!-- include waibuDb.partial:/crud/_addons.html -->

package/bajoTemplate/partial/crud/details-handler.html

@@ -1,21 +1,5 @@
 <c:div id="main-form">
   <!-- include waibuDb.partial:/crud/_form.html -->
 </c:div>
-<c:grid-row gutter="2" margin="top-2">
-  <c:grid-col col="6-lg">
-    <c:wdb-btn-back />
-    <% if (schema.disabled.includes('remove') && schema.disabled.includes('update')) { %>
-    <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 />
-      <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/>
-  </c:grid-col>
-</c:grid-row>
+<!-- include waibuDb.partial:/crud/_details-btns.html -->
 <!-- include waibuDb.partial:/crud/_addons.html -->

package/bajoTemplate/partial/crud/edit-handler.html

@@ -1,19 +1,5 @@
 <c:form id="main-form">
   <!-- include waibuDb.partial:/crud/_form.html -->
-  <c:grid-row gutter="2" margin="top-2">
-    <c:grid-col col="6-lg">
-      <c:wdb-btn-back />
-      <c:btn-group margin="start-1">
-        <c:wdb-btn-details />
-        <c:wdb-btn-clone/>
-        <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/>
-      <c:btn type="reset" color="secondary" t:content="reset" margin="start-2"/>
-      <c:btn type="submit" color="primary" t:content="submit" margin="start-2"/>
-    </c:grid-col>
-  </c:grid-row>
+  <!-- include waibuDb.partial:/crud/_edit-btns.html -->
 </c:form>
 <!-- include waibuDb.partial:/crud/_addons.html -->

package/bajoTemplate/partial/crud/list-handler.html

@@ -1,19 +1,4 @@
-<c:grid-row gutter="3" margin="bottom-3">
-  <c:grid-col col="4-lg">
-    <c:wdb-query />
-  </c:grid-col>
-  <c:grid-col col="8-lg" flex="justify-content:end-lg">
-    <c:btn-group margin="end-2">
-      <c:wdb-btn-add text="nowrap"/>
-      <c:wdb-btn-edit on-list menu="end"/>
-    </c:btn-group>
-    <c:wdb-btn-delete on-list margin="end-2" />
-    <c:btn-group>
-      <c:wdb-btn-export selector="#main-table" handler="list"/>
-      <c:wdb-btn-columns menu="end"/>
-    </c:btn-group>
-  </c:grid-col>
-</c:grid-row>
+<!-- include waibuDb.partial:/crud/_list-btns.html -->
 <c:wdb-table id="main-table" border body-divider strip responsive />
 <!-- include waibuDb.partial:/crud/_list-footer.html -->
 <!-- include waibuDb.partial:/crud/_addons.html -->

package/package.json

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

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

@@ -5,12 +5,15 @@ const defReadonly = ['id', 'createdAt', 'updatedAt']
 function getCommons (action, schema, ext, opts = {}) {
   const { map, get, set, without, uniq } = this.lib._
   const label = get(ext, `view.${action}.label`, get(ext, 'common.label', {}))
+  const card = get(ext, `view.${action}.card`, get(ext, 'common.card', true))
   const hidden = get(ext, `view.${action}.hidden`, get(ext, 'common.hidden', []))
+  const disabled = get(ext, `view.${action}.disabled`, get(ext, 'common.disabled', []))
+  const aggregate = get(ext, `view.${action}.stat.aggregate`, get(ext, 'common.stat.aggregate', []))
   hidden.push(...schema.hidden, ...(opts.hidden ?? []))
   const allFields = without(map(schema.properties, 'name'), ...hidden)
   const forFields = get(ext, `view.${action}.fields`, get(ext, 'common.fields', allFields))
-  set(schema, 'view.stat.aggregate', get(ext, `view.${action}.stat.aggregate`, get(ext, 'common.stat.aggregate', [])))
-  set(schema, 'view.disabled', get(ext, 'disabled', []))
+  set(schema, 'view.stat.aggregate', aggregate)
+  set(schema, 'view.disabled', disabled)
   if (schema.disabled.length > 0) schema.view.disabled.push(...schema.disabled)
   let fields = []
   for (const f of forFields) {
@@ -18,7 +21,11 @@ function getCommons (action, schema, ext, opts = {}) {
   }
   fields = uniq(without(fields, ...hidden))
   if (action !== 'add' && !fields.includes('id')) fields.unshift('id')
-  return { fields, allFields, label }
+  let noWrap = get(ext, `view.${action}.noWrap`, get(ext, 'common.noWrap', true))
+  if (noWrap === true) noWrap = fields
+  else if (noWrap === false) noWrap = []
+  set(schema, 'view.noWrap', noWrap)
+  return { fields, allFields, label, card }
 }
 
 function autoLayout ({ action, schema, ext, layout, allWidgets }) {
@@ -37,15 +44,18 @@ function autoLayout ({ action, schema, ext, layout, allWidgets }) {
 }
 
 function customLayout ({ action, schema, ext, layout, allWidgets, readonly }) {
-  const { find, omit, merge, isString } = this.lib._
+  const { find, omit, merge, isString, 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] = f.split(':')
-        f = { name, col, label }
+        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
@@ -59,7 +69,7 @@ function customLayout ({ action, schema, ext, layout, allWidgets, readonly }) {
 
 function applyLayout (action, schema, ext) {
   const { set, get, isEmpty, map, find } = this.lib._
-  const { fields, label } = getCommons.call(this, action, schema, ext)
+  const { fields, label, card } = 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 => {
@@ -91,6 +101,7 @@ function applyLayout (action, schema, ext) {
   set(schema, 'view.layout', layout)
   set(schema, 'view.fields', fields)
   set(schema, 'view.label', label)
+  set(schema, 'view.card', card)
 }
 
 const handler = {
@@ -121,13 +132,15 @@ const handler = {
 }
 
 async function getSchemaExt (model, view, opts) {
-  const { readConfig } = this.app.bajo
+  const { readConfig, defaultsDeep } = this.app.bajo
   const { getSchema } = this.app.dobo
   const { pick } = this.lib._
 
   let schema = getSchema(model)
   const base = path.basename(schema.file, path.extname(schema.file))
-  const ext = await readConfig(`${schema.ns}:/waibuDb/schema/${base}.*`, { ignoreError: true })
+  let ext = await readConfig(`${schema.ns}:/waibuDb/schema/${base}.*`, { ignoreError: true })
+  const over = await readConfig(`main:/waibuDb/extend/${schema.ns}/schema/${base}.*`, { ignoreError: true })
+  ext = defaultsDeep(over, ext)
   await handler[view].call(this, schema, ext, opts)
   schema = pick(schema, ['name', 'properties', 'indexes', 'disabled', 'attachment', 'sortables', 'view'])
   return { schema, ext }

package/plugin/method/record/get.js

@@ -2,8 +2,8 @@ import prepCrud from '../../../lib/prep-crud.js'
 
 async function get ({ model, req, reply, id, options = {} }) {
   const { recordFindOne } = this.app.dobo
-  const { name, filter, opts } = prepCrud.call(this, { model, req, reply, id, options, args: ['model', 'id'] })
-  filter.query = { $and: [filter.query ?? {}, { id: id ?? req.params.id }] }
+  const { name, recId, filter, opts } = prepCrud.call(this, { model, req, reply, id, options, args: ['model', 'id'] })
+  filter.query = { $and: [filter.query ?? {}, { id: recId }] }
   const ret = await recordFindOne(name, filter, opts)
   return ret
 }

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

@@ -10,7 +10,7 @@ async function btnDelete () {
       const { isEmpty, get } = this.plugin.app.bajo.lib._
       this.params.noTag = true
       const schema = get(this, 'component.locals.schema', {})
-      if (schema.view.disabled.includes('delete')) {
+      if (schema.view.disabled.includes('remove')) {
         this.params.html = ''
         return
       }

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

@@ -18,12 +18,13 @@ async function echarts () {
           right: 0
         }
       }
+      this.params.tag = 'div'
     }
 
     build = async () => {
-      const { defaultsDeep, generateId } = this.plugin.app.bajo
+      const { generateId } = this.plugin.app.bajo
       const { base64JsonDecode, jsonStringify } = this.plugin.app.waibuMpa
-      const { cloneDeep } = this.plugin.app.bajo.lib._
+      const { merge, cloneDeep } = this.plugin.app.bajo.lib._
       this.params.attr.id = generateId('alpha')
       this.params.attr['x-data'] = `chart${this.params.attr.id}`
       this.params.attr['@resize.window.debounce.500ms'] = `
@@ -33,7 +34,7 @@ async function echarts () {
       `
       let option = cloneDeep(this.defOption)
       if (this.params.attr.option === true) this.params.attr.option = 'e30='
-      if (this.params.attr.option) option = defaultsDeep(base64JsonDecode(this.params.attr.option), this.defOption)
+      if (this.params.attr.option) option = merge(option, base64JsonDecode(this.params.attr.option))
       this.params.attr['x-init'] = `
         $watch('option', val => {
           if (chart) chart.setOption(val)

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

@@ -91,6 +91,7 @@ async function table () {
           head = await this.component.buildTag({ tag: 'div', attr: { flex: 'justify-content:between align-items:end' }, html: content.join('\n') })
         }
         let text = this.params.attr.headerNowrap ? '' : 'nowrap'
+        if (text === '' && this.isNoWrap(f, schema, group.body.nowrap)) text = 'nowrap'
         if (this.isRightAligned(f, schema)) text += ' align:end'
         const attr = { dataKey: f, dataType: prop.type, text }
         items.push(await this.component.buildTag({ tag: 'th', attr, html: head }))
@@ -146,11 +147,9 @@ async function table () {
           if (!disableds.includes('get')) attr.style = { cursor: 'pointer' }
           const cellFormatter = get(schema, `view.cellFormatter.${f}`)
           if (cellFormatter) merge(attr, await cellFormatter(dataValue, d))
-          if (!['object', 'array'].includes(prop.type)) {
-            const noWrap = this.isNoWrap(f, schema, group.body.nowrap) ? 'nowrap' : ''
-            if (this.isRightAligned(f, schema)) attr.text = `align:end ${noWrap}`
-            else attr.text = noWrap
-          }
+          const noWrap = this.isNoWrap(f, schema, group.body.nowrap) ? 'nowrap' : ''
+          if (this.isRightAligned(f, schema)) attr.text = `align:end ${noWrap}`
+          else attr.text = noWrap
           const lookup = get(schema, `view.lookup.${f}`)
           if (lookup) {
             const item = find(lookup.values, set({}, lookup.id ?? 'id', value))