cronapp-framework-js 3.1.0 → 3.2.0

package/js/controllers.js

@@ -50,17 +50,15 @@ if (!window.hostApp) {
         return;
       }
 
-      let headerValues = window.isUsingCookie() ? {
-        'Content-Type': 'application/x-www-form-urlencoded'
-      } : {
-        'Content-Type': 'application/x-www-form-urlencoded',
-        'X-AUTH-TOKEN' : $location.search().token
-      };
+      // O token vem como parametro do link de redefinição de senha, não pode usar cookie nesta requisição
       $http({
         method: 'POST',
         url: window.hostApp + 'auth/confirm-reset-password',
         data: $.param({password: passwordNew.value}),
-        headers: headerValues
+        headers: {
+          'Content-Type': 'application/x-www-form-urlencoded',
+          'X-AUTH-TOKEN' : $location.search().token
+        }
       }).then(() => {
         Notification.info($translate.instant('ResetPasswordSuccess'));
         passwordNew.value = "";

package/js/directives.js

@@ -4032,7 +4032,7 @@
           }
         };
       })
-
+    
       .directive('cronDynamicSelect', function ($compile, $timeout, $parse, $translate, $log) {
         return {
           restrict: 'E',
@@ -4220,97 +4220,28 @@
                 });
               }
 
-              options.virtual.valueMapper = async function(options) {
-                await waitRender();
-
-                $log.debug("valueMapper | " + attrs['id'] + " | " + options.value);
-
-                if (lastValueMapper && !lastValueMapper.completed) {
-                  $log.debug("valueMapper Canceling | " + lastValueMapper.value);
-                  lastValueMapper.canceled = true;
-                }
-
-                lastValueMapper = options;
-
-                var _combobox = _options.combobox;
-                if (options.canceled) {
-                  $log.debug("valueMapper CANCELED | " + options.value);
-                  return;
-                }
-
-                if (options.value || options.value === "") {
-                  if(_combobox.options.optionLabel[_combobox.options.dataValueField] !== null && options.value === ""){
-                    options.completed = true;
-                    $log.debug("valueMapper.success | " + attrs['id'] + " | NULL");
-                    options.success(null);
-                  }
-                  else{
-                    _combobox.isEvaluating = true;
-                    var _dataSource = _options.dataSource.transport.options.cronappDatasource;
-                    if (options.value === undefined || options.value === null || options.value === "") {
-                      options.completed = true;
-                      $log.debug("valueMapper.success | " + attrs['id'] + " | NULL");
-                      options.success(null);
-                      _combobox.isEvaluating = false;
-                    } else {
-                      $log.debug("valueMapper.findObj | " + attrs['id'] + " | " + options.value);
-                      _dataSource.findObj([options.value], false, function(data) {
-                        options.completed = true;
-
-                        if (options.canceled) {
-                          $log.debug("valueMapper CANCELED | " + options.value);
-                          _combobox.isEvaluating = false;
-                          return;
-                        }
-                        if (Array.isArray(data)) {
-                          data = data[0];
-                        }
-                        $log.debug("valueMapper.success | " + attrs['id'] + " | " + data);
-                        options.success(data);
-                        _combobox.isEvaluating = false;
-
-                        if (select.changeCursor) {
-                          scope.safeApply(function() {
-                            if (options.canceled) {
-                              $log.debug("valueMapper CANCELED | " + options.value);
-                              return;
-                            }
-                            if (data != null) {
-                              var found = _goTo(_scope, _combobox, data);
-                              if (!found) {
-                                _dataSource.data.push(data);
-                                found = _goTo(_scope, _combobox, data);
-                              }
-                              if (found) {
-                                modelSetter(_scope, found[select.dataValueField]);
-                              }
-                            } else {
-                              modelSetter(_scope, null);
-                            }
-                          });
-                        } else {
-                          if (data == null) {
-                            modelSetter(_scope, null);
-                          }
-                        }
-                      }, function() {
-                        options.completed = true;
-                        if (options.canceled) {
-                          $log.debug("valueMapper CANCELED | " + options.value);
-                          _combobox.isEvaluating = false;
-                          return;
-                        }
-                        $log.debug("valueMapper.success | " + attrs['id'] + " | NULL");
-                        options.success(null);
-                        _combobox.isEvaluating = false;
-                      }, [combobox.options.dataValueField]);
-                    }
+              options.virtual.valueMapper = async function (options) {
+                if (!combobox || combobox.isEvaluating) return;
+                combobox.isEvaluating = true;
+              
+                var _dataSource = _options.dataSource.transport.options.cronappDatasource;
+                $log.debug("valueMapper.findObj | " + attrs['id'] + " | " + options.value);
+              
+                try {
+                  let currentValue = combobox.value();
+              
+                  let data = await _dataSource.findObj([options.value], false);
+                  if (Array.isArray(data)) data = data[0];
+                  
+                  if (currentValue === combobox.value()) {
+                    options.success(data);
                   }
-                } else {
-                  $log.debug("valueMapper.success | " + attrs['id'] + " | NULL");
+                } catch (e) {
                   options.success(null);
+                } finally {
+                  combobox.isEvaluating = false;
                 }
-              };
+              }; 
             }
 
             options.messages =  {
@@ -4322,24 +4253,42 @@
               scope.safeApply(() => {
                 var contextVars = { 
                     'selected' : dataItem,
-                    'selectedKey' : dataItem[options.dataValueField],
-                    'selectedValue' : dataItem[options.dataTextField]
+                    'selectedKey' : dataItem ? dataItem[options.dataValueField] : "",
+                    'selectedValue' : dataItem ? dataItem[options.dataTextField] : ""
                 };
-                scope.$eval(attrs.ngChange, contextVars); 
+                scope.$eval(attrs.ngChange, contextVars);
               });
             } : undefined;
             
-            options.close = attrs.ngClose ? function (){scope.$eval(attrs.ngClose)}: undefined;
-            options.dataBound = attrs.ngDataBound ? function (){scope.$eval(attrs.ngDataBound)}: undefined;
-            options.filtering = attrs.ngFiltering ? function (){scope.$eval(attrs.ngFiltering)}: undefined;
-            options.open = function(e) {
+            
+            options.close = attrs.ngClose ? function () {
+              scope.$eval(attrs.ngClose);
+            } : undefined;
+                        
+            options.dataBound = function () {
+              if (!scope.$$phase && !scope.$root.$$phase) {
+                _compileAngular(scope, combobox.element[0]);
+              }
+            };
+
+            
+            options.filtering = attrs.ngFiltering ? function () {
+              scope.$eval(attrs.ngFiltering);
+            } : undefined;
+            
+            options.open = function (e) {
               if (!dataSourceScreen.fetched || (dataSourceScreen.lastLoadedTime !== combobox.dataSource.lastLoadedTime)) {
                 combobox.options.firstLazyRead = true;
                 combobox.dataSource.read();
                 combobox.dataSource.lastLoadedTime = dataSourceScreen.lastLoadedTime;
               }
+            
+              let emptyOption = { [combobox.options.dataValueField]: "", [combobox.options.dataTextField]: "" };
+              if (!combobox.dataSource.data().some(item => item[combobox.options.dataValueField] === "")) {
+                combobox.dataSource.add(emptyOption);
+              }
             };
-
+            
             options.select = attrs.ngSelect ? function (e) { 
               scope.safeApply(() => {
                 var contextVars = { 
@@ -4370,6 +4319,49 @@
               dataSourceScreen.__ignoreFirstFetch = true;
             }
             var combobox = $element.kendoDropDownList(options).data('kendoDropDownList');
+            combobox.isEvaluating = false;
+            
+            function forceEmptyLineSelected() {
+              var optionLabel = combobox.list.find('.k-list-optionlabel');
+            
+              if (optionLabel && optionLabel.length) {
+                optionLabel.addClass("k-state-selected k-state-focused");
+              }
+              $log.debug("Linha vazia marcada como ativa:", optionLabel);
+            }
+            
+            var scrolling = false;
+
+            combobox.bind("open", function () {
+              if (scrolling) return;
+              scrolling = true;
+            
+              setTimeout(() => {
+                scrolling = false;
+              }, 300);
+            });
+            
+            combobox.bind("change", function () {
+              if (combobox.isEvaluating) return;
+              combobox.isEvaluating = true;
+            
+              try {
+                let selectedItem = combobox.dataItem();
+            
+                if (selectedItem && selectedItem[options.dataValueField] === "") {
+                  modelSetter(scope, "");
+                  modelTextFieldSetter(scope, "");
+                } else {
+                  modelSetter(scope, selectedItem[options.dataValueField]);
+                  modelTextFieldSetter(scope, selectedItem[options.dataTextField]);
+                }
+            
+                forceEmptyLineSelected();
+              } finally {
+                combobox.isEvaluating = false;
+              }
+            });
+            
             options.combobox = combobox;
             $(combobox.element[0]).attr('tabindex','-1');
             if (dataSourceScreen != null && dataSourceScreen != undefined) {
@@ -4434,63 +4426,22 @@
             /**
              * Observa o read do datasource para setar o primeiro valor ou valor inicial.
              */
-            var defineInitialValue = function() {
+            var defineInitialValue = function () {
               if (combobox.definingInitialValue) {
                 return;
               }
               if (!combobox.isEvaluating) {
-                var currentValue = returnTypedValue(combobox.value());
+                var currentValue = combobox.value();
                 var nextValue = null;
-
-                var found = dataSourceScreen.goTo(currentValue);
-
-                if (!found) {
-                  if ((combobox.options.lazyFirstInitialValue || !dataSourceScreen.lazy) && select.initValue != undefined && select.initValue != null) {
-                    combobox.options.lazyFirstInitialValue = false;
-                    found = dataSourceScreen.goTo(select.initValue);
-                    if (found) {
-                      nextValue = select.initValue;
-                    }
-                  }
-
-
-                  if (nextValue == null && select.firstValue) {
-                    if (dataSourceScreen) {
-                      combobox.definingInitialValue = true;
-                      dataSourceScreen.fetch({
-                        params: {
-                          $top: 1
-                        }
-                      }, {
-                        success: function(data) {
-                          if (data.length) {
-                            dataSourceScreen.data.push(data[0]);
-                            nextValue = data[0][select.dataValueField];
-                          }
-                          modelSetter(_scope, nextValue);
-                          forceChangeModel(nextValue);
-                          combobox.definingInitialValue = false;
-                        },
-                        error: function() {
-                          combobox.definingInitialValue = false;
-                        },
-                        canceled: function() {
-                          combobox.definingInitialValue = false;
-                        }
-                      }, undefined, {lookup : true});
-                    }
-                  } else {
-                    modelSetter(_scope, nextValue);
-                    forceChangeModel(nextValue);
-                    combobox.definingInitialValue = false;
-                  }
+            
+                if (!currentValue || currentValue === "") {
+                  nextValue = "";
+                  modelSetter(scope, nextValue);
+                  forceEmptyLineSelected();
                 }
               }
-              else {
-                setTimeout(()=>defineInitialValue(),300);
-              }
-            }
-
+            };
+            
             var _ngModelCtrl = ngModelCtrl;
             if (dataSourceScreen != null && dataSourceScreen != undefined) {
               dataSourceScreen.addDataSourceEvents({
@@ -4513,50 +4464,46 @@
                   return;
                 }
                 _scope.$apply(function() {
-                  modelSetter(_scope, combobox.dataItem()[select.dataValueField]);
-                  modelTextFieldSetter(_scope, combobox.dataItem()[select.dataTextField]);
-                  if(select.changeValueBasedOnLabel){
-                    let comboLabelValue = combobox.dataItem()[select.dataTextField];
-                    // Try to eval it first in pure vanilla and then if it was not possible in angular context.
-                    try {
-                      eval(select.changeValueBasedOnLabel + '=' + '"' + comboLabelValue + '"');
-                    }catch (e) {
-                      try {
-                        _scope.$eval(select.changeValueBasedOnLabel + '=' + '"' + comboLabelValue + '"')
-                      }catch (e) {
-                        console.error("Não foi possível atribuir o texto do combobox ", comboLabelValue, " no compo informado ", select.changeValueBasedOnLabel);
-                      }
-                    }
+                  let selectedItem = combobox.dataItem();
+                  
+                  if (!selectedItem || selectedItem[select.dataValueField] === "") {
+                    combobox.value("");
+                    modelSetter(_scope, "");
+                    modelTextFieldSetter(_scope, "");
+                  } else {
+                    modelSetter(_scope, selectedItem[select.dataValueField]);
+                    modelTextFieldSetter(_scope, selectedItem[select.dataTextField]);
                   }
-
+            
                   _compileAngular(scope, options.combobox.element[0]);
                   if (options?.combobox?.span) {
                     _compileAngular(scope, options.combobox.span);
                   }
                 });
-
-              }
-
+              };
+            
               applyChange();
-
             });
-
+            
             /**
              * Observando model do DropdownList.
              */
             if (ngModelCtrl) {
               ngModelCtrl.$formatters.push(function (value) {
-                $log.debug("$formatters | " + attrs['id'] + " | " + value);
-                var x = combobox.value();
-                if (value === undefined || (value === "" && select.optionLabelValue === undefined)) {
-                  value = null;
-                  modelSetter(_scope, value);
+                if (value === undefined || value === "") {
+                  value = "";
+                  modelSetter(scope, value);
                 }
-                forceChangeModel(value);
-
                 return value;
               });
-
+              
+              ngModelCtrl.$parsers.push(function (value) {
+                if (!value || value === "") {
+                  return "";
+                }
+                return value;
+              });
+              
               ngModelCtrl.$parsers.push(function (value) {
                 $log.debug("$parsers | " + attrs['id'] + " | " + value);
                 if ((typeof value === 'boolean') || value) {
@@ -4591,9 +4538,11 @@
               select.initValue = null;
             }
 
-            if (select.initValue == '') {
-              select.initValue = null;
+            if (select.initValue === null || select.initValue === "" || !select.initValue) {
+              combobox.value("");
+              modelSetter(_scope, "");
             }
+            
 
             if (combobox.dataSource.transport && combobox.dataSource.transport.options) {
               combobox.dataSource.transport.options.combobox = combobox;
@@ -4641,7 +4590,7 @@
           }
         };
       })
-
+    
       .directive('cronMultiSelect', function ($compile, $parse) {
         return {
           restrict: 'E',
@@ -4651,6 +4600,15 @@
             var modelSetter = modelGetter.assign;
             var model = attrs['ngModel'];
 
+            let jumpThread = () => {
+              return new Promise((resolve) => {
+                let jumpWait = setInterval(() => {
+                  clearInterval(jumpWait);
+                  resolve();
+                });
+              });
+            };
+
             var _self = this;
             var select = {};
             try {
@@ -4662,12 +4620,29 @@
             var _scope = scope;
             var _ngModelCtrl = ngModelCtrl;
 
+            if (select.relationDataSource != null) { 
+              try {
+                eval(select.relationDataSource.name);
+              }
+              catch (e) {
+                await jumpThread();
+              }
+            }
             var relactionDS = {
               relationDataSource: (select.relationDataSource != null ? eval(select.relationDataSource.name) : null),
               relationField: (select.relationField != null ? select.relationField : '')
             }
 
-            var options = await app.kendoHelper.getConfigCombobox(select, scope);
+            var options = undefined;
+            try {
+              eval(select.dataSourceScreen.name);
+              options = await app.kendoHelper.getConfigCombobox(select, scope);
+            }
+            catch (e) {
+              await jumpThread();
+              options = await app.kendoHelper.getConfigCombobox(select, scope);
+            }
+             
 
             try {
               delete options.dataSource.schema.model.id;
@@ -6008,16 +5983,16 @@
         }
       })
 
-  .directive('crnInfiniteScroll', ['$compile', function($compile){
+  .directive('crnInfiniteScroll', ['$compile', function($compile) {
     'use strict';
     return {
       restrict: 'EA',
       link: function(scope, element, attrs) {
-        var dataSource = attrs.crnInfiniteScroll ? eval(attrs.crnInfiniteScroll) : attrs.crnDatasource ? eval(attrs.crnDatasource): undefined;
-        if (dataSource) {
-          let nextPageInfinite = {
-            isVisible: false,
-            checkVisibility: function(visible) {
+        let nextPageInfinite = {
+          isVisible: false,
+          checkVisibility: function(visible) {
+            var dataSource = attrs.crnInfiniteScroll ? scope.$eval(attrs.crnInfiniteScroll) : attrs.crnDatasource ? scope.$eval(attrs.crnDatasource): undefined;
+            if (dataSource) {
               if (nextPageInfinite.isVisible !== visible) {
                 nextPageInfinite.isVisible = visible;
                 if (nextPageInfinite.isVisible) {
@@ -6033,21 +6008,21 @@
                   }
                 }
               }
-            },
-            eventScroll: function() {
-              var topElem = element.offset().top;
-              var botElem = element.offset().top + element.outerHeight();
-              var botScrn = $(window).scrollTop() + $(window).innerHeight();
-              var topScrn = $(window).scrollTop();
-              nextPageInfinite.checkVisibility((botScrn > topElem) && (topScrn < botElem));
             }
-          };
-          $(window).scroll(nextPageInfinite.eventScroll);
-          $(window).ready(nextPageInfinite.eventScroll);
-        }
+          },
+          eventScroll: function() {
+            var topElem = element.offset().top;
+            var botElem = element.offset().top + element.outerHeight();
+            var botScrn = $(window).scrollTop() + $(window).innerHeight();
+            var topScrn = $(window).scrollTop();
+            nextPageInfinite.checkVisibility((botScrn > topElem) && (topScrn < botElem));
+          }
+        };
+        $(window).scroll(nextPageInfinite.eventScroll);
+        $(window).ready(nextPageInfinite.eventScroll);
       }
-    }
-  }])
+    };
+  }]);
 
 }(app));
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cronapp-framework-js",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "Javascript library for CronApp's projects",
   "main": "cronapp.framework.js",
   "scripts": {