diff --git a/projects/api-common/package.json b/projects/api-common/package.json index 5859e87..0197447 100644 --- a/projects/api-common/package.json +++ b/projects/api-common/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-api-common", "version": "0.0.1", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/common": "^9.0.2", diff --git a/projects/api-external/package.json b/projects/api-external/package.json index 04d8f31..fdda764 100644 --- a/projects/api-external/package.json +++ b/projects/api-external/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-api-external", "version": "0.0.1", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/common": "^9.0.2", diff --git a/projects/api-message/package.json b/projects/api-message/package.json index 6080b5f..ef82509 100644 --- a/projects/api-message/package.json +++ b/projects/api-message/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-api-message", "version": "0.0.1", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/common": "^9.0.2", diff --git a/projects/api-prompt/package.json b/projects/api-prompt/package.json index d7318db..5d20c7c 100644 --- a/projects/api-prompt/package.json +++ b/projects/api-prompt/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-api-prompt", "version": "0.0.1", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/common": "^9.0.2", diff --git a/projects/api-public/package.json b/projects/api-public/package.json index b74a5f0..46fc8e0 100644 --- a/projects/api-public/package.json +++ b/projects/api-public/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-api-public", "version": "0.0.1", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/common": "^9.0.2", diff --git a/projects/core/package.json b/projects/core/package.json index cb84913..f89ff81 100644 --- a/projects/core/package.json +++ b/projects/core/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-core", "version": "0.0.7", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/common": "^9.0.2", diff --git a/projects/i18n/package.json b/projects/i18n/package.json index 7359097..31581cc 100644 --- a/projects/i18n/package.json +++ b/projects/i18n/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-i18n", "version": "0.0.6", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/common": "^9.0.6", diff --git a/projects/logger/package.json b/projects/logger/package.json index db24558..31be9b5 100644 --- a/projects/logger/package.json +++ b/projects/logger/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-logger", "version": "0.0.2", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/common": "^9.1.0", diff --git a/projects/native/package.json b/projects/native/package.json index 8d7f76e..6641c3c 100644 --- a/projects/native/package.json +++ b/projects/native/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-native", "version": "0.0.5", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/common": "^9.0.2", diff --git a/projects/pi/package.json b/projects/pi/package.json index b8776f4..e3f7952 100644 --- a/projects/pi/package.json +++ b/projects/pi/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-pi", "version": "0.0.1", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/common": "^9.0.2", diff --git a/projects/protocol-authentication/package.json b/projects/protocol-authentication/package.json index dba304f..fc141bb 100644 --- a/projects/protocol-authentication/package.json +++ b/projects/protocol-authentication/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-protocol-authentication", "version": "0.0.3", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/common": "^9.0.2", diff --git a/projects/protocol-buddy/package.json b/projects/protocol-buddy/package.json index 84321c5..6fd5f4b 100644 --- a/projects/protocol-buddy/package.json +++ b/projects/protocol-buddy/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-protocol-buddy", "version": "0.0.3", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/common": "^9.0.2", diff --git a/projects/protocol-event/package.json b/projects/protocol-event/package.json index 0b2160e..f1b337d 100644 --- a/projects/protocol-event/package.json +++ b/projects/protocol-event/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-protocol-event", "version": "0.0.3", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/common": "^9.0.2", diff --git a/projects/protocol-file/package.json b/projects/protocol-file/package.json index 3789c40..cfa8309 100644 --- a/projects/protocol-file/package.json +++ b/projects/protocol-file/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-protocol-file", "version": "0.0.3", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/common": "^9.0.2", diff --git a/projects/protocol-group/package.json b/projects/protocol-group/package.json index 4f49a73..d3b9cbd 100644 --- a/projects/protocol-group/package.json +++ b/projects/protocol-group/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-protocol-group", "version": "0.0.3", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/common": "^9.0.2", diff --git a/projects/protocol-info/package.json b/projects/protocol-info/package.json index 47f9aae..7ccd48e 100644 --- a/projects/protocol-info/package.json +++ b/projects/protocol-info/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-protocol-info", "version": "0.0.3", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/common": "^9.0.2", diff --git a/projects/protocol-inner/package.json b/projects/protocol-inner/package.json index d456a53..dabbcda 100644 --- a/projects/protocol-inner/package.json +++ b/projects/protocol-inner/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-protocol-inner", "version": "0.0.3", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/common": "^9.0.2", diff --git a/projects/protocol-option/package.json b/projects/protocol-option/package.json index 76e4236..e901722 100644 --- a/projects/protocol-option/package.json +++ b/projects/protocol-option/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-protocol-option", "version": "0.0.3", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/common": "^9.0.2", diff --git a/projects/protocol-ping/package.json b/projects/protocol-ping/package.json index f36dbc5..f21af20 100644 --- a/projects/protocol-ping/package.json +++ b/projects/protocol-ping/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-protocol-ping", "version": "0.0.3", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/common": "^9.0.2", diff --git a/projects/protocol-query/package.json b/projects/protocol-query/package.json index 2b5988e..ea38587 100644 --- a/projects/protocol-query/package.json +++ b/projects/protocol-query/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-protocol-query", "version": "0.0.3", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/common": "^9.0.2", diff --git a/projects/protocol-room/package.json b/projects/protocol-room/package.json index f3d117d..615046c 100644 --- a/projects/protocol-room/package.json +++ b/projects/protocol-room/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-protocol-room", "version": "0.0.3", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/common": "^9.0.2", diff --git a/projects/protocol-service/package.json b/projects/protocol-service/package.json index 3d21fd5..07d3dd3 100644 --- a/projects/protocol-service/package.json +++ b/projects/protocol-service/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-protocol-service", "version": "0.0.3", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/common": "^9.0.2", diff --git a/projects/protocol-status/package.json b/projects/protocol-status/package.json index e80478c..4dc8079 100644 --- a/projects/protocol-status/package.json +++ b/projects/protocol-status/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-protocol-status", "version": "0.0.3", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/common": "^9.0.2", diff --git a/projects/protocol-sync/package.json b/projects/protocol-sync/package.json index e70f253..2a96ba4 100644 --- a/projects/protocol-sync/package.json +++ b/projects/protocol-sync/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-protocol-sync", "version": "0.0.3", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/common": "^9.0.2", diff --git a/projects/protocol-umg/package.json b/projects/protocol-umg/package.json index 878bacf..2db5091 100644 --- a/projects/protocol-umg/package.json +++ b/projects/protocol-umg/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-protocol-umg", "version": "0.0.3", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/common": "^9.0.2", diff --git a/projects/protocol/package.json b/projects/protocol/package.json index 8e6227a..fbbe2a6 100644 --- a/projects/protocol/package.json +++ b/projects/protocol/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-protocol", "version": "0.0.3", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/common": "^9.0.2", diff --git a/projects/store-authentication/package.json b/projects/store-authentication/package.json index 577275c..b812ba9 100644 --- a/projects/store-authentication/package.json +++ b/projects/store-authentication/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-store-authentication", "version": "0.0.14", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/common": "^9.0.2", diff --git a/projects/store-chat/package.json b/projects/store-chat/package.json index 10f2c79..0711a1a 100644 --- a/projects/store-chat/package.json +++ b/projects/store-chat/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-store-chat", "version": "0.0.66", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/common": "^9.0.2", diff --git a/projects/store-group/package.json b/projects/store-group/package.json index 8a3b090..fa2ca41 100644 --- a/projects/store-group/package.json +++ b/projects/store-group/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-store-group", "version": "0.0.22", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/common": "^9.0.2", diff --git a/projects/store-organization/package.json b/projects/store-organization/package.json index f72e221..cc04da3 100644 --- a/projects/store-organization/package.json +++ b/projects/store-organization/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-store-organization", "version": "0.0.20", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/common": "^9.0.0", diff --git a/projects/ui-authentication/package.json b/projects/ui-authentication/package.json index 382ac62..1d206ee 100644 --- a/projects/ui-authentication/package.json +++ b/projects/ui-authentication/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-ui-authentication", "version": "0.0.29", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/cdk": "^9.0.0", diff --git a/projects/ui-group/package.json b/projects/ui-group/package.json index 4c8f4b9..b5931c5 100644 --- a/projects/ui-group/package.json +++ b/projects/ui-group/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-ui-group", "version": "0.0.78", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/cdk": "^9.0.0", diff --git a/projects/ui-group/src/lib/components/expansion.component.ts b/projects/ui-group/src/lib/components/expansion.component.ts index 8eb5ec5..9ec4df3 100644 --- a/projects/ui-group/src/lib/components/expansion.component.ts +++ b/projects/ui-group/src/lib/components/expansion.component.ts @@ -23,6 +23,9 @@ import { MatTreeFlattener, MatTree } from '@angular/material/tree'; import { UserInfo, GroupDetailData } from '@ucap/protocol-sync'; import { UserInfoSS, UserInfoF, UserInfoDN } from '@ucap/protocol-query'; +import { Subject } from 'rxjs'; +import { takeUntil } from 'rxjs/operators'; +import { PerfectScrollbarDirective } from 'ngx-perfect-scrollbar'; import { VirtualScrollTreeFlatDataSource, @@ -233,6 +236,9 @@ export class ExpansionComponent implements OnInit, OnDestroy, AfterViewInit { @ViewChild(PerfectScrollbarDirective, { static: false }) psDirectiveRef: PerfectScrollbarDirective; + @ViewChild(PerfectScrollbarDirective, { static: false }) + psDirectiveRef?: PerfectScrollbarDirective; + @ContentChild(ExpansionNodeDirective, { read: TemplateRef, static: false diff --git a/projects/ui-organization/package.json b/projects/ui-organization/package.json index f23ff36..3424be5 100644 --- a/projects/ui-organization/package.json +++ b/projects/ui-organization/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-ui-organization", "version": "0.0.202", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/cdk": "^9.0.0", diff --git a/projects/ui-organization/src/lib/components/tree.component.ts b/projects/ui-organization/src/lib/components/tree.component.ts index 6092eaf..091c6b6 100644 --- a/projects/ui-organization/src/lib/components/tree.component.ts +++ b/projects/ui-organization/src/lib/components/tree.component.ts @@ -154,6 +154,9 @@ export class TreeComponent implements OnInit, OnDestroy, AfterViewInit { @ViewChild(PerfectScrollbarDirective, { static: false }) psDirectiveRef?: PerfectScrollbarDirective; + @ViewChild(PerfectScrollbarDirective, { static: false }) + psDirectiveRef?: PerfectScrollbarDirective; + treeControl: FlatTreeControl; treeFlattener: MatTreeFlattener; dataSource: VirtualScrollTreeFlatDataSource; diff --git a/projects/ui-skin-default/package.json b/projects/ui-skin-default/package.json index 873febc..dc72494 100644 --- a/projects/ui-skin-default/package.json +++ b/projects/ui-skin-default/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-ui-skin-default", "version": "0.0.1", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@ucap/ui-scss": "~0.0.1", diff --git a/projects/ui/package.json b/projects/ui/package.json index 9d2ead5..3d7b949 100644 --- a/projects/ui/package.json +++ b/projects/ui/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-ui", "version": "0.0.97", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/cdk": "^9.0.0", diff --git a/projects/ui/src/lib/services/dialog.service.ts b/projects/ui/src/lib/services/dialog.service.ts new file mode 100644 index 0000000..66a049c --- /dev/null +++ b/projects/ui/src/lib/services/dialog.service.ts @@ -0,0 +1,52 @@ +import { TemplateRef, Injectable } from '@angular/core'; +import { ComponentType } from '@angular/cdk/portal'; +import { + MatDialog, + MatDialogConfig, + MatDialogRef +} from '@angular/material/dialog'; + +import { of } from 'rxjs'; +import { take, map, catchError } from 'rxjs/operators'; + +@Injectable({ + providedIn: 'root' +}) +export class DialogService { + constructor(private matDialog: MatDialog) {} + + public open( + componentOrTemplateRef: ComponentType | TemplateRef, + config?: MatDialogConfig + ): Promise { + return new Promise((resolve, reject) => { + config = { ...config, autoFocus: false }; + + const dialogRef = this.matDialog.open( + componentOrTemplateRef, + config + ); + + dialogRef + .afterClosed() + .pipe( + take(1), + map(result => { + return resolve(result); + }), + catchError(err => { + return of(reject(err)); + }) + ) + .subscribe(); + }); + } + + getDialogById(id: string): MatDialogRef { + return this.matDialog.getDialogById(id); + } + + closeAll() { + this.matDialog.closeAll(); + } +} diff --git a/projects/web-socket/package.json b/projects/web-socket/package.json index 45f8110..0cfb745 100644 --- a/projects/web-socket/package.json +++ b/projects/web-socket/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-web-socket", "version": "0.0.2", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/common": "^9.0.2", diff --git a/projects/web-storage/package.json b/projects/web-storage/package.json index 078fba6..0236d1b 100644 --- a/projects/web-storage/package.json +++ b/projects/web-storage/package.json @@ -2,7 +2,7 @@ "name": "@ucap/ng-web-storage", "version": "0.0.3", "publishConfig": { - "registry": "https://nexus.loafle.net/repository/npm-ucap/" + "registry": "http://10.81.13.229:8081/repository/npm-ucap/" }, "peerDependencies": { "@angular/common": "^9.0.2",