cavalion-vcl 1.1.44 → 1.1.47

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+### 2022/01/18 -  1.1.47
+
+`#CVLN-20220118-1`
+
+* Workaround for weird rendering bug in ui/List
+
+### 2022/01/18 -  1.1.46
+
+* **ui/List**: Adding "ignore-busy" class behaviour
+* **ui/List**: Refactoring `groupByColumn(...)` -> `groupBy(column, ...)`
+* **ui/List**: Refactoring `render` => `render_` (vcl/Control.prototype.render was not being overridden/nameclashing)
+
+
+### 2022/01/07 -  1.1.45
+
+* **data/Array**: Fix for `context` parameter in `onFilterObject`-event
+
+### 2022/01/04
+
+- Adding sort-features to ui/List, -Column and -Header
+
 ### 2022/01/03 -  1.1.44
 
 * Adding `context` parameter to Array:onFilterObject-event, which can be used as a cache for a specific filter context (updateFilter-call)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cavalion-vcl",
-  "version": "1.1.44",
+  "version": "1.1.47",
   "description": "Visual Component Library for vcl-comps",
   "main": "index.js",
   "scripts": {

package/src/data/Array.js

@@ -185,7 +185,7 @@ define(function(require) {
 			
 			updateFilter: function(notify) {
 				if(this._onFilterObject !== null && this._array !== null) {
-					var arr = [], context = {};
+					var arr = [], context = { source: this };
 					this._arr = this._array;
 					for(var i = 0; i < this._array.length; ++i) {
 						var obj = this._array[i];
@@ -310,12 +310,15 @@ define(function(require) {
 					});
 				}
 
+				var A = this._arr;
 				this.assertArray();
 				try {
 					// TODO Hmm, this sorting of _arr feels a lil' dodgy TBH...
-					this._arr && window.Array.prototype.sort.apply(this._arr, arguments);
+					// this._arr && window.Array.prototype.sort.apply(this._arr, arguments);
+					this._arr = this._array;
 					return window.Array.prototype.sort.apply(this._array, arguments);
 				} finally {
+					this._arr = A;
 					this.arrayChanged();
 				}
 			}

package/src/entities/Query.js

@@ -358,9 +358,6 @@ define(function(require) {
 				return this._attributes !== "" ? this._attributes.split(",") : [];
 			},
 			processResult: function(res, page, criteria) {
-				
-				//this.print("page/" + page + "/processResult", {res: res, criteria: criteria});
-
 				var instances = res.instances;
 				var tuples = res.tuples;
 				var size = instances.length;
@@ -371,7 +368,7 @@ define(function(require) {
 					this.notify(SourceEvent.layoutChanged);
 				}
 
-				if(this._arr === null || this._arr.length === 0) {
+				if(this._arr === null/* || this._arr.length === 0*/) {
 					if(!res.hasOwnProperty("count")) {
 						if(this._count === false && page === 0 && res.instances.length === 0) {
 							res.count = 0;

package/src/prototypes/ui/forms/Home.tree.js

@@ -337,7 +337,7 @@ var Handlers = {
 			// @overrides ui/forms/Home<>
 			container.setVisible(false);
 			container.setParent(scope.client);
-			node.setText(params.title || "&nbsp;");
+			node.setText(params.text || params.title || "&nbsp;");
 			node.setVar("control", container);
 			node.setParent(parent || scope.tree);
 			node.update(function() {

package/src/ui/List.js

@@ -102,6 +102,15 @@ define(function(require) {
 			_onColumnGetValue: null,
 			_onColumnRenderCell: null,
 
+/**--		#CVLN-20220118-1-workaround */			
+			visibleChanged() {
+				if(this.isVisible()) {
+					// this.print("#CVLN-20220118-1 Calling rowHeightChanged-workaround");
+					this._body.rowHeightChanged();
+				}
+				return this.inherited(arguments);
+			},
+
 /**--		overrides ../Component.prototype */
 			destroy: function() {
 				/** @overrides ../Component.prototype.destroy */
@@ -212,7 +221,7 @@ define(function(require) {
 					var topRow = parseInt(me._nodes.body.scrollTop / me._rowHeight, 10);
 					me._topRow = topRow;
 					
-					me.render();
+					me.render_();
 				}
 
 				return this.inherited(arguments);
@@ -336,7 +345,7 @@ define(function(require) {
 			},
 
 			notifyEvent: function(event, data) {},
-			render: function(bodyUpdateRows/*TODO*/) {
+			render_: function(bodyUpdateRows/*TODO*/) {
 				if(bodyUpdateRows) return this._body.updateRows();
 				
 				var vrc = this.getVisibleRowCount(true);
@@ -346,8 +355,6 @@ define(function(require) {
 				}
 
 				var start = this._topRow - this._rowBuffer;
-
-
 				var end = start + vrc + this._rowBuffer * 2;
 
 				if(start < 0) {
@@ -390,7 +397,7 @@ define(function(require) {
 						}
 					}, 50);
 				}
-				this._body.render();
+				this._body.render_();
 			},
 			renderCell: function(cell, row, column) {
 				var value, orgValue;
@@ -489,7 +496,7 @@ define(function(require) {
 					}
 					this.setSelection([]);
 					//this.alignControls();
-					this.render();
+					this.render_();
 				}
 			},
 
@@ -533,7 +540,7 @@ define(function(require) {
 			setVisibleRowCount: function(value) {
 				if(this._visibleRowCount !== value) {
 					this._visibleRowCount = value;
-					this.render();
+					this.render_();
 				}
 			},
 			
@@ -655,12 +662,13 @@ define(function(require) {
 				this.notifyEvent("columnsChanged");
 			},
 			updateColumns: function() {
-				this.resetColumnAutoWidth(); 
-				
 				var updateColumns = this.updateColumns;
 				this.updateColumns = function() {
 					console.log("updateColumns blocked");
 				};
+
+				this.resetColumnAutoWidth(); 
+				
 				try {
 					if(this._source !== null) {
 						var columns = [].concat(this._columns);
@@ -668,15 +676,6 @@ define(function(require) {
 						var changed = false;
 						var attrs = this._source.getAttributeNames();
 
-//						sort(function(i1, i2) {
-//						    var s1 = i1.split(".").length;
-//						    var s2 = i2.split(".").length;
-//						    if(s1 !== s2) {
-//						        return s1 < s2 ? -1 : 1;
-//						    }
-//						    return i1 < i2 ? -1 : 1;
-//						});
-
 						for(var i = 0; i < attrs.length; ++i) {
 							var column = this.getColumnByAttribute(attrs[i]);
 							if(column === null) {
@@ -721,7 +720,7 @@ define(function(require) {
 				for(var i = 0; i < this._columns.length; ++i) {
 					this._columns[i].setAutoWidthValue("", true);
 				}
-				this.render();
+				this.render_();
 			},
 			getAutoColumns: function() {
 				return this._autoColumns;
@@ -760,7 +759,7 @@ define(function(require) {
 						break;
 
 					case SourceEvent.busyChanged:
-						if(data && this._topRow > 0) { /* TODO what about scrolling up? */
+						if((data && this._topRow > 0) || this.hasClass("ignore-busy")) { /* TODO what about scrolling up? */
 							return;
 						}
 						this.setTimeout("update-busy", function() {
@@ -825,10 +824,7 @@ define(function(require) {
 			},
 
 			valueByColumnAndRow(column, row) {
-				var value, orgValue;
-				if(column._attribute !== "") {
-					orgValue = (value = this._source.getAttributeValue(column._attribute, row));
-				}
+				var value = this._source.getAttributeValue(column._attribute, row);
 				if(column._wantsNullValues || (value !== null && value !== undefined)) {
 					if(column._displayFormat !== "") {
 						value = String.format(column._displayFormat, value);
@@ -845,14 +841,47 @@ define(function(require) {
 				}
 				return value;
 			},
-			groupByColumn(column) {
+			groupBy(column/*, ... TODO */) {
 				var r = {};
 				this._source.getObjects().forEach((obj, row) => {
-					var value = this.getValueByColumnAndRow(column, row);
+					var value = this.valueByColumnAndRow(column, row);
 					(r[value] = r[value] || []).push(obj);
 				});
 				return r;
 			},
+			sortBy(column, dir, numeric) {
+				
+				if(typeof column === "string") {
+					column = column.split(" ");
+					if(arguments.length === 1) {
+						dir = column[1];
+					}
+					if(column.length === 2) {
+						numeric = column[2] === "numeric";
+					}
+					column = this.getColumnByName(column[0]);
+				} else if(typeof column === "number") {
+					column = this.getColumn();
+				}
+
+				this._source.sort((i1, i2) => {
+					
+					var row1 = this._source._array.indexOf(i1);
+					var row2 = this._source._array.indexOf(i2);
+
+					i1 = this.valueByColumnAndRow(column, row1);
+					i2 = this.valueByColumnAndRow(column, row2);
+					
+					if(numeric === true) {
+						if(isNaN(i1 = parseFloat(i1))) return 1;
+						if(isNaN(i2 = parseFloat(i2))) return -1;
+					}
+					
+					if(i1 === i2) return 0;
+					
+					return (dir === "desc" ? -1 : 1) * (i1 < i2 ? -1 : 1);
+				});
+			},
 			
 			hasSelection: function() {
 				return this._selection.length > 0;

package/src/ui/ListBody.js

@@ -53,7 +53,7 @@ define(function(require) {
 			getList: function() {
 				return this._parent !== null ? this._parent : null;
 			},
-			render: function() {
+			render_: function() {
 				var list = this.getList();
 				if(list.getCount() === 0) {
 					this._firstRow = 0;

package/src/ui/ListColumn.js

@@ -242,9 +242,8 @@ define(function(require) {
 				return r;
 			},
 			
-			
 			groupBy: function() {
-				return this._list.groupByColumn(this);	
+				return this._list.groupBy(this);	
 			},
 
 			sizing: function(evt) {

package/src/ui/ListHeader.js

@@ -9,9 +9,7 @@ define(function(require) {
 	var ListColumn = require("js/referenceClass!./List");
 
 	var ListHeader = {
-
 		inherits: Panel,
-
 		prototype: {
 
 			"@css": {
@@ -44,30 +42,17 @@ define(function(require) {
 				}
 			},
 
-			/**
-			 *
-			constructor: function() {
-			},
-			 */
-
-			/**
-			 * @overrides ../Control.prototype
-			 */
+			/** @overrides ../Control.prototype */
 			_align: "top",
 			_autoSize: "height",
 			_content: "<div></div>",
 
-			/**
-			 * @overrides ../Control.prototype.getClientNode
-			 */
 			getClientNode: function() {
+				/** overrides ../Control.prototype.getClientNode */
 				return this._node.childNodes[0];
 			},
-
-			/**
-			 * @overrides ../Control.prototype.setParent
-			 */
 			setParent: function(value) {
+				/** overrides ../Control.prototype.setParent */
 				if(this._parent !== value) {
 					if(this._parent !== null) {
 						Method.disconnect(this._parent, "notifyEvent", this, "listNotifyEvent");
@@ -81,11 +66,8 @@ define(function(require) {
 					}
 				}
 			},
-
-			/**
-			 * @overrides ../Control.prototype.dispatchChildEvent
-			 */
 			dispatchChildEvent: function(component, name, evt, f) {
+				/** overrides ../Control.prototype.dispatchChildEvent */
 				if(component instanceof ListColumn && component._parent === this) {
 					if(name === "dragstart" && component.hasClass("size") === false) {
 						var listview = this.getList();
@@ -141,25 +123,16 @@ define(function(require) {
 				return this.inherited(arguments);
 			},
 
-			/**
-			 *
-			 */
 			listNotifyEvent: function(event, data) {
 				if(event === "setScrollLeft" && this._node !== null) {
 					this._node/*.childNodes[0]*/.scrollLeft = data;
 				}
 			},
-
-			/**
-			 *
-			 */
 			getList: function() {
 				return this._parent !== null ? this._parent : null;
 			}
 		},
-
 		properties: {
-
 			"align": {
 				set: Method,
 				type: Panel.ALIGN
@@ -172,4 +145,4 @@ define(function(require) {
 	};
 
 	return (ListHeader = Class.define(require, ListHeader));
-});
+});