waibu-db 1.1.9 → 1.1.10

package/package.json

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

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

@@ -7,11 +7,13 @@ function getCommons (action, schema, ext, opts = {}) {
   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) {
@@ -19,6 +21,10 @@ function getCommons (action, schema, ext, opts = {}) {
   }
   fields = uniq(without(fields, ...hidden))
   if (action !== 'add' && !fields.includes('id')) fields.unshift('id')
+  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 }
 }
 

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

@@ -22,9 +22,9 @@ async function echarts () {
     }
 
     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'] = `
@@ -34,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))