Skip to content

Commit 13774f8

Browse files
feat(4839) conchadas + loading
1 parent 92f7ce8 commit 13774f8

File tree

4 files changed

+14
-9
lines changed

4 files changed

+14
-9
lines changed

dist/lets.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/directives/crud/lets-crud-filter.directive.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
angular.module('letsAngular').directive('crudFilter', crudFilter);
55

6-
crudFilter.$inject = ['$q', 'Restangular', '$timeout', '$rootScope'];
6+
crudFilter.$inject = ['$q', 'Restangular', '$timeout', '$rootScope','swangular'];
77

8-
function crudFilter($q, Restangular, $timeout, $rootScope) {
8+
function crudFilter($q, Restangular, $timeout, $rootScope,swangular) {
99
return {
1010
templateUrl: 'lets/views/crud/crud-filter.html',
1111
replace: true,
@@ -325,6 +325,7 @@
325325
scope.objFilter = {data: filterData};
326326
}
327327

328+
if(scope.$parent.headers && scope.$parent.headers.loading) swangular.showLoading()
328329
if (start) {
329330
$rootScope.$broadcast('refreshGRID', false, true);
330331
}

src/directives/crud/lets-crud-list.directive.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
angular.module('letsAngular').directive('crudList', crudList);
55

6-
crudList.$inject = ['$window', 'jQuery', 'Backbone', 'Backgrid', 'appSettings', 'fwObjectService', '$timeout', '$state'];
6+
crudList.$inject = ['$window', 'jQuery', 'Backbone', 'Backgrid', 'appSettings', 'fwObjectService', '$timeout', '$state','swangular'];
77

8-
function crudList($window, jQuery, Backbone, Backgrid, appSettings, fwObjectService, $timeout, $state) {
8+
function crudList($window, jQuery, Backbone, Backgrid, appSettings, fwObjectService, $timeout, $state, swangular) {
99
return {
1010
scope: {
1111
crudListSettings: '&',
@@ -38,7 +38,11 @@
3838
pageSize: 20,
3939
},
4040
mode: 'server',
41-
parseRecords: function (resp, options) {
41+
parseRecords: function (resp, options) {
42+
if(settings && settings.loading) swangular.close()
43+
44+
scope.$emit('filtered-data', resp, scope);
45+
4246
if (scope.$el[0].parseRecords && typeof scope.$el[0].parseRecords == 'function') {
4347
return scope.$el[0].parseRecords(resp.data);
4448
} else {

src/views/crud/crud-list.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<a class="btn btn-primary outline-btn btn-block btn-new" ng-disabled="export_btn_is_disable" ng-click="export()"><span class="icon fa fa-share"></span>Exportar Dados</a>
1010
</div>
1111
</div>
12-
<section grid="main" class="widget" crud-list crud-list-settings="{url: headers.route, fields: headers.fields, tab: false, settings: headers.settings, filterScope: headers.settings.filterScope, sort:headers.settings.sort, tableClass: headers.tableClass}">
12+
<section grid="main" class="widget" crud-list crud-list-settings="{url: headers.route, fields: headers.fields, tab: false, settings: headers.settings, filterScope: headers.settings.filterScope, sort:headers.settings.sort, tableClass: headers.tableClass, loading: headers.loading}">
1313
<header class='crud-list-header row hidden-xs' style='display: flex;'>
1414
<h4>{{headers.label}}</h4>
1515
</header>

0 commit comments

Comments
 (0)