Merge branch 'master' of https://git.loafle.net/ucap/ucap-angular
This commit is contained in:
commit
ded2b11115
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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<FlatNode>;
|
||||
treeFlattener: MatTreeFlattener<OrganizationNode, FlatNode>;
|
||||
dataSource: VirtualScrollTreeFlatDataSource<OrganizationNode, FlatNode>;
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
52
projects/ui/src/lib/services/dialog.service.ts
Normal file
52
projects/ui/src/lib/services/dialog.service.ts
Normal file
|
@ -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<T, D = any, R = any>(
|
||||
componentOrTemplateRef: ComponentType<T> | TemplateRef<T>,
|
||||
config?: MatDialogConfig<D>
|
||||
): Promise<R> {
|
||||
return new Promise<R>((resolve, reject) => {
|
||||
config = { ...config, autoFocus: false };
|
||||
|
||||
const dialogRef = this.matDialog.open<T, D, R>(
|
||||
componentOrTemplateRef,
|
||||
config
|
||||
);
|
||||
|
||||
dialogRef
|
||||
.afterClosed()
|
||||
.pipe(
|
||||
take(1),
|
||||
map(result => {
|
||||
return resolve(result);
|
||||
}),
|
||||
catchError(err => {
|
||||
return of(reject(err));
|
||||
})
|
||||
)
|
||||
.subscribe();
|
||||
});
|
||||
}
|
||||
|
||||
getDialogById(id: string): MatDialogRef<any, any> {
|
||||
return this.matDialog.getDialogById(id);
|
||||
}
|
||||
|
||||
closeAll() {
|
||||
this.matDialog.closeAll();
|
||||
}
|
||||
}
|
|
@ -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",
|
||||
|
|
|
@ -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",
|
||||
|
|
Loading…
Reference in New Issue
Block a user