qms-angular 1.0.60 → 1.0.61

package/bundles/qms-angular.umd.js

@@ -4409,6 +4409,12 @@
         findChild: findChild$1
     };
 
+    var TreeFlatNode = /** @class */ (function () {
+        function TreeFlatNode() {
+        }
+        return TreeFlatNode;
+    }());
+
     var TreeComponent = /** @class */ (function () {
         function TreeComponent(cdRef, domSanitizer, iconRegistry, appIconService) {
             var _this = this;
@@ -4602,13 +4608,22 @@
                 this.checkSelected(selectedData_1);
                 this.checkBoxEvent.emit(selectedData_1);
             }
-            if (this.parentNodeOnClick) {
+            // keep expand
+            if (this.parentNodeOnClick && Object.keys(this.parentNodeOnClick).length) {
+                var tempParent = [];
+                var root = new TreeFlatNode();
                 for (var i = 0; i < this.treeControl.dataNodes.length; i++) {
                     var tree = this.treeControl.dataNodes[i];
-                    if (this.parentNodeOnClick.parentId === tree.id || this.parentNodeOnClick.id === tree.id) {
-                        this.getParent(tree);
+                    if (this.parentNodeOnClick.parentId === tree.parentId && this.parentNodeOnClick.id === tree.id
+                        || this.parentNodeOnClick.parentId === tree.id) {
+                        tempParent = __spreadArray(__spreadArray([], __read(tempParent)), [this.getParent(tree)]);
+                        root = tree;
                     }
                 }
+                tempParent.push(root);
+                tempParent.forEach(function (x) {
+                    _this.treeControl.expand(x);
+                });
             }
         };
         TreeComponent.prototype.getParent = function (node) {
@@ -4621,7 +4636,6 @@
             for (var i = index; i >= 0; i--) {
                 var currentNode = treeControl.dataNodes[i];
                 if (treeControl.getLevel(currentNode) < currentLevel) {
-                    treeControl.expand(currentNode);
                     return currentNode;
                 }
             }
@@ -5486,12 +5500,6 @@
     ];
     QMSRelatedGlobalService.ctorParameters = function () { return []; };
 
-    var TreeFlatNode = /** @class */ (function () {
-        function TreeFlatNode() {
-        }
-        return TreeFlatNode;
-    }());
-
     var RelatedPopupComponent = /** @class */ (function () {
         function RelatedPopupComponent(cdRef, translate, dialogRef, globalService, iconRegistry, sanitizer, appIconService, elem, data) {
             this.cdRef = cdRef;
@@ -5813,7 +5821,13 @@
                 var node = void 0;
                 var typeId = void 0;
                 if (item.itemType === this.dataType.document) {
-                    // document
+                    // document  
+                    var isExistInDisabled = this.disabledList2.findIndex(function (x) {
+                        return x.id && x.id.toLowerCase() === item.id.toLowerCase();
+                    });
+                    if (isExistInDisabled >= 0) {
+                        return;
+                    }
                     position = this.treeData2.findIndex(function (x) {
                         return x.childId === item.id;
                     });
@@ -6005,6 +6019,12 @@
                     }
                 }
                 else {
+                    var isExistInDisabled = this.disabledList.findIndex(function (x) {
+                        return x.id && x.id.toLowerCase() === item.id.toLowerCase();
+                    });
+                    if (isExistInDisabled >= 0) {
+                        return;
+                    }
                     position = this.treeData1.findIndex(function (x) {
                         return x.childId && x.childId.toLowerCase() === item.id.toLowerCase();
                     });