@tripup-company/element-ui-extended 0.0.20 → 0.0.21

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

@@ -7590,23 +7590,33 @@ var filter_convertor_FilterConverter = /*#__PURE__*/function () {
       var filterFactory = new filter_factory_FilterFactory();
       var searchArray = [],
           searchFieldsArray = [];
+      var groupBy = [];
       Object.keys(search).forEach(function (key) {
-        if (search[key].operator && search[key].value) {
-          var filter = filterFactory.createFilter(key, search[key]);
+        if (search[key].value.length) {
+          var _search$key$field;
 
-          var _filter$applyFilter = filter.applyFilter(),
-              searchItem = _filter$applyFilter.searchItem,
-              searchFieldItem = _filter$applyFilter.searchFieldItem;
+          var filter = filterFactory.createFilter((_search$key$field = search[key].field) !== null && _search$key$field !== void 0 ? _search$key$field : key, search[key]);
 
-          searchArray.push(searchItem);
-          searchFieldsArray.push(searchFieldItem);
+          if (key === 'group_by') {
+            var _search$key$field2;
+
+            groupBy = (_search$key$field2 = search[key].field) !== null && _search$key$field2 !== void 0 ? _search$key$field2 : key;
+          } else {
+            var _filter$applyFilter = filter.applyFilter(),
+                searchItem = _filter$applyFilter.searchItem,
+                searchFieldItem = _filter$applyFilter.searchFieldItem;
+
+            searchArray.push(searchItem);
+            searchFieldsArray.push(searchFieldItem);
+          }
         }
       });
       var searchString = searchArray.join(';');
       var searchFieldsString = searchFieldsArray.join(';');
       return {
         search: searchString,
-        searchFields: searchFieldsString
+        searchFields: searchFieldsString,
+        groupBy: groupBy
       };
     }
   }]);