@wavemaker/app-ng-runtime 11.7.1-next.NULL → 11.7.1-rc.162

app-ng-runtime/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wavemaker/app-ng-runtime",
-    "version": "11.7.1-next.NULL",
+    "version": "11.7.1-rc.162",
     "description": "All modules required for a wavemaker application.",
     "main": "index.js",
     "scripts": {

app-ng-runtime/scripts/datatable/datatable.js

@@ -19,6 +19,7 @@ $.widget('wm.datatable', {
         isMobile: false,
         enableSort: true,
         filtermode: '',
+        filteronkeypress: false,
         activeRow: undefined,
         height: '100%',
         showHeader: true,
@@ -964,6 +965,7 @@ $.widget('wm.datatable', {
             gridElement: null,
             gridHeader: null,
             gridBody: null,
+            columnClickInfo: {},
             gridFooter: null,
             gridSearch: null,
             tableId: null,
@@ -1662,6 +1664,9 @@ $.widget('wm.datatable', {
     // triggered on capture phase of click listener.
     // sets the selected rowdata on click.
     rowClickHandlerOnCapture: function (e, $row, options) {
+        if(this.getColInfo(e) && (e.target.type != 'checkbox')) {
+            return;
+        }
         $row = $row || $(e.target).closest('tr.app-datagrid-row');
         var gridRow = this.gridElement.find($row);
         // WMS-21139 trigger selectedItems change when the captured click is on the current table but not on child table
@@ -1675,6 +1680,9 @@ $.widget('wm.datatable', {
 
     /* Handles row selection. */
     rowSelectionHandler: function (e, $row, options) {
+        if(this.getColInfo(e) && (e.target.type != 'checkbox')) {
+            return;
+        }
         options = options || {};
         var rowId,
             rowData,
@@ -2684,18 +2692,44 @@ $.widget('wm.datatable', {
         }
         return false;
     },
+    getColInfo: function(event) {
+        var row =  $(event.target).closest('tr.app-datagrid-row');
+        var rowId = row.attr('data-row-id');
+        var column = $(event.target).closest('td.app-datagrid-cell');
+        var colId = column.attr('data-col-id');
+        if(this.columnClickInfo && this.columnClickInfo[rowId] && this.columnClickInfo[rowId][colId]) {
+            return this.columnClickInfo[rowId][colId];
+        }
+        return false;
+    },
     /* Attaches all event handlers for the table. */
     attachEventHandlers: function ($htm) {
         var $header = this.gridHeaderElement,
             self = this;
 
         if (this.options.enableRowSelection) {
-            $htm[0].removeEventListener('click', this.rowClickHandlerOnCapture.bind(this), true);
+            $htm[0].removeEventListener('click', this.rowClickHandlerOnCapture.bind(this));
             $htm.off();
+            $htm[0].addEventListener('click', this.rowClickHandlerOnCapture.bind(this));
             // add js click handler for capture phase in order to first listen on grid and
             // assign selectedItems so that any child actions can have access to the selectedItems.
-            $htm[0].addEventListener('click', this.rowClickHandlerOnCapture.bind(this), true);
             $htm.on('click', this.rowSelectionHandler.bind(this));
+            $htm.on("click", "td *", function(event) {
+
+                // Prevent propagation to parent elements
+                if(event.target.type != 'checkbox'){
+                    var row =  $(event.target).closest('tr.app-datagrid-row');
+                    var rowId = row.attr('data-row-id');
+                    var column = $(event.target).closest('td.app-datagrid-cell');
+                    var colId = column.attr('data-col-id');
+                    var id = Number(colId);
+                    var colDefination = self.preparedHeaderData[id];
+                    if(colDefination.readonly) {
+                        self.columnClickInfo[rowId] = {};
+                        self.columnClickInfo[rowId][colId] = true;
+                    }
+                }
+            });
             $htm.on('dblclick', this.rowDblClickHandler.bind(this));
             $htm.on('keydown', this.onKeyDown.bind(this));
         }
@@ -2924,7 +2958,7 @@ $.widget('wm.datatable', {
             }
 
             /* Search only when enter key is pressed. */
-            if (e.which === 13) {
+            if (e.which === 13 || self.options.filteronkeypress) {
                 search(e);
             }
         });