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

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

@@ -6209,12 +6209,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=616c3de9&scoped=true&
+// 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=c47f5f70&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":_vm.filters.length ? 18 : 24}},[_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()]},{"handleApplyTopFilter":_vm.handleApplyTopFilter,"handleResetTopFilter":_vm.handleResetTopFilter},{ 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}})]},{"handleChangeSort":_vm.handleChangeSort},{ 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":_vm.filters.length ? 6 : 0}},[_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()]},{"handleApplyFilter":_vm.handleApplyFilter,"handleResetFilter":_vm.handleResetFilter},{ filters: _vm.filters, search: _vm.search })],2)],1)]})],2)}
 var staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./src/components/CompositeTable/index.vue?vue&type=template&id=616c3de9&scoped=true&
+// CONCATENATED MODULE: ./src/components/CompositeTable/index.vue?vue&type=template&id=c47f5f70&scoped=true&
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.to-string.js
 var es_object_to_string = __webpack_require__("d3b7");
@@ -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
       };
     }
   }]);
@@ -8222,6 +8232,10 @@ var QuickSearchFilter_component = normalizeComponent(
       default: "--",
       type: String
     },
+    selectFilter: {
+      default: null,
+      type: String
+    },
     storageKey: {
       default: "storage.key",
       type: String
@@ -8321,7 +8335,7 @@ var QuickSearchFilter_component = normalizeComponent(
                 _this.loading = true;
                 _context.prev = 1;
                 _context.next = 4;
-                return _this.repository.all(_this.queryFilter, _this.includes);
+                return _this.repository.all(_this.queryFilter, _this.includes, _this.selectFilter);
 
               case 4:
                 response = _context.sent;
@@ -8431,7 +8445,7 @@ var CompositeTable_component = normalizeComponent(
   staticRenderFns,
   false,
   null,
-  "616c3de9",
+  "c47f5f70",
   null
   
 )