waibu-db 1.0.2 → 1.0.4

package/bajo/.dependencies

@@ -0,0 +1,2 @@
+dobo
+waibu

package/bajo/config.json

@@ -12,6 +12,5 @@
   "dbModel": {
     "count": false,
     "patchEnabled": false
-  },
-  "dependencies": ["waibu", "dobo"]
+  }
 }

package/package.json

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

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

@@ -46,7 +46,7 @@ async function btnEdit () {
               if (id.slice(-6) === '-split') {
                 const selector = '#' + id.replace('-split', '-menu') + ' a.dropdown-item'
                 const item = document.querySelector(selector)
-                item.href = href.replace('/edit', '/add') + '&mode=clone'
+                item.href = href.replace('edit?&id=', 'add?&id=') + '&mode=clone'
               } else el.href = href
             }
           `

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

@@ -5,7 +5,7 @@ async function echarts () {
 
   return class WdbEcharts extends WdbBase {
     static scripts = [...super.scripts,
-      '^waibuDb.virtual:/echarts/echarts.min.js'
+      '^waibuExtra.virtual:/echarts/echarts.min.js'
     ]
 
     constructor (options) {
@@ -24,7 +24,6 @@ async function echarts () {
       const { defaultsDeep, generateId } = this.plugin.app.bajo
       const { base64JsonDecode, jsonStringify } = this.plugin.app.waibuMpa
       const { cloneDeep } = this.plugin.app.bajo.lib._
-      this._normalizeAttr(this.params, { tag: 'div' })
       this.params.attr.dim = this.params.attr.dim ?? 'width:100 height:100'
       this.params.attr.id = generateId('alpha')
       this.params.attr['x-data'] = `chart${this.params.attr.id}`

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

@@ -66,6 +66,37 @@ async function query () {
                 if (ext) prefix += ext
                 return ':' + prefix + '\\'' + v + '\\''
               },
+              initBuilder () {
+                this.builder = document.getElementById('${id}').value
+                if (_.isEmpty(this.builder)) return
+                const tokens = _.merge({}, this.ops, {
+                  in: ':[',
+                  contains: ':~',
+                  starts: ':~^',
+                  ends: ':~$$',
+                  '!in': ':-[',
+                  '!contains': ':-~',
+                  '!starts': ':-~^',
+                  '!ends': ':-~$$'
+                })
+                for (const part of this.builder.split('+')) {
+                  let [f, opv] = part.split(':')
+                  opv = ':' + opv
+                  this.selected.push(f)
+                  let op
+                  let val
+                  _.each(tokens, (v, k) => {
+                    if (opv.slice(0, v.length) === v) {
+                      op = k
+                      val = opv.slice(v.length).replaceAll('[', '').replaceAll(']', '').replaceAll('\\'', '')
+                    }
+                  })
+                  console.log(op, val)
+                  if (_.isEmpty(op)) continue
+                  this[f + 'Op'] = op
+                  this[f + 'Val'] = val
+                }
+              },
               expandArray (val = '') {
                 return _.map(val.split(','), item => {
                   item = _.trim(item)
@@ -98,14 +129,15 @@ async function query () {
                 if (run) {
                   const url = new URL(window.location.href)
                   const params = new URLSearchParams(url.search)
-                  this.params.set('${qsKey.page}', 1)
-                  this.params.set('${qsKey.query}', this.builder ?? '')
-                  window.location.href = '?' + this.params.toString()
+                  params.set('${qsKey.page}', 1)
+                  params.set('${qsKey.query}', this.builder ?? '')
+                  window.location.href = '?' + params.toString()
                 } else $dispatch('on-query', this.builder)
                 const instance = wbs.getInstance('${upperFirst(container)}', $refs.query)
                 instance.hide()
               }
             }" x-init="
+              initBuilder()
               const ops = _.map(fields, f => (f + 'Op'))
               const vals = _.map(fields, f => (f + 'Val'))
               const watcher = ['selected', ...ops, ...vals].join(',')
@@ -130,9 +162,9 @@ async function query () {
                 const val = document.getElementById('${id}').value ?? ''
                 const url = new URL(window.location.href)
                 const params = new URLSearchParams(url.search)
-                this.params.set('${qsKey.page}', 1)
-                this.params.set('${qsKey.query}', val)
-                window.location.href = '?' + this.params.toString()
+                params.set('${qsKey.page}', 1)
+                params.set('${qsKey.query}', val)
+                window.location.href = '?' + params.toString()
               }
             }" @click="submit" @on-submit.window="submit()" />
           </c:form-input-addon>