cronapp-framework-js 3.0.0-SP.4 → 3.0.0-SP.41

package/js/directives.js

@@ -2688,6 +2688,67 @@
               return attributes;
             }
 
+            function commandClick(e, column) {
+              e.preventDefault();
+              let tr = $(e.target).closest("tr");
+              let grid = tr.closest('table');
+              let itemAsObj = this.dataItem(tr);
+              let item = this.dataItem(tr);
+              let index = $(grid.find('tbody')[0]).children().index(tr);
+              let call = undefined;
+              if (column.dataType == "Customized" || column.dataType == "CustomizedLink" || column.dataType == "GroupedButtons")
+                call = column.execute;
+              else
+                call = generateBlocklyCall(column.blocklyInfo);
+              let cronappDatasource = this.dataSource.transport.options.cronappDatasource;
+              let currentGrid = options.refComponent;
+              let selectedRows = [];
+              currentGrid.select().each(function() {
+                let gridRow = currentGrid.dataItem(this);
+                cronappDatasource.data.forEach(function(dsRow) {
+                  if (dsRow.__$id == gridRow.__$id)
+                    selectedRows.push(dsRow);
+                });
+              });
+
+              if (!(cronappDatasource.inserting || cronappDatasource.editing)) {
+                let tr = e.currentTarget.parentElement.parentElement;
+                this.select(tr);
+              }
+
+              let selectedRowsKeyOrObj = [];
+              if (options.fieldType && options.fieldType === 'key') {
+                item = helperDirective.changeObjectField(cronappDatasource, cronappDatasource.findObjInDs(item));
+                selectedRows.forEach(row => {
+                  selectedRowsKeyOrObj.push(helperDirective.changeObjectField(cronappDatasource, cronappDatasource.findObjInDs(row)));
+                });
+              }
+              else {
+                selectedRowsKeyOrObj = selectedRows;
+              }
+
+              let consolidated = {
+                item: item,
+                index: index
+              }
+
+              let contextVars = {
+                'currentData': cronappDatasource.data,
+                'datasource': cronappDatasource.copyWithoutAngularObj(),
+                'selectedIndex': index,
+                'index': index,
+                'selectedRow': item,
+                'consolidated': consolidated,
+                'item': item,
+                'selectedKeys': cronappDatasource.getKeyValues(cronappDatasource.findObjInDs(itemAsObj), true),
+                'selectedRows': selectedRowsKeyOrObj
+              };
+
+              cronappDatasource.goTo(itemAsObj);
+              scope.$eval(call, contextVars);
+              return;
+            };
+
             var columns = [];
             if (options.columns) {
               options.columns.forEach(function(column)  {
@@ -2757,7 +2818,7 @@
                     className = 'k-custom-command' + (label ? ' k-button-with-label' : '');
                   }
                   if (column.theme)
-                    className += ' ' + column.theme;
+                    className += ' btn ' + column.theme;
 
                   var tooltip = '';
                   if (column.tooltip && column.tooltip.length)
@@ -2769,79 +2830,21 @@
                     className += ' ' + classForTooltip;
                   }
 
+                  let width = column.width;
+                  if (width) {
+                    width += 'px';
+                  }
+
                   let idForCommand = app.common.generateId();
                   let ariaLabel = tooltip || label || idForCommand;
-                  let template = `<a href class='k-button ${className} k-grid-${idForCommand}' aria-label='${ariaLabel}'><span class='${column.iconClass}'></span>${label}</a>`;
+                  let template = `<a href class='k-button ${className} k-grid-${idForCommand}' aria-label='${ariaLabel}' style='width:${width}'><span class='${column.iconClass}'></span>${label}</a>`;
 
                   var addColumn = {
                     command: [{
                       name: idForCommand,
                       template: template,
                       click: function(e) {
-                        e.preventDefault();
-                        var tr = $(e.target).closest("tr");
-                        var grid = tr.closest('table');
-
-                        var itemAsObj = this.dataItem(tr);
-                        var item = this.dataItem(tr);
-                        var index = $(grid.find('tbody')[0]).children().index(tr)
-
-
-                        var call = undefined;
-                        if (column.dataType == "Customized" || column.dataType == "CustomizedLink")
-                          call = column.execute;
-                        else
-                          call = generateBlocklyCall(column.blocklyInfo);
-
-                        var cronappDatasource = this.dataSource.transport.options.cronappDatasource;
-                        var currentGrid = options.refComponent;
-                        var selectedRows = [];
-                        currentGrid.select().each(function() {
-                          var gridRow = currentGrid.dataItem(this);
-                          cronappDatasource.data.forEach(function(dsRow) {
-                            if (dsRow.__$id == gridRow.__$id)
-                              selectedRows.push(dsRow);
-                          });
-                        });
-
-                        if (!(cronappDatasource.inserting || cronappDatasource.editing)) {
-                          var tr = e.currentTarget.parentElement.parentElement;
-                          this.select(tr);
-                        }
-
-                        let selectedRowsKeyOrObj = [];
-                        if(options.fieldType && options.fieldType === 'key') {
-                          item = helperDirective.changeObjectField(cronappDatasource, cronappDatasource.findObjInDs(item));
-                          selectedRows.forEach(row => {
-                            selectedRowsKeyOrObj.push(helperDirective.changeObjectField(cronappDatasource, cronappDatasource.findObjInDs(row)));
-                          });
-                        }
-                        else {
-                          selectedRowsKeyOrObj = selectedRows;
-                        }
-
-                        var consolidated = {
-                          item: item,
-                          index: index
-                        }
-
-                        var contextVars = {
-                          'currentData': cronappDatasource.data,
-                          'datasource': cronappDatasource.copyWithoutAngularObj(),
-                          'selectedIndex': index,
-                          'index': index,
-                          'selectedRow': item,
-                          'consolidated': consolidated,
-                          'item': item,
-                          'selectedKeys': cronappDatasource.getKeyValues(cronappDatasource.findObjInDs(itemAsObj), true),
-                          'selectedRows': selectedRowsKeyOrObj
-                        };
-
-                        if (this.element.find('input[type=checkbox]').length === 0) {
-                          cronappDatasource.goTo(itemAsObj);
-                        }
-                        scope.$eval(call, contextVars);
-                        return;
+                        commandClick.bind(this)(e, column);
                       }
                     }],
                     width: widthDevice.width,
@@ -2852,6 +2855,62 @@
                   columns.push(addColumn);
                   setIdCommandButton.bind(this)(idForCommand, column.dataType);
                 }
+                else if (column.dataType == "GroupedButtons") {
+
+                  if (column.buttonColumns && column.buttonColumns.length) {
+
+                    let commands = [];
+                    
+                    column.buttonColumns.forEach(function(buttonColumn) {
+                      let label = buttonColumn.label == undefined ? '': buttonColumn.label;
+                      if (buttonColumn.iconClass && label)
+                        label = '&nbsp;' + label;
+
+                      let className = 'k-custom-command' + (label ? ' k-button-with-label' : '');
+                      if (buttonColumn.theme)
+                        className += ' btn ' + buttonColumn.theme;
+
+                      let tooltip = '';
+                      if (buttonColumn.tooltip && buttonColumn.tooltip.length)
+                        tooltip = buttonColumn.tooltip;
+
+                      if (tooltip)  {
+                        let classForTooltip = app.common.generateId();
+                        tooltips[classForTooltip] = tooltip;
+                        className += ' ' + classForTooltip;
+                      }
+
+                      let width = buttonColumn.width;
+                      if (width) {
+                        width += 'px';
+                      }
+
+                      let idForCommand = app.common.generateId();
+                      let ariaLabel = tooltip || label || idForCommand;
+                      let template = `<a href class='k-button ${className} k-grid-${idForCommand}' aria-label='${ariaLabel}' style='width:${width}'><span class='${buttonColumn.iconClass}'></span>${label}</a>`;
+                    
+                      let command = {
+                        name: idForCommand,
+                        template: template,
+                        click: function(e) {
+                          buttonColumn.dataType = column.dataType;
+                          commandClick.bind(this)(e, buttonColumn);
+                        }
+                      };
+                      commands.push(command);
+                    });
+
+                    var addColumn = {
+                      command: commands,
+                      width: widthDevice.width,
+                      title: column.headerText ? column.headerText: '',
+                      hidden: !widthDevice.visible,
+                      attributes: getAttributes(column)
+                    };
+                    columns.push(addColumn);
+                    setIdCommandButton.bind(this)(app.common.generateId(), column.dataType);
+                  }          
+                }
                 else if (column.dataType == "Selectable") {
                   var checkColumn = {
                     selectable: true,
@@ -2989,7 +3048,11 @@
               var cronappDatasource = this.dataSource.transport.options.cronappDatasource;
               if (!(cronappDatasource.inserting || cronappDatasource.editing)) {
                 if (this.selectable) {
+                  setToActiveInCronappDataSource.bind(this)(e.data);
                   this.select(e.masterRow);
+                  if (options.columns.find(c => c.dataType == 'Selectable') !== undefined) {
+                    collapseAllExcecptCurrent(this, e.detailRow, e.masterRow);
+                  }
                 }
                 else {
                   setToActiveInCronappDataSource.bind(this)(e.data);
@@ -3217,14 +3280,22 @@
               },
               change: function(e) {
                 var item = this.dataItem(this.select());
-                setToActiveInCronappDataSource.bind(this)(item);
+                if ((options.details && options.details.length == 0) || (!cronapi.internal.hasMethodInCallStack('detailInit'))) {
+                  setToActiveInCronappDataSource.bind(this)(item);
+                }
                 var cronappDatasource = this.dataSource.transport.options.cronappDatasource;
                 if(options.fieldType && options.fieldType === 'key'){
                   cronappDatasource.active = helperDirective.changeObjectField(cronappDatasource, cronappDatasource.active);
                 }
+
+                let trDetails = this.select().next();
+                let trMasters = this.select();
+
                 if (ngModelCtrl) {
                   if ("multiple" === options.allowSelectionRowType) {
                     let selecteds = [];
+                    trDetails = [];
+                    trMasters = [];
                     this.select().each((i, row)=> {
                       let item = this.dataItem(row);
                       let objInDs = cronappDatasource.findObjInDs(item, false);
@@ -3234,6 +3305,10 @@
                       if (objInDs !== null){
                         selecteds.push(objInDs);
                       }
+                      if (item["_objectKey"] === cronappDatasource.active["_objectKey"]) {
+                        trMasters.push(this.select()[i]);
+                        trDetails.push(this.select().next()[i]);
+                      }
                     });
                     ngModelCtrl.$setViewValue(selecteds);
                   }
@@ -3246,7 +3321,7 @@
                     }
                   }
                 }
-                collapseAllExcecptCurrent(this, this.select().next(), this.select());
+                collapseAllExcecptCurrent(this, trDetails, trMasters);
 
                 if (attrs && attrs.ngChange) {
                   scope.$eval(attrs.ngChange);
@@ -3269,8 +3344,8 @@
                       command = 'edit';
                     }
 
-                      let modelName = helperDirective.getModelName(attrs);
-                      if (item && item["_objectKey"]) {
+                    let modelName = helperDirective.getModelName(attrs);
+                    if (item && item["_objectKey"]) {
                       let key = item["_objectKey"];
                       let id = `${modelName}-${command}-${key}`;
                       $elem.attr('id', id);
@@ -3445,11 +3520,63 @@
                 }
               });
 
+              grid.selectable.userEvents.unbind("select");
+
             });
 
+            let contextMenuId = app.common.generateId();
+            let contextMenuValue = app.common.generateId();
+            let contextMenuClose = app.common.generateId();
+            let contextMenuHtml = $(`<ul id="${contextMenuId}">
+                                <li id="copyText">
+                                  <input id="${contextMenuValue}">
+                                  <span id="${contextMenuClose}" class="k-icon k-i-close" style="margin-left: 5px;"></span>
+                                </li>
+                              </ul>`);
             element.html($templateDyn);
+            element.append(contextMenuHtml);
             $compile($templateDyn)(element.scope());
 
+            let contextMenu = $(`#${contextMenuId}`).kendoContextMenu({
+              target: $templateDyn,
+              filter: "td",
+              close: (e) => {
+                if (!closeContextMenu) {
+                  e.preventDefault();
+                }
+              },
+              open: (e) => {
+                let cell = e.target;
+                let row = $(cell).parent()[0];
+                let grid = $templateDyn.data("kendoGrid");
+                let itemId = e.item.id;
+
+                let cellText = cell.innerText;
+                if (cellText.length && cellText !== '​') {
+                  $(e.item).find(`#${contextMenuValue}`).val(cellText);
+                  closeContextMenu = false;
+                }
+                else {
+                  let menuRejected = () => {
+                    return new Promise((resolve, reject) => {
+                      let waiting = setInterval(() => {
+                        if ($(`#${contextMenuId}`).is(':visible')) {
+                          clearInterval(waiting);
+                          $(`#${contextMenuId}`).hide();
+                        }
+                      });
+                    });
+                  }
+                  menuRejected();
+                }
+              }
+            }).data("kendoContextMenu");
+
+            $(`#${contextMenuClose}`).on("click", (e) => {
+              closeContextMenu = true;
+              contextMenu.close();
+            });
+
           }
         };
       }])
@@ -3531,8 +3658,8 @@
                     getAllParent(cronappDatasource, itemResult.d.results[0], ids, resolve, reject);
                   },
                   beforeSend: (xhr) => {
-                    if (window.uToken) {
-                      xhr.setRequestHeader ("X-AUTH-TOKEN", window.uToken);
+                    if (!window.isUsingCookie()) {
+                      xhr.setRequestHeader ("X-AUTH-TOKEN", cronapi.util.getUserToken());
                     }
                   },
                   error: () => reject(),
@@ -3673,8 +3800,8 @@
                               resolve();
                             },
                             beforeSend: (xhr) => {
-                              if (window.uToken) {
-                                xhr.setRequestHeader ("X-AUTH-TOKEN", window.uToken);
+                              if (!window.isUsingCookie()) {
+                                xhr.setRequestHeader ("X-AUTH-TOKEN", cronapi.util.getUserToken());
                               }
                             },
                             error: () => reject(),
@@ -4175,9 +4302,10 @@
             options.dataBound = attrs.ngDataBound ? function (){scope.$eval(attrs.ngDataBound)}: undefined;
             options.filtering = attrs.ngFiltering ? function (){scope.$eval(attrs.ngFiltering)}: undefined;
             options.open = function(e) {
-              if (!dataSourceScreen.fetched || (dataSourceScreen.data.length > combobox.dataSource.data().length)) {
+              if (!dataSourceScreen.fetched || (dataSourceScreen.lastLoadedTime !== combobox.dataSource.lastLoadedTime)) {
                 combobox.options.firstLazyRead = true;
                 combobox.dataSource.read();
+                combobox.dataSource.lastLoadedTime = dataSourceScreen.lastLoadedTime;
               }
             };
 
@@ -4225,6 +4353,13 @@
 
             this.toComboType(attrs, parent, select, combobox);
 
+            let forcedRefreshModelAt;
+            let canRefresh = () => {
+              let check = performance.now();
+              if (!forcedRefreshModelAt) return true;
+              return check - forcedRefreshModelAt > 2000;
+            };
+
             var forceChangeModel = async function(value) {
 
               $log.debug("forceChangeModel | " + attrs['id'] + " | " + value);
@@ -4331,7 +4466,7 @@
                 overRideRefresh: function() {
                   dataSourceScreen.fetched = false;
                   dataSourceScreen.cleanup();
-                  defineInitialValue();
+                  canRefresh() && defineInitialValue();
                 }
               });
             }
@@ -4465,6 +4600,10 @@
             });
 
             $("[aria-owns='" + `${attrs.id}_listbox` + "']").attr('aria-label', $translate.instant('template.crud.search'));
+            if (ngModelCtrl.$modelValue) {
+              _scope.cronapi.internal.forceRefreshNgModel(attrs.ngModel, ngModelCtrl.$modelValue);
+              forcedRefreshModelAt = performance.now();
+            }
           }
         };
       })
@@ -5262,6 +5401,87 @@
                     return false;
                   });
                 }
+                $('#checkCollapsibleMenu').on('click', function() {
+                  var mainView = document.getElementById("main-view");
+                  if (this.checked) {
+                    mainView.classList.remove("main-view-retratil");
+                  } else {
+                    mainView.classList.add("main-view-retratil");
+                  }
+                });
+
+                let baseNav = element.closest('nav');
+                if (baseNav && baseNav.length) {
+
+                  let subMenuOnHover = !baseNav.hasClass('submenu-click');
+                  let baseNavId = baseNav.attr('id');
+
+                  if (!baseNavId) {
+                    baseNavId = app.common.generateId();
+                    baseNav.attr('id', baseNavId);
+                  }
+
+                  if (subMenuOnHover) {
+                    let alreadyHooked = $(`#${baseNavId} .dropdown-submenu`).data('hooked');
+                    if (!alreadyHooked) {
+                      $(`#${baseNavId} .dropdown-submenu`).on('mouseenter', function (e) {
+                        $(this).children('.dropdown-menu').addClass('show');
+                      }).on('mouseleave', function (e) {
+                        $(this).children('.dropdown-menu').removeClass('show');
+                      });
+                      $(`#${baseNavId} .dropdown-submenu`).data('hooked', true);
+                    }
+                    
+                  }
+                  else {
+                    let alreayHooked = $(`#${baseNavId} .dropdown-menu a.dropdown-toggle`).data('hooked');
+                    if (!alreayHooked) {
+                      $(`#${baseNavId} .dropdown-menu a.dropdown-toggle`).on('click', function(e) {
+                        if (!$(this).next().hasClass('show')) {
+                          $(this).parents('.dropdown-menu').first().find('.show').removeClass('show');
+                        }
+                        var $subMenu = $(this).next('.dropdown-menu');
+                        $subMenu.toggleClass('show');
+
+                        $(this).parents('li.nav-item.dropdown.show').on('hidden.bs.dropdown', function(e) {
+                          $('.dropdown-submenu .show').removeClass('show');
+                        });
+
+                        if ($subMenu.length) {
+                          return false;
+                        }
+                        else {
+                          $('.dropdown-menu').removeClass('show');
+                        }
+                      });
+                      $(`#${baseNavId} .dropdown-menu a.dropdown-toggle`).data('hooked', true);
+                    }
+                    
+                    let alreadyHookedBs = $(`#${baseNavId} .dropdown.nav-item`).data('hooked');
+                    if (!alreadyHookedBs) {
+                      $(`#${baseNavId} .dropdown.nav-item`).on('hidden.bs.dropdown', function (e) {
+                        $('.dropdown-submenu .show').removeClass("show");
+                        $('.dropdown-menu .show').removeClass('show');
+                      });
+                      $(`#${baseNavId} .dropdown.nav-item`).data('hooked', true);
+                    }
+                    
+                  }
+
+                }
+                else {
+                  let menuWihtoutNavBar_id = $(element).find('ul:first').attr('id')
+                  let alreadyHooked = $(`#${menuWihtoutNavBar_id} .dropdown-submenu`).data('hooked');
+                  if (!alreadyHooked) {
+                    $(`#${menuWihtoutNavBar_id} .dropdown-submenu`).on('mouseenter', function (e) {
+                      $(this).children('.dropdown-menu').addClass('show');
+                    }).on('mouseleave', function (e) {
+                      $(this).children('.dropdown-menu').removeClass('show');
+                    });
+                    $(`#${menuWihtoutNavBar_id} .dropdown-submenu`).data('hooked', true);
+                  }
+                }
+
               });
             });
           }
@@ -7258,6 +7478,33 @@ function cronReportViewer($compile) {
 
       executeReport(attrs.options);
 
+      // Não inicia em em Tab não ativa
+      // Verifica se esta dentro de um tab
+      let elementTab = element[0].parentElement;
+      while (elementTab) {
+        if (elementTab.tagName === "BODY") {
+          elementTab = null;
+        } else if (elementTab.classList.contains("tab-pane")) {
+          break;
+        } else {
+          elementTab = elementTab.parentElement;
+        }
+      }
+      // Se estiver dentro de um tab e esta não estiver ativa, inclui observador para ler o relatorio ao ativar a tab
+      if (elementTab && !elementTab.classList.contains("active")) {
+        let observerClassChange = new MutationObserver(function(mutationsList, observer) {
+          for (let mutation of mutationsList) {
+            if (mutation.attributeName === "class" && mutation.target.classList.contains("active")) {
+              executeReport(attrs.options);
+              // Desconecta observador, pois só precisa ser executado uma vez.
+              observer.disconnect();
+              break;
+            }
+          }
+        });
+        observerClassChange.observe(elementTab, { attributes: true });
+      }
+
       var filterTimeout = null;
       scope.$watch(function(){ return attrs.options }, function(value, old){
         if (value !== old) {
@@ -7276,4 +7523,5 @@ function cronReportViewer($compile) {
 
     }
   };
-}
+}
+

package/js/reports/reports.service.js

@@ -14,7 +14,7 @@
     // data
     this.getReport = function(reportName) {
       var req = {
-        url : 'api/rest/report',
+        url : window.hostApp + 'api/rest/report',
         method : 'POST',
         data : angular.toJson({
           'reportName' : reportName
@@ -26,7 +26,7 @@
     // bytes[]
     this.getPDF = function(report) {
       var req = {
-        url : 'api/rest/report/pdf',
+        url : window.hostApp + 'api/rest/report/pdf',
         method : 'POST',
         responseType : 'arraybuffer',
         data : angular.toJson(report)
@@ -37,7 +37,7 @@
     // file
     this.getPDFAsFile = function(report) {
       var req = {
-        url : 'api/rest/report/pdfasfile',
+        url : window.hostApp + 'api/rest/report/pdfasfile',
         method : 'POST',
         data : angular.toJson(report)
       };
@@ -46,7 +46,7 @@
 
     this.getContentAsString = function(report) {
       var req = {
-        url : 'api/rest/report/contentasstring',
+        url : window.hostApp + 'api/rest/report/contentasstring',
         method : 'POST',
         data : angular.toJson(report)
       };
@@ -55,7 +55,7 @@
 
     this.getDataSourcesParams = function(datasourcesInBand) {
       var req = {
-        url : 'api/rest/report/getdatasourcesparams',
+        url : window.hostApp + 'api/rest/report/getdatasourcesparams',
         method : 'POST',
         data : angular.toJson(datasourcesInBand)
       };

package/js/upload.service.js

@@ -80,14 +80,17 @@
               console.log(files[i].$valid);
             }
             var _u = JSON.parse(localStorage.getItem('_u'));
+            let headerValues = window.isUsingCookie() ? {
+              'Content-Type' : undefined
+            } : {
+              'Content-Type' : undefined,
+              'X-AUTH-TOKEN' : (_u ?_u.token : '')
+            };
             this.$promise = $http({
               method: 'POST',
               url: (window.hostApp || "") + uploadUrl,
               data: formData,
-              headers:  {
-                'Content-Type': undefined,
-                'X-AUTH-TOKEN': (_u ?_u.token : '')
-              },
+              headers: headerValues,
               onProgress: function(event) {
                 this.safeApply(function() {
                   if (event.lengthComputable) {

package/package.json

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

package/postupdate.json

@@ -20,6 +20,12 @@
       "type": "script",
       "onTop": true
     },
+    {
+      "file": "index.html",
+      "script": "js/hostApp.js",
+      "type": "script",
+      "onTop": true
+    },
     {
       "file": "index.html",
       "script": "js/customStateProvider.js",