@wavemaker/app-runtime-wm-build 11.3.4-rc.5290 → 11.3.4-rc.5297

app-runtime-wm-build/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wavemaker/app-runtime-wm-build",
-    "version": "11.3.4-rc.5290",
+    "version": "11.3.4-rc.5297",
     "description": "All modules required for a wavemaker application.",
     "main": "index.js",
     "scripts": {

app-runtime-wm-build/wmapp/scripts/wm-loader.js

@@ -12389,7 +12389,8 @@
         mindate: "mindate",
         maxdate: "maxdate",
         excludedates: "excludedates",
-        excludedays: "excludedays"
+        excludedays: "excludedays",
+        invalidNumber: "invalidNumber"
     };
     var BaseFieldValidations = function() {
         function BaseFieldValidations(instance, formwidget, widgettype, widgetControl, widgetContext, tableFieldType) {
@@ -32130,7 +32131,8 @@
             }
         }
         if (_.isString(propertyValueMap.customcolors) && propertyValueMap.customcolors) {
-            colors = _.split(propertyValueMap.customcolors, ",");
+            var tempColors = propertyValueMap.customcolors.replace(/'/g, '"');
+            colors = JSON.parse(tempColors);
         }
         if (_.isArray(propertyValueMap.customcolors)) {
             colors = propertyValueMap.customcolors;
@@ -32280,7 +32282,7 @@
             var value = _.get(dataObj, xKey);
             if (isLineTypeChart(this.type) && !core.isNumberType(this.xAxisDataType)) {
                 this.xDataKeyArr.push(value);
-                return index;
+                return value;
             }
             return value;
         };
@@ -45676,6 +45678,7 @@
             _this.rowDef = {};
             _this.rowInstance = {};
             _this.fullFieldDefs = [];
+            _this.variableInflight = true;
             _this.applyProps = new Map;
             _this.redraw = _.debounce(_this._redraw, 150);
             _this.debouncedHandleLoading = _.debounce(_this.handleLoading, 350);
@@ -46399,6 +46402,9 @@
             set: function(newValue) {
                 var _a;
                 this.isDataLoading = false;
+                if (this.variableInflight && _.isEmpty(newValue)) {
+                    return;
+                }
                 this.variableInflight = false;
                 if (this.gridOptions.isNavTypeScrollOrOndemand()) {
                     _a = __read(this.paginationService.updateFieldsOnPagination(this, newValue), 2), 
@@ -46848,6 +46854,9 @@
         };
         TableComponent.prototype.setGridData = function(serverData) {
             var data = this.filternullrecords ? this.removeEmptyRecords(serverData) : serverData;
+            if (_.get(this.datasource, "category") === "wm.Variable") {
+                this.variableInflight = false;
+            }
             if (!this.variableInflight) {
                 if (data && data.length === 0) {
                     this.callDataGridMethod("setStatus", "nodata", this.nodatamessage);