qms-angular 1.1.41 → 1.1.42

package/fesm2015/qms-angular.js

@@ -30430,25 +30430,26 @@ class SelectDepartmentTreeComponent {
         const treeNodes = this.treeDepartmentService.convertToTreeData(this.config.selectedList.map(x => (Object.assign(Object.assign({}, x), { parentId: x.groupId }))));
         this.execWithoutEmitNodeChangeEvent(() => {
             const selectedItems = [];
-            const reMapTreeNode = (item) => {
+            const reMapTreeNode = (item, clearGroupId = false) => {
                 var _a;
                 const node = this.treeControl.dataNodes.find(x => x.id == item.id);
                 const nestedNode = this.convertToNestedNode(node);
                 node.groupId = item.groupId;
                 node.isGroup = item.isGroup;
                 this.checkListSelection.select(node);
-                return Object.assign(Object.assign({}, nestedNode), { groupId: item.groupId, isGroup: item.isGroup, childCount: (_a = nestedNode.childCount) !== null && _a !== void 0 ? _a : this.getListChildrenOfNode(node).length, children: [] });
+                return Object.assign(Object.assign({}, nestedNode), { groupId: clearGroupId ? null : item.groupId, isGroup: item.isGroup, childCount: (_a = nestedNode.childCount) !== null && _a !== void 0 ? _a : this.getListChildrenOfNode(node).length, children: [] });
             };
             treeNodes.forEach(item => {
                 const node = this.treeControl.dataNodes.find(x => x.id == item.id);
                 if (!node)
                     return;
                 const nestedNode = this.convertToNestedNode(node);
-                selectedItems.push(Object.assign(Object.assign({}, reMapTreeNode(item)), { children: item.children.map(x => reMapTreeNode(x)) }));
+                selectedItems.push(Object.assign(Object.assign({}, reMapTreeNode(item, true)), { children: item.children.map(x => reMapTreeNode(x)) }));
             });
             this.resultSelected.push(...selectedItems);
         });
         this.onValueChangeEvent.emit(this.resultSelected);
+        this._onSelectionNodeChangeEvent('added', this.resultSelected);
         this.cdRef.detectChanges();
     }
     _initListSelected() {
@@ -32024,6 +32025,9 @@ class QMSSelectAccessDialogComponent {
         return userGroups.data || [];
     }
     ;
+    ngAfterContentChecked() {
+        this.cdRef.detectChanges();
+    }
     ngAfterContentInit() {
         this.cdRef.detectChanges();
     }
@@ -32081,8 +32085,23 @@ class QMSSelectAccessDialogComponent {
         this.resultAccess = _.cloneDeep(Object.assign(Object.assign({}, this.dialogData.data.selectedData), { departments: [] }));
         // init group selected department
         this._departmentSelected = _.cloneDeep(this.dialogData.data.selectedData.departments);
-        const groups = this._departmentSelected.filter(x => x.isGroup) || [];
-        const singleItem = this._departmentSelected.filter(x => !x.isGroup && !x.groupId);
+        const groups = [];
+        const singleItem = [];
+        this._departmentSelected.forEach(item => {
+            if (item.isGroup) {
+                groups.push(item);
+                return;
+            }
+            if (!item.groupId) {
+                singleItem.push(item);
+                return;
+            }
+            if (!this._departmentSelected.some(x => x.id == item.groupId)) {
+                item.groupId = null;
+                singleItem.push(item);
+                return;
+            }
+        });
         groups.forEach(group => {
             const child = this._departmentSelected.filter(item => item.groupId == group.id);
             group.children = child;
@@ -32372,9 +32391,11 @@ class QMSSelectAccessDialogComponent {
                             this.resultAccess.departments.splice(index, 1);
                     });
             });
+            this.cdRef.detectChanges();
         }
         this.resultAccess.departments.forEach(item => {
-            item.children = item.children.filter((x, index) => index === item.children.findIndex(_x => x.id === _x.id));
+            if (!!item.children)
+                item.children = item.children.filter((x, index) => index === item.children.findIndex(_x => x.id === _x.id));
         });
         this._departmentSelected = _.cloneDeep(this.resultAccess.departments);
         this.cdRef.detectChanges();