@refinitiv-ui/efx-grid 6.0.104 → 6.0.106

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

@@ -8474,18 +8474,14 @@ EventDispatcher_EventDispatcher._proto = EventDispatcher_EventDispatcher.prototy
  * @constructor
  * @extends {EventDispatcher}
  */
-let DataCache_DataCache = function () {
+let DataCache = function () {
 	let _t = this;
 
 	_t._rows = {};
 	_t._subs = {};
-	_t._staticFields = {};
 	_t._onInsert = _t._onInsert.bind(_t);
 	_t._onUpdate = _t._onUpdate.bind(_t);
 	_t._onDelete = _t._onDelete.bind(_t);
-	_t._onBatchRequestADCData = _t._onBatchRequestADCData.bind(_t);
-	_t._onADCUpdate = _t._onADCUpdate.bind(_t);
-	_t._onADCError = _t._onADCError.bind(_t);
 	_t._onQ2DataChanged = _t._onQ2DataChanged.bind(_t);
 	_t._onQ2SubAdded = _t._onQ2SubAdded.bind(_t);
 	_t._onQ2SubRemoved = _t._onQ2SubRemoved.bind(_t);
@@ -8493,13 +8489,13 @@ let DataCache_DataCache = function () {
 	_t._addEvent("dataComposed");
 	_t._addEvent("dataChanged");
 };
-es6_Ext.inherits(DataCache_DataCache, event_EventDispatcher);
+es6_Ext.inherits(DataCache, event_EventDispatcher);
 
 //#region Public
 /**
  * @public
  */
-DataCache_DataCache.prototype.dispose = function () {
+DataCache.prototype.dispose = function () {
 	this.unlistenAll();
 	this.clearAllData(true);
 	this._quotes2 = null;
@@ -8510,7 +8506,7 @@ DataCache_DataCache.prototype.dispose = function () {
  * @public
  * @param {Object} subs Subscriptions object from JET.Quotes2
  */
-DataCache_DataCache.prototype.setSubscriptions = function (subs) {
+DataCache.prototype.setSubscriptions = function (subs) {
 	if (this._quotes2) {
 		this._quotes2["removeEventListener"]("dataChanged", this._onQ2DataChanged);
 		this._quotes2["removeEventListener"]("subscriptionAdded", this._onQ2SubAdded);
@@ -8532,7 +8528,7 @@ DataCache_DataCache.prototype.setSubscriptions = function (subs) {
  * @public
  * @return {Object} subs Subscriptions object from JET.Quotes2
  */
-DataCache_DataCache.prototype.getSubscriptions = function () {
+DataCache.prototype.getSubscriptions = function () {
 	return this._quotes2;
 };
 
@@ -8544,7 +8540,7 @@ DataCache_DataCache.prototype.getSubscriptions = function () {
  * object does not provide a way to access its data
  * @param {Object=} opt_values Initial values
  */
-DataCache_DataCache.prototype.addSubscription = function (sub, opt_primaryRic, opt_values) {
+DataCache.prototype.addSubscription = function (sub, opt_primaryRic, opt_values) {
 	if (this.getSubscription(sub["id"])) {
 		return;
 	}
@@ -8575,7 +8571,7 @@ DataCache_DataCache.prototype.addSubscription = function (sub, opt_primaryRic, o
  * @public
  * @param {Object} sub Subscription object from JET.Quote
  */
-DataCache_DataCache.prototype.removeSubscription = function (sub) { // All RICs associated to the subscription are removed
+DataCache.prototype.removeSubscription = function (sub) { // All RICs associated to the subscription are removed
 	let subId = sub["id"];
 
 	if (!sub || !this._subs[subId]) {
@@ -8599,7 +8595,7 @@ DataCache_DataCache.prototype.removeSubscription = function (sub) { // All RICs
  * Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
  * @public
  */
-DataCache_DataCache.prototype.startAllSubscriptions = function () {
+DataCache.prototype.startAllSubscriptions = function () {
 	if (this._quotes2) {
 		this._quotes2["start"]();
 	} else {
@@ -8613,7 +8609,7 @@ DataCache_DataCache.prototype.startAllSubscriptions = function () {
  * Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
  * @public
  */
-DataCache_DataCache.prototype.stopAllSubscriptions = function () {
+DataCache.prototype.stopAllSubscriptions = function () {
 	if (this._quotes2) {
 		this._quotes2["stop"]();
 	} else {
@@ -8628,7 +8624,7 @@ DataCache_DataCache.prototype.stopAllSubscriptions = function () {
  * @param {string} sub_id
  * @return {Object} Subscription object from JET.Quote
  */
-DataCache_DataCache.prototype.getSubscription = function (sub_id) {
+DataCache.prototype.getSubscription = function (sub_id) {
 	return (this._subs[sub_id]) ? this._subs[sub_id]["s"] : null;
 };
 
@@ -8637,7 +8633,7 @@ DataCache_DataCache.prototype.getSubscription = function (sub_id) {
  * @param {string} sub_id
  * @return {string} ric that has been input when calling addSubscription
  */
-DataCache_DataCache.prototype.getPrimaryRic = function (sub_id) {
+DataCache.prototype.getPrimaryRic = function (sub_id) {
 	let subDef = this._subs[sub_id];
 	if (subDef) {
 		return subDef["primary"];
@@ -8650,7 +8646,7 @@ DataCache_DataCache.prototype.getPrimaryRic = function (sub_id) {
  * @param {boolean=} opt_suppressEvent
  * @fires DataCache#dataChanged
  */
-DataCache_DataCache.prototype.clearAllData = function (opt_suppressEvent) { // All subscriptions are also removed
+DataCache.prototype.clearAllData = function (opt_suppressEvent) { // All subscriptions are also removed
 	if (this._quotes2) {
 		this._quotes2["removeAllSubscriptions"]();
 	} else {
@@ -8660,13 +8656,6 @@ DataCache_DataCache.prototype.clearAllData = function (opt_suppressEvent) { // A
 	this._subs = {};
 	this._rows = {};
 
-	if (this._adcTimerId >= 0) {
-		clearTimeout(this._adcTimerId);
-		this._adcTimerId = -1;
-	}
-
-	this._adcRicMap = null;
-
 	if (!opt_suppressEvent) {
 		this._dispatchDataChange({"globalChange": true});
 	}
@@ -8678,7 +8667,7 @@ DataCache_DataCache.prototype.clearAllData = function (opt_suppressEvent) { // A
  * @param {boolean=} opt_suppressEvent
  * @fires DataCache#dataChanged
  */
-DataCache_DataCache.prototype.clearColumnData = function (colId, opt_suppressEvent) {
+DataCache.prototype.clearColumnData = function (colId, opt_suppressEvent) {
 	let cids = (typeof colId === "string") ? [/** @type {string} */(colId)] : /** @type {Array.<string>} */(colId);
 
 	for (let i = cids.length; --i >= 0;) {
@@ -8702,7 +8691,7 @@ DataCache_DataCache.prototype.clearColumnData = function (colId, opt_suppressEve
  * @param {string} cid
  * @return {*}
  */
-DataCache_DataCache.prototype.getData = function (rid, cid) {
+DataCache.prototype.getData = function (rid, cid) {
 	let row = this.getRowData(rid);
 
 	return (row) ? row[cid] : null;
@@ -8713,7 +8702,7 @@ DataCache_DataCache.prototype.getData = function (rid, cid) {
  * @public
  * @return {Object.<string, Array.<string>>} Map of Array of subscription object
  */
-DataCache_DataCache.prototype.getAllRics = function () { // Slow
+DataCache.prototype.getAllRics = function () { // Slow
 	let ricMap = {};
 
 	for (let subId in this._subs) {
@@ -8735,7 +8724,7 @@ DataCache_DataCache.prototype.getAllRics = function () { // Slow
  * @public
  * @return {Array.<string>}
  */
-DataCache_DataCache.prototype.getAllRowIds = function () {
+DataCache.prototype.getAllRowIds = function () {
 	let rids = [];
 
 	for (let rid in this._rows) {
@@ -8750,7 +8739,7 @@ DataCache_DataCache.prototype.getAllRowIds = function () {
  * @param {string} rid ID of a row to be checked for its presence.
  * @return {boolean} `true` if row was found, `false` if row was not found.
  */
-DataCache_DataCache.prototype.hasRowId = function (rid) {
+DataCache.prototype.hasRowId = function (rid) {
 	return !!this._rows[rid];
 };
 
@@ -8759,7 +8748,7 @@ DataCache_DataCache.prototype.hasRowId = function (rid) {
  * @param {string} cid
  * @return {!Array.<*>}
  */
-DataCache_DataCache.prototype.getColumnData = function (cid) {
+DataCache.prototype.getColumnData = function (cid) {
 	let fieldRows = [];
 
 	for (let rid in this._rows) {
@@ -8774,7 +8763,7 @@ DataCache_DataCache.prototype.getColumnData = function (cid) {
  * @param {string} rid
  * @return {Object.<string, *>}
  */
-DataCache_DataCache.prototype.getRowData = function (rid) {
+DataCache.prototype.getRowData = function (rid) {
 	return this._rows[rid] || null;
 };
 
@@ -8785,7 +8774,7 @@ DataCache_DataCache.prototype.getRowData = function (rid) {
  * @param {number=} opt_to EXCLUSIVE
  * @return {!Array.<Object>}
  */
-DataCache_DataCache.prototype.getMultipleRowData = function (rids, opt_from, opt_to) {
+DataCache.prototype.getMultipleRowData = function (rids, opt_from, opt_to) {
 	let len = rids.length;
 
 	if (opt_to == null) {
@@ -8814,7 +8803,7 @@ DataCache_DataCache.prototype.getMultipleRowData = function (rids, opt_from, opt
  * @public
  * @return {!Array.<Object.<string, *>>}
  */
-DataCache_DataCache.prototype.getAllRowData = function () {
+DataCache.prototype.getAllRowData = function () {
 	let rows = [];
 	let rowMap = this._rows;
 
@@ -8833,7 +8822,7 @@ DataCache_DataCache.prototype.getAllRowData = function () {
  * @return {boolean} Return true if there is any change, and false otherwise
  * @fires DataCache#dataChanged
  */
-DataCache_DataCache.prototype.setData = function (rid, cid, value) { // Data changed event is always dispatched
+DataCache.prototype.setData = function (rid, cid, value) { // Data changed event is always dispatched
 	let values = {};
 
 	values[cid] = value;
@@ -8843,30 +8832,10 @@ DataCache_DataCache.prototype.setData = function (rid, cid, value) { // Data cha
 
 /**
  * @public
+ * @ignore
  * @param {string} rid
- * @return {boolean}
  */
-DataCache_DataCache.prototype.hasDataCloudData = function (rid) {
-	if (!this._adcFields) {
-		return false;
-	}
-
-	let row = this.getRowData(rid);
-
-	if (!row) {
-		return false;
-	}
-
-	for (let i = this._adcFields.length; --i >= 0;) {
-		let data = row[this._adcFields[i]];
-
-		if (data != null) {
-			return true;
-		}
-	}
-
-	return false;
-};
+DataCache.prototype.hasDataCloudData = function (rid) {};
 
 /**
  * @public
@@ -8876,7 +8845,7 @@ DataCache_DataCache.prototype.hasDataCloudData = function (rid) {
  * @return {boolean} Return true if there is any change, and false otherwise
  * @fires DataCache#dataChanged
  */
-DataCache_DataCache.prototype.setRowData = function (rid, values, opt_eventArg) { // Data changed event is always dispatched
+DataCache.prototype.setRowData = function (rid, values, opt_eventArg) { // Data changed event is always dispatched
 	let row = this.getRowData(rid);
 	let dirty = false;
 	let changes = null;
@@ -8925,7 +8894,7 @@ DataCache_DataCache.prototype.setRowData = function (rid, values, opt_eventArg)
  * @param {string} rid
  * @return {Object}
  */
-DataCache_DataCache.prototype.cloneRowData = function (rid) {
+DataCache.prototype.cloneRowData = function (rid) {
 	let fields = this._rows[rid];
 
 	if (!fields) {
@@ -8945,64 +8914,34 @@ DataCache_DataCache.prototype.cloneRowData = function (rid) {
 	return values;
 };
 
-/**
- * Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
+/** Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
  * @public
- * @param {Array.<string>} fields
+ * @ignore
  * @suppress {checkTypes}
  */
-DataCache_DataCache.prototype.addStaticFields = function (fields) {
-	if (!Array.isArray(fields)) {
-		return;
-	}
-
-	for (let i in fields) {
-		if (!this._staticFields[fields[i]]) {
-			this._staticFields[fields[i]] = 1;
-		} else {
-			this._staticFields[fields[i]]++;
-		}
-	}
-};
+DataCache.prototype.addStaticFields = function () {};
 
 /**
  * Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
  * @public
- * @param {Array.<string>} fields
+ * @ignore
  * @suppress {checkTypes}
  */
-DataCache_DataCache.prototype.removeStaticFields = function (fields) {
-	if (!Array.isArray(fields)) {
-		return;
-	}
-
-	for (let i in fields) {
-		if (this._staticFields[fields[i]]) {
-			this._staticFields[fields[i]]--;
-
-			if (this._staticFields[fields[i]] === 0) {
-				delete this._staticFields[fields[i]];
-			}
-		}
-	}
-};
+DataCache.prototype.removeStaticFields = function () {};
 
 /**
  * Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
  * @public
+ * @ignore
  */
-DataCache_DataCache.prototype.resetStaticFields = function () {
-	this._staticFields = {};
-};
+DataCache.prototype.resetStaticFields = function () {};
 
 /**
  * Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
  * @public
- * @return {Object.<string, number>}
+ * @ignore
  */
-DataCache_DataCache.prototype.getStaticFields = function () {
-	return this._staticFields;
-};
+DataCache.prototype.getStaticFields = function () {};
 
 /**
  * Construct a JSON object that is compatible with console.table()
@@ -9018,8 +8957,8 @@ DataCache_DataCache.prototype.getStaticFields = function () {
  *   "withRowIds": boolean
  * };
  */
-DataCache_DataCache.prototype.dump = function (options) {
-	return DataCache_DataCache.constructTable(this.getAllRowData(), options, Object.keys(this._rows));
+DataCache.prototype.dump = function (options) {
+	return DataCache.constructTable(this.getAllRowData(), options, Object.keys(this._rows));
 };
 
 /**
@@ -9035,104 +8974,43 @@ DataCache_DataCache.prototype.dump = function (options) {
  *   "withRowIds": boolean
  * };
  */
-DataCache_DataCache.prototype.log = function (opt_options) {
+DataCache.prototype.log = function (opt_options) {
 	console.table(this.dump(opt_options));
 };
 
 //#region ADC
 /** Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
  * @public
+ * @ignore
  * @param {string} userId
  * @param {string} productId
  * @param {string} url
  * @param {string=} opt_lang
  */
-DataCache_DataCache.prototype.setDataCloudSettings = function (userId, productId, url, opt_lang) {
-	if (userId != null) {
-		this._userId = userId;
-	}
-
-	if (productId != null) {
-		this._productId = productId;
-	}
-
-	if (url != null) {
-		this._adcUrl = url;
-	}
-
-	if (opt_lang) {
-		this._lang = opt_lang;
-	}
-};
+DataCache.prototype.setDataCloudSettings = function (userId, productId, url, opt_lang) {};
 
 /**
  * Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
  * @public
- * @return {Array.<string>}
+ * @ignore
  */
-DataCache_DataCache.prototype.getDataCloudFields = function () {
-	return this._adcFields; // Return private members
-};
+DataCache.prototype.getDataCloudFields = function () {};
 
 /**
  * Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
  * @public
+ * @ignore
  * @param {Array.<string>|string} fields
- * @return {boolean} Return true if success, and false otherwise
  */
-DataCache_DataCache.prototype.addDataCloudFields = function (fields) {
-	if (!this._adcFields) {
-		this._adcFields = [];
-		this._adcRefMap = {};
-	}
-
-	let newFields = [];
-
-	if (fields instanceof Array) {
-		for (let i = fields.length; --i >= 0;) {
-			this._addDataCloudField(fields[i], newFields);
-		}
-	} else {
-		this._addDataCloudField(/** @type {string} */(fields), newFields);
-	}
-
-	if (newFields.length <= 0) {
-		return false;
-	}
-
-	let ricMap = this.getAllRics();
-
-	this._batchRequestDataCloud(ricMap, newFields);
-
-	return true;
-};
+DataCache.prototype.addDataCloudFields = function (fields) {};
 
 /**
  * Deprecated. Built-in Data Service is deprecated due to the lack of flexibility.
  * @public
+ * @ignore
  * @param {string} field
- * @return {boolean} Return true if success, and false otherwise
  */
-DataCache_DataCache.prototype.removeDataCloudField = function (field) {
-	if (!this._adcFields) {
-		return false;
-	}
-
-	if (!this._adcRefMap[field]) {
-		return false;
-	}
-
-	--this._adcRefMap[field];
-
-	if (!this._adcRefMap[field]) {
-		let foundAt = this._adcFields.indexOf(field);
-
-		this._adcFields.splice(foundAt, 1);
-		this.clearColumnData(field);
-	}
-
-	return true;
-};
+DataCache.prototype.removeDataCloudField = function (field) {};
 //#endregion ADC
 //#endregion Public
 
@@ -9143,7 +9021,7 @@ DataCache_DataCache.prototype.removeDataCloudField = function (field) {
  * @fires DataTable#dataComposed
  * @fires DataTable#dataChanged
  */
-DataCache_DataCache.prototype._dispatchDataChange = function (e) {
+DataCache.prototype._dispatchDataChange = function (e) {
 	if (this._composing) {
 		return;
 	}
@@ -9161,7 +9039,7 @@ DataCache_DataCache.prototype._dispatchDataChange = function (e) {
  * @param {string} colName
  * @return {*}
  */
-DataCache_DataCache._defaultPropertyGetter = function (propertyName, rowData, colName) {
+DataCache._defaultPropertyGetter = function (propertyName, rowData, colName) {
 	let d = rowData[colName];
 
 	return d ? d[propertyName] : null;
@@ -9173,7 +9051,7 @@ DataCache_DataCache._defaultPropertyGetter = function (propertyName, rowData, co
  * @param {string} colName
  * @return {*}
  */
-DataCache_DataCache._defaultGetter = function (rowData, colName) {
+DataCache._defaultGetter = function (rowData, colName) {
 	return rowData[colName];
 };
 
@@ -9186,13 +9064,13 @@ DataCache_DataCache._defaultGetter = function (rowData, colName) {
  * @param {Array.<string>=} opt_rowIds Optional row ids corresponding to the given dataset
  * @return {!Array.<Object>} Return a JSON object that is compatible with console.table()
  */
-DataCache_DataCache.constructTable = function (dataset, opt_options, opt_rowIds) {
+DataCache.constructTable = function (dataset, opt_options, opt_rowIds) {
 	let startIndex = 0;
 	let rLen = dataset.length;
 	let rowLim = rLen;
 	let colMap = null;
 	let rids = opt_rowIds || null;
-	let getter = DataCache_DataCache._defaultGetter;
+	let getter = DataCache._defaultGetter;
 	let transformation = false;
 
 	if (opt_options) {
@@ -9215,7 +9093,7 @@ DataCache_DataCache.constructTable = function (dataset, opt_options, opt_rowIds)
 
 		if (opt_options["getter"]) {
 			if (typeof opt_options["getter"] == "string") {
-				getter = DataCache_DataCache._defaultPropertyGetter.bind(null, opt_options["getter"]);
+				getter = DataCache._defaultPropertyGetter.bind(null, opt_options["getter"]);
 			} else { // Function
 				getter = opt_options["getter"];
 			}
@@ -9278,15 +9156,12 @@ DataCache_DataCache.constructTable = function (dataset, opt_options, opt_rowIds)
  * @param {string} ric
  * @param {Object.<string, *>} values
  */
-DataCache_DataCache.prototype._insertRic = function (subId, ric, values) {
+DataCache.prototype._insertRic = function (subId, ric, values) {
 	// HACK: Some chain may have 0# symbol in there chain index (e.g. 0#CL:)
 	ric = ric.replace("0#", "");
 
 	let rid = subId + ric;
 
-	// We cannot cache event arguments because user may want to collect all the updates
-	this._onADCForNewRic(subId, ric);
-
 	let rowData = this.getRowData(rid);
 	if (!rowData) { // Ensure that we have subscription id and ric from Quotes2
 		let tmp = values;
@@ -9313,7 +9188,7 @@ DataCache_DataCache.prototype._insertRic = function (subId, ric, values) {
  * @private
  * @param {Object} e
  */
-DataCache_DataCache.prototype._onQ2DataChanged = function (e) {
+DataCache.prototype._onQ2DataChanged = function (e) {
 	let subId = e["subId"];
 	let ric = e["ric"];
 	let values = /** @type{Object.<string, *>} */(e["values"]);
@@ -9331,31 +9206,17 @@ DataCache_DataCache.prototype._onQ2DataChanged = function (e) {
  * @private
  * @param {Object} e
  */
-DataCache_DataCache.prototype._onQ2SubAdded = function (e) {
+DataCache.prototype._onQ2SubAdded = function (e) {
 	let subs = e["subs"];
-	let duplicateSubIds = e["duplicateSubIds"];
 	let len = subs.length;
 
 	for (let i = 0; i < len; ++i) {
 		let sub = subs[i];
-		let ric = sub["ric"];
 
 		// chain subId fires twice, one with "_ci_" and one without "_ci_"
 		// the subId with "_ci_" should be ignore
-		if(sub["id"].indexOf("_ci_") >= 0){
-			continue;
-		}
-
-		this.addSubscription(sub, ric);
-
-		if (duplicateSubIds) { // There will be no network request for duplicate subs, and hence we need to update the data from our cache
-			let dupSubId = duplicateSubIds[i];
-
-			if (dupSubId) {
-				window.setTimeout(
-					this._onDuplicateRic.bind(this, sub["id"], this.getRowData(dupSubId + ric)),
-					10);
-			}
+		if(sub["id"].indexOf("_ci_") < 0){
+			this.addSubscription(sub, sub["ric"]);
 		}
 	}
 };
@@ -9364,7 +9225,7 @@ DataCache_DataCache.prototype._onQ2SubAdded = function (e) {
  * @private
  * @param {Object} e
  */
-DataCache_DataCache.prototype._onQ2SubRemoved = function (e) {
+DataCache.prototype._onQ2SubRemoved = function (e) {
 	let subs = e["subs"];
 	let len = subs.length;
 
@@ -9373,78 +9234,8 @@ DataCache_DataCache.prototype._onQ2SubRemoved = function (e) {
 
 		// chain subId fires twice, one with "_ci_" and one without "_ci_"
 		// the subId with "_ci_" should be ignore
-		if(sub["id"].indexOf("_ci_") >= 0){
-			continue;
-		}
-
-		this.removeSubscription(sub);
-	}
-};
-
-/**
- * @private
- * @param {string} subId Subscription id
- * @param {string} ric
- */
-DataCache_DataCache.prototype._onADCForNewRic = function (subId, ric) {
-	let sub = this._subs[subId];
-
-	if (!sub) {
-		return;
-	}
-
-	if (this._adcFields) {
-		if (!sub["rics"][ric]) { // First time insertion
-			if (this._adcTimerId < 0) {
-				this._adcRicMap = {};
-				this._adcTimerId = setTimeout(this._onBatchRequestADCData, 100);
-			}
-
-			if (!this._adcRicMap[ric]) {
-				this._adcRicMap[ric] = [];
-			}
-
-			this._adcRicMap[ric].push(subId);
-		}
-	}
-
-	sub["rics"][ric] = true;
-};
-
-/**
- * @private
- * @param {string} subId
- * @param {Object.<string, *>} dupData
- */
-DataCache_DataCache.prototype._onDuplicateRic = function (subId, dupData) {
-	let sub = this._subs[subId];
-
-	if (!sub) {
-		return;
-	}
-
-	sub = sub["s"]; // Quotes2' subscription
-
-	let ric = sub["ric"];
-	let dupSubId = /** @type{string} */(dupData["SUB_ID"]);
-	let values = this._cloneRowData(dupData, ric, subId);
-
-	if (!values) {
-		return;
-	}
-
-	this._onInsert(sub, ric, values);
-
-	let children = sub["children"];
-
-	if (children) {
-		let childCount = children.length;
-
-		for (let i = 0; i < childCount; ++i) {
-			ric = children[i];
-			values = this._cloneRowData(dupSubId, ric, subId);
-
-			this._onInsert(sub, ric, values); // TODO: This makes a lot of ADC request
+		if(sub["id"].indexOf("_ci_") < 0){
+			this.removeSubscription(sub);
 		}
 	}
 };
@@ -9455,13 +9246,12 @@ DataCache_DataCache.prototype._onDuplicateRic = function (subId, dupData) {
  * @param {string} ric
  * @param {Object.<string, *>} values
  */
-DataCache_DataCache.prototype._onInsert = function (sub, ric, values/*, rowN*/) {
+DataCache.prototype._onInsert = function (sub, ric, values/*, rowN*/) {
 	let subId = sub["id"];
 
 	if (this._quotes2) {
 		this._insertRic(subId, ric, values);
 	} else {
-		this._onADCForNewRic(subId, ric);
 		this.setRowData(subId + ric, values, {"subscription": sub, "ric": ric});
 	}
 };
@@ -9470,7 +9260,7 @@ DataCache_DataCache.prototype._onInsert = function (sub, ric, values/*, rowN*/)
  * @private
  * @function
  */
-DataCache_DataCache.prototype._onUpdate = DataCache_DataCache.prototype._onInsert;
+DataCache.prototype._onUpdate = DataCache.prototype._onInsert;
 
 /**
  * This is a legacy code and should be deprecated
@@ -9479,315 +9269,42 @@ DataCache_DataCache.prototype._onUpdate = DataCache_DataCache.prototype._onInser
  * @param {string} ric
  * @param {Array.<string, *>} values
  */
-DataCache_DataCache.prototype._onDelete = function (sub, ric, values/*, rowN*/) {
+DataCache.prototype._onDelete = function (sub, ric, values/*, rowN*/) {
 	delete this._subs[sub["id"]]["rics"][ric];
 
 	// We cannot cache event arguments because user may want to collect all the updates
 	this.setRowData(sub["id"] + ric, null, {"subscription": sub, "ric": ric});
 };
 
-/**
- * @private
- * @param {string} field
- * @param {Array.<string>} ary_out
- */
-DataCache_DataCache.prototype._addDataCloudField = function (field, ary_out) {
-	if (!this._adcRefMap[field]) {
-		this._adcFields.push(field);
-
-		ary_out.push(field);
-
-		this._adcRefMap[field] = 1;
-	} else {
-		++this._adcRefMap[field];
-	}
-};
-
-/**
- * @private
- * @param {Object} e
- * @suppress {missingProperties}
- */
-DataCache_DataCache.prototype._onADCUpdate = function (e) {
-	let xhr = e["currentTarget"]; // XMLHttpRequest
-	let resp = null;
-
-	try {
-		resp = JSON.parse(xhr.responseText);
-		// window.console.log("Successfully parse: " + resp.rows);
-	} catch (err) {
-		return;
-	}
-
-	if (resp["status"] !== "Ok") {
-		return;
-	}
-
-	let colCount = resp["cols"];
-	let rows = resp["rows"];
-	let colDefs = rows[0]; // The first row is always the column definition
-	let ricIndex = -1;
-	let fieldIndices = {};
-
-	for (let i = 0; i < colCount; ++i) {
-		let colDef = colDefs[i];
-
-		if (colDef["i"] === "instrument") {
-			ricIndex = i;
-		} else if (colDef["r"]) {
-			fieldIndices[colDef["r"]] = i;
-		}
-	}
-
-	let rowCount = rows.length;
-
-	for (let j = 1; j < rowCount; ++j) { // Start from 1
-		let row = rows[j];
-		let ric = row[ricIndex];
-		let values = {};
-
-		for (let field in fieldIndices) {
-			let value = row[fieldIndices[field]];
-
-			if (value != null) {
-				// Data should be merged from the backend.
-				// Don't override data with null value.
-				// TODO: Merge all the row into one single row
-				if (value !== null && value["f"] == null) {
-					if (this._quotes2) {
-						values[field] = value;
-						values[field + "_FORMATTED"] = value;
-					} else {
-						values[field] = {"formatted": value + "", "raw": value};
-					}
-				}
-			}
-		}
-
-		let subIds = xhr.ricMap[ric];
-
-		if (subIds) { // Only ric within the subscription can be updated
-			for (i = subIds.length; --i >= 0;) {
-				let subId = subIds[i];
-
-				if (this._subs[subId]) { // Only update the existing subscription
-					// window.console.log("ADC update " + subId + ric + " with " + JSON.stringify(values));
-					this.setRowData(subId + ric, values); // Event is fired
-				}
-			}
-		}
-	}
-};
-
-/**
- * @private
- * @param {Object} e
- */
-DataCache_DataCache.prototype._onADCError = function (e) {
-	window.console.log(e);
-};
-
-/**
- * @private
- * @param {Object} e
- */
-DataCache_DataCache.prototype._onBatchRequestADCData = function (e) {
-	if (this._adcTimerId <= 0) {
-		return;
-	}
-
-	this._adcTimerId = -1;
-	this._batchRequestDataCloud(this._adcRicMap, this._adcFields);
-	this._adcRicMap = null;
-};
-
-/**
- * @private
- * @param {Object.<string, Array.<string>>} ricMap of Array of subscription object
- * @param {Array.<string>} fields
- * @return {XMLHttpRequest}
- */
-DataCache_DataCache.prototype._batchRequestDataCloud = function (ricMap, fields) {
-	if (!this._adcUrl) {
-		return null;
-	}
-
-	let rics = [];
-
-	for (let ric in ricMap) {
-		rics.push(ric);
-	}
-
-	// Request data cloud in small multiple batches because the service cannot handle a long request
-	while (rics.length > 30) {
-		this._requestDataCloud(ricMap, fields, rics.splice(0, 30));
-	}
-
-	return this._requestDataCloud(ricMap, fields, rics);
-};
-
-/**
- * @private
- * @param {Object.<string, Array.<string>>} ricMap of Array of subscription object
- * @param {Array.<string>} fields
- * @param {Array.<string>} rics
- * @return {XMLHttpRequest}
- */
-DataCache_DataCache.prototype._requestDataCloud = function (ricMap, fields, rics) { // Small batch
-	if (!rics || rics.length <= 0) {
-		return null;
-	}
-
-	if (!fields || fields.length <= 0) {
-		return null;
-	}
-
-	let xhr = new XMLHttpRequest();
-
-	xhr.onload = this._onADCUpdate;
-	xhr.onerror = this._onADCError;
-	xhr.ricMap = ricMap;
-
-	xhr.open("POST", this._adcUrl, true);
-	xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
-
-	let body = 'formula=' + fields + '&identifiers=' + rics;
-
-	// window.console.log("ADC is requested with " + body);
-	if (this._productId) {
-		body += '&productid=' + this._productId;
-	}
-
-	if (this._userId) {
-		body += '&uuid=' + this._userId;
-	}
-
-	if (this._lang) {
-		body += '&lang=' + this._lang;
-	}
-
-	xhr.send(body);
-
-	return xhr;
-};
-
-/**
- * @private
- * @param {string|Object.<string, *>} obj
- * @param {string} ric
- * @param {string} newSubId
- * @return {Object}
- */
-DataCache_DataCache.prototype._cloneRowData = function (obj, ric, newSubId) {
-	let subId = (typeof obj === "string") ? obj : obj["SUB_ID"];
-	let fields = this._rows[subId + ric];
-
-	if (!fields) { // The specified row has been removed
-		if (typeof obj === "object") {
-			fields = obj;
-		} else {
-			return null;
-		}
-	}
-
-	let values = {};
-
-	for (let key in fields) {
-		if (this._staticFields[key] == null) { // Static field must not be cloned
-			values[key] = fields[key];
-		}
-	}
-
-	values["SUB_ID"] = newSubId;
-
-	return values;
-};
-
 /** @protected
  * @ignore
  * @type {!Object.<string, Object>}
  */
-DataCache_DataCache.prototype._rows;
+DataCache.prototype._rows;
 
 /**
  * @private
  * @type {!Object.<string, Object>}
  */
-DataCache_DataCache.prototype._subs;
+DataCache.prototype._subs;
 
 /**
  * @private
  * @type {Object}
  */
-DataCache_DataCache.prototype._quotes2 = null;
-
-/**
- * @private
- * @type {Object.<string, number>}
- */
-DataCache_DataCache.prototype._staticFields = null;
-
-//#region ADC
-/**
- * @private
- * @type {Array.<string>}
- */
-DataCache_DataCache.prototype._adcFields = null;
-
-/**
- * @private
- * @type {Object.<string, number>}
- */
-DataCache_DataCache.prototype._adcRefMap = null;
-
-/**
- * @private
- * @type {number}
- */
-DataCache_DataCache.prototype._adcTimerId = -1;
-
-/**
- * @private
- * @description ricMap of Array of subscription object
- * @type {Object.<string, Array.<string>>}
- */
-DataCache_DataCache.prototype._adcRicMap = null;
-
-/**
- * @private
- * @type {string}
- */
-DataCache_DataCache.prototype._adcUrl = "/datacloud/rest/select";
-
-/**
- * @private
- * @type {string}
- */
-DataCache_DataCache.prototype._userId = "";
-
-/**
- * @private
- * @type {string}
- */
-DataCache_DataCache.prototype._productId = "";
+DataCache.prototype._quotes2 = null;
 
 /** @protected
  * @ignore
  * @type {boolean}
  */
-DataCache_DataCache.prototype._composing = false;
+DataCache.prototype._composing = false;
 
-/** @protected
- * @ignore
- * @type {string}
- */
-DataCache_DataCache.prototype._lang = "";
-//#endregion ADC
 //#endregion Private
 
-DataCache_DataCache._proto = DataCache_DataCache.prototype;
+DataCache._proto = DataCache.prototype;
 
-/* harmony default export */ var data_DataCache = (DataCache_DataCache);
+/* harmony default export */ var data_DataCache = (DataCache);
 
 
 // CONCATENATED MODULE: ./node_modules/@grid/core/es6/data/Segment.js
@@ -13777,7 +13294,7 @@ RowDefinition.prototype.getConfigObject = function(rowOptions) {
 		obj["info"] = this._info;
 	}
 
-	val = this._getStaticRowData();
+	val = this._cloneStaticRowData();
 	if(val) {
 		obj["values"] = val;
 	}
@@ -13795,7 +13312,7 @@ RowDefinition.prototype.getConfigObject = function(rowOptions) {
 			let i, rowDef, staticValues;
 			for(i = 0; i < len; i++) {
 				rowDef = children[i];
-				staticValues = rowDef._getStaticRowData();
+				staticValues = rowDef._cloneStaticRowData();
 				if(staticValues) {
 					dirty = true;
 					childValues[rowDef.getRic()] = staticValues;
@@ -13898,15 +13415,16 @@ RowDefinition.prototype.getData = function(field) {
 	return this._dc ? this._dc.getData(this._dataId, field) : null;
 };
 
-/** @public
+/** This method replaces all existing static data by the given data -- all existing static data are removed.
+* @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
+* @param {Array.<string>=} indexToFieldMap In case of the given data is an array, this param will be used for mapping index to field
 */
-RowDefinition.prototype.setStaticRowData = function(data, opt_fields) {
+RowDefinition.prototype.setStaticRowData = function(data, indexToFieldMap) {
 	this._clearStaticData();
 
 	if(Array.isArray(data)) { // Convert array to object
-		data = arrayToObject(data, opt_fields);
+		data = arrayToObject(data, indexToFieldMap);
 	}
 
 	this._staticValues = (typeof data === "object") ? data : null;
@@ -13918,16 +13436,28 @@ RowDefinition.prototype.setStaticRowData = function(data, opt_fields) {
 /** @private
 * @return {Object.<string, *>}
 */
-RowDefinition.prototype._getStaticRowData = function() {
+RowDefinition.prototype._cloneStaticRowData = function() {
 	return this._staticValues ? cloneObject(this._staticValues) : null;
 };
 /** @public
+* @param {string} field
+* @param {*} value
+*/
+RowDefinition.prototype.setStaticData = function(field, value) {
+	if(!this._staticValues) {
+		this._staticValues = {};
+	}
+	this._staticValues[field] = value;
+
+	this.setData(field, value);
+};
+/** @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
+* @param {Array.<string>=} indexToFieldMap In case of the given data is an array, this param will be used for mapping index to field
 */
-RowDefinition.prototype.updateRowData = function(data, opt_fields) {
+RowDefinition.prototype.updateRowData = function(data, indexToFieldMap) {
 	if(Array.isArray(data)) { // Convert array to object
-		data = arrayToObject(data, opt_fields);
+		data = arrayToObject(data, indexToFieldMap);
 	}
 
 	if(data) {
@@ -13935,16 +13465,32 @@ RowDefinition.prototype.updateRowData = function(data, opt_fields) {
 	}
 };
 /** @public
-* @param {string} field
-* @param {*} value
+* @param {RowDefinition} srcRowDef Original source of row data to be copied from
 */
-RowDefinition.prototype.setStaticData = function(field, value) {
-	if(!this._staticValues) {
-		this._staticValues = {};
-	}
-	this._staticValues[field] = value;
+RowDefinition.prototype.copyRowData = function(srcRowDef) {
+	if(srcRowDef && srcRowDef !== this) {
+		let field;
+		let uncopiable_fields = {
+			"ROW_DEF": 1,
+			"SUB_ID": 1
+		};
+		let staticValues = this._staticValues;
+		for(field in staticValues) {
+			uncopiable_fields[field] = 1;
+		}
+		staticValues = srcRowDef._staticValues;
+		for(field in staticValues) {
+			uncopiable_fields[field] = 1;
+		}
 
-	this.setData(field, value);
+		let srcRowData = srcRowDef.getRowData();
+		let rowData = this.getRowData();
+		for(field in srcRowData) {
+			if(!uncopiable_fields[field]) {
+				rowData[field] = srcRowData[field]; // There is no dataChanged event fired
+			}
+		}
+	}
 };
 /** @public
 * @param {Object.<string, *>} data
@@ -14395,7 +13941,7 @@ RowDefinition.prototype.unlinkChain = function() {
 		}
 	}
 
-	let staticData = this._getStaticRowData();
+	let staticData = this._cloneStaticRowData();
 	this.unsubscribeForUpdates();
 
 	// Restore static data
@@ -14682,15 +14228,15 @@ const SYNAPSE_URL =
 * @constant
 * @description
 * ^TR.						=> start with TR.
-* [\w]+						=> any field with string and value
+* \w+						=> any field with string and value
 * [\(]						=> open bucket (
-* [\w\-\=\,]*			=> any property name and follow by = EX. SDATE=2011-11-11, PRIOD=123123
+* [\w\-=,]*				=> any property name and follow by = EX. SDATE=2011-11-11, PRIOD=123123
 * (?:EDATE|SDATE)	=> non-capturing group match EDATE or SDATE
-* [\w\-\=\,]+ 		=> another propertie param
+* [\w\-=,]+				=> another propertie param
 * [\)]$						=> end with only )
 * i								=> for match both upper and lower cases
 */
-const TimeSeriesRegEx = /^TR\.[\w]+\([\w\-\=\,]*(?:EDATE|SDATE)\=+[\w\-\=\,]*[ \w]*\)$/i;
+const TimeSeriesRegEx = /^TR\.\w+\([\w\-=,]*(?:EDATE|SDATE)=+[\w\-=,]*[ \w]*\)$/i;
 
 /* @namespace */
 let FieldDefinition = {};
@@ -14698,7 +14244,11 @@ let FieldDefinition = {};
 /** @type {Object.<string, Object>}
 * @private
 */
-FieldDefinition._defs = {
+FieldDefinition._defs = {};
+/** @type {Object.<string, Object>}
+* @private
+*/
+FieldDefinition._defaults = {
 	"CF_NAME": {
 		name: "Name",
 		rank: 2800003,
@@ -14843,6 +14393,17 @@ FieldDefinition.set = function(field, def) {
 /** Get field definition object
 * @public
 * @function
+*/
+FieldDefinition.resetAll = function() {
+	let defs = FieldDefinition._defs = {};
+	let defaultFields = FieldDefinition._defaults;
+	for(let key in defaultFields) {
+		defs[key] = defaultFields[key];
+	}
+};
+/** Get field definition object
+* @public
+* @function
 * @param {string} field
 * @return {Object}
 */
@@ -15198,8 +14759,9 @@ function onLoadEnd(e) {
 }
 
 (function() { // Add "field" property to all default field definitions. This reduces file size and redundancy
-	for(let key in FieldDefinition._defs) {
-		FieldDefinition._defs[key]["field"] = key;
+	for(let key in FieldDefinition._defaults) {
+		FieldDefinition._defaults[key]["field"] = key;
+		FieldDefinition._defs[key] = FieldDefinition._defaults[key];
 	}
 })();
 
@@ -24501,6 +24063,179 @@ HScrollbar._proto = HScrollbar.prototype;
 /* harmony default export */ var components_HScrollbar = (HScrollbar);
 
 
+// CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/util/CellBoundPainter.js
+/** @private
+* @function
+* @param {number} idx
+* @param {number} limit
+* @return {number}
+*/
+let _validateIndex = function(idx, limit) {
+	if(idx > limit) {
+		return limit;
+	} else if(idx < 0) {
+		return 0;
+	}
+	return idx;
+};
+
+/** @constructor
+* @param {Object} ctx
+*/
+let CellBoundPainter = function (ctx) {
+	this._boundLayer = ctx.boundLayer;
+	this._layoutX = ctx.layoutX;
+	this._layoutY = ctx.layoutY;
+	this._hscrollbar = ctx.hscrollbar;
+	this._calculateColumnBounds = ctx.calculateColumnBounds;
+};
+
+/** @type {Element}
+* @private
+*/
+CellBoundPainter.prototype._boundLayer = null;
+/** @type {!TrackLayout}
+* @private
+*/
+CellBoundPainter.prototype._layoutX;
+/** @type {!TrackLayout}
+* @private
+*/
+CellBoundPainter.prototype._layoutY;
+/** @type {HScrollbar}
+* @private
+*/
+CellBoundPainter.prototype._hscrollbar;
+/** @type {Function}
+* @private
+*/
+CellBoundPainter.prototype._calculateColumnBounds;
+/** @type {Element}
+* @private
+*/
+CellBoundPainter.prototype._cellBound = null;
+/** @type {number}
+* @private
+*/
+CellBoundPainter.prototype._cbLftIdx = 0;
+/** @type {number}
+* @private
+*/
+CellBoundPainter.prototype._cbRgtIdx = 0;
+/** @type {number}
+* @private
+*/
+CellBoundPainter.prototype._cbTopIdx = 0;
+/** @type {number}
+* @private
+*/
+CellBoundPainter.prototype._cbBtmIdx = 0;
+
+/** @public
+*/
+CellBoundPainter.prototype.dispose = function () {
+	let cellBound = this._cellBound;
+	if(cellBound) {
+		let pn = cellBound.parentNode;
+		if(pn) {
+			pn.removeChild(cellBound);
+		}
+		this._cellBound = null;
+	}
+	this._boundLayer = null;
+	this._layoutX = null;
+	this._layoutY = null;
+	this._hscrollbar = null;
+	this._calculateColumnBounds = null;
+};
+
+/** @public
+* @param {number} colIndex
+* @param {number} rowIndex
+* @param {number} width
+* @param {number} height
+* @param {number} colCount
+*/
+CellBoundPainter.prototype.setCellBounds = function (colIndex, rowIndex, width, height, colCount) {
+	let cellBound = this._cellBound;
+	if(!cellBound) {
+		cellBound = this._cellBound = document.createElement("div");
+		cellBound.className = "selection-bound";
+	}
+
+	// Validate inputs
+	let rgtIndex = colIndex + width; // Exclusive
+	let btmIndex = rowIndex + height; // Exclusive
+
+	let rowCount = this._layoutY.getLaneCount();
+
+	this._cbLftIdx = _validateIndex(colIndex, colCount);
+	this._cbRgtIdx = _validateIndex(rgtIndex, colCount);
+	this._cbTopIdx = _validateIndex(rowIndex, rowCount);
+	this._cbBtmIdx = _validateIndex(btmIndex, rowCount);
+
+	this.updateCellBounds();
+};
+
+/** @public
+*/
+CellBoundPainter.prototype.updateCellBounds = function() {
+	let cellBound = this._cellBound;
+	if(!cellBound) {
+		return;
+	}
+
+	let layoutX = this._layoutX;
+	let layoutY = this._layoutY;
+	let lftIdx = this._cbLftIdx;
+	let rgtIdx = this._cbRgtIdx; // Exclusive
+	let topIdx = this._cbTopIdx;
+	let btmIdx = this._cbBtmIdx; // Exclusive
+	let lftPx, rgtPx, topPx, btmPx;
+	lftPx = rgtPx = topPx = btmPx = 0;
+	if(lftIdx < rgtIdx && topIdx < btmIdx) {
+		lftPx = layoutX.getLaneStart(lftIdx);
+		rgtPx = layoutX.getLaneEnd(rgtIdx - 1);
+		topPx = layoutY.getLaneStart(topIdx);
+		btmPx = layoutY.getLaneEnd(btmIdx - 1);
+	}
+
+	let width = rgtPx - lftPx;
+	let height = btmPx - topPx;
+	let noBorders = [false, false];
+	if(width > 0 && height > 0 && this._hscrollbar) {
+		let positions = [0, 0];
+		this._calculateColumnBounds(lftIdx, rgtIdx - 1, positions, noBorders);
+		lftPx = positions[0];
+		rgtPx = positions[1];
+		width = rgtPx - lftPx;
+	}
+
+	if(width > 0) {
+		cellBound.style.left = lftPx + "px";
+		cellBound.style.top = topPx + "px";
+		cellBound.style.width = width + "px";
+		cellBound.style.height = height + "px";
+
+		cellBound.classList.toggle("no-left-bound", noBorders[0]);
+		cellBound.classList.toggle("no-right-bound", noBorders[1]);
+
+		if(this._boundLayer) {
+			this._boundLayer.appendChild(cellBound);
+		}
+	} else {
+		let pn = cellBound.parentNode;
+		if(pn) {
+			pn.removeChild(cellBound);
+		}
+	}
+};
+
+CellBoundPainter._proto = CellBoundPainter.prototype;
+
+/* harmony default export */ var util_CellBoundPainter = (CellBoundPainter);
+
+
 // CONCATENATED MODULE: ./node_modules/@grid/core/es6/grid/LayoutGrid.js
 /* eslint-disable */
 
@@ -24516,6 +24251,7 @@ HScrollbar._proto = HScrollbar.prototype;
 
 
 
+
 /* eslint-enable */
 
 //#region Events
@@ -24781,7 +24517,10 @@ LayoutGrid.prototype._leftColumnSeparator = null;
 * @private
 */
 LayoutGrid.prototype._rightColumnSeparator = null;
-
+/** @type {Element}
+* @private
+*/
+LayoutGrid.prototype._cellBoundPainter = null;
 /**
  * {@link ElementWrapper#dispose}
  * @override
@@ -24806,6 +24545,10 @@ LayoutGrid.prototype.dispose = function () {
 	this._ctx = null;
 	this._hscrollbar = null;
 
+	if(this._cellBoundPainter) {
+		this._cellBoundPainter.dispose();
+	}
+
 	this._dispose();
 };
 /**
@@ -26776,7 +26519,22 @@ LayoutGrid.prototype.selectCell = function (colIndex, rowIndex, selected) {
 * @param {number} width
 * @param {number} height
 */
-LayoutGrid.prototype.setCellBounds = function (colIndex, rowIndex, width, height) {};
+LayoutGrid.prototype.setCellBounds = function (colIndex, rowIndex, width, height) {
+	let boundLayer = this._initBoundLayer();
+	let cellBoundPainter = this._cellBoundPainter;
+	if(!cellBoundPainter) {
+		cellBoundPainter = this._cellBoundPainter = new util_CellBoundPainter({
+			boundLayer: boundLayer,
+			layoutX: this._trackX,
+			layoutY: this._trackY,
+			hscrollbar: this._hscrollbar,
+			calculateColumnBounds: this.calculateColumnBounds.bind(this)
+		});
+	}
+
+	let colCount = this.getColumnCount();
+	cellBoundPainter.setCellBounds(colIndex, rowIndex, width, height, colCount);
+};
 /** @public
 * @ignore
 * @return {!TrackLayout}
@@ -27889,6 +27647,7 @@ ColumnStats.prototype._refs;
  // eslint-disable-line
  // eslint-disable-line
  // eslint-disable-line
+ // eslint-disable-line
 
 /** @event WrappedView#dataChanged
 * @description Trigger when data within the data view has been changed. Not only actual change in data, but also position change will trigger this event.
@@ -29166,7 +28925,7 @@ WrappedView.prototype.wrapView = function (wrapSize) {
 * @see {@link DataCache#dump}
 */
 WrappedView.prototype.dump = function(opt_options) {
-	return DataCache.constructTable(this.getMultipleRowData(this._rids), opt_options, this._rids);
+	return data_DataCache.constructTable(this.getMultipleRowData(this._rids), opt_options, this._rids);
 };
 /** Print current data and structure to console panel
 * @public
@@ -34652,23 +34411,9 @@ VScrollbar._proto = VScrollbar.prototype;
 
 
 
-/* eslint-enable */
 
+/* eslint-enable */
 
-/** @private
-* @function
-* @param {number} idx
-* @param {number} limit
-* @return {number}
-*/
-let _validateIndex = function(idx, limit) {
-	if(idx > limit) {
-		return limit;
-	} else if(idx < 0) {
-		return 0;
-	}
-	return idx;
-};
 
 /** @constructor
  * @ignore
@@ -34754,26 +34499,10 @@ VirtualizedLayoutGrid.prototype._rowBoundCache = null;
 * @private
 */
 VirtualizedLayoutGrid.prototype._rowSelDirty = false;
-/** @type {Element}
-* @private
-*/
-VirtualizedLayoutGrid.prototype._cellBound = null;
-/** @type {number}
-* @private
-*/
-VirtualizedLayoutGrid.prototype._cbLftIdx = 0;
-/** @type {number}
-* @private
-*/
-VirtualizedLayoutGrid.prototype._cbRgtIdx = 0;
-/** @type {number}
-* @private
-*/
-VirtualizedLayoutGrid.prototype._cbTopIdx = 0;
-/** @type {number}
+/** @type {Object}
 * @private
 */
-VirtualizedLayoutGrid.prototype._cbBtmIdx = 0;
+VirtualizedLayoutGrid.prototype._cellBoundPainter = null;
 /** @type {number}
 * @private
 */
@@ -34826,6 +34555,9 @@ VirtualizedLayoutGrid.prototype.dispose = function () {
 		clearTimeout(this._rowBoundTimer);
 		this._rowBoundTimer = 0;
 	}
+	if(this._cellBoundPainter) {
+		this._cellBoundPainter.dispose();
+	}
 };
 /** @override */
 VirtualizedLayoutGrid.prototype.setWidth = function (px) {
@@ -35653,26 +35385,20 @@ VirtualizedLayoutGrid.prototype.selectCell = function (colIndex, rowIndex, selec
 * @param {number} height
 */
 VirtualizedLayoutGrid.prototype.setCellBounds = function (colIndex, rowIndex, width, height) {
-	let cellBound = this._cellBound;
-	if(!cellBound) {
-		cellBound = this._cellBound = document.createElement("div");
-		cellBound.className = "selection-bound";
+	let boundLayer = this._initBoundLayer();
+	let cellBoundPainter = this._cellBoundPainter;
+	if(!cellBoundPainter) {
+		cellBoundPainter = this._cellBoundPainter = new util_CellBoundPainter({
+			boundLayer: boundLayer,
+			layoutX: this.getHorizontalLayout(),
+			layoutY: this._layoutY,
+			hscrollbar: this._hscrollbar,
+			calculateColumnBounds: this.calculateColumnBounds.bind(this)
+		});
 	}
-	this._initBoundLayer();
-
-	// Validate inputs
-	let rgtIndex = colIndex + width; // Exclusive
-	let btmIndex = rowIndex + height; // Exclusive
 
 	let colCount = this.getColumnCount();
-	let rowCount = this._layoutY.getLaneCount();
-
-	this._cbLftIdx = _validateIndex(colIndex, colCount);
-	this._cbRgtIdx = _validateIndex(rgtIndex, colCount);
-	this._cbTopIdx = _validateIndex(rowIndex, rowCount);
-	this._cbBtmIdx = _validateIndex(btmIndex, rowCount);
-
-	this._updateCellBounds();
+	cellBoundPainter.setCellBounds(colIndex, rowIndex, width, height, colCount);
 };
 /** @public
 * @ignore
@@ -35691,59 +35417,6 @@ VirtualizedLayoutGrid.prototype.getHorizontalLayout = function () {
 VirtualizedLayoutGrid.prototype.calculateColumnBounds = function (lftIdx, rgtIdx, outPositions, outNoBorders) {
 	this._grid.calculateColumnBounds(lftIdx, rgtIdx, outPositions, outNoBorders);
 };
-/** @private
-*/
-VirtualizedLayoutGrid.prototype._updateCellBounds = function () {
-	let cellBound = this._cellBound;
-	if(!cellBound) {
-		return;
-	}
-
-	let layoutX = this.getHorizontalLayout();
-	let layoutY = this._layoutY;
-	let lftIdx = this._cbLftIdx;
-	let rgtIdx = this._cbRgtIdx; // Exclusive
-	let topIdx = this._cbTopIdx;
-	let btmIdx = this._cbBtmIdx; // Exclusive
-	let lftPx, rgtPx, topPx, btmPx;
-	lftPx = rgtPx = topPx = btmPx = 0;
-	if(lftIdx < rgtIdx && topIdx < btmIdx) {
-		lftPx = layoutX.getLaneStart(lftIdx);
-		rgtPx = layoutX.getLaneEnd(rgtIdx - 1);
-		topPx = layoutY.getLaneStart(topIdx);
-		btmPx = layoutY.getLaneEnd(btmIdx - 1);
-	}
-
-	let width = rgtPx - lftPx;
-	let height = btmPx - topPx;
-	let noBorders = [false, false];
-	if(width > 0 && height > 0 && this._hscrollbar) {
-		let positions = [0, 0];
-		this.calculateColumnBounds(lftIdx, rgtIdx - 1, positions, noBorders);
-		lftPx = positions[0];
-		rgtPx = positions[1];
-		width = rgtPx - lftPx;
-	}
-
-	if(width > 0) {
-		cellBound.style.left = lftPx + "px";
-		cellBound.style.top = topPx + "px";
-		cellBound.style.width = width + "px";
-		cellBound.style.height = height + "px";
-
-		cellBound.classList.toggle("no-left-bound", noBorders[0]);
-		cellBound.classList.toggle("no-right-bound", noBorders[1]);
-
-		if(this._boundLayer) {
-			this._boundLayer.appendChild(cellBound);
-		}
-	} else {
-		let pn = cellBound.parentNode;
-		if(pn) {
-			pn.removeChild(cellBound);
-		}
-	}
-};
 /** @public
 * @ignore
 * @param {!Array.<Array>} posAry Left and right bound positions in pixel
@@ -35761,6 +35434,7 @@ VirtualizedLayoutGrid.prototype.updateColumnSeparators = function () {
 	this._grid.updateColumnSeparators();
 };
 /** @private
+* @return {Element}
 */
 VirtualizedLayoutGrid.prototype._initBoundLayer = function () {
 	let boundLayer = this._boundLayer;
@@ -35769,6 +35443,7 @@ VirtualizedLayoutGrid.prototype._initBoundLayer = function () {
 		boundLayer.className = "cover-layer";
 		this._element.appendChild(boundLayer);
 	}
+	return boundLayer;
 };
 /** @private
 */
@@ -35781,7 +35456,11 @@ VirtualizedLayoutGrid.prototype._requestUpdatingRowBounds = function () {
 */
 VirtualizedLayoutGrid.prototype._updateRowBounds = function () {
 	this._rowBoundTimer = 0;
-	this._updateCellBounds();
+
+	let cellBoundPainter = this._cellBoundPainter;
+	if(cellBoundPainter) {
+		cellBoundPainter.updateCellBounds();
+	}
 
 	if(!this._rowSelDirty) {
 		return;
@@ -36547,7 +36226,7 @@ Core.prototype._hasPendingRowChange = false;
 * @return {string}
 */
 Core.getVersion = function () {
-	return "5.1.103";
+	return "5.1.106";
 };
 /** {@link ElementWrapper#dispose}
 * @override
@@ -44916,28 +44595,6 @@ let toRowData = function(rowDef) {
 	return rowDef ? rowDef.getRowData() : null;
 };
 
-/** @private
-* @const
-* @type {Object.<string, number>}
-*/
-let _unclonableFields = {
-	"ROW_DEF": 1,
-	"SUB_ID": 1
-};
-/** @private
-* @param {RowDefinition} fromRowDef
-* @param {RowDefinition} toRowDef
-*/
-let cloneRowData = function(fromRowDef, toRowDef) {
-	let from = toRowData(fromRowDef);
-	let to = toRowData(toRowDef);
-	for(let key in from) {
-		if(!_unclonableFields[key]) {
-			to[key] = from[key];
-		}
-	}
-};
-
 /** @private
 * @param {RowDefinition} rowDef
 * @return {boolean}
@@ -45115,10 +44772,9 @@ let Grid = function(placeholder, config) {
 		}
 	}
 	if(!t._sharedDataSource) {
-		t._dc = new DataCache_DataCache();
+		t._dc = new DataCache();
 		t._dc.listen("dataChanged", t._onDataChanged);
 		t._dc.listen("dataComposed", t._onDataComposed);
-		t._dc.addStaticFields([ROW_DEF, SUB_ID]); // Static fields are deprecated, set fields to be ignore during clone in DataCache
 
 		t._dt = new DataTable();
 		t._dt.setSortingLogic(/** @type{Function} */(t._mainSorter));
@@ -46686,12 +46342,6 @@ Grid.prototype.removeColumn = function(colRef) {
 
 	let colDef = this.getColumnDefinition(colIndex);
 
-	if(!colDef.isRealTimeField()) {
-		if(this._dc) {
-			this._dc.removeStaticFields([colDef.getField()]);
-		}
-	}
-
 	this._grid.removeColumnAt(colIndex);
 	this._connector.removeFields(colDef);
 
@@ -46715,25 +46365,16 @@ Grid.prototype.removeColumns = function(colRefs) {
 	}
 	indices.sort(Grid._descendingOrder); // Removal must be done from the back
 
-	let staticFields = []; // For clearing any data stored in our cache
 	let prevState = this._grid.freezeLayout(); // To prevent multiple UI updates
 
 	for(let i = 0; i < len; ++i) {
 		let colIndex = indices[i];
 		let colDef = this.getColumnDefinition(colIndex);
-		if(!colDef.isRealTimeField()) {
-			staticFields.push(colDef.getField());
-		}
 		colDef.dispose();
 		this._grid.removeColumnAt(colIndex);
 		this._connector.removeFields(colDef);
 	}
 
-	if(staticFields.length) {
-		if(this._dc) {
-			this._dc.removeStaticFields(staticFields);
-		}
-	}
 	this._grid.freezeLayout(prevState);
 };
 /** Sorting is also cleared.
@@ -46763,9 +46404,6 @@ Grid.prototype.removeAllColumns = function() {
 
 	this._connector.removeAllFields();
 	this._grid.setColumnCount(0);
-	if(this._dc) {
-		this._dc.resetStaticFields();
-	}
 };
 
 /** Move the column at the specified index to the target index. When moving multiple columns, the original order of the source columns will be sorted by their index and the position of the columns will not be guaranteed to be exactly at the destination index.
@@ -47027,13 +46665,12 @@ Grid.prototype.setColumnSorter = function(colRef, func) {
 
 /** Initialize data for the given rowDef from another rowDef with the same RIC
 * @private
-* @param {RowDefinition} rowDef
+* @param {!RowDefinition} rowDef
 */
 Grid.prototype._initDuplicateRicData = function(rowDef) {
-	let ric = rowDef.getSymbol();
-	let rowDefs = this._connector.getRowDefByRic(ric);
-	if(rowDefs && rowDefs.length) {
-		cloneRowData(rowDefs[0], rowDef);
+	let rowDefs = this._connector.getRowDefByRic(rowDef.getSymbol());
+	if(rowDefs) {
+		rowDef.copyRowData(rowDefs[0]);
 	}
 };
 /** @public
@@ -47466,15 +47103,15 @@ Grid.prototype.hasHiddenRow = function(){
 * @param {Grid~RowReference} rowRef
 * @param {string} str RIC to be set to a row
 * @param {RowDefinition~Options=} options
+* @returns {RowDefinition} Returns modified Row Definition instance
 */
 Grid.prototype.setRic = function(rowRef, str, options) {
 	if(this._mainGrid) {
-		this._mainGrid.setRic(this._toRowId(rowRef), str, options);
-		return;
+		return this._mainGrid.setRic(this._toRowId(rowRef), str, options);
 	}
 	let rowDef = this._getRowDefinitionByRef(rowRef);
 	if(rowDef) {
-		var tempOpt = options || {};
+		let tempOpt = options || {};
 		if(typeof str === "string") {
 			tempOpt["ric"] = str;
 		} else {
@@ -47496,6 +47133,7 @@ Grid.prototype.setRic = function(rowRef, str, options) {
 			rowDef.setStaticRowData(values, tempOpt["fields"]);
 		}
 	}
+	return rowDef;
 };
 /** Unlink the chain and its constituents. When the chain is expanded,
  * the chain row and its members are converted from autogenerated to
@@ -48760,7 +48398,7 @@ Grid.prototype._logData = function(rowDefs, options) {
 		// TODO: Get all required fields and eliminate duplicate fields
 		options["colNames"] = this.getColumnFields();
 	}
-	let tbl = DataCache_DataCache.constructTable(rowDefs.map(toRowData), options);
+	let tbl = DataCache.constructTable(rowDefs.map(toRowData), options);
 
 	console.table(tbl); // eslint-disable-line
 };