@refinitiv-ui/efx-grid 6.0.21 → 6.0.23

package/lib/rt-grid/dist/rt-grid.js

@@ -13094,6 +13094,10 @@ var RowDefinition = function(rowOptions) {
 * @private
 */
 RowDefinition._runningId = 0;
+/** @type {string}
+* @private
+*/
+RowDefinition._childDataField = "CHILD_VALUES";
 //#region Private Members
 /** @type {string}
 * @private
@@ -13284,7 +13288,11 @@ RowDefinition.prototype._initializeAsConstituent = function(rowOptions) {
 			}
 		}
 	}
-	// TODO: Allow constituent to have predefined static values
+	var val = rowOptions["values"];
+	// eslint-disable-next-line no-undefined
+	if(val !== undefined) {
+		this.setStaticRowData(val, rowOptions["fields"]);
+	}
 };
 /** @public
 * @param {string} userInput
@@ -13356,11 +13364,6 @@ RowDefinition.prototype.getConfigObject = function(rowOptions) {
 		obj["ric"] = val;
 	}
 
-	val = this._staticValues;
-	if(val) {
-		obj["values"] = Object(Util["b" /* cloneObject */])(val);
-	}
-
 	val = this._chainRic;
 	if(val) {
 		obj["chainRic"] = val;
@@ -13392,6 +13395,40 @@ RowDefinition.prototype.getConfigObject = function(rowOptions) {
 		obj["hidden"] = val;
 	}
 
+	val = this._getStaticRowData();
+	if(val) {
+		obj["values"] = val;
+	}
+
+	// obtain the static values of constituent rows
+	if(this.isChain()) {
+		var children = this.getChildren();
+		if(children) {
+			var childValues = val ? val[RowDefinition._childDataField] : {};
+			if(!childValues) {
+				childValues = {};
+			}
+			var dirty = false;
+			var len = children.length;
+			var i, rowDef, staticValues;
+			for(i = 0; i < len; i++) {
+				rowDef = children[i];
+				staticValues = rowDef._getStaticRowData();
+				if(staticValues) {
+					dirty = true;
+					childValues[rowDef.getRic()] = staticValues;
+				}
+			}
+
+			if(dirty) {
+				if(!obj["values"]) {
+					obj["values"] = {};
+				}
+				obj["values"][RowDefinition._childDataField] = childValues;
+			}
+		}
+	}
+
 	return obj;
 };
 /** Since an index chain (e.g. .FTSE) can automatically produce rows for its constituent, we need to separate rowId and dataId, so that the constituents still use the same data Id as that of its parent.
@@ -13466,6 +13503,12 @@ RowDefinition.prototype.setStaticRowData = function(data, opt_fields) {
 	}
 };
 /** @public
+* @return {Object.<string, *>}
+*/
+RowDefinition.prototype._getStaticRowData = function() {
+	return this._staticValues ? Object(Util["b" /* cloneObject */])(this._staticValues) : null;
+};
+/** @public
 * @param {Object.<string, *>|Array} data
 * @param {Array.<string>=} opt_fields In case of the given data is an array, this param will be used for mapping index to field
 */
@@ -13766,6 +13809,22 @@ RowDefinition.deregisterFromView = function(rowIds, rowDef) {
 	rowDef._deregisterFromView(rowIds);
 	return rowIds;
 };
+/** @private
+* @param {string} ric
+* @return {Object}
+*/
+RowDefinition.prototype._getChildStaticRowData = function(ric) {
+	if(!this._staticValues) {
+		return null;
+	}
+
+	var childValues = this._staticValues[RowDefinition._childDataField];
+	if(!childValues) {
+		return null;
+	}
+
+	return childValues[ric] || null;
+};
 /** @public
 * @ignore
 * @param {string} ric
@@ -13793,12 +13852,19 @@ RowDefinition.prototype.addConstituent = function(ric) {
 
 	var newChild = !childDef;
 	if(newChild) {
-		childDef = new RowDefinition({
+		var rowOptions = {
 			"asConstituent": true,
 			"dataId": this._subId + ric,
 			"ric": ric,
 			"parent": this
-		});
+		};
+
+		var staticData = this._getChildStaticRowData(ric);
+		if(staticData) {
+			rowOptions["values"] = staticData;
+		}
+
+		childDef = new RowDefinition(rowOptions);
 	}
 
 	if(this._view) {
@@ -14120,7 +14186,7 @@ var FieldDefinition = {};
 FieldDefinition._defs = {
 	"X_RIC_NAME": {
 		name: "RIC",
-		notRealTimeField: true,
+		IsRealtimeField: false,
 		width: 100,
 		binding: xRicNameRenderer,
 		sortLogic: xRicNameSorter
@@ -14258,7 +14324,13 @@ FieldDefinition._loadingField = {};
 * @param {Object} def
 */
 FieldDefinition.set = function(field, def) {
-	FieldDefinition._defs[field] = def || null;
+	if (!FieldDefinition._defs[field]) {
+		FieldDefinition._defs[field] = def;
+	} else {
+		for (var key in def) {
+			FieldDefinition._defs[field][key] = def[key];
+		}
+	}
 };
 /** @public
 * @function
@@ -14315,11 +14387,64 @@ FieldDefinition.setFieldCaching = function (caching) {
 	FieldDefinition._caching = caching;
 };
 
+/** @public
+* @param {string} field
+* @return {boolean}
+*/
+FieldDefinition.isFormula = function(field) {
+	return field.charAt(0) === "=";
+};
+/** @public
+* @param {string} field
+* @return {boolean}
+*/
+FieldDefinition.isAdc = function(field) {
+	return field.indexOf("TR.") === 0;
+};
+
+/** @public
+* @param {string} field
+* @return {boolean}
+*/
+FieldDefinition.isRealTimeField = function(field) {
+	if (!field) {
+		return false;
+	}
+
+	if(FieldDefinition.isAdc(field)) {
+		return false;
+	}
+
+	if(FieldDefinition.isFormula(field)) {
+		return false;
+	}
+
+	if(FieldDefinition.getFieldProperty(field, "timeSeriesChild")) {
+		return false;
+	}
+
+	if(FieldDefinition.isTimeSeries(field)) {
+		return false;
+	}
+
+	return FieldDefinition.getFieldProperty(field, "IsRealtimeField") !== false;
+};
+
 /** @public
 * @param {string} field
 * @return {boolean}=true if field is time series field
 */
-FieldDefinition.isTimeSeriesField = function (field) {
+FieldDefinition.isTimeSeries = function (field) {
+	if (!field) {
+		return false;
+	}
+
+	// We can check time series using a cache to avoid duplicating checks in regular expressions.
+	var timeSeriesField = FieldDefinition.getFieldProperty(field, "timeSeries");
+	if (timeSeriesField != null) {
+		return timeSeriesField;
+	}
+
 	/*
 		^TR.                    => start with TR.
 		[\w]+                   => any field with string and value
@@ -14328,9 +14453,39 @@ FieldDefinition.isTimeSeriesField = function (field) {
 		EDATE\=+                => EDATE in bucket
 		[\w\-\=\,]+             => another propertie param
 		[\)]$                   => end with only )
+		i						=> for match both upper and lower cases
 	*/
+	var timeSeriesRegex = /^TR.[\w]+[\(][\w\-\=\,]*EDATE\=+[\w\-\=\,]+[\)]$/i;
+	return timeSeriesRegex.test(field);
+};
+
+/**
+ * Set property value into field definition
+ * @private
+ * @param {string} field field definition
+ * @param {string} propertyName
+ * @param {*} value
+ */
+FieldDefinition.setFieldProperty = function(field, propertyName, value) {
+	if(!FieldDefinition._defs[field]) {
+		FieldDefinition._defs[field] = {};
+	}
+	FieldDefinition._defs[field][propertyName] = value;
+};
 
-	return !!field.toUpperCase().match(/^TR.[\w]+[\(][\w\-\=\,]*EDATE\=+[\w\-\=\,]+[\)]$/g);
+/**
+ * Set property value into field definition
+ * @private
+ * @param {string} field field definition
+ * @param {string} propertyName
+ * @return {*}
+ */
+FieldDefinition.getFieldProperty = function(field, propertyName) {
+	var fieldDef = FieldDefinition._defs[field];
+	if(fieldDef) {
+		return fieldDef[propertyName];
+	}
+	return null;
 };
 
 /** to get more info about field via synapse service
@@ -14781,10 +14936,6 @@ ColumnDefinition.prototype._eventArg;
 /** @type {boolean}
 * @private
 */
-ColumnDefinition.prototype._realTimeField = false;
-/** @type {boolean}
-* @private
-*/
 ColumnDefinition.prototype._autoGenerated = false;
 
 /** @type {!Array.<string>}
@@ -14831,10 +14982,6 @@ ColumnDefinition.prototype._parent = null;
 * @private
 */
 ColumnDefinition.prototype._children = null;
-/** @type {boolean}
-* @private
-*/
-ColumnDefinition.prototype._timeSeriesField = false;
 /** @type {Object}
 * @private
 */
@@ -14921,7 +15068,7 @@ ColumnDefinition.prototype.initialize = function(columnOption) {
 		}
 	}
 
-	this._setField(field, columnOption["formula"]); // Perform some field manipulation
+	this._setField(field, columnOption); // Perform some field manipulation
 
 	val = columnOption["name"] || columnOption["title"]; // title is migrated from Composite Grid
 	if(val != null) { // Name can be empty string
@@ -14936,7 +15083,7 @@ ColumnDefinition.prototype.initialize = function(columnOption) {
 
 	val = columnOption["notRealTimeField"];
 	if(val != null) {
-		this._realTimeField = !val;
+		js_FieldDefinition.setFieldProperty(field, "IsRealtimeField", !val);
 	}
 
 	val = columnOption["tooltip"];
@@ -15153,17 +15300,13 @@ ColumnDefinition.prototype.getAllFields = function() {
 * @return {boolean}
 */
 ColumnDefinition.prototype.isRealTimeField = function() {
-	// TODO: Simplify this logic
-	if(this._field && this._realTimeField && !this._formula) {
-		return ColumnDefinition.isRealTimeField(this._field);
-	}
-	return false;
+	return js_FieldDefinition.isRealTimeField(this._field);
 };
 /** @public
 * @return {boolean}
 */
-ColumnDefinition.prototype.isTimeSeriesField = function() {
-	return this._timeSeriesField;
+ColumnDefinition.prototype.isTimeSeries = function() {
+	return js_FieldDefinition.isTimeSeries(this._field);
 };
 /** @public
 * @return {boolean}
@@ -15176,27 +15319,21 @@ ColumnDefinition.prototype.isFormulaField = function() {
 * @return {boolean}
 */
 ColumnDefinition.isFormulaField = function(field) {
-	return field.charAt(0) === "=";
+	return js_FieldDefinition.isFormula(field);
 };
 /** @public
 * @param {string} field
 * @return {boolean}
 */
 ColumnDefinition.isAdcField = function(field) {
-	return field.indexOf("TR.") === 0;
+	return js_FieldDefinition.isAdc(field);
 };
 /** @public
 * @param {string} field
 * @return {boolean}
 */
 ColumnDefinition.isRealTimeField = function(field) {
-	if(field) {
-		if(!ColumnDefinition.isFormulaField(field)) {
-			return !ColumnDefinition.isAdcField(field);
-		}
-	}
-
-	return false;
+	return js_FieldDefinition.isRealTimeField(field);
 };
 /** @public
 * @function
@@ -15321,8 +15458,10 @@ ColumnDefinition.prototype.getConfigObject = function(colOptions) {
 		obj["name"] = this._name;
 	}
 
-	if(!this._realTimeField) {
-		obj["notRealTimeField"] = true;
+	// The 'IsRealtimeField' property will only be set if the user sets 'notRealTimeField' in the column options. It will be returned if the user has this option enabled, otherwise it will not be returned
+	value = js_FieldDefinition.getFieldProperty(this._field, "IsRealtimeField") === false;
+	if(value) {
+		obj["notRealTimeField"] = value;
 	}
 
 	if(this._tooltip != null) {
@@ -15543,7 +15682,7 @@ ColumnDefinition.prototype.setSorter = function(func) {
 */
 ColumnDefinition.prototype.isRowSorting = function() {
 	if(this._rowSorting == null) {
-		return !this._realTimeField;
+		return !js_FieldDefinition.getFieldProperty(this._field, "IsRealtimeField");
 	}
 	return this._rowSorting ? true : false;
 };
@@ -15566,9 +15705,9 @@ ColumnDefinition.prototype.setName = function(str) {
 
 /** @private
 * @param {string|null=} field
-* @param {string} formulaStr
+* @param {ColumnDefinition~Options=} columnOption
 */
-ColumnDefinition.prototype._setField = function(field, formulaStr) {
+ColumnDefinition.prototype._setField = function(field, columnOption) {
 	var defaultField = (field == null); // undefined or null
 	if(!field) {
 		field = "";
@@ -15576,6 +15715,7 @@ ColumnDefinition.prototype._setField = function(field, formulaStr) {
 	// Trim white spaces -- equivalent to String.trim(), which is not support in IE8
 	field = field.replace(/^\s+|\s+$/gm, "");
 
+	var formulaStr = columnOption["formula"];
 	if(this._fnEngine) {
 		var uppercasedF = field.toUpperCase(); // For comparison only
 		var predefinedF = formulaStr || js_PredefinedFormula.get(uppercasedF);
@@ -15603,13 +15743,13 @@ ColumnDefinition.prototype._setField = function(field, formulaStr) {
 		this._field = field;
 		this._name = field;
 		this._emptyField = false;
-		this._realTimeField = field ? true : false;
 	}
 
-	if(js_FieldDefinition.isTimeSeriesField(field)) {
-		// children will be clone the config from parent too
-		this._realTimeField = false;
-		this._timeSeriesField = true;
+	// We need to cache time series in field definition for improve performance of checking methond
+	js_FieldDefinition.setFieldProperty(field, "timeSeries", js_FieldDefinition.isTimeSeries(field) ? true : false);
+
+	if(columnOption["parent"]) {
+		js_FieldDefinition.setFieldProperty(field, "timeSeriesChild", true);
 	}
 
 	this._isDefaultName = true;
@@ -15918,7 +16058,7 @@ SnapshotFiller.prototype._onRequest = function () {
 	var fields = [];
 	var timeSeriesFields = [];
 	for (var field in this._fields) {
-		if(!FieldDefinition.isTimeSeriesField(field)) {
+		if(!FieldDefinition.isTimeSeries(field)) {
 			fields.push(field);
 		} else {
 			timeSeriesFields.push(field);
@@ -20516,6 +20656,33 @@ CellSpans.prototype.removeColumn = function (at) { // Use when a column is remov
 	}
 	return dirty;
 };
+/** @public
+* @param {boolean=} bool
+*/
+CellSpans.prototype.freezeMapping = function (bool) {
+	this._frozenMapping = bool !== false;
+	if(!this._frozenMapping) {
+		this._mapCellSpans();
+	}
+};
+
+
+/** @private
+*/
+CellSpans.prototype._mapCellSpans = function () {
+	var cellSpans = this._spans;
+	this._spans = [];
+	this._occupiedMap = {};
+	var i, cellSpan;
+	for(i = cellSpans.length; --i >= 0;) {
+		cellSpan = cellSpans[i];
+		if(cellSpan.indexX >= 0) {
+			cellSpan.register(this._spans, this._occupiedMap);
+		}
+	}
+};
+
+
 /** @public
 * @param {number} from
 * @param {number} amount This can be negative number
@@ -20532,18 +20699,10 @@ CellSpans.prototype.shiftColumn = function (from, amount) { // Use when a column
 			cellSpan.indexX += amount;
 		}
 	}
-	if(!dirty) { return false; }
+	if(!dirty || this._frozenMapping) { return false; }
 
 	// Re-registers all cellspans. Some of the cellspans may be lost due to shifting
-	var cellSpans = this._spans;
-	this._spans = [];
-	this._occupiedMap = {};
-	for(i = cellSpans.length; --i >= 0;) {
-		cellSpan = cellSpans[i];
-		if(cellSpan.indexX >= 0) {
-			cellSpan.register(this._spans, this._occupiedMap);
-		}
-	}
+	this._mapCellSpans();
 	return true;
 };
 /** @public
@@ -20832,6 +20991,12 @@ CellSpans.prototype._spans;
 */
 CellSpans.prototype._occupiedMap;
 
+/**
+* @private
+* @type {boolean}
+*/
+CellSpans.prototype._frozenMapping = false;
+
 /* harmony default export */ var components_CellSpans = (CellSpans);
 
 
@@ -24585,6 +24750,7 @@ LayoutGrid.prototype.setFrozenLayout = function (bool) {
 	if (this._frozenLayout !== bool) {
 		this._frozenLayout = bool;
 
+		this._cellSpans.freezeMapping(this._frozenLayout);
 		if (!this._frozenLayout) {
 			this._syncLayoutToColumns(0);
 			this._syncLayoutToRows(0, this._rowCount);
@@ -29299,6 +29465,20 @@ DataView.prototype.isCollapsed = function() {
 DataView.prototype.enableContentAsHeader = function(bool) {
 	this._shared.contentAsHeader = bool !== false;
 };
+/** set default collapse when new groups added
+* @public
+* @param {boolean=} collapse=false, if enable it, it will be set collapsing by default
+*/
+DataView.prototype.setDefaultCollapse = function(collapse) {
+	this._shared.defaultCollapse = !!collapse;
+};
+/** get default collapse when new groups added
+* @public
+* @return {boolean}
+*/
+DataView.prototype.getDefaultCollapse = function() {
+	return !!this._shared.defaultCollapse; // it can be null, convert to boolean
+};
 /** @private
 * @return {?Array.<string>}
 */
@@ -31217,6 +31397,10 @@ DataView.prototype._addGroup = function (value) {
 		}
 	}
 	member = new DataView();
+	var collapsed = this._shared.defaultCollapse;
+	if(collapsed != null) {
+		member._collapsed = collapsed;
+	}
 	member._groupId = groupId;
 	if(typeof value == "string") { // TODO: Raw value should not always be a string
 		if(value == "null") {
@@ -34529,7 +34713,7 @@ Core.prototype._rowHeightTimerId = 0;
 * @return {string}
 */
 Core.getVersion = function () {
-	return "5.1.30";
+	return "5.1.32";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -36881,6 +37065,13 @@ Core.prototype.freezeLayout = function (opt_bool) {
 	if (prevState !== opt_bool) {
 		this._frozenLayout = opt_bool;
 
+		var stp = this.getPlugin("SortableTitlePlugin");
+		if(this._frozenLayout) {
+			if(stp) {
+				stp.freezeIndicator(true);
+			}
+		}
+
 		if (!this._frozenLayout) {
 			// Width has not yet changed so we need to disable it first
 			this._disableEvent("widthChanged");
@@ -36909,6 +37100,9 @@ Core.prototype.freezeLayout = function (opt_bool) {
 			if(!viewChanged) { // Always update virtualizer
 				this._rowVirtualizer.update(true); // Force section activation
 			}
+			if(stp) {
+				stp.freezeIndicator(false);
+			}
 		}
 		this._rowHeightSync = true;
 	}
@@ -39479,6 +39673,7 @@ ReferenceCounter.prototype.getSession = function() {
 		} else if(val < 0) {
 			removedEntries.push(key);
 		}
+		// else {} // when val 0 do nothing, doesn't change anything
 	}
 	return {
 		newEntries: newEntries.filter(Boolean),
@@ -39507,9 +39702,15 @@ ReferenceCounter.prototype.addReference = function(key, referer) {
 
 		if(this._counter[key]) {
 			++this._counter[key];
+			// The session will not change when a field already exists and a counter is attempted to be added
 		} else {
 			this._counter[key] = 1;
-			this._session[key] = 1;
+			if(this._session[key] === -1) {
+				this._session[key] = 0;
+			} else {
+				this._session[key] = 1;
+			}
+
 			return true;
 		}
 	}
@@ -39559,7 +39760,11 @@ ReferenceCounter.prototype.removeReference = function(key, referer, count) {
 	val -= count;
 	if(!val || val < 0) {
 		delete this._counter[key];
-		this._session[key] = -1;
+		if(this._session[key] === 1) {
+			this._session[key] = 0;
+		} else {
+			this._session[key] = -1;
+		}
 		return true;
 	}
 
@@ -40252,6 +40457,10 @@ SortableTitlePlugin.prototype._userManagedLogic = false;
 * @type {boolean}
 */
 SortableTitlePlugin.prototype._disabled = false;
+/** @private
+* @type {boolean}
+*/
+SortableTitlePlugin.prototype._frozenIndicator = false;
 /** Since DataView in real-time grid has only one ROW_DEF column, we need to re-map sorting field to sort correctly.
 * @private
 * @type {boolean}
@@ -40810,8 +41019,9 @@ SortableTitlePlugin.prototype.sortColumns = function (sortOptions, opt_arg) {
 * @param {Object=} opt_arg Event argument to be sent with preDataSorting event
 */
 SortableTitlePlugin.prototype.clearSortState = function (opt_arg) {
-	this._popSortState(0, opt_arg);
-	this.updateSortSymbols();
+	if(this._popSortState(0, opt_arg)) {
+		this.updateSortSymbols();
+	}
 };
 /** @description Perform sorting with the same parameter.
 * @public
@@ -41016,6 +41226,12 @@ SortableTitlePlugin.prototype.disableTwoStateSorting = function (disabled) {
 
 };
 /** @public
+* @param {boolean=} bool=true, if set to false it will be unfreeze indicator
+*/
+SortableTitlePlugin.prototype.freezeIndicator = function (bool) {
+	this._frozenIndicator = bool !== false;
+};
+/** @public
 * @param {boolean=} disabled
 */
 SortableTitlePlugin.prototype.disableSortSymbols = function (disabled) {
@@ -41628,7 +41844,7 @@ SortableTitlePlugin.prototype._clearSortSymbols = function (state) {
 SortableTitlePlugin.prototype._updateSortableIndicator = function (hostIndex) {
 	var t = this;
 	var host = t._hosts[hostIndex];
-	if (!host) { return; }
+	if (!host || this._frozenIndicator) { return; }
 
 	var section = host.getSection("title");
 	if (section == null) { return; }
@@ -41916,6 +42132,7 @@ SortableTitlePlugin._proto = SortableTitlePlugin.prototype;
 * @property {boolean=} formulaEngine=false If enabled, field with leading equal sign will be treated as a formula and rows will be filled with the calculated values.
 * @property {number=} adcPollingInterval=0 Length of polling interval for refreshing ADC data in milliseconds. The default value (0) means no polling.
 * @property {boolean=} fieldCaching=false If enabled, field definition will be caching internal mechanism
+* @property {string=} childDataField=CHILD_VALUES The given field will be used to store children's static data, such as row color assignment.
 */
 
 /** @typedef {number|string|RowDefinition} Grid~RowReference
@@ -42112,8 +42329,7 @@ var Grid = function(placeholder, config) {
 	t._recalculateFormulas = t._recalculateFormulas.bind(t);
 	t._updateStreamingData = t._updateStreamingData.bind(t);
 	t.updateColumnTitle = t.updateColumnTitle.bind(t);
-	t._insertTimeSeriesChildren = t._insertTimeSeriesChildren.bind(t);
-
+	t._populateTimeSeriesChildren = t._populateTimeSeriesChildren.bind(t);
 
 	t._onPostSectionDataBinding = t._onPostSectionDataBinding.bind(t);
 	t._asyncClearDataUpdates = t._asyncClearDataUpdates.bind(t);
@@ -42137,7 +42353,7 @@ var Grid = function(placeholder, config) {
 	t._formulaConflator = new Conflator(300, t._onFormulaDataChanged);
 	t._chainConflator = new Conflator(100, t._addMemberOfChain);
 	t._columnTitleConflator = new Conflator(0, t.updateColumnTitle);
-	t._timeSeriesChildConflator = new Conflator(0, t._insertTimeSeriesChildren);
+	t._timeSeriesChildConflator = new Conflator(0, t._populateTimeSeriesChildren);
 
 
 	t._defaultColumnOptions = {};
@@ -42378,6 +42594,10 @@ Grid.prototype._pollingEnabled = true;
 * @private
 */
 Grid.prototype._fieldCaching = false;
+/** @type {string}
+* @private
+*/
+Grid.prototype._childDataField = "";
 
 
 /** @public
@@ -42792,6 +43012,9 @@ Grid.prototype.initialize = function(gridOption) {
 	}
 
 	// Row operations
+	if(gridOption["childDataField"] != null) {
+		this._childDataField = RowDefinition._childDataField = gridOption["childDataField"];
+	}
 	var rows = gridOption["rows"];
 	if(!rows) {
 		rows = gridOption["rics"] || null; // Make "rics" an alias to "rows"
@@ -42947,6 +43170,10 @@ Grid.prototype.getConfigObject = function (gridOptions) {
 		obj["fieldCaching"] = this._fieldCaching;
 	}
 
+	if(this._childDataField) {
+		obj["childDataField"] = this._childDataField;
+	}
+
 	// get all rows config
 	var rowDefs = this.getAllRowDefinitions();
 	var rows = obj["rows"] = [];
@@ -43084,9 +43311,8 @@ Grid.prototype._onFieldAdded = function(e) {
 
 	// JET
 	if (this._subs) {
-		var colDefs = this.getColumnDefinitions();
-		var fields = colDefs.reduce(ColumnDefinition.getRealTimeFields, []);
-		this._subs["addFields"](fields);
+		var realtimeFields = addedFields.filter(js_FieldDefinition.isRealTimeField);
+		this._subs["addFields"](realtimeFields);
 	}
 
 	this._dispatch(e.type, e);
@@ -43097,6 +43323,7 @@ Grid.prototype._onFieldAdded = function(e) {
 Grid.prototype._onFieldRemoved = function(e) {
 	var removedFields = e.removedFields;
 
+	// TODO: ADC fields have an interval load. Currently, we only keep the field but do not delete it.
 	// JET
 	if(this._subs) {
 		this._subs["removeFields"](removedFields);
@@ -43193,7 +43420,7 @@ Grid.prototype._updateTimeSeriesFields = function (e) {
 /** @private
 * @param {ColumnDefinition} colDef
 */
-Grid.prototype._insertTimeSeriesChildren = function (colDef) {
+Grid.prototype._populateTimeSeriesChildren = function (colDef) {
 	if(this._timeSeriesChildConflator.conflate(colDef) ) {
 		return;
 	}
@@ -43243,7 +43470,7 @@ Grid.prototype._cloneTimeSeriesColumn = function (parentColDef, childField, idx)
 		}
 	}
 	columnOption = Object(Util["b" /* cloneObject */])(obj);
-	columnOption["field"] = childField.replace("TR.", "");
+	columnOption["field"] = childField.replace("TR.", ""); // We need to remove the 'TR' prefix from the field to avoid confusion with time series fields.
 	columnOption["name"] = childField.split("_")[1].split("T")[0]; // Currently, response server format utc date ex "2022-11-23T00:00:00"
 	columnOption["parent"] = parentColDef;
 	this.insertColumn(columnOption, idx++);
@@ -43350,15 +43577,12 @@ Grid.prototype._onFieldLoadedError = function (err) {
  * @param {string} referrer
  */
 Grid.prototype._onFieldLoaded = function (field, referrer) {
-	// async process, the field can be remove before column added
-	var colIndex = this.getColumnIndex(field);
-	if(colIndex > -1) {
-		var colDef = this._getColumnDefinition(field);
-		if(colDef.isTimeSeriesField()) {
-			this._insertTimeSeriesChildren(colDef);
-		}
-		this._connector.addFields(field, referrer);
+	// For time series, we need to wait until the field is loadedm, then we can insert a child from the field data.
+	if(js_FieldDefinition.isTimeSeries(field)) {
+		var colDef = this.getColumnDefinitionById(referrer); // The 'referrer' is a column ID that was just added
+		this._populateTimeSeriesChildren(colDef);
 	}
+	this._connector.addFields(field, referrer);
 };
 
 /**
@@ -43387,7 +43611,7 @@ Grid.prototype._shouldLoadFieldInfo = function (field, isRealTime) {
 	var fieldDef = js_FieldDefinition.get(field);
 	if (!fieldDef &&
 		field !== 'X_RIC_NAME' && // ignore X_RIC_NAME
-		(isRealTime || ColumnDefinition.isAdcField(field)) && // realtime field or adc field (Without static field)
+		(isRealTime || js_FieldDefinition.isAdc(field)) && // realtime field or adc field (Without static field)
 		(this._RTK || window["JET"]) // have rtk instance or window jet sub
 	) {
 		return true;
@@ -43491,14 +43715,13 @@ Grid.prototype._onColumnAdded = function(e) {
 		}
 	}
 	this._grid.setDataColumnName(idx, ROW_DEF); // This make ColumnDefinition renderer work
-
 	var fields = colDef.getAllFields();
 	var referrer = colDef.getId();
 	var len = fields.length;
 	var field, dataType, prom, isRealTimeField, onLoaded;
 	for(i = 0; i < len; i++) {
 		field = fields[i];
-		isRealTimeField = ColumnDefinition.isRealTimeField(field);
+		isRealTimeField = js_FieldDefinition.isRealTimeField(field);
 		if(this._shouldLoadFieldInfo(field, isRealTimeField)) {
 			if(field === colField) {
 				dataType = colDef.getDataType(); // Data-type from user's column options
@@ -43514,14 +43737,14 @@ Grid.prototype._onColumnAdded = function(e) {
 				onLoaded = this._onFieldLoaded.bind(this, field, referrer);
 				prom = prom.then(onLoaded).catch(onLoaded);
 			} else {
-				if(colDef.isTimeSeriesField()) {
-					this._insertTimeSeriesChildren(colDef);
+				if(colDef.isTimeSeries()) {
+					this._populateTimeSeriesChildren(colDef);
 				}
 				this._connector.addFields(field, referrer);
 			}
 		} else {
-			if(colDef.isTimeSeriesField()) {
-				this._insertTimeSeriesChildren(colDef);
+			if(colDef.isTimeSeries()) {
+				this._populateTimeSeriesChildren(colDef);
 			}
 			this._connector.addFields(field, referrer);
 		}
@@ -43677,6 +43900,62 @@ Grid.prototype.moveColumnById = function (srcCol, destCol) {
 	return this.moveColumn(srcIndex, destIndex);
 };
 
+/** @public
+* @param {number|string|Array.<number|string>} colRefs List of column index or column id to be moved
+* @param {number|string} destCol Destination position where the moved columns will be placed BEFORE the specified position. This can be column id or index
+* @return {boolean} Return true if there is any change, and false otherwise
+*/
+Grid.prototype.reorderColumns = function (colRefs, destCol) {
+	var destId = (typeof destCol === "number") ? this.getColumnId(destCol) : destCol;
+
+	if(Array.isArray(colRefs)) {
+		var srcLen = colRefs.length;
+		if(srcLen > 1) {
+			var colIds = this.getColumnIds();
+			var srcIds = [];
+			var invalidDest = false;
+			var i;
+			for(i = 0; i < srcLen; ++i) {
+				var colRef = colRefs[i];
+				var srcId = (typeof colRef === "number") ? colIds[colRef] : colRef;
+				if(srcId) {
+					srcIds.push(srcId);
+					if(destId === srcId) {
+						invalidDest = true; // Destination must not exist in source columns
+					}
+				}
+			}
+			srcLen = srcIds.length;
+			if(invalidDest) { // Find the next valid destination where it is not contained in the source columns
+				var colCount = colIds.length;
+				var destIdx = this.getColumnIndex(destId);
+				if(destIdx >= 0) {
+					while(++destIdx < colCount) {
+						destId = colIds[destIdx];
+						if(srcIds.indexOf(destId) < 0) {
+							break;
+						}
+					}
+				}
+				if(destIdx < 0 || destIdx >= colCount) {
+					destId = "";
+				}
+			}
+
+			var dirty = 0;
+			for(i = 0; i < srcLen; ++i) {
+				dirty |= this.moveColumnById(srcIds[i], destId);
+			}
+			// TODO: Handle the case where all columns stay in the same place
+			return dirty ? true : false;
+		} else {
+			return this.moveColumnById(colRefs[0], destId);
+		}
+	}
+
+	// colRefs will be a number or string
+	return this.moveColumnById(colRefs, destId);
+};
 
 /** The hidden column still occupies the same index.
 * @public
@@ -43747,7 +44026,7 @@ Grid.prototype.addDataFields = function(fieldRef, referrer) {
 	var i, field, dataType, prom, isRealTimeField, onLoaded;
 	for(i = 0; i < len; i++) {
 		field = fields[i];
-		isRealTimeField = ColumnDefinition.isRealTimeField(field);
+		isRealTimeField = js_FieldDefinition.isRealTimeField(field);
 		if(this._shouldLoadFieldInfo(field, isRealTimeField)) {
 			dataType = ColumnDefinition.getDataType(field);
 			prom = js_FieldDefinition.loadFieldInfo(field)
@@ -44867,7 +45146,7 @@ Grid.prototype.unpinColumn = function(colRef, dest) {
 		var len = ary.length;
 
 		var dirty = 0;
-		for(var i = 0; i < len; ++i) {
+		for(var i = len; --i >= 0;) { // WARNING: unpinning is done in reversed order
 			dirty |= this._unpinColumn(ary[i], dest);
 		}
 		return dirty ? true : false;