@tripup-company/element-ui-extended 0.0.9 → 0.0.10

package/dist/element-ui-extended.common.js

@@ -6169,7 +6169,7 @@ __webpack_require__.r(__webpack_exports__);
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, "CompositeTable", function() { return /* reexport */ CompositeTable; });
 __webpack_require__.d(__webpack_exports__, "GenericFilters", function() { return /* reexport */ GenericFilters; });
-__webpack_require__.d(__webpack_exports__, "GenericFiltersTop", function() { return /* reexport */ GenericTopFilter; });
+__webpack_require__.d(__webpack_exports__, "QuickSearchFilter", function() { return /* reexport */ QuickSearchFilter; });
 __webpack_require__.d(__webpack_exports__, "GenericTable", function() { return /* reexport */ GenericTable; });
 __webpack_require__.d(__webpack_exports__, "GenericPaginator", function() { return /* reexport */ GenericPaginator; });
 __webpack_require__.d(__webpack_exports__, "CreateForm", function() { return /* reexport */ CreateForm; });
@@ -6203,12 +6203,12 @@ if (typeof window !== 'undefined') {
 // Indicate to webpack that this file can be concatenated
 /* harmony default export */ var setPublicPath = (null);
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7229a924-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/CompositeTable/index.vue?vue&type=template&id=7f40e991&scoped=true&
-var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{directives:[{name:"loading",rawName:"v-loading",value:(_vm.loading),expression:"loading"}],staticClass:"composite-table"},[_vm._t("default",function(){return [_vm._t("top-filter",function(){return [(_vm.filtersTop.length)?_c('generic-top-filter',{attrs:{"filters":_vm.filtersTop,"search":_vm.search},on:{"apply:filter":_vm.handleApplyFilter,"reset:filter":_vm.handleResetFilter}}):_vm._e()]},null,{ filtersTop: _vm.filtersTop, search: _vm.search }),_c('el-row',{attrs:{"gutter":20}},[_c('el-col',{attrs:{"span":18}},[_vm._t("table",function(){return [_c('generic-table',{attrs:{"fields":_vm.fields,"data":_vm.data},on:{"sort:change":_vm.handleChangeSort}})]},null,{ fields: _vm.fields, data: _vm.data }),_c('el-row',[_c('el-col',[_vm._t("paginator",function(){return [_c('generic-paginator',{attrs:{"total":_vm.total,"limit":_vm.limit,"current-page":_vm.currentPage},on:{"size:change":_vm.handleSizeChange,"page:change":_vm.handleCurrentChange}})]},null,{ total: _vm.total, limit: _vm.limit, currentPage: _vm.currentPage })],2)],1)],2),_c('el-col',{attrs:{"span":6}},[_vm._t("filter",function(){return [(_vm.filters.length)?_c('generic-filter',{attrs:{"filters":_vm.filters,"search":_vm.search},on:{"apply:filter":_vm.handleApplyFilter,"reset:filter":_vm.handleResetFilter}}):_vm._e()]},null,{ filters: _vm.filters, search: _vm.search })],2)],1)]})],2)}
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7229a924-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/CompositeTable/index.vue?vue&type=template&id=0ed61922&scoped=true&
+var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{directives:[{name:"loading",rawName:"v-loading",value:(_vm.loading),expression:"loading"}],staticClass:"composite-table"},[_vm._t("default",function(){return [_c('el-row',{attrs:{"gutter":20}},[_c('el-col',{attrs:{"span":18}},[_vm._t("quick-search-filter",function(){return [(_vm.topFilter)?_c('quick-search-filter',{attrs:{"filter":_vm.topFilter,"search":_vm.topSearch},on:{"apply:filter":_vm.handleApplyTopFilter,"reset:filter":_vm.handleResetTopFilter}}):_vm._e()]},null,{ topFilter: _vm.topFilter, search: _vm.search }),_vm._t("table",function(){return [_c('generic-table',{attrs:{"fields":_vm.fields,"data":_vm.data},on:{"sort:change":_vm.handleChangeSort}})]},null,{ fields: _vm.fields, data: _vm.data }),_c('el-row',[_c('el-col',[_vm._t("paginator",function(){return [_c('generic-paginator',{attrs:{"total":_vm.total,"limit":_vm.limit,"current-page":_vm.currentPage},on:{"size:change":_vm.handleSizeChange,"page:change":_vm.handleCurrentChange}})]},null,{ total: _vm.total, limit: _vm.limit, currentPage: _vm.currentPage })],2)],1)],2),_c('el-col',{attrs:{"span":6}},[_vm._t("filter",function(){return [(_vm.filters.length)?_c('generic-filter',{attrs:{"filters":_vm.filters,"search":_vm.search},on:{"apply:filter":_vm.handleApplyFilter,"reset:filter":_vm.handleResetFilter}}):_vm._e()]},null,{ filters: _vm.filters, search: _vm.search })],2)],1)]})],2)}
 var staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./src/components/CompositeTable/index.vue?vue&type=template&id=7f40e991&scoped=true&
+// CONCATENATED MODULE: ./src/components/CompositeTable/index.vue?vue&type=template&id=0ed61922&scoped=true&
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.to-string.js
 var es_object_to_string = __webpack_require__("d3b7");
@@ -7386,12 +7386,12 @@ var GenericFilters_component = normalizeComponent(
 )
 
 /* harmony default export */ var GenericFilters = (GenericFilters_component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7229a924-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/GenericPaginator/index.vue?vue&type=template&id=bb57d95e&
-var GenericPaginatorvue_type_template_id_bb57d95e_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"m-t-15"},[_c('el-pagination',{attrs:{"total":_vm.total,"current-page":_vm.currentPage,"page-size":_vm.limit,"layout":'total, sizes, prev, pager, next, jumper'},on:{"size-change":_vm.sizeChange,"current-change":_vm.pageChange}})],1)}
-var GenericPaginatorvue_type_template_id_bb57d95e_staticRenderFns = []
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7229a924-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/GenericPaginator/index.vue?vue&type=template&id=62ea2e41&
+var GenericPaginatorvue_type_template_id_62ea2e41_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"m-t-15"},[_c('el-pagination',{attrs:{"total":_vm.total,"current-page":_vm.currentPage,"page-size":_vm.limit,"layout":'total, sizes, prev, pager, next, jumper'},on:{"size-change":_vm.sizeChange,"current-change":_vm.pageChange}})],1)}
+var GenericPaginatorvue_type_template_id_62ea2e41_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./src/components/GenericPaginator/index.vue?vue&type=template&id=bb57d95e&
+// CONCATENATED MODULE: ./src/components/GenericPaginator/index.vue?vue&type=template&id=62ea2e41&
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.number.constructor.js
 var es_number_constructor = __webpack_require__("a9e3");
@@ -7441,7 +7441,6 @@ var es_number_constructor = __webpack_require__("a9e3");
   },
   methods: {
     pageChange: function pageChange(val) {
-      debugger;
       this.$emit('page:change', val);
     },
     sizeChange: function sizeChange(val) {
@@ -7461,8 +7460,8 @@ var es_number_constructor = __webpack_require__("a9e3");
 
 var GenericPaginator_component = normalizeComponent(
   components_GenericPaginatorvue_type_script_lang_js_,
-  GenericPaginatorvue_type_template_id_bb57d95e_render,
-  GenericPaginatorvue_type_template_id_bb57d95e_staticRenderFns,
+  GenericPaginatorvue_type_template_id_62ea2e41_render,
+  GenericPaginatorvue_type_template_id_62ea2e41_staticRenderFns,
   false,
   null,
   null,
@@ -7471,12 +7470,12 @@ var GenericPaginator_component = normalizeComponent(
 )
 
 /* harmony default export */ var GenericPaginator = (GenericPaginator_component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7229a924-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/GenericTable/index.vue?vue&type=template&id=1dbee846&
-var GenericTablevue_type_template_id_1dbee846_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('el-table',{attrs:{"data":_vm.data,"border":""},on:{"sort-change":_vm.sortChange}},[_vm._l((_vm.fields),function(field){return [(field.callback)?[_c('el-table-column',{key:field.prop,attrs:{"prop":field.prop,"label":field.label,"width":field.width ? field.width : null,"sortable":"custom"},scopedSlots:_vm._u([{key:"default",fn:function(context){return [_c('el-link',{on:{"click":function($event){return field.callback(field.prop, context.$index, context.row)}}},[_vm._v(" "+_vm._s(typeof field.formatter === 'function' ? field.formatter(context.row) : context.row[field.prop])+" ")])]}}],null,true)})]:[_c('el-table-column',{key:field.prop,attrs:{"formatter":typeof field.formatter === 'function' ? field.formatter : null,"prop":field.prop,"label":field.label,"width":field.width ? field.width : null,"sortable":"custom"}})]]})],2)],1)}
-var GenericTablevue_type_template_id_1dbee846_staticRenderFns = []
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7229a924-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/GenericTable/index.vue?vue&type=template&id=78fe6b34&
+var GenericTablevue_type_template_id_78fe6b34_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('el-table',{attrs:{"data":_vm.data,"border":""},on:{"sort-change":_vm.sortChange}},[_vm._l((_vm.fields),function(field){return [(field.callback)?[_c('el-table-column',{key:field.prop,attrs:{"prop":field.prop,"label":field.label,"width":field.width ? field.width : null,"sortable":field.sortable ? field.sortable : null},scopedSlots:_vm._u([{key:"default",fn:function(context){return [_c('el-link',{on:{"click":function($event){return field.callback(field.prop, context.$index, context.row)}}},[_vm._v(" "+_vm._s(typeof field.formatter === "function" ? field.formatter(context.row) : context.row[field.prop])+" ")])]}}],null,true)})]:[_c('el-table-column',{key:field.prop,attrs:{"formatter":typeof field.formatter === 'function' ? field.formatter : null,"prop":field.prop,"label":field.label,"width":field.width ? field.width : null,"sortable":field.sortable ? field.sortable : null}})]]})],2)],1)}
+var GenericTablevue_type_template_id_78fe6b34_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./src/components/GenericTable/index.vue?vue&type=template&id=1dbee846&
+// CONCATENATED MODULE: ./src/components/GenericTable/index.vue?vue&type=template&id=78fe6b34&
 
 // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/GenericTable/index.vue?vue&type=script&lang=js&
 //
@@ -7498,6 +7497,28 @@ var GenericTablevue_type_template_id_1dbee846_staticRenderFns = []
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 /* harmony default export */ var GenericTablevue_type_script_lang_js_ = ({
   name: "GenericTable",
   props: {
@@ -7525,7 +7546,7 @@ var GenericTablevue_type_template_id_1dbee846_staticRenderFns = []
   },
   methods: {
     sortChange: function sortChange(data) {
-      this.$emit('sort:change', data);
+      this.$emit("sort:change", data);
     }
   }
 });
@@ -7541,8 +7562,8 @@ var GenericTablevue_type_template_id_1dbee846_staticRenderFns = []
 
 var GenericTable_component = normalizeComponent(
   components_GenericTablevue_type_script_lang_js_,
-  GenericTablevue_type_template_id_1dbee846_render,
-  GenericTablevue_type_template_id_1dbee846_staticRenderFns,
+  GenericTablevue_type_template_id_78fe6b34_render,
+  GenericTablevue_type_template_id_78fe6b34_staticRenderFns,
   false,
   null,
   null,
@@ -7700,30 +7721,14 @@ var meta_model_MetaModel = /*#__PURE__*/function (_BaseModel) {
 }(base_model_BaseModel);
 
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7229a924-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/GenericFilters/GenericTopFilter.vue?vue&type=template&id=e981941c&
-var GenericTopFiltervue_type_template_id_e981941c_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('el-row',[_vm._l((_vm.filters),function(column){return _c('filter-top-row',{key:column.name,attrs:{"column":column,"search":_vm.search[column.name]}})}),_c('el-col',{staticClass:"m-t-20",attrs:{"span":6}},[_c('el-button',{on:{"click":_vm.applyFilter}},[_vm._v("Filter")]),_c('el-button',{on:{"click":_vm.resetFilter}},[_vm._v("Reset filter")])],1)],2)}
-var GenericTopFiltervue_type_template_id_e981941c_staticRenderFns = []
-
-
-// CONCATENATED MODULE: ./src/components/GenericFilters/GenericTopFilter.vue?vue&type=template&id=e981941c&
-
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7229a924-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/GenericFilters/FilterTopRow.vue?vue&type=template&id=8bda4366&
-var FilterTopRowvue_type_template_id_8bda4366_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.column)?_c('el-col',{staticClass:"m-b-20",attrs:{"span":18}},[(_vm.column.type !== 'checkbox')?_c('el-col',{staticClass:"m-b-5 p-l-0"},[_c('label',[_vm._v(_vm._s(_vm.column.label))])]):_vm._e(),(_vm.column.type==='string')?_c('el-input',{model:{value:(_vm.search.value),callback:function ($$v) {_vm.$set(_vm.search, "value", $$v)},expression:"search.value"}}):_vm._e()],1):_vm._e()}
-var FilterTopRowvue_type_template_id_8bda4366_staticRenderFns = []
-
-
-// CONCATENATED MODULE: ./src/components/GenericFilters/FilterTopRow.vue?vue&type=template&id=8bda4366&
-
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/GenericFilters/FilterTopRow.vue?vue&type=script&lang=js&
-
-
-
-
-
-
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7229a924-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/GenericFilters/QuickSearchFilter.vue?vue&type=template&id=61231db6&
+var QuickSearchFiltervue_type_template_id_61231db6_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('el-row',{staticClass:"m-b-20"},[(_vm.filter)?_c('el-col',[(_vm.filter.type === 'string')?_c('el-input',{attrs:{"clearable":""},on:{"clear":_vm.resetFilter},nativeOn:{"keyup":function($event){if(!$event.type.indexOf('key')&&_vm._k($event.keyCode,"enter",13,$event.key,"Enter")){ return null; }return _vm.applyFilter.apply(null, arguments)}},model:{value:(_vm.search[_vm.filter.name].value),callback:function ($$v) {_vm.$set(_vm.search[_vm.filter.name], "value", $$v)},expression:"search[filter.name].value"}}):_vm._e()],1):_vm._e()],1)}
+var QuickSearchFiltervue_type_template_id_61231db6_staticRenderFns = []
 
 
+// CONCATENATED MODULE: ./src/components/GenericFilters/QuickSearchFilter.vue?vue&type=template&id=61231db6&
 
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/GenericFilters/QuickSearchFilter.vue?vue&type=script&lang=js&
 //
 //
 //
@@ -7731,143 +7736,6 @@ var FilterTopRowvue_type_template_id_8bda4366_staticRenderFns = []
 //
 //
 //
-//
-/* harmony default export */ var FilterTopRowvue_type_script_lang_js_ = ({
-  props: {
-    column: {
-      type: Object,
-      default: function _default() {
-        return {};
-      }
-    },
-    search: {
-      type: Object,
-      default: function _default() {
-        return {};
-      }
-    }
-  },
-  data: function data() {
-    var _this$column$selectKe, _this$column$selectLa, _this$column$selectVa, _this$column$filterab, _this$column$remote, _this$column$remoteMe;
-
-    return {
-      loading: false,
-      selectKey: (_this$column$selectKe = this.column.selectKey) !== null && _this$column$selectKe !== void 0 ? _this$column$selectKe : 'key',
-      selectLabel: (_this$column$selectLa = this.column.selectLabel) !== null && _this$column$selectLa !== void 0 ? _this$column$selectLa : 'label',
-      selectValue: (_this$column$selectVa = this.column.selectValue) !== null && _this$column$selectVa !== void 0 ? _this$column$selectVa : 'key',
-      filterable: (_this$column$filterab = this.column.filterable) !== null && _this$column$filterab !== void 0 ? _this$column$filterab : false,
-      remote: (_this$column$remote = this.column.remote) !== null && _this$column$remote !== void 0 ? _this$column$remote : false,
-      remoteMethod: (_this$column$remoteMe = this.column.remoteMethod) !== null && _this$column$remoteMe !== void 0 ? _this$column$remoteMe : null,
-      selectListLocal: this.search.selectList ? this.search.selectList : this.column.type === 'enum' ? this.column.values : this.boolValues
-    };
-  },
-  computed: {
-    isMultiple: function isMultiple() {
-      return this.column.is_multiple ? this.column.is_multiple : false;
-    },
-    remoteMethodHandler: {
-      get: function get() {
-        if (this.remoteMethod !== null) {
-          return this.remoteCall;
-        }
-
-        return null;
-      }
-    }
-  },
-  watch: {
-    search: function search() {
-      if (this.search.operator === '') {
-        this.showFilter = false;
-      }
-    }
-  },
-  mounted: function mounted() {
-    if (this.column.operator) {
-      this.search.operator = this.column.operator;
-    }
-  },
-  methods: {
-    remoteCall: function remoteCall(query) {
-      var _this = this;
-
-      return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-        var response;
-        return regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _this.loading = true;
-                _context.next = 3;
-                return _this.remoteMethod.all({
-                  search: _this.selectLabel + ':' + query,
-                  searchFields: _this.selectLabel + ':like'
-                });
-
-              case 3:
-                response = _context.sent;
-                _this.selectListLocal = response.data;
-                _this.search['selectList'] = response.data;
-                _this.loading = false;
-
-              case 7:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee);
-      }))();
-    },
-    updateSearch: function updateSearch(key) {
-      if (key && this.remote) {
-        var obj = _defineProperty({}, this.selectKey, key);
-
-        var _iterator = _createForOfIteratorHelper(this.selectListLocal),
-            _step;
-
-        try {
-          for (_iterator.s(); !(_step = _iterator.n()).done;) {
-            var item = _step.value;
-
-            if (item[this.selectKey] === key) {
-              obj[this.selectLabel] = item[this.selectLabel];
-              this.search.selectList = [obj];
-            }
-          }
-        } catch (err) {
-          _iterator.e(err);
-        } finally {
-          _iterator.f();
-        }
-      }
-    }
-  }
-});
-// CONCATENATED MODULE: ./src/components/GenericFilters/FilterTopRow.vue?vue&type=script&lang=js&
- /* harmony default export */ var GenericFilters_FilterTopRowvue_type_script_lang_js_ = (FilterTopRowvue_type_script_lang_js_); 
-// CONCATENATED MODULE: ./src/components/GenericFilters/FilterTopRow.vue
-
-
-
-
-
-/* normalize component */
-
-var FilterTopRow_component = normalizeComponent(
-  GenericFilters_FilterTopRowvue_type_script_lang_js_,
-  FilterTopRowvue_type_template_id_8bda4366_render,
-  FilterTopRowvue_type_template_id_8bda4366_staticRenderFns,
-  false,
-  null,
-  null,
-  null
-  
-)
-
-/* harmony default export */ var FilterTopRow = (FilterTopRow_component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/GenericFilters/GenericTopFilter.vue?vue&type=script&lang=js&
-
-
 //
 //
 //
@@ -7875,21 +7743,11 @@ var FilterTopRow_component = normalizeComponent(
 //
 //
 //
-//
-//
-//
-//
-//
-//
-//
-//
-
-
-/* harmony default export */ var GenericTopFiltervue_type_script_lang_js_ = ({
-  name: "GenericTopFilter",
+/* harmony default export */ var QuickSearchFiltervue_type_script_lang_js_ = ({
+  name: "QuickSearchFilter",
   props: {
-    filters: {
-      type: Array,
+    filter: {
+      type: Object,
       default: function _default() {
         return {};
       }
@@ -7901,30 +7759,18 @@ var FilterTopRow_component = normalizeComponent(
       }
     }
   },
-  components: {
-    FilterTopRow: FilterTopRow
-  },
-  data: function data() {
-    var filterConvertor = new filter_convertor_FilterConverter();
-    return {
-      filterConvertor: filterConvertor
-    };
-  },
   methods: {
-    getFilter: function getFilter() {
-      return this.filterConvertor.applyFilter(this.search);
-    },
     applyFilter: function applyFilter() {
-      this.$emit("apply:filter", this.filterConvertor.applyFilter(this.search));
+      this.$emit("apply:filter");
     },
     resetFilter: function resetFilter() {
-      this.$emit("reset:filter", {});
+      this.$emit("reset:filter");
     }
   }
 });
-// CONCATENATED MODULE: ./src/components/GenericFilters/GenericTopFilter.vue?vue&type=script&lang=js&
- /* harmony default export */ var GenericFilters_GenericTopFiltervue_type_script_lang_js_ = (GenericTopFiltervue_type_script_lang_js_); 
-// CONCATENATED MODULE: ./src/components/GenericFilters/GenericTopFilter.vue
+// CONCATENATED MODULE: ./src/components/GenericFilters/QuickSearchFilter.vue?vue&type=script&lang=js&
+ /* harmony default export */ var GenericFilters_QuickSearchFiltervue_type_script_lang_js_ = (QuickSearchFiltervue_type_script_lang_js_); 
+// CONCATENATED MODULE: ./src/components/GenericFilters/QuickSearchFilter.vue
 
 
 
@@ -7932,10 +7778,10 @@ var FilterTopRow_component = normalizeComponent(
 
 /* normalize component */
 
-var GenericTopFilter_component = normalizeComponent(
-  GenericFilters_GenericTopFiltervue_type_script_lang_js_,
-  GenericTopFiltervue_type_template_id_e981941c_render,
-  GenericTopFiltervue_type_template_id_e981941c_staticRenderFns,
+var QuickSearchFilter_component = normalizeComponent(
+  GenericFilters_QuickSearchFiltervue_type_script_lang_js_,
+  QuickSearchFiltervue_type_template_id_61231db6_render,
+  QuickSearchFiltervue_type_template_id_61231db6_staticRenderFns,
   false,
   null,
   null,
@@ -7943,7 +7789,7 @@ var GenericTopFilter_component = normalizeComponent(
   
 )
 
-/* harmony default export */ var GenericTopFilter = (GenericTopFilter_component.exports);
+/* harmony default export */ var QuickSearchFilter = (QuickSearchFilter_component.exports);
 // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--13-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--1-0!./node_modules/vue-loader/lib??vue-loader-options!./src/components/CompositeTable/index.vue?vue&type=script&lang=js&
 
 
@@ -7955,9 +7801,6 @@ var GenericTopFilter_component = normalizeComponent(
 
 
 
-
-
-//
 //
 //
 //
@@ -8017,9 +7860,10 @@ var GenericTopFilter_component = normalizeComponent(
 
 
 
+
 /* harmony default export */ var CompositeTablevue_type_script_lang_js_ = ({
   components: {
-    GenericTopFilter: GenericTopFilter,
+    QuickSearchFilter: QuickSearchFilter,
     GenericFilter: GenericFilters,
     GenericTable: GenericTable,
     GenericPaginator: GenericPaginator
@@ -8042,11 +7886,11 @@ var GenericTopFilter_component = normalizeComponent(
       },
       type: Array
     },
-    filtersTop: {
+    topFilter: {
       default: function _default() {
-        return [];
+        return {};
       },
-      type: Array
+      type: Object
     },
     filters: {
       default: function _default() {
@@ -8055,7 +7899,7 @@ var GenericTopFilter_component = normalizeComponent(
       type: Array
     },
     includes: {
-      default: '--',
+      default: "--",
       type: String
     },
     storageKey: {
@@ -8066,7 +7910,9 @@ var GenericTopFilter_component = normalizeComponent(
   data: function data() {
     var localStorage = new local_storage_service_LocalStorageService(this.storageKey);
     var listQueryService = new list_query_service_ListQueryService(this.$route ? this.$route.name : "storage.key", localStorage);
+    var filterConvertor = new filter_convertor_FilterConverter();
     var search = {};
+    var topSearch = {};
 
     var _iterator = _createForOfIteratorHelper(this.filters),
         _step;
@@ -8085,29 +7931,22 @@ var GenericTopFilter_component = normalizeComponent(
       _iterator.f();
     }
 
-    var _iterator2 = _createForOfIteratorHelper(this.filtersTop),
-        _step2;
-
-    try {
-      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-        var _column = _step2.value;
-        search[_column.name] = {
-          position: "top",
-          value: ""
-        };
-      }
-    } catch (err) {
-      _iterator2.e(err);
-    } finally {
-      _iterator2.f();
+    if (this.topFilter) {
+      topSearch[this.topFilter.name] = {
+        value: "",
+        operator: this.topFilter.operator
+      };
     }
 
     search = Object.assign(search, listQueryService.getListQuery().search);
+    topSearch = Object.assign(topSearch, listQueryService.getListQuery().topSearch);
     return {
       loading: false,
       filter: {},
       data: [],
       search: search,
+      topSearch: topSearch,
+      filterConvertor: filterConvertor,
       meta: Object.assign(new meta_model_MetaModel(), listQueryService.getListQuery().meta),
       listQueryService: listQueryService
     };
@@ -8121,7 +7960,8 @@ var GenericTopFilter_component = normalizeComponent(
         page: (_this$meta = this.meta) !== null && _this$meta !== void 0 && (_this$meta$pagination = _this$meta.pagination) !== null && _this$meta$pagination !== void 0 && _this$meta$pagination.current_page ? this.meta.pagination.current_page : meta.page,
         limit: (_this$meta2 = this.meta) !== null && _this$meta2 !== void 0 && (_this$meta2$paginatio = _this$meta2.pagination) !== null && _this$meta2$paginatio !== void 0 && _this$meta2$paginatio.per_page ? this.meta.pagination.per_page : meta.limit
       };
-      return _objectSpread2(_objectSpread2({}, query), this.filter);
+      var filter = this.filterConvertor.applyFilter(_objectSpread2(_objectSpread2({}, this.search), this.topSearch));
+      return _objectSpread2(_objectSpread2({}, query), filter);
     },
     currentPage: function currentPage() {
       var _this$data$meta;
@@ -8210,7 +8050,7 @@ var GenericTopFilter_component = normalizeComponent(
           page: this.listQueryService.getListQuery().meta.page
         }
       });
-      this.meta.pagination.per_page = val;
+      external_commonjs_vue_commonjs2_vue_root_Vue_default.a.set(this.data, "meta.per_page.current_page", val);
       this.fetch();
     },
     handleCurrentChange: function handleCurrentChange(val) {
@@ -8220,38 +8060,49 @@ var GenericTopFilter_component = normalizeComponent(
           limit: this.listQueryService.getListQuery().meta.limit
         }
       });
-      this.data.meta.pagination.current_page = val;
+      external_commonjs_vue_commonjs2_vue_root_Vue_default.a.set(this.data, "meta.pagination.current_page", val);
       this.fetch();
     },
-    handleFilterChange: function handleFilterChange(val) {
-      this.filter = val;
-      this.data.meta.pagination.current_page = 1;
+    handleFilterChange: function handleFilterChange() {
+      external_commonjs_vue_commonjs2_vue_root_Vue_default.a.set(this.data, "meta.pagination.current_page", 1);
       this.fetch();
     },
-    handleApplyFilter: function handleApplyFilter(filters) {
+    handleApplyFilter: function handleApplyFilter() {
       this.listQueryService.updateListQuery({
         search: this.search
       });
-      this.handleFilterChange(filters);
+      this.handleFilterChange();
     },
     handleResetFilter: function handleResetFilter() {
       for (var column in this.search) {
-        if (this.search[column].position === "top") {
-          this.search[column] = Object.assign(this.search[column], {
-            value: ""
-          });
-        } else {
-          this.search[column] = Object.assign(this.search[column], {
-            operator: "",
-            value: ""
-          });
-        }
+        this.search[column] = Object.assign(this.search[column], {
+          operator: "",
+          value: ""
+        });
       }
 
       this.listQueryService.updateListQuery({
         search: {}
       });
       this.handleFilterChange({});
+    },
+    handleApplyTopFilter: function handleApplyTopFilter() {
+      this.listQueryService.updateListQuery({
+        topSearch: this.topSearch
+      });
+      this.handleFilterChange();
+    },
+    handleResetTopFilter: function handleResetTopFilter() {
+      for (var column in this.topSearch) {
+        this.topSearch[column] = Object.assign(this.topSearch[column], {
+          value: ""
+        });
+      }
+
+      this.listQueryService.updateListQuery({
+        topSearch: {}
+      });
+      this.handleFilterChange({});
     }
   }
 });
@@ -8271,7 +8122,7 @@ var CompositeTable_component = normalizeComponent(
   staticRenderFns,
   false,
   null,
-  "7f40e991",
+  "0ed61922",
   null
   
 )