@wavemaker/app-ng-runtime 11.6.0-next.141926 → 11.6.0-next.141929

app-ng-runtime/components/data/table/bundles/index.umd.js

@@ -385,6 +385,7 @@
             this.items = [];
             this.rowActions = [];
             this.shownavigation = false;
+            this.showFirstRow = false;
             this.documentClickBind = noop;
             this.prevFilterExpression = [];
             this.fieldDefs = [];
@@ -551,7 +552,7 @@
                     });
                 },
                 // assigns the items on capture phase of the click handler.
-                assignSelectedItems: (row, e, isRowSelected) => {
+                assignSelectedItems: (row, e, rowInfo) => {
                     this.ngZone.run(() => {
                         /*
                          * in case of single select, update the items with out changing the reference.
@@ -559,8 +560,11 @@
                          */
                         if (this.multiselect) {
                             //Fix for [WMS-25110]: Add row to items list only if the row is selected
-                            if (_.findIndex(this.items, row) === -1 && (isRowSelected === undefined || isRowSelected == true)) {
+                            if (_.findIndex(this.items, row) === -1 && ((rowInfo === null || rowInfo === void 0 ? void 0 : rowInfo._selected) === undefined || (rowInfo === null || rowInfo === void 0 ? void 0 : rowInfo._selected) == true || (this.gridfirstrowselect && (rowInfo === null || rowInfo === void 0 ? void 0 : rowInfo.rowId) == 0 && !this.showFirstRow))) {
                                 this.items.push(row);
+                                if ((rowInfo === null || rowInfo === void 0 ? void 0 : rowInfo.rowId) == 0) {
+                                    this.showFirstRow = true;
+                                }
                             }
                         }
                         else {
@@ -1814,7 +1818,8 @@
                         }
                     }
                     // for Static Variables with Retain State enabled, prevent Table from rendering more than once
-                    if (!(_.get(this.datasource, 'category') === 'wm.Variable' && this._pageLoad && this.getConfiguredState() !== 'none')) {
+                    // Fix for [WMS-25284]: Render table that is inside list widget and bound to static Variable
+                    if (!(_.get(this.datasource, 'category') === 'wm.Variable' && this._pageLoad && this.getConfiguredState() !== 'none') || (this.parentList && _.startsWith(this.binddataset, 'item'))) {
                         this.watchVariableDataSet(nv);
                     }
                     break;