cronapp-framework-js 2.9.6-SP.3 → 2.9.6-SP.32

package/i18n/locale_en_us.json

@@ -152,5 +152,7 @@
   "clear": "Clear",
   "noDataFound": "No data found",
   "yes": "Yes",
-  "no": "No"
+  "no": "No",
+  "Datasource.Error": "Error",
+  "Datasource.Duplicate": "There is more than one data source with the same name, use a unique name for each, check if there is a modal with the data source that has the name: "
 }

package/i18n/locale_pt_br.json

@@ -152,5 +152,7 @@
   "clear": "Limpar",
   "noDataFound": "Nenhum dado encontrado",
   "yes": "Sim",
-  "no": "Não"
+  "no": "Não",
+  "Datasource.Error": "Erro",
+  "Datasource.Duplicate": "Existem mais de uma fonte de dados com o mesmo nome, utilize nome único para cada, verifique se existe modal com a fonte de dados que tenha o nome: "
 }

package/js/app.js

@@ -546,7 +546,11 @@ window.camelCaseToSentenceCase = function(str){
 const keyCodeFormActions = {
   initialize: () => $(document).on("keypress", "form[crn-datasource]", keyCodeFormActions.handle),
   handle: (e) => !keyCodeFormActions[e.keyCode || e.which] || keyCodeFormActions[e.keyCode || e.which](e),
-  13: (e) => e.preventDefault()
+  13: (e) => {
+    if (!e.target || e.target.type !== 'textarea') {
+      e.preventDefault();
+    }
+  }
 };
 keyCodeFormActions.initialize();
 

package/js/directives.js

@@ -102,11 +102,11 @@
         const expressionOnChange = options.expressionOnChange;
         const expressionOnNavigate = options.expressionOnNavigate;
 
-        const initialDate = expressionInitialDate ? await scope.$eval(generateBlocklyCall(expressionInitialDate)) : new Date();
-        const selectDates = (expressionSelectDates && options.isSelectableMultiple) ? await scope.$eval(generateBlocklyCall(expressionSelectDates)) : [];
-        const disableDates = expressionDisableDates ? await scope.$eval(generateBlocklyCall(expressionDisableDates)) : null;
-        const min = expressionMinDate ? await scope.$eval(generateBlocklyCall(expressionMinDate)) : new Date(1900, 0, 1);
-        const max = expressionMaxDate ? await scope.$eval(generateBlocklyCall(expressionMaxDate)) : new Date(2099, 11, 31);
+        const initialDate = expressionInitialDate ? await scope.$eval(generateBlocklyCall(expressionInitialDate, true)) : new Date();
+        const selectDates = (expressionSelectDates && options.isSelectableMultiple) ? await scope.$eval(generateBlocklyCall(expressionSelectDates, true)) : [];
+        const disableDates = expressionDisableDates ? await scope.$eval(generateBlocklyCall(expressionDisableDates, true)) : null;
+        const min = expressionMinDate ? await scope.$eval(generateBlocklyCall(expressionMinDate, true)) : new Date(1900, 0, 1);
+        const max = expressionMaxDate ? await scope.$eval(generateBlocklyCall(expressionMaxDate), true) : new Date(2099, 11, 31);
 
         cronCalendarElement.kendoCalendar({
           culture: culture.startsWith('pt') ? 'pt-BR' : 'en-US',
@@ -221,7 +221,7 @@
 
   app.directive('textarea', transformText);
 
-  var generateBlocklyCall = function(blocklyInfo) {
+  var generateBlocklyCall = function(blocklyInfo, hasToPromise) {
     var call = "";
     if (!blocklyInfo) return call;
 
@@ -238,7 +238,7 @@
     }
     else if (blocklyInfo.type == "server") {
       var blocklyName = blocklyInfo.blocklyClass + '.' + blocklyInfo.blocklyMethod;
-      call = "cronapi.server('"+blocklyName+"')";
+      call = "cronapi.server('"+blocklyName+"')" + (hasToPromise ? '.toPromise()' : '');
 
       var params = "";
       blocklyInfo.blocklyParams.forEach(function(p) {
@@ -355,7 +355,7 @@
             var required = (attr.ngRequired && attr.ngRequired == "true"?"required":"");
             var content = element.html();
             const objectFit = attr.objectFit || 'unset';
-            let templateDyn =`<div ngf-drop="" ngf-drag-over-class="dragover" style="display: flex; justify-content: center; width: 100%; height: 100%; ">
+            let templateDyn =`<div ngf-drop="" ngf-drag-over-class="dragover" style="display: flex; justify-content: center; width: 100%; height: 100%; position: relative; ">
                                 <img alt="$picture$" style="width: 100%; object-fit: ${objectFit}" ng-if="$ngModel$"
                                   data-ng-src="{{$ngModel$.startsWith(\'http\') || ($ngModel$.startsWith(\'/\') && $ngModel$.length < 1000)? $ngModel$ : \'data:image/png;base64,\' + $ngModel$}}">
                                 <input id="$id$" aria-label="$userHtml$" ng-if="!$ngModel$" autocomplete="off" tabindex="-1"
@@ -394,6 +394,12 @@
                 .split('$picture$').join($translate.instant(imgAltText))
             );
 
+            var readOnly = attr.readOnly == 'true';
+            if (readOnly) {
+              templateDyn.find('.remove-image-button').remove();
+              templateDyn.find('.start-camera-button-attribute').remove();
+            }
+
             element.html(templateDyn);
             $compile(templateDyn)(element.scope());
           }
@@ -1288,7 +1294,7 @@
             var tinyMCEOptions = {
               menubar: false,
               statusbar: false,
-              plugins: "bdesk_photo advlist anchor autolink autoresize autosave charmap code colorpicker contextmenu directionality emoticons fullpage fullscreen hr image imagetools importcss insertdatetime legacyoutput link lists media nonbreaking noneditable pagebreak paste preview print save searchreplace tabfocus table template toc visualblocks visualchars wordcount tiny_mce_wiris",
+              plugins: "bdesk_photo advlist anchor autolink autoresize autosave charmap code colorpicker contextmenu directionality emoticons fullpage fullscreen hr image imagetools importcss insertdatetime legacyoutput link lists media nonbreaking noneditable pagebreak paste preview print save searchreplace tabfocus table template toc visualblocks visualchars wordcount tiny_mce_wiris colorpicker textcolor",
               toolbar: "",
               content_style: ""
             };
@@ -1299,6 +1305,8 @@
                   tinyMCEOptions.toolbar += " " + toolbarGroup[key];
               }
             }
+
+            tinyMCEOptions.toolbar += " forecolor backcolor ";
             tinyMCEOptions.menubar = optionsSelected.showMenuBar;
             tinyMCEOptions.statusbar = optionsSelected.showStatusBar;
             tinyMCEOptions.content_style = optionsSelected.contentStyle;
@@ -1550,8 +1558,8 @@
               return datasource.active;
             }
           },
-          getSchedulerProperties: function(options, datasource, scope) {
-            let schedulerStartDate = (options.initialDateStrategy === 'Expression' ? scope.$eval(generateBlocklyCall(options.initialDateBlocklyInfo)) : options.initialDate);
+          getSchedulerProperties: async function(options, datasource, scope) {
+            let schedulerStartDate = (options.initialDateStrategy === 'Expression' ? await scope.$eval(generateBlocklyCall(options.initialDateBlocklyInfo, true)) : options.initialDate);
             let lastSearchedPeriod = {start: null, end: null};
 
             let needsToFetchData = function(searchablePeriod) {
@@ -1988,11 +1996,11 @@
 
             this.initCulture();
 
-            $.getScript(baseUrl, function() {
+            $.getScript(baseUrl, async function() {
 
               let kendoDatasource = app.kendoHelper.getDataSource(options.dataSourceScreen.entityDataSource, scope, true, options.dataSourceScreen.rowsPerPage);
 
-              let schedulerProperties = this.getSchedulerProperties(options, datasource, scope);
+              let schedulerProperties = await this.getSchedulerProperties(options, datasource, scope);
 
               schedulerElement.kendoScheduler(schedulerProperties);
 
@@ -3470,6 +3478,10 @@
                   }
 
                   $element = $(element);
+                  let $grid = $element.find('[data-role="grid"]');
+                  if ($grid.length) {
+                    $element = $grid;
+                  }
                   let style = $element.attr("style")||"";
                   if (style) {
                     style += ", ";
@@ -4216,7 +4228,13 @@
                 value = null;
               }
 
-              await combobox.value(value);
+              let comboValue = combobox.value();
+              comboValue = comboValue !== undefined && comboValue !== null ? comboValue.trim() : comboValue;
+              let valueToCheck = value !== undefined && value !== null ? ('' + value).trim() : value;
+
+              if (valueToCheck !== comboValue) {
+                await combobox.value(value);
+              }
 
               if (select.changeCursor) {
                 scope.safeApply(() => {
@@ -4580,11 +4598,21 @@
 
             }.bind(relactionDS);
 
+            var hideSelectedItem = attrs.crnHideSelectedItem == 'true';
+            var onSelectedItem = () => {
+              if (hideSelectedItem) {
+                if (combobox.list && combobox.list.length > 0) {
+                  combobox.list.find('.k-item').show();
+                  combobox.list.find('.k-item.k-state-selected').hide();
+                }
+              }
+            }
+
             options['change'] = attrs.ngChange ? function (){_scope.$eval(attrs.ngChange)}: 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'] = attrs.ngOpen ? function (){_scope.$eval(attrs.ngOpen)}: undefined;
+            options['open'] = attrs.ngOpen ? function (){_scope.$eval(attrs.ngOpen); onSelectedItem();}: onSelectedItem;
             options['cascade'] = attrs.ngCascade ? function (){_scope.$eval(attrs.ngCascade)}: undefined;
             evtSelect = attrs.ngSelect ? function (){_scope.$eval(attrs.ngSelect)}: undefined;
             deselect = attrs.ngDeselect ? function (){_scope.$eval(attrs.ngDeselect)}: undefined;
@@ -5108,7 +5136,7 @@
             items.forEach(function (item) {
 
               var security = (item.security && item.security != null) ? ` cronapp-security="${item.security }" ` : '';
-              var action = (item.action && item.action != null) ? ` ng-click="${item.action}" ` : '';
+              var action = (item.action && item.action != null) ? ` ng-click="cronapi.internal.lastCronappMenuClick('${item.id}');${item.action}" ` : '';
               var hide = (item.hide && item.hide != null) ? ` ng-hide="${item.hide}"  ` : '';
               var iconClass = (item.iconClass && item.iconClass != null) ? `<i class="${item.iconClass}" id="menu-tag-i-${item.id}"></i>&nbsp;` : '';
               var title = `<span id="menu-tag-span-${item.id}"></span>`;
@@ -5235,168 +5263,98 @@
         };
       }])
 
-      .directive('cronBreadcrumbs', function () {
+      .directive('cronBreadcrumbs', function ($rootScope) {
       'use strict';
       return {
         restrict: 'E',
         replace: true,
         link: function (scope, element, attrs) {
 
-          let crnDelimiterIcon = attrs.crnDelimiterIcon;
-          let crnTypeMenu = attrs.typeMenu;
-          let idMenu = attrs.idMenu ? attrs.idMenu : null;
-          let breadcrumb = [];
-          let actionBlockly = attrs.ngInit ? attrs.ngInit : null;
-          let idBreadcrumb = attrs.id;
-          let arrayPaiBreadcrumb = [];
+          var bcAction = attrs.ngInit ? attrs.ngInit : null;
+          const bcDelimiterIcon = attrs.crnDelimiterIcon;
+          const bcTypeMenu = attrs.typeMenu;
+          const bcMenuId = attrs.idMenu ? attrs.idMenu : null;
+          const bcId = attrs.id;
+          const bcIconRoot = attrs.breadcrumbIcon ? attrs.breadcrumbIcon : null;
+          const bcList = [];
 
-          let iconRoot = attrs.breadcrumbIcon ? attrs.breadcrumbIcon : null;
+          const fillAction = async () => {
+              const shortVersion = bcAction.replace("cronapi.client('js.", 'blockly.js.');
+              bcAction = shortVersion.replace("').run()", '');
+              bcAction = scope.$eval(bcAction);
+              bcList = await bcAction();
 
-          async function functionActionBlockly() {
-            let shortVersion = actionBlockly.replace("cronapi.client('js.", 'blockly.js.');
-            actionBlockly = shortVersion.replace("').run()", '');
-            actionBlockly = scope.$eval(actionBlockly);
-            breadcrumb = await actionBlockly();
-
-            var onclick = async (e) => {
-              if (e.item.action)  {
-                e.item.action();
-              }
-            };
+              const onclick = async (e) => {
+                if (e.item.action)  {
+                  e.item.action();
+                }
+              };
 
-            $(`#${idBreadcrumb}`).kendoBreadcrumb({
-              items: breadcrumb,
-              delimiterIcon: crnDelimiterIcon,
-              navigational: true,
-              click : onclick
-            });
+              $(`#${bcId}`).kendoBreadcrumb({
+                items: bcList,
+                delimiterIcon: bcDelimiterIcon,
+                navigational: true,
+                click : onclick
+              });
           }
 
+          const clearAction = (action) => {
+           if (action) {
+            return action.replace("cronapi.screen.changeView('", '').replace("', [])", '');
+           }
+           return "#/home";
+          }
 
-          if (actionBlockly && crnTypeMenu === "idBloco") {
-            functionActionBlockly()
-
+          if (bcAction && bcTypeMenu === "idBloco") {
+            fillAction();
           } else {
-            setTimeout(() => {
-              // Capturar o  json do menu
-              let menuOptions = $(`#${idMenu}`)[0].parentElement.attributes['options'];
-              menuOptions = JSON.parse(menuOptions.value);
-              let subMenuOptions = menuOptions.subMenuOptions;
-
-              // Capturar a url da pagina
-              let page = document.location.hash;
-              if (page === "") {
-                page = "home"
-              } else {
-                page = page.split("/");
-              }
-
-              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 (arrayPaiBreadcrumb.length != 0 && items[i].level === arrayPaiBreadcrumb[arrayPaiBreadcrumb.length - 1].level) {
-                    if (!action) {
-                      arrayPaiBreadcrumb[arrayPaiBreadcrumb.length - 1] = {
-                        level: items[i].level,
-                        title: items[i].title,
-                        href: '#'
-                      };
-
-                    } else if (action) {
-                      arrayPaiBreadcrumb[arrayPaiBreadcrumb.length - 1] = {
-                        level: items[i].level,
-                        title: items[i].title,
-                        href: document.location.origin + '/' + action.join("/")
-                      };
-
-                    }
-
-                  } else {
-                    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] || action[action.length - 1] === page) {
-                        x = true;
+            var observer = new MutationObserver((mutation, observer) => {
+                const $parent = $(`#${bcMenuId}`).parent();
+                const attrOptions = $parent.attr('options');
+                if (attrOptions) {
+                    observer.disconnect(); // stop observing
+
+                    const options = JSON.parse(attrOptions);
+                    const page = document.location.hash || 'home';
+
+                    const findTrace = (array, action, path = []) => {
+                      for (let i = 0; i < array.length; i++) {
+                        var item = array[i];
+                        item.action = clearAction(item.action);
+                        if (item.action === action) {
+                          return [...path, item];
+                        }
+                        if (item.menuItems) {
+                          const result = findTrace(item.menuItems, action, [...path, item]);
+                          if (result) {
+                            return result;
+                          }
+                        }
                       }
+                      return null;
                     }
-                  }
 
-                  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,
-                          showIcon: false
-                        })
-                      }
+                    const trace = findTrace(options.subMenuOptions, page);
+                    if (trace) {
+                        for (var index in trace) {
+                            const item = trace[index];
+                            bcList.push({
+                              type: index == 0 ? 'rootitem' : 'item',
+                              href: item.action,
+                              text: item.title,
+                              showText: true,
+                              showIcon: false
+                            });
+                        }
+                        $(`#${bcId}`).kendoBreadcrumb({
+                            items: bcList,
+                            delimiterIcon: bcDelimiterIcon,
+                            navigational: true
+                        });
                     }
-
-                    return breadcrumb
-                  }
                 }
-              }
-
-              $(`#${idBreadcrumb}`).kendoBreadcrumb({
-                items: breadcrumb,
-                delimiterIcon: crnDelimiterIcon,
-                navigational: true
-              });
-
-            }, 800);
+            });
+            observer.observe(document.body, { childList : true});
           }
         }
       }
@@ -5420,7 +5378,7 @@
                     let blocklyParams = shortVersion.split('.run')[1];
                     evaluated = await scope.$eval(blocklyPackage + blocklyParams);
                 } else {
-                    evaluated = scope.$eval(attrs.ngInitialValue);
+                    evaluated = scope.$eval(attrs.ngInitialValue) || attrs.ngInitialValue;
                 }
               } catch (e) {
                 evaluated = attrs.ngInitialValue;

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "cronapp-framework-js",
-  "version": "2.9.6-SP.3",
+  "version": "2.9.6-SP.32",
   "description": "Javascript library for CronApp's projects",
   "main": "cronapp.framework.js",
   "scripts": {
     "build": "npm i && gulp",
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "preinstall": "npx force-resolutions"
   },
   "repository": {
     "type": "git",
@@ -63,14 +64,18 @@
     "angular-ui-notification": "0.3.6",
     "ui-select": "0.18.1",
     "bootstrap": "3.4.1",
-    "chart.js": "2.7.0",
+    "chart.js": "2.9.4",
     "cpf_cnpj": "0.2.0",
     "font-awesome": "4.4.0",
     "jquery": "3.5.1",
     "justgage": "1.3.5",
-    "moment": "2.29.1",
+    "moment": "2.29.4",
     "moment-timezone": "0.5.33",
     "ng-file-upload": "12.2.13",
     "signature_pad": "^3.0.0-beta.4"
+  },
+  "resolutions": {
+    "chart.js": "2.9.4",
+    "moment": "2.29.4"
   }
 }

package/postupdate.json

@@ -387,6 +387,10 @@
       "old": "plugins/chart.js/dist/Chart.min.js",
       "new": "node_modules/chart.js/dist/Chart.min.js"
     },
+    {
+      "old": "node_modules/cronapp-lib-js/dist/js/chart.js/Chart.min.js",
+      "new": "node_modules/chart.js/dist/Chart.min.js"
+    },
     {
       "old": "plugins/angular-chart.js/dist/angular-chart.min.js",
       "new": "node_modules/angular-chart.js/dist/angular-chart.min.js"
@@ -471,6 +475,10 @@
       "old": "plugins/moment/min/moment-with-locales.min.js",
       "new": "node_modules/moment/min/moment-with-locales.min.js"
     },
+    {
+      "old": "node_modules/cronapp-lib-js/dist/js/moment/moment-with-locales.min.js",
+      "new": "node_modules/moment/min/moment-with-locales.min.js"
+    },
     {
       "old": "plugins/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js",
       "new": "node_modules/eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min.js"