Melhorias

joaopaulichi · Sep 28, 2018 · d5a0e03 · d5a0e03
1 parent b1811fc
commit d5a0e03
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 7 deletions.
diff --git a/build/softgrid.src.js b/build/softgrid.src.js
@@ -1004,13 +1004,22 @@
                     	_controlesParaColunas();
 
                     	var _colunas = [];
+						var _limpar = false;
 
                     	angular.forEach(_properties.cols, function(col){
-                    		_colunas.push(scope.cols.filter(function (item) { return removeAccents(item.title).replace(" ", "") === col.col; })[0]);
+                    		var _col = scope.cols.filter(function (item) { return removeAccents(item.title).replace(" ", "") === col.col; })[0];
+
+                    		if(_col)
+                    			_colunas.push(_col);
+                    		else
+                    			_limpar = true;
                         });
 
                         scope.sg_cols = _colunas;
 
+                        if(_limpar)
+                        	scope.limparConfiguracaoColuna();
+
                         _getFilteredData();
                     }
 

diff --git a/dist/softgrid.js b/dist/softgrid.js
@@ -1004,13 +1004,22 @@
                     	_controlesParaColunas();
 
                     	var _colunas = [];
+						var _limpar = false;
 
                     	angular.forEach(_properties.cols, function(col){
-                    		_colunas.push(scope.cols.filter(function (item) { return removeAccents(item.title).replace(" ", "") === col.col; })[0]);
+                    		var _col = scope.cols.filter(function (item) { return removeAccents(item.title).replace(" ", "") === col.col; })[0];
+
+                    		if(_col)
+                    			_colunas.push(_col);
+                    		else
+                    			_limpar = true;
                         });
 
                         scope.sg_cols = _colunas;
 
+                        if(_limpar)
+                        	scope.limparConfiguracaoColuna();
+
                         _getFilteredData();
                     }
 

diff --git a/dist/softgrid.min.js b/dist/softgrid.min.js
diff --git a/mock/app.js b/mock/app.js
@@ -49,9 +49,8 @@ angular.module('todoApp', ['softgrid.directive','ngSanitize'])
                 {type: "checkbox", title: "Selecionar", callback: opa, item: "ativo" },
                 {title: "Nome",     item: function(item){return item.nome}, edit: { item: "nome", function: _editar, width: "100%"}},
                 {title: "Cargo",    item: function(item){return item.cargo}, align: "center", click: opa},
-                {title: "Telefone", item: function(item){return 0}, width: "100px", popOver: true},
-                {type: "select", title: "Status", item: 'status', data: dataSelect, field: { text: 'nome', value: 'id' },
-                callback: _callBackApprove},
+                {title: "Telefonete", item: function(item){return 0}, width: "100px", popOver: true},
+                {type: "select", title: "Status", item: 'status', data: dataSelect, field: { text: 'nome', value: 'id' }, callback: _callBackApprove},
                 {title: "Cargo A", default: false, item: function(item){return item.cargo + "A"}},
                 {title: "Cargo B", default: false, item: function(item){return item.cargo + "B"}},
                 {title: "Cargo C", default: false, item: function(item){return item.cargo + "C"}},

diff --git a/src/softgrid.js b/src/softgrid.js
@@ -1004,13 +1004,22 @@
                     	_controlesParaColunas();
 
                     	var _colunas = [];
+						var _limpar = false;
 
                     	angular.forEach(_properties.cols, function(col){
-                    		_colunas.push(scope.cols.filter(function (item) { return removeAccents(item.title).replace(" ", "") === col.col; })[0]);
+                    		var _col = scope.cols.filter(function (item) { return removeAccents(item.title).replace(" ", "") === col.col; })[0];
+
+                    		if(_col)
+                    			_colunas.push(_col);
+                    		else
+                    			_limpar = true;
                         });
 
                         scope.sg_cols = _colunas;
 
+                        if(_limpar)
+                        	scope.limparConfiguracaoColuna();
+
                         _getFilteredData();
                     }