cronapp-framework-js 3.0.0-SP.51 → 3.0.0-SP.53

package/js/directives.js

@@ -4183,95 +4183,26 @@
                 });
               }
 
-              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;
                 }
               };
             }
@@ -4285,24 +4216,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 = { 
@@ -4333,6 +4282,51 @@
               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) {
@@ -4397,63 +4391,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({
@@ -4476,50 +4429,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) {
@@ -4554,9 +4503,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;
@@ -4604,7 +4555,7 @@
           }
         };
       })
-
+    
       .directive('cronMultiSelect', function ($compile, $parse) {
         return {
           restrict: 'E',
@@ -5971,54 +5922,56 @@
         }
       })
 
-  .directive('crnInfiniteScroll', ['$compile', function($compile) {
-  'use strict';
-  return {
-    restrict: 'EA',
-    link: function(scope, element, attrs) {
-      var dataSource = scope.$eval(attrs.crnInfiniteScroll || attrs.crnDatasource);
-
-      if (dataSource) {
-        let nextPageInfinite = {
-          isVisible: false,
-          checkVisibility: function() {
-            var topElem = element.offset().top;
-            var botElem = element.offset().top + element.outerHeight();
-            var botScrn = $(window).scrollTop() + $(window).innerHeight();
-            var topScrn = $(window).scrollTop();
-
-            return (botScrn > topElem) && (topScrn < botElem);
-          },
-          eventScroll: function() {
-            let visible = nextPageInfinite.checkVisibility();
-
-            if (visible && dataSource.loaded && dataSource.loadedFinish) {
-              dataSource.nextPage();
-            } else if (visible && !(dataSource.loaded && dataSource.loadedFinish)) {
-              let intervalNextPage = setInterval(function() {
-                if (dataSource.loaded && dataSource.loadedFinish) {
-                  dataSource.nextPage();
-                  clearInterval(intervalNextPage);
+      .directive('crnInfiniteScroll', ['$compile', function($compile) {
+        'use strict';
+        return {
+          restrict: 'EA',
+          link: function(scope, element, attrs) {
+            var dataSource = scope.$eval(attrs.crnInfiniteScroll || attrs.crnDatasource);
+      
+            if (dataSource) {
+              let nextPageInfinite = {
+                isVisible: false,
+                isLoading: false,
+      
+                checkVisibility: function() {
+                  var topElem = element.offset().top;
+                  var botElem = element.offset().top + element.outerHeight();
+                  var botScrn = $(window).scrollTop() + $(window).innerHeight();
+                  var topScrn = $(window).scrollTop();
+      
+                  return (botScrn > topElem) && (topScrn < botElem);
+                },
+      
+                loadNextPage: function() {
+                  if (!nextPageInfinite.isLoading && dataSource.loaded && dataSource.loadedFinish) {
+                    nextPageInfinite.isLoading = true;
+                    dataSource.nextPage().finally(() => {
+                      nextPageInfinite.isLoading = false;
+                    });
+                  }
+                },
+      
+                eventScroll: function() {
+                  let visible = nextPageInfinite.checkVisibility();
+                  if (visible) {
+                    nextPageInfinite.loadNextPage();
+                  }
                 }
-              }, 250);
+              };
+      
+              $(window).on('scroll', nextPageInfinite.eventScroll);
+              $(window).ready(nextPageInfinite.eventScroll);
+              scope.$on('$destroy', function() {
+              $(window).off('scroll', nextPageInfinite.eventScroll);
+              });
+            } else {
+              console.error('DataSource não foi definido ou não está acessível.');
             }
           }
         };
-
-        $(window).on('scroll', nextPageInfinite.eventScroll);
-        $(window).on('load', nextPageInfinite.eventScroll);
-
-        scope.$on('$destroy', function() {
-          $(window).off('scroll', nextPageInfinite.eventScroll);
-          $(window).off('load', nextPageInfinite.eventScroll);
-        });
-      } else {
-        console.error('DataSource não foi definido ou não está acessível.');
       }
-    }
-  };
-}])
-
+    ]);
 }(app));
 
 function maskDirectiveAsDate($compile, $translate, $parse) {

package/package.json

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