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

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

@@ -6212,12 +6212,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=0ed61922&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=3819ce03&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=0ed61922&scoped=true&
+// CONCATENATED MODULE: ./src/components/CompositeTable/index.vue?vue&type=template&id=3819ce03&scoped=true&
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.object.to-string.js
 var es_object_to_string = __webpack_require__("d3b7");
@@ -7956,46 +7956,38 @@ var QuickSearchFilter_component = normalizeComponent(
       search: search,
       topSearch: topSearch,
       filterConvertor: filterConvertor,
-      meta: Object.assign(new meta_model_MetaModel(), listQueryService.getListQuery().meta),
+      meta: listQueryService.getListQuery().meta,
+      metaModel: new meta_model_MetaModel(),
       listQueryService: listQueryService
     };
   },
   computed: {
     queryFilter: function queryFilter() {
-      var _this$meta, _this$meta$pagination, _this$meta2, _this$meta2$paginatio;
-
-      var meta = this.listQueryService.getListQuery().meta;
       var query = {
-        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
+        page: this.meta.page,
+        limit: this.meta.limit
       };
       var filter = this.filterConvertor.applyFilter(_objectSpread2(_objectSpread2({}, this.search), this.topSearch));
       return _objectSpread2(_objectSpread2({}, query), filter);
     },
     currentPage: function currentPage() {
-      var _this$data$meta;
-
-      if ((_this$data$meta = this.data.meta) !== null && _this$data$meta !== void 0 && _this$data$meta.pagination) {
-        return this.data.meta.pagination.current_page;
+      if (this.listQueryService.getListQuery().meta) {
+        return this.listQueryService.getListQuery().meta.page;
       }
 
       return 0;
     },
     total: function total() {
-      var _this$data$meta2;
+      var _this$metaModel;
 
-      if ((_this$data$meta2 = this.data.meta) !== null && _this$data$meta2 !== void 0 && _this$data$meta2.pagination) {
-        return this.data.meta.pagination.total;
+      if ((_this$metaModel = this.metaModel) !== null && _this$metaModel !== void 0 && _this$metaModel.pagination) {
+        return this.metaModel.pagination.total;
       }
 
       return 0;
     },
     limit: function limit() {
-      var _this$data$meta3, _this$listQueryServic;
-
-      if ((_this$data$meta3 = this.data.meta) !== null && _this$data$meta3 !== void 0 && _this$data$meta3.pagination) {
-        return this.data.meta.pagination.per_page;
-      }
+      var _this$listQueryServic;
 
       if ((_this$listQueryServic = this.listQueryService.getListQuery().meta) !== null && _this$listQueryServic !== void 0 && _this$listQueryServic.limit) {
         var _this$listQueryServic2;
@@ -8027,7 +8019,7 @@ var QuickSearchFilter_component = normalizeComponent(
               case 4:
                 response = _context.sent;
                 _this.data = response.data;
-                external_commonjs_vue_commonjs2_vue_root_Vue_default.a.set(_this.data, "meta", response.meta);
+                external_commonjs_vue_commonjs2_vue_root_Vue_default.a.set(_this, "metaModel", response.meta);
                 _context.next = 12;
                 break;
 
@@ -8059,7 +8051,7 @@ var QuickSearchFilter_component = normalizeComponent(
           page: this.listQueryService.getListQuery().meta.page
         }
       });
-      external_commonjs_vue_commonjs2_vue_root_Vue_default.a.set(this.data, "meta.per_page.current_page", val);
+      external_commonjs_vue_commonjs2_vue_root_Vue_default.a.set(this.meta, "limit", val);
       this.fetch();
     },
     handleCurrentChange: function handleCurrentChange(val) {
@@ -8069,12 +8061,11 @@ var QuickSearchFilter_component = normalizeComponent(
           limit: this.listQueryService.getListQuery().meta.limit
         }
       });
-      external_commonjs_vue_commonjs2_vue_root_Vue_default.a.set(this.data, "meta.pagination.current_page", val);
+      external_commonjs_vue_commonjs2_vue_root_Vue_default.a.set(this.meta, "page", val);
       this.fetch();
     },
     handleFilterChange: function handleFilterChange() {
-      external_commonjs_vue_commonjs2_vue_root_Vue_default.a.set(this.data, "meta.pagination.current_page", 1);
-      this.fetch();
+      this.handleCurrentChange(1);
     },
     handleApplyFilter: function handleApplyFilter() {
       this.listQueryService.updateListQuery({
@@ -8131,7 +8122,7 @@ var CompositeTable_component = normalizeComponent(
   staticRenderFns,
   false,
   null,
-  "0ed61922",
+  "3819ce03",
   null
   
 )