From a7364df914df3f1ef78685e3d126eb7ee8b3dbb4 Mon Sep 17 00:00:00 2001 From: nikitam Date: Wed, 26 Sep 2018 18:35:51 +0530 Subject: [PATCH] filter-search --- client/src/components/SchemaView.vue | 4 +++- .../src/services/dflowzdata/dflowzdata.hooks.js | 14 +++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/client/src/components/SchemaView.vue b/client/src/components/SchemaView.vue index 37991da..e266df1 100644 --- a/client/src/components/SchemaView.vue +++ b/client/src/components/SchemaView.vue @@ -313,7 +313,8 @@ export default { $limit: this.limit, '_currentStatus': true, '_state': this.$route.params.stateid, - 'id[$search]': '^' + query.text + // 'id[$search]': '^' + query.text + '$search': query.text }, heads) .then(res => { this.isFlowzLoaded = true @@ -375,6 +376,7 @@ export default { // }) }, sortData (object) { + // console.log('object') }, emailService (item) { this.isEmailDone = true diff --git a/service/src/services/dflowzdata/dflowzdata.hooks.js b/service/src/services/dflowzdata/dflowzdata.hooks.js index 301e87a..37e4d5f 100644 --- a/service/src/services/dflowzdata/dflowzdata.hooks.js +++ b/service/src/services/dflowzdata/dflowzdata.hooks.js @@ -60,11 +60,23 @@ let beforeFind = function (hook) { const query = hook.service.service.createQuery(hook.params.query); hook.params.rethinkdb = query.group(value) } + if (query.$search !== undefined) { + hook.service.service.options.name = hook.params.headers.ftablename; + hook.service.service.table = hook.service.rDB.table(hook.params.headers.ftablename); + let value = hook.params.query.$search + delete hook.params.query.$search + const query = hook.service.service.createQuery(hook.params.query); + // hook.params.rethinkdb = query.group(value) + hook.params.rethinkdb = query.filter(function(doc) { + return doc.coerceTo('string').match('(?i)' + value); + }) + // console.log('hook.params.rethinkdb', hook.params.rethinkdb) + } } function beforeCreate (hook) { try { - console.log('before create ================================', hook.params) + // console.log('before create ================================', hook.params) hook.params.done = true if (hook.params.headers.ftablename !== undefined && hook.data._state !== undefined) { let regex = /_/g