mmhglobal-dynamicform 1.2.0 → 1.2.3

package/README.md

@@ -3,6 +3,17 @@
 This library was generated with [Angular CLI](https://github.com/angular/angular-cli) version 11.2.13.
 
 ## Changelog
+`1.2.3`<br/> 
+[ztree] - fix ztree selected node ui when popup.
+[zgrid] - enhance on grid command handler.
+mainservice - fix successhandler.
+
+`1.2.2`<br/> 
+[ztree] - fix ztree ui in when popup.
+
+`1.2.1`<br/> 
+[ztree] - fix popup ui display.
+
 `1.2.0`<br/> 
 [zgrid] - change page button from 5 to 3.<br/>
 [zgrid] - allow previousnext page button by setting EnablePreviousNextButton true/false.<br/>
@@ -11,7 +22,7 @@ This library was generated with [Angular CLI](https://github.com/angular/angular
 [zgrid] - fix PageSize NAN if using setdata.<br/>
 [zgrid] - hide tooltips if is command cell.<br/>
 [zgrid] - Added validation for cell edit via EnableGridCommand.<br/>
-[zree] - fix ui for latest kendo treeview v8.<br/>
+[ztree] - fix ui for latest kendo treeview v8.<br/>
 [zgridcalendar] - removed.<br/>
 Update Kendo component.
 

package/bundles/mmhglobal-dynamicform.umd.js

@@ -1451,25 +1451,13 @@
             }
         };
         MainService.prototype.handleSuccess = function (res, successMsg) {
-            var _this = this;
             this.group.isTriggered = false;
-            if (res == null) {
-                this.toastService.show(successMsg);
-            }
-            else if (res.Data !== undefined && res.ProcessingStatus !== undefined) {
-                if (res.ProcessingStatus === true) {
-                    if (Array.isArray(res.Data)) {
-                        res.Data.map(function (s) { return _this.webApiService.showHttpResponseMessage(i3.MESSAGETYPE.Success, successMsg + " : " + s.CostCode, null); });
-                    }
-                    else {
-                        this.webApiService.showHttpResponseMessage(i3.MESSAGETYPE.Success, successMsg, null);
-                    }
+            if (res) {
+                if (res.ProcessingStatus) {
+                    this.webApiService.showHttpResponseMessage(i3.MESSAGETYPE.Success, successMsg, null);
                 }
+                return res;
             }
-            else {
-                this.toastService.show(successMsg);
-            }
-            return res;
         };
         MainService.prototype.handleError = function (res) {
             this.group.isTriggered = false;
@@ -5955,7 +5943,7 @@
                 var _zgrid = this.zgrid;
             }
         };
-        /*  */
+        /* grid command handler */
         ZgridComponent.prototype.addHandler = function (_a) {
             var sender = _a.sender;
             this.isNew = true;
@@ -5981,18 +5969,24 @@
         ZgridComponent.prototype.saveHandler = function (_a) {
             var sender = _a.sender, rowIndex = _a.rowIndex, formGroup = _a.formGroup, isNew = _a.isNew;
             // get grid data.
-            var gridExistingData = this.gData ? this.gData : [];
+            var gridExistingData = this.gData ? this.gData : this.gridData ? this.gridData.data : [];
             // if valid
             if (formGroup.valid) {
                 // check for duplicate UniqueKey
-                var uniqueKeyExist_1 = false;
+                var uniqueKeyExist_1;
                 var uniqueKey_1 = this.data['UniqueKey'];
                 if (uniqueKey_1) {
-                    gridExistingData.forEach(function (data) {
-                        if (data[uniqueKey_1] === formGroup.value[uniqueKey_1]) {
-                            uniqueKeyExist_1 = true;
-                        }
-                    });
+                    var formUniqueKeyValue_1 = formGroup.value[uniqueKey_1];
+                    if (isNew || (!isNew && (gridExistingData[rowIndex][uniqueKey_1] != formUniqueKeyValue_1))) {
+                        // if new...
+                        // if edit... if current field, uniquekey value changed. need to check.  
+                        gridExistingData.forEach(function (data) {
+                            if (data[uniqueKey_1] === formUniqueKeyValue_1) {
+                                uniqueKeyExist_1 = true;
+                                return;
+                            }
+                        });
+                    }
                 }
                 if (!uniqueKeyExist_1) {
                     if (isNew) {
@@ -6006,6 +6000,9 @@
                     this.setData(gridExistingData);
                     sender.closeRow(rowIndex);
                 }
+                else {
+                    this.toastService.show('Error occur: Duplicated unique field entry.', 'top', true, 3000, 'danger');
+                }
             }
         };
         ZgridComponent.prototype.cancelHandler = function (_a) {
@@ -8058,18 +8055,23 @@
                     });
                 }
                 else {
-                    var optionData_1 = i3.ZComponentHelper.getGroupEvalValue.call(this, this.itemDataField);
-                    // append data via timeout after data is loaded.
-                    if (optionData_1 && optionData_1.length === 1 && !this.data.DisableAutoFirstSelection) {
-                        var thisComponent_1 = this;
-                        setTimeout(function () {
-                            thisComponent_1.autoSelectFirstOption(isRequired_1, optionData_1[0], fieldValue, thisComponent_1.group.zModel.Id);
-                            if (this.group) {
-                                if (this.group.afterLoadzDataOptions) {
-                                    this.group.afterLoadzDataOptions(this.group);
+                    if (Array.isArray(this.data.SelectOptions) && this.data.SelectOptions) {
+                        //skip eval if selectoptions is exist
+                    }
+                    else {
+                        var optionData_1 = i3.ZComponentHelper.getGroupEvalValue.call(this, this.itemDataField);
+                        // append data via timeout after data is loaded.
+                        if (optionData_1 && optionData_1.length === 1 && !this.data.DisableAutoFirstSelection) {
+                            var thisComponent_1 = this;
+                            setTimeout(function () {
+                                thisComponent_1.autoSelectFirstOption(isRequired_1, optionData_1[0], fieldValue, thisComponent_1.group.zModel.Id);
+                                if (this.group) {
+                                    if (this.group.afterLoadzDataOptions) {
+                                        this.group.afterLoadzDataOptions(this.group);
+                                    }
                                 }
-                            }
-                        }, 100);
+                            }, 100);
+                        }
                     }
                     this.isLoading = false;
                 }
@@ -9095,6 +9097,7 @@
             this.state = { expandedkeys: [] };
             this.itemIndex = [];
             this.selectedKeys = [];
+            this.absoluteText = false;
             this.componentProperties = new i3.ZComponentProperties();
             this.isExpanded = function (dataItem, index) {
                 // console.log(index);
@@ -9170,6 +9173,10 @@
             if (this.data.TreeviewExpandAll) {
                 this.expandAll();
             }
+            // fix text align issue
+            if (this.data.OnAddNode || this.data.OnRemoveNode) {
+                this.absoluteText = true;
+            }
         };
         ZtreeComponent.prototype.ngAfterViewInit = function () {
             // const componentId = ZComponentHelper.getComponentId(this.data);
@@ -9439,8 +9446,8 @@
     ZtreeComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: "app-ztree",
-                    template: "<div style=\"width:100%\"\r\n     *ngIf=\"(!!componentProperties.isVisibleField ? group[componentProperties.isVisibleField] : componentProperties.isVisible)\">\r\n  <kendo-treeview [nodes]=\"getItems()\"\r\n                  kendoTreeViewExpandable\r\n                  kendoTreeViewSelectable\r\n                  kendoTreeViewDragAndDrop\r\n                  kendoTreeViewDragAndDropEditing\r\n                  [isExpanded]=\"isExpanded\"\r\n                  (collapse)=\"handleCollapse($event)\"\r\n                  (expand)=\"handleExpand($event)\"\r\n                  (nodeDrop)=\"handleNodeDrop($event)\"\r\n                  (nodeDragEnd)=\"handleNodeDragEnd($event)\"\r\n                  (selectionChange)=\"onSelectionChange($event)\"\r\n                  [selectedKeys]=\"selectedKeys\"\r\n                  kendoTreeViewHierarchyBinding\r\n                  childrenField=\"Value\"\r\n                  [filterable]=\"data.Filterable\"\r\n                  textField=\"Name\"\r\n                  (filterChange)=\"handleFilter($event)\">\r\n\r\n    <ng-template kendoTreeViewNodeTemplate let-dataItem #nodetemplate>\r\n\r\n      <ion-button *ngIf=\"!!data.OnAddNode\"\r\n                  (click)=\"onAddNode($event, dataItem, data, group)\"\r\n                  style=\"zoom: 0.6; margin: 0 0 0 2px;\" mat-raised-button color=\"primary\" size=\"medium\"\r\n                  [hidden]=\"(!!dataItem.OnAddNodeVisible)\">\r\n        <!-- <ion-icon name=\"add\" slot=\"icon-only\"></ion-icon> -->\r\n        <fa-icon [icon]=\"'plus'\"></fa-icon>\r\n      </ion-button>\r\n      <ion-button *ngIf=\"!!data.OnRemoveNode\" (click)=\"onRemoveNode($event, dataItem, data, group)\"\r\n                  style=\"zoom: 0.6; margin: 0 15px 0 10px;\" color=\"danger\" mat-raised-button size=\"medium\"\r\n                  [hidden]=\"(!!dataItem.OnRemoveNodeVisible)\">\r\n        <!-- <ion-icon name=\"close\" slot=\"icon-only\"></ion-icon> -->\r\n        <fa-icon [icon]=\"'minus'\"></fa-icon>\r\n      </ion-button>\r\n\r\n      <ion-label style=\"position: absolute; top: 14px;\">\r\n        {{ getTemplate(dataItem, data, group) }}\r\n      </ion-label>\r\n\r\n    </ng-template>\r\n  </kendo-treeview>\r\n</div>\r\n",
-                    styles: [":host{--ion-color-primary:#479400;--ion-color-primary-rgb:56,128,255;--ion-color-primary-contrast:#fff;--ion-color-primary-contrast-rgb:255,255,255;--ion-color-primary-shade:#3171e0;--ion-color-primary-tint:#4c8dff}:host ::ng-deep kendo-treeview .k-treeview-leaf{width:100%;margin:5px;padding:9px 20px 9px 8px;border-radius:3px;border:1px solid #c8dbf5;background-color:#e3ecf8;color:#0a45ab;font-size:13px;cursor:pointer}:host ::ng-deep kendo-treeview .k-treeview-leaf.k-state-selected{width:100%;margin:5px;padding:9px 20px 9px 8px;border-radius:3px;background-color:#a9c3e8;color:#0a45ab;font-size:13px;cursor:pointer}:host ::ng-deep kendo-treeview .k-treeview-leaf.k-state-hover,:host ::ng-deep kendo-treeview .k-treeview-leaf:hover{width:100%;margin:5px;padding:9px 20px 9px 8px;border-radius:3px;background-color:#c9daf2;color:#0a45ab;font-size:13px;cursor:pointer}"]
+                    template: "<div style=\"width:100%\"\r\n     *ngIf=\"(!!componentProperties.isVisibleField ? group[componentProperties.isVisibleField] : componentProperties.isVisible)\">\r\n  <kendo-treeview [nodes]=\"getItems()\"\r\n                  kendoTreeViewExpandable\r\n                  kendoTreeViewSelectable\r\n                  kendoTreeViewDragAndDrop\r\n                  kendoTreeViewDragAndDropEditing\r\n                  [isExpanded]=\"isExpanded\"\r\n                  (collapse)=\"handleCollapse($event)\"\r\n                  (expand)=\"handleExpand($event)\"\r\n                  (nodeDrop)=\"handleNodeDrop($event)\"\r\n                  (nodeDragEnd)=\"handleNodeDragEnd($event)\"\r\n                  (selectionChange)=\"onSelectionChange($event)\"\r\n                  [selectedKeys]=\"selectedKeys\"\r\n                  kendoTreeViewHierarchyBinding\r\n                  childrenField=\"Value\"\r\n                  [filterable]=\"data.Filterable\"\r\n                  textField=\"Name\"\r\n                  (filterChange)=\"handleFilter($event)\">\r\n\r\n    <ng-template kendoTreeViewNodeTemplate let-dataItem #nodetemplate>\r\n\r\n      <ion-button *ngIf=\"!!data.OnAddNode\"\r\n                  (click)=\"onAddNode($event, dataItem, data, group)\"\r\n                  style=\"zoom: 0.6; margin: 0 0 0 2px;\" mat-raised-button color=\"primary\" size=\"medium\"\r\n                  [hidden]=\"(!!dataItem.OnAddNodeVisible)\"> \r\n        <fa-icon [icon]=\"'plus'\"></fa-icon>\r\n      </ion-button>\r\n      <ion-button *ngIf=\"!!data.OnRemoveNode\" (click)=\"onRemoveNode($event, dataItem, data, group)\"\r\n                  style=\"zoom: 0.6; margin: 0 15px 0 10px;\" color=\"danger\" mat-raised-button size=\"medium\"\r\n                  [hidden]=\"(!!dataItem.OnRemoveNodeVisible)\"> \r\n        <fa-icon [icon]=\"'minus'\"></fa-icon>\r\n      </ion-button>\r\n\r\n      <ion-label *ngIf=\"absoluteText\" style=\"position: absolute; top: 14px;\">\r\n        {{ getTemplate(dataItem, data, group) }}\r\n      </ion-label>\r\n\r\n      <ion-label *ngIf=\"!absoluteText\">\r\n        {{ getTemplate(dataItem, data, group) }}\r\n      </ion-label>\r\n    </ng-template>\r\n  </kendo-treeview>\r\n</div>\r\n",
+                    styles: [":host{--ion-color-primary:#479400;--ion-color-primary-rgb:56,128,255;--ion-color-primary-contrast:#fff;--ion-color-primary-contrast-rgb:255,255,255;--ion-color-primary-shade:#3171e0;--ion-color-primary-tint:#4c8dff}:host ::ng-deep kendo-treeview .k-treeview-leaf{width:100%;margin:5px;padding:9px 20px 9px 8px;border-radius:3px;border:1px solid #c8dbf5;background-color:#e3ecf8;color:#0a45ab;font-size:13px;cursor:pointer}:host ::ng-deep kendo-treeview .k-treeview-leaf.k-selected{width:100%;margin:5px;padding:9px 20px 9px 8px;border-radius:3px;background-color:#a9c3e8!important;color:#0a45ab!important;font-size:13px;cursor:pointer}:host ::ng-deep kendo-treeview .k-treeview-leaf.k-state-hover,:host ::ng-deep kendo-treeview .k-treeview-leaf:hover{width:100%;margin:5px;padding:9px 20px 9px 8px;border-radius:3px;background-color:#c9daf2;color:#0a45ab;font-size:13px;cursor:pointer}"]
                 },] }
     ];
     ZtreeComponent.ctorParameters = function () { return []; };