mmhglobal-dynamicform 1.1.29 → 1.1.33

package/README.md

@@ -3,6 +3,25 @@
 This library was generated with [Angular CLI](https://github.com/angular/angular-cli) version 11.2.13.
 
 ## Changelog 
+`1.33`<br/>
+[zupload] - minor fix for selectFileOnly attribute. <br/>
+[zgrid] - added support for filter operator "contains" for .net core. Default as contains, to use ==, zgrid attribute add FilterContainsUsingEqual:true.
+
+`1.32`<br/>
+[zgrid] - added getFormControlData function to retrieve incell data. <br/>
+[zgrid] - added AfterloadCallback attribute handling. <br/>
+[zgrid] - fix form control error when grid data is null. <br/>
+[zupload] - save file data to group scope. <br/>
+[zquerybuilder] - bug fix for query builder.
+
+`1.31`<br/>
+update dynamicform module for zuploadmodule. <br/>
+
+`1.30`<br/>
+[zupload] - support Select/Remove/Change Event. <br/>
+[zupload] - added SelectFileOnly attribute handling, to allow select file without upload. <br/>
+[zupload] - added selected file append to group scope (type+value as name). <br/>
+
 `1.1.29`<br/>
 [zgrid] - Incelledit support ztime format. <br/>
 [zgrid] - cleaned the code and the way data been loaded. <br/>

package/bundles/mmhglobal-dynamicform.umd.js

@@ -2397,6 +2397,11 @@
                     return "isnull";
                 case "isnotnull":
                     return "isnotnull";
+                case "contains": {
+                    if (!this.field['FilterContainsUsingEqual']) {
+                        return "contains";
+                    }
+                }
                 default:
                     return "==";
                 // eq, neq, isnull, isnotnull, endswith, startswith
@@ -5537,7 +5542,9 @@
                         });
                     }
                 }
-                _this.createFormControls();
+                if (_this.gData) {
+                    _this.createFormControls();
+                }
             };
             /* Available Functions */
             this.setEnable = function (status) {
@@ -5628,6 +5635,9 @@
                     _this.setGridSessionKey(_this.group);
                 }
                 return rxjs.of(true);
+            }), operators.tap(function () {
+                _this.gridCallback(_this.group);
+                return rxjs.of(true);
             })).subscribe();
         };
         ZgridComponent.prototype.ngOnDestroy = function () {
@@ -5769,6 +5779,16 @@
                 });
             }
         };
+        ZgridComponent.prototype.gridCallback = function (group) {
+            if (this.data['AfterloadCallback']) {
+                var me = Object.assign({}, this);
+                this.group.subject.next({
+                    type: "zgrid-AfterloadCallback",
+                    target: this.data['AfterloadCallback'],
+                    data: me
+                });
+            }
+        };
         ZgridComponent.prototype.getData = function () {
             if (this.zgrid) {
                 this.zgrid.getDataBinding();
@@ -6074,6 +6094,9 @@
             var formArray = this.inlineEditedFormGroups.get('items');
             return formArray.at(rowIndex);
         };
+        ZgridComponent.prototype.getFormControlData = function (value) {
+            return this.inlineEditedFormGroups.value.items;
+        };
         /* Event */
         ZgridComponent.prototype.beforeGridGetData = function (group, me) {
             console.warn("beforeDataBinding triggered");
@@ -8125,10 +8148,12 @@
             return this.qbItems[rule.field].options ? this.qbItems[rule.field].options : optionsList;
         };
         ZquerybuilderComponent.prototype.setQueryValue = function (queryValueString) {
-            var defaultQueryValueJson = JSON.parse(queryValueString);
-            this.queryCtrl = defaultQueryValueJson;
-            // default lock the query builder if there default query
-            this.completeRule(true, defaultQueryValueJson);
+            if (queryValueString) {
+                var defaultQueryValueJson = toQueryRule(JSON.parse(queryValueString));
+                this.queryCtrl = defaultQueryValueJson;
+                // default lock the query builder if there default query
+                this.completeRule(true, defaultQueryValueJson);
+            }
         };
         return ZquerybuilderComponent;
     }());
@@ -8150,7 +8175,23 @@
         data: [{ type: i0.Input }],
         group: [{ type: i0.Input }],
         form: [{ type: i0.Input }]
-    };
+    };
+    function toQueryRule(queryBuilderModel) {
+        var rule = {};
+        if (queryBuilderModel.condition) {
+            rule.condition = queryBuilderModel.condition;
+            rule.rules = queryBuilderModel.rules.map(function (q) { return toQueryRule(q); });
+        }
+        else {
+            rule.field = queryBuilderModel.field;
+            rule.type = queryBuilderModel.type;
+            rule.operator = queryBuilderModel.operator;
+            rule.value = queryBuilderModel.value instanceof Array
+                ? queryBuilderModel.type === 'date' ? new Date(queryBuilderModel.value) : queryBuilderModel.value
+                : [queryBuilderModel.type === 'date' ? new Date(queryBuilderModel.value) : queryBuilderModel.value];
+        }
+        return rule;
+    }
 
     /********** Angular **********/
     var ZreportComponent = /** @class */ (function () {
@@ -10620,7 +10661,6 @@
         form: [{ type: i0.Input }]
     };
 
-    /********** Angular **********/
     var MyFileInfo = /** @class */ (function () {
         function MyFileInfo() {
         }
@@ -10662,6 +10702,7 @@
             this.imagePreviews = [];
             this.uid = [];
             this.showFileList = true;
+            this.fileList = [];
             this.restrictions = {
                 allowedExtensions: [
                     "jpg",
@@ -10838,49 +10879,115 @@
         };
         ZuploadComponent.prototype.onRemove = function (e) {
             var _this = this;
-            var myFile = e.files[0];
-            // console.log('remove done: ', e);
-            e.data = {
-                id: myFile.myUid,
-            };
-            e.headers = e.headers.append("Authorization", "Bearer " + this.authService.e1AccessToken);
-            if (this.data.EnableImagePreview) {
-                e.files.forEach(function (file) {
-                    _this.imagePreviews = _this.imagePreviews.filter(function (f) { return f.uid !== file.uid; });
+            // remove file from component memory
+            var index = this.fileList.findIndex(function (item) { return item.uid === e.files[0].uid; });
+            if (index >= 0) {
+                this.fileList.splice(index, 1);
+                this.group['zupload_' + this.data.Value] = this.fileList;
+            }
+            if (this.data['FileRemovedEvent']) {
+                this.group.subject.next({
+                    type: "zupload-fileRemovedEvent",
+                    target: this.data['FileRemovedEvent'],
+                    data: e
+                });
+            }
+            else {
+                var myFile = e.files[0];
+                // console.log('remove done: ', e);
+                e.data = {
+                    id: myFile.myUid,
+                };
+                e.headers = e.headers.append("Authorization", "Bearer " + this.authService.e1AccessToken);
+                if (this.data.EnableImagePreview) {
+                    e.files.forEach(function (file) {
+                        _this.imagePreviews = _this.imagePreviews.filter(function (f) { return f.uid !== file.uid; });
+                    });
+                }
+            }
+        };
+        ZuploadComponent.prototype.onChange = function (file) {
+            if (this.data['FileChangedEvent']) {
+                this.group.subject.next({
+                    type: "zupload-fileChangedEvent",
+                    target: this.data['FileChangedEvent'],
+                    data: file
                 });
             }
         };
         ZuploadComponent.prototype.selectEventHandler = function (e) {
             var _this = this;
             var me = this;
-            // Only workable for Auto Upload = false
-            if (!this.data.AutoUpload) {
-                // Compression for image file
-                var imageCompressionEnabled = this.data.Compression ? true : false;
-                //Check if Image Compression is enabled.
-                if (imageCompressionEnabled === true) {
-                    e.files.forEach(function (file) {
-                        // Compress only if it is an image file
-                        if (file.rawFile && file.rawFile.type.includes("image")) {
-                            if (!file.validationErrors) {
-                                var imgConfig = _this.compressionConfigHandler(_this.data.Compression);
-                                if (file.size > imgConfig.FileSizeMinSizeByte) {
-                                    me.compressImage.compress(file.rawFile, imgConfig) //Pass in parameter to set the Compression Options
-                                        .pipe(operators.take(1))
-                                        .subscribe(function (compressFile) {
-                                        _this.ngZone.run(function () {
-                                            file.rawFile = compressFile;
-                                            file.size = compressFile.size;
-                                            var reader = new FileReader();
-                                            reader.readAsDataURL(file.rawFile);
+            if (this.data['SelectFileOnly']) {
+                // append all file to component memory
+                e.files.forEach(function (file) { return __awaiter(_this, void 0, void 0, function () {
+                    var reader;
+                    return __generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0:
+                                if (!file.rawFile) return [3 /*break*/, 2];
+                                reader = new FileReader();
+                                reader.onload = function (ev) {
+                                    // clone the data and also add the readed file to the object
+                                    var fileData = Object.assign({}, file);
+                                    fileData['file'] = ev.target["result"];
+                                    // push to component fileList
+                                    me.fileList.push(fileData);
+                                    me.group['zupload_' + me.data.Value] = me.fileList;
+                                    if (me.data['FileSelectedEvent']) {
+                                        // call the project event
+                                        me.group.subject.next({
+                                            type: "zupload-fileSelectedEvent",
+                                            target: me.data['FileSelectedEvent'],
+                                            data: me.fileList
                                         });
-                                        console.log("Compressed file size: " + (file.rawFile.size / 1024).toFixed(2) + "KB");
-                                    });
-                                } // file size check
-                            } // validationErrors check
-                        } // file type check
-                    }); // loop each file
-                } // imagecompression check
+                                    }
+                                };
+                                return [4 /*yield*/, reader.readAsDataURL(file.rawFile)];
+                            case 1:
+                                _a.sent();
+                                _a.label = 2;
+                            case 2: return [2 /*return*/];
+                        }
+                    });
+                }); });
+            }
+            else {
+                // Only workable for Auto Upload = false
+                if (!this.data.AutoUpload) {
+                    // Compression for image file
+                    var imageCompressionEnabled = this.data.Compression ? true : false;
+                    //Check if Image Compression is enabled.
+                    if (imageCompressionEnabled === true) {
+                        e.files.forEach(function (file) {
+                            // Compress only if it is an image file
+                            if (file.rawFile && file.rawFile.type.includes("image")) {
+                                if (!file.validationErrors) {
+                                    var imgConfig = _this.compressionConfigHandler(_this.data.Compression);
+                                    if (file.size > imgConfig.FileSizeMinSizeByte) {
+                                        me.compressImage.compress(file.rawFile, imgConfig) //Pass in parameter to set the Compression Options
+                                            .pipe(operators.take(1))
+                                            .subscribe(function (compressFile) {
+                                            _this.ngZone.run(function () {
+                                                file.rawFile = compressFile;
+                                                file.size = compressFile.size;
+                                                // clone the data and also add the readed file to the object
+                                                var fileData = Object.assign({}, file);
+                                                // push to component fileList
+                                                me.fileList.push(fileData);
+                                                var reader = new FileReader();
+                                                reader.readAsDataURL(file.rawFile);
+                                            });
+                                            console.log("Compressed file size: " + (file.rawFile.size / 1024).toFixed(2) + "KB");
+                                        });
+                                    } // file size check
+                                } // validationErrors check
+                            } // file type check
+                        }); // loop each file
+                    } // imagecompression check
+                    // add to group scope 
+                    me.group['zupload_' + me.data.Value] = e.files;
+                }
             }
         };
         return ZuploadComponent;
@@ -10888,7 +10995,7 @@
     ZuploadComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: "app-zupload",
-                    template: "<ion-item [formGroup]=\"form\" *ngIf=\"(!!componentProperties.isVisibleField ? group[componentProperties.isVisibleField] : componentProperties.isVisible)\" [ngClass]=\"getIon_InvalidClass(form, data)\" style=\"margin-left: -15px;\">\r\n  <ion-label [attr.for]=\"data.Value\" *ngIf=\"data.ShowLabel === undefined || data.ShowLabel\" position=\"stacked\" style=\"margin-bottom: 10px;\">\r\n    {{data.Label}} <ion-text *ngIf=\"(!!componentProperties.isRequiredField ? group[componentProperties.isRequiredField] : componentProperties.isRequired)\" color=\"danger\">*</ion-text>\r\n  </ion-label>\r\n  <div class=\"ion-row\" style=\"justify-content: space-between; width: 100%\">\r\n    <span style=\"flex: 1;\">\r\n      <kendo-upload [autoUpload]=\"isAutoUpload\"\r\n                    [saveUrl]=\"uploadSaveUrl\"\r\n                    [removeUrl]=\"uploadRemoveUrl\"\r\n                    [restrictions]=\"restrictions\"\r\n                    [formControlName]=\"data.Value\"\r\n                    [multiple]=\"isMultiple\"\r\n                    [chunkable]=\"chunkSettings\"\r\n                    [showFileList]=\"showFileList\"\r\n                    (select)=\"selectEventHandler($event)\"\r\n                    (remove)=\"onRemove($event)\"\r\n                    (success)=\"onSuccess($event)\"\r\n                    (upload)=\"uploadEventHandler($event)\">\r\n      </kendo-upload>\r\n    </span>\r\n  </div>\r\n</ion-item>\r\n<br />\r\n<!--<div class=\"wrap\" *ngIf=\"data.EnableCompression\">\r\n  <ion-label>Enable Compression: </ion-label>\r\n  <ion-checkbox style=\"margin: -5px 0;\" color=\"primary\" (ionChange)=\"toogleEnableCompression($event)\"></ion-checkbox>\r\n</div>-->\r\n<ion-label *ngIf=\"imagePreviews.length\" position=\"stacked\">\r\n  Image Preview:\r\n</ion-label>\r\n<div *ngIf=\"imagePreviews.length\" >\r\n  <img *ngFor=\"let image of imagePreviews\"\r\n       [src]=\"image.src\"\r\n       alt=\"image preview\"\r\n       height=\"100\"\r\n       style=\"margin: 5px; border: 1px solid gray;\"/>\r\n</div>\r\n  ",
+                    template: "<ion-item [formGroup]=\"form\" *ngIf=\"(!!componentProperties.isVisibleField ? group[componentProperties.isVisibleField] : componentProperties.isVisible)\" [ngClass]=\"getIon_InvalidClass(form, data)\" style=\"margin-left: -15px;\">\r\n  <ion-label [attr.for]=\"data.Value\" *ngIf=\"data.ShowLabel === undefined || data.ShowLabel\" position=\"stacked\" style=\"margin-bottom: 10px;\">\r\n    {{data.Label}} <ion-text *ngIf=\"(!!componentProperties.isRequiredField ? group[componentProperties.isRequiredField] : componentProperties.isRequired)\" color=\"danger\">*</ion-text>\r\n  </ion-label>\r\n  <div class=\"ion-row\" style=\"justify-content: space-between; width: 100%\">\r\n    <span style=\"flex: 1;\">\r\n      <kendo-upload *ngIf=\"!data.SelectFileOnly\"\r\n                    [autoUpload]=\"isAutoUpload\"\r\n                    [saveUrl]=\"uploadSaveUrl\"\r\n                    [removeUrl]=\"uploadRemoveUrl\"\r\n                    [restrictions]=\"restrictions\"\r\n                    [formControlName]=\"data.Value\"\r\n                    [multiple]=\"isMultiple\"\r\n                    [chunkable]=\"chunkSettings\"\r\n                    [showFileList]=\"showFileList\"\r\n                    (select)=\"selectEventHandler($event)\"\r\n                    (remove)=\"onRemove($event)\"\r\n                    (success)=\"onSuccess($event)\"\r\n                    (upload)=\"uploadEventHandler($event)\">\r\n      </kendo-upload>\r\n\r\n      <kendo-fileselect *ngIf=\"data.SelectFileOnly\"\r\n                        (select)=\"selectEventHandler($event)\"\r\n                        (remove)=\"onRemove($event)\"\r\n                        (valueChange)=\"onChange($event)\"\r\n                        [restrictions]=\"restrictions\" >\r\n      </kendo-fileselect>\r\n    </span>\r\n  </div>\r\n</ion-item>\r\n<br />\r\n<!--<div class=\"wrap\" *ngIf=\"data.EnableCompression\">\r\n  <ion-label>Enable Compression: </ion-label>\r\n  <ion-checkbox style=\"margin: -5px 0;\" color=\"primary\" (ionChange)=\"toogleEnableCompression($event)\"></ion-checkbox>\r\n</div>-->\r\n<ion-label *ngIf=\"imagePreviews.length\" position=\"stacked\">\r\n  Image Preview:\r\n</ion-label>\r\n<div *ngIf=\"imagePreviews.length\" >\r\n  <img *ngFor=\"let image of imagePreviews\"\r\n       [src]=\"image.src\"\r\n       alt=\"image preview\"\r\n       height=\"100\"\r\n       style=\"margin: 5px; border: 1px solid gray;\"/>\r\n</div>\r\n",
                     styles: [""]
                 },] }
     ];
@@ -11394,6 +11501,7 @@
                         kendoAngularTreeview.TreeViewModule,
                         kendoAngularTooltip.TooltipModule,
                         kendoAngularUpload.UploadModule,
+                        kendoAngularUpload.UploadsModule,
                         i3.ZCoreModule,
                         i4.MmhglobalZmodalModule
                     ],
@@ -11581,6 +11689,7 @@
     exports.ZuploadComponent = ZuploadComponent;
     exports.ZworkflowbuttonsComponent = ZworkflowbuttonsComponent;
     exports.refreshGrid = refreshGrid;
+    exports.toQueryRule = toQueryRule;
     exports.ɵa = ZComponentDebugService;
     exports.ɵb = ZGridCalendarBindingDirective;
     exports.ɵc = ZComponentService;