cronapp-framework-js 2.8.27 → 2.8.31

package/js/app.js

@@ -212,7 +212,7 @@ var app = (function() {
         $scope.UploadService = UploadService;
         $scope.$state = $state;
 
-        app.registerEventsCronapi($scope, $translate);
+        app.registerEventsCronapi($scope, $translate, $location);
 
         $("form").kendoValidator({
             errorTemplate: '<span class="k-widget k-tooltip-validation k-x-invalid-msg-block">#=message#</span>',
@@ -233,18 +233,6 @@ var app = (function() {
           }
         }
 
-        //Components personalization jquery
-        $scope.registerComponentScripts = function() {
-          //carousel slider
-          $('.carousel-indicators li').on('click', function() {
-            var currentCarousel = '#' + $(this).parent().parent().parent().attr('id');
-            var index = $(currentCarousel + ' .carousel-indicators li').index(this);
-            $(currentCarousel + ' #carousel-example-generic').carousel(index);
-          });
-        };
-
-        $scope.registerComponentScripts();
-
         try {
           var contextAfterPageController = $controller('AfterPageController', { $scope: $scope });
           app.copyContext(contextAfterPageController, this, 'AfterPageController');
@@ -333,6 +321,7 @@ var app = (function() {
             }
 
             $rootScope.renderFinished = true;
+            registerComponentScripts();
           });
         };
 
@@ -365,7 +354,23 @@ app.bindScope = function($scope, obj) {
   return newObj;
 };
 
-app.registerEventsCronapi = function($scope, $translate) {
+app.registerEventsCronapi = function($scope, $translate, $location) {
+
+  let $stateParams = $scope.params || {};
+  let queryStringParams = $location && $location.search() || {};
+  $scope.params = {};
+
+  let makeCopy = (from, to) => {
+      for (let key in from) {
+          if (from.hasOwnProperty(key)) {
+              to[key] = from[key];
+          }
+      }
+  };
+  makeCopy($stateParams, $scope.params);
+  makeCopy(queryStringParams, $scope.params);
+
+
   for (var x in app.userEvents)
     $scope[x] = app.userEvents[x].bind($scope);
 
@@ -520,4 +525,14 @@ const keyCodeFormActions = {
   handle: (e) => !keyCodeFormActions[e.keyCode || e.which] || keyCodeFormActions[e.keyCode || e.which](e),
   13: (e) => e.preventDefault()
 };
-keyCodeFormActions.initialize();
+keyCodeFormActions.initialize();
+
+//Components personalization jquery
+var registerComponentScripts = function() {
+  //carousel slider
+  $('.carousel-indicators li').on('click', function() {
+    var currentCarousel = '#' + $(this).parent().parent().parent().attr('id');
+    var index = $(currentCarousel + ' .carousel-indicators li').index(this);
+    $(currentCarousel + ' > div').carousel(index);
+  });
+};

package/js/controllers.js

@@ -81,7 +81,7 @@
     $scope.$http = $http;
     $scope.params = $stateParams;
     $scope.$state = $state;
-    app.registerEventsCronapi($scope, $translate);
+    app.registerEventsCronapi($scope, $translate, $location);
 
     $rootScope.http = $http;
     $rootScope.Notification = Notification;
@@ -91,12 +91,6 @@
       ReportService.openReport(reportName, params, config);
     };
 
-    var queryStringParams = $location.search();
-    for (var key in queryStringParams) {
-      if (queryStringParams.hasOwnProperty(key)) {
-        $scope.params[key] = queryStringParams[key];
-      }
-    }
     $scope.redirectToLogin = function() {
       $scope.cronapi.social.ssoLogin();
     };
@@ -250,7 +244,7 @@
     $scope.$http = $http;
     $scope.params = $stateParams;
     $scope.$state = $state;
-    app.registerEventsCronapi($scope, $translate);
+    app.registerEventsCronapi($scope, $translate, $location);
 
     $rootScope.http = $http;
     $rootScope.Notification = Notification;
@@ -260,13 +254,6 @@
       ReportService.openReport(reportName, params, config);
     };
 
-    var queryStringParams = $location.search();
-    for (var key in queryStringParams) {
-      if (queryStringParams.hasOwnProperty(key)) {
-        $scope.params[key] = queryStringParams[key];
-      }
-    }
-
     $scope.message = {};
 
     $scope.selecionado = {

package/js/directives.js

@@ -2126,7 +2126,8 @@
                   let waitRender = setInterval(function() {
                     let $myElement = $('#' + componentId);
                     if ($myElement.length > 0) {
-                      var x = angular.element($myElement);
+                      let $closeTdElemen = $myElement.closest('td');
+                      let x = angular.element($closeTdElemen || $myElement);
                       $compile(x)(scope);
                       clearInterval(waitRender);
                       resolve(componentId);
@@ -3372,7 +3373,7 @@
             var parent = element.parent();
             $(parent).append('<input style="width: 100%;" '+ id + name + ' class="cronSelect"/>');
             var $element = $(parent).find('input.cronSelect');
-
+            var cronDisabled = attrs.cronDisabled ? attrs.cronDisabled : 'true';
             var options = await app.kendoHelper.getConfigCombobox(select, scope);
             options.close = attrs.ngClose ? function (){scope.$eval(attrs.ngClose)}: undefined;
             options.dataBound = attrs.ngDataBound ? function (){scope.$eval(attrs.ngDataBound)}: undefined;
@@ -3422,7 +3423,11 @@
               }
             };
             initializeAttrAndEvents();
-            combobox.enable(true);
+            if (cronDisabled) {
+              combobox.enable(false);
+            } else {
+              combobox.enable(true);
+            }
 
             var _scope = scope;
             var _ngModelCtrl = ngModelCtrl;
@@ -3516,12 +3521,14 @@
             }
           },
           link: async function (scope, element, attrs, ngModelCtrl) {
+            await cronapi.internal.skipIterationLoop();
             var modelGetter = $parse(attrs['ngModel']);
             var modelSetter = modelGetter.assign;
             var select = {};
             var self = this;
             var parentDS = {};
             var textField = null;
+            var cronDisabled = attrs.cronDisabled ? attrs.cronDisabled : 'true';
             try {
               select = JSON.parse(attrs.options);
               parentDS = this.getActive(attrs.ngModel);
@@ -3885,7 +3892,13 @@
             _compileAngular(scope, combobox.ul);
 
             $(element).remove();
-            combobox.enable(true);
+
+            if(cronDisabled){
+              combobox.enable(false);
+            } else {
+              combobox.enable(true);
+            }
+
             $("[aria-owns='" + `${attrs.id}_listbox` + "']").attr('aria-label', $translate.instant('template.crud.search'));
           }
         };
@@ -3899,6 +3912,7 @@
             var modelGetter = $parse(attrs['ngModel']);
             var modelSetter = modelGetter.assign;
             var model = attrs['ngModel'];
+            var cronDisabled = attrs.cronDisabled ? attrs.cronDisabled : 'true';
 
             var _self = this;
             var select = {};
@@ -4035,7 +4049,11 @@
             deselect = attrs.ngDeselect ? function (){_scope.$eval(attrs.ngDeselect)}: undefined;
 
             var combobox = $element.kendoMultiSelect(options).data('kendoMultiSelect');
-            combobox.enable(true);
+            if(cronDisabled){
+              combobox.enable(false);
+            }else {
+              combobox.enable(true);
+            }
             app.kendoHelper.receivePushData(combobox);
 
             $("[aria-describedby='" + `${attrs.id}_taglist` + "']").attr('id', `${attrs.id}-container`);
@@ -4105,6 +4123,7 @@
             options.select = attrs.ngSelect ? function (){scope.$eval(attrs.ngSelect);}: undefined;
             var parent = element.parent();
             var id = attrs.id ? ' id="' + attrs.id + '"' : '';
+            var cronDisabled = attrs.cronDisabled ? attrs.cronDisabled : 'true';
             var name = attrs.name ? ' name="' + attrs.name + '"' : '';
             var validationmessage = attrs.validationmessage ? ' validationmessage="' + attrs.validationmessage + '"' : '';
             var required = '';
@@ -4136,7 +4155,12 @@
             }
 
             var autoComplete = $element.kendoAutoComplete(options).data('kendoAutoComplete');
-            autoComplete.enable(true);
+
+            if(cronDisabled){
+              autoComplete.enable(false);
+            } else {
+              autoComplete.enable(true);
+            }            
 
             if (ngModelCtrl) {
               ngModelCtrl.$formatters.push(function (value) {
@@ -4705,18 +4729,140 @@
         }
       }])
 
+      .directive('cronBreadcrumbs', function () {
+          'use strict';
+          return {
+              restrict: 'E',
+              replace: true,
+              link: function (scope, element, attrs) {
+                setTimeout(() => {
+
+                  let crnDelimiterIcon = attrs.crnDelimiterIcon;
+                  let idMenu = attrs.idMenu;
+
+                  // Capturar o  json do menu
+                  let menuOptions = $(`#${idMenu}`)[0].children[0].attributes['options'];
+                  menuOptions = JSON.parse(menuOptions.value);
+                  let subMenuOptions = menuOptions.subMenuOptions;
+
+                  // Capturar a url da pagina
+                  let page = document.location.hash;
+                  page = page.split("/");
+
+                  let idBreadcrumb = attrs.id;
+
+                  let breadcrumb = [];
+                  let arrayPaiBreadcrumb = [];
+
+                  inicio(subMenuOptions);
+
+                  function inicio(items) {
+                    let x = false;
+
+                    for (let i in items) {
+
+                      let action = items[i].action;
+                      if (action && action != "") {
+                        action = action.replace("cronapi.screen.changeView('", '');
+                        action = action.replace("', [])", '')
+                        action = action.split("/");
+                      } else {
+                        action = null
+                      }
+
+                      if(items[i].level === 1){
+                        arrayPaiBreadcrumb = []
+                      }
+                      if (!action) {
+                        arrayPaiBreadcrumb.push({
+                          level: items[i].level,
+                          title: items[i].title,
+                          href: '#'
+                        });
+                      } else if (action) {
+                        arrayPaiBreadcrumb.push({
+                          level: items[i].level,
+                          title: items[i].title,
+                          href: document.location.origin + '/' + action.join("/")
+                        });
+                      }
+
+                      if (items[i].menuItems.length > 0) {
+                        inicio(items[i].menuItems);
+
+                      } else {
+                        if(action){
+                          if (action[action.length - 1] === page[page.length - 1]) {
+                            x = true
+                          }
+                        }
+                      }
+
+                      if (x) {
+                        for (let y in arrayPaiBreadcrumb) {
+
+                          if (y == 0 && arrayPaiBreadcrumb[y].level == 1) {
+                            breadcrumb.push({
+                              type: "rootitem",
+                              href: arrayPaiBreadcrumb[y].href,
+                              text: arrayPaiBreadcrumb[y].title,
+                              showText: true,
+                              showIcon: false
+                            })
+                          } else if (y == 0 && arrayPaiBreadcrumb[y].level != 1) {
+                            breadcrumb.push({
+                              type: "rootitem",
+                              href: arrayPaiBreadcrumb[y].href,
+                              text: arrayPaiBreadcrumb[y].title,
+                              showText: true,
+                              showIcon: false
+                            })
+                          } else {
+                            breadcrumb.push({
+                              type: "item",
+                              href: arrayPaiBreadcrumb[y].href,
+                              text: arrayPaiBreadcrumb[y].title,
+                              showText: true
+                            })
+                          }
+                        }
+
+                        return breadcrumb
+                      }
+                    }
+                  }
+
+                  $(`#${idBreadcrumb}`).kendoBreadcrumb({
+                    items: breadcrumb,
+                    delimiterIcon: crnDelimiterIcon,
+                    navigational: true
+                  });
+
+                }, 800);
+              }
+          }
+      })
+
       .directive('ngInitialValue', function($parse) {
         return {
           restrict: 'A',
           require: 'ngModel',
-          link: function(scope, element, attrs, ngModelCtrl) {
+          link: async function(scope, element, attrs, ngModelCtrl) {
             if (attrs.ngInitialValue) {
               var modelGetter = $parse(attrs['ngModel']);
               var modelSetter = modelGetter.assign;
               var evaluated;
 
               try {
-                evaluated = scope.$eval(attrs.ngInitialValue);
+                if(attrs.ngInitialValue.indexOf("cronapi.client('js.") != -1){//cronapi caller?
+                    let shortVersion = attrs.ngInitialValue.replace("cronapi.client('js.", 'blockly.js.');
+                    let blocklyPackage = shortVersion.split("').names")[0];
+                    blocklyPackage = blocklyPackage.split("').attr()")[0];
+                    let blocklyParams = shortVersion.split('.run')[1];
+                    evaluated = await scope.$eval(blocklyPackage + blocklyParams); 
+                } else {
+                    evaluated = scope.$eval(attrs.ngInitialValue);
+                }
               } catch (e) {
                 evaluated = attrs.ngInitialValue;
               }
@@ -4776,7 +4922,7 @@
                     viewValue = null;
                     el.prop('indeterminate', true);
                 }
-                ctrl.$setViewValue(viewValue);
+                setTimeout(() => ctrl.$setViewValue(viewValue));
               };
             } else if (attrs.crnAllowNullValues == 'false') {
               ctrl.$render = function () {
@@ -4786,7 +4932,7 @@
                   viewValue = false;
                 }
                 if (viewValue === falseValue) {
-                  let modelForEval = `${el.attr('ng-model')}=${viewValue}`;
+                  let modelForEval = `${el.attr('ng-model')}=${attrs.ngFalseValue}`;
                   scope.$eval(modelForEval);
                 }
                 el.data('checked', viewValue);
@@ -4803,7 +4949,7 @@
                     viewValue = falseValue;
                     break;
                 }
-                ctrl.$setViewValue(viewValue);
+                setTimeout(() => ctrl.$setViewValue(viewValue));
               };
             }
             el.bind('click', function () {

package/js/reports/reports.service.js

@@ -156,6 +156,9 @@
         }
         var viewer = new Stimulsoft.Viewer.StiViewer(options, viewerId, false);
         viewer.report = report;
+        if(StiJsViewer.prototype.IsTouchDevice()) {
+          viewer.options.appearance.interfaceType = Stimulsoft.Viewer.StiInterfaceType.Touch;
+        }
         return viewer;
       };
     

package/package.json

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