@wavemaker/app-runtime-wm-build 11.4.0-next.1417031 → 11.4.0-next.1417033

app-runtime-wm-build/wmmobile/scripts/wm-libs.js

@@ -189956,12 +189956,11 @@ $.widget("wm.datatable", {
         }
     },
     _getGridTemplate: function() {
-        var self = this, preparedData, $tbody, tbodyExists, pageStartIndex = self.getPageStartIndex(), startRowIndex = self.options.startRowIndex, isScrollorOnDemand = self.options.isNavTypeScrollOrOndemand();
+        var self = this, preparedData, $tbody, pageStartIndex = self.getPageStartIndex(), startRowIndex = self.options.startRowIndex, isScrollorOnDemand = self.options.isNavTypeScrollOrOndemand();
         if (isScrollorOnDemand) {
             $tbody = this.gridElement;
         } else {
-            tbodyExists = this.gridElement.find("tbody").length;
-            $tbody = tbodyExists > 0 ? this.gridElement.find("tbody:first") : this.gridElement.empty();
+            $tbody = this.gridElement.empty();
         }
         if (isScrollorOnDemand) {
             this._handleCRUDForInfiniteScroll($tbody);
@@ -190679,6 +190678,9 @@ $.widget("wm.datatable", {
             break;
 
           case "data":
+            if (!this.isResetSortIconsDone) {
+                this.setSortIconDefault();
+            }
             this.refreshGridData();
             break;
 
@@ -191437,6 +191439,7 @@ $.widget("wm.datatable", {
         }));
     },
     resetSortIcons: function($el) {
+        this.isResetSortIconsDone = true;
         var $sortContainer;
         if (!$el && this.gridHeaderElement) {
             $sortContainer = this.gridHeaderElement.find(".sort-buttons-container.active");
@@ -191445,12 +191448,22 @@ $.widget("wm.datatable", {
         }
         $el.removeClass("desc asc").removeClass(this.options.cssClassNames.descIcon).removeClass(this.options.cssClassNames.ascIcon);
     },
+    setSortIconDefault: function() {
+        const sortInfo = this.options.sortInfo, $e = this.tableContainer, $th = $e.find("[data-col-field='" + sortInfo.field + "']"), $sortContainer = $th.find(".sort-buttons-container"), $sortIcon = $sortContainer.find("i.sort-icon"), direction = sortInfo.direction;
+        if (direction === "asc") {
+            $sortIcon.addClass(direction + " " + this.options.cssClassNames.ascIcon);
+            $sortContainer.addClass("active");
+        } else if (direction === "desc") {
+            $sortIcon.addClass(direction + " " + this.options.cssClassNames.descIcon);
+            $sortContainer.addClass("active");
+        }
+    },
     sortHandler: function(e) {
         e.stopImmediatePropagation();
         if ($(e.target).hasClass("header-data") && this.options.enableColumnSelection) {
             this.headerClickHandler(e);
         }
-        var $e = $(e.target), $th = $e.closest("th.app-datagrid-header-cell"), id = $th.attr("data-col-id"), $sortContainer = $th.find(".sort-buttons-container"), $sortIcon = $sortContainer.find("i.sort-icon"), direction = $sortIcon.hasClass("asc") ? "desc" : $sortIcon.hasClass("desc") ? "" : "asc", sortInfo = this.options.sortInfo, $previousSortMarker = this.gridHeaderElement.find(".sort-buttons-container.active"), field = $th.attr("data-col-field"), $previousSortedColumn, $previousSortIcon, colId, colDef;
+        var $e = $(e.target), $th = $e.closest("th.app-datagrid-header-cell"), id = $th.attr("data-col-id"), $sortContainer = $th.find(".sort-buttons-container"), $sortIcon = $sortContainer.find("i.sort-icon"), direction = $sortIcon.hasClass("asc") ? "desc" : "asc", sortInfo = this.options.sortInfo, $previousSortMarker = this.gridHeaderElement.find(".sort-buttons-container.active"), field = $th.attr("data-col-field"), $previousSortedColumn, $previousSortIcon, colId, colDef;
         this.resetSortIcons($sortIcon);
         $sortIcon.addClass(direction);
         if (direction === "asc") {
@@ -191921,6 +191934,9 @@ $.widget("wm.datatable", {
                 }
             });
         }
+        if (!this.isResetSortIconsDone) {
+            this.setSortIconDefault();
+        }
     },
     addOrRemoveScroll: function() {
         var gridContent = this.gridContainer.find("tbody"), gridHeader = this.gridContainer.find(".table-header");