sync 0428

2020-04-28 22:18:11 +09:00 · 2020-04-28 22:18:11 +09:00 · b03f36b99a
commit b03f36b99a
parent c9540517b0
42 changed files with 2894 additions and 3035 deletions
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -184,7 +184,7 @@
    "@ucap/ng-store-organization": "file:pack/ucap-ng-store-organization-0.0.4.tgz",
    "@ucap/ng-ui": "file:pack/ucap-ng-ui-0.0.4.tgz",
    "@ucap/ng-ui-authentication": "file:pack/ucap-ng-ui-authentication-0.0.16.tgz",
-    "@ucap/ng-ui-group": "file:pack/ucap-ng-ui-group-0.0.3.tgz",
+    "@ucap/ng-ui-group": "file:pack/ucap-ng-ui-group-0.0.4.tgz",
    "@ucap/ng-ui-organization": "file:pack/ucap-ng-ui-organization-0.0.2.tgz",
    "@ucap/ng-ui-skin-default": "file:pack/ucap-ng-ui-skin-default-0.0.1.tgz",
    "@ucap/ng-web-socket": "file:pack/ucap-ng-web-socket-0.0.2.tgz",
--- 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": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/common": "^9.0.2",
--- 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": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/common": "^9.0.2",
--- 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": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/common": "^9.0.2",
--- 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": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/common": "^9.0.2",
--- 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": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/common": "^9.0.2",
--- a/projects/core/package.json
+++ b/projects/core/package.json
@ -2,7 +2,7 @@
  "name": "@ucap/ng-core",
  "version": "0.0.1",
  "publishConfig": {
-    "registry": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/common": "^9.0.2",
--- a/projects/i18n/package.json
+++ b/projects/i18n/package.json
@ -2,7 +2,7 @@
  "name": "@ucap/ng-i18n",
  "version": "0.0.6",
  "publishConfig": {
-    "registry": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/common": "^9.0.6",
--- a/projects/logger/package.json
+++ b/projects/logger/package.json
@ -2,7 +2,7 @@
  "name": "@ucap/ng-logger",
  "version": "0.0.2",
  "publishConfig": {
-    "registry": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/common": "^9.1.0",
--- a/projects/native-browser/package.json
+++ b/projects/native-browser/package.json
@ -2,7 +2,7 @@
  "name": "@ucap/ng-native-browser",
  "version": "0.0.1",
  "publishConfig": {
-    "registry": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/common": "^9.0.2",
--- a/projects/native/package.json
+++ b/projects/native/package.json
@ -2,7 +2,7 @@
  "name": "@ucap/ng-native",
  "version": "0.0.1",
  "publishConfig": {
-    "registry": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/common": "^9.0.2",
--- a/projects/pi/package.json
+++ b/projects/pi/package.json
@ -2,7 +2,7 @@
  "name": "@ucap/ng-pi",
  "version": "0.0.1",
  "publishConfig": {
-    "registry": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/common": "^9.0.2",
--- 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": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/common": "^9.0.2",
--- 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": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/common": "^9.0.2",
--- 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": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/common": "^9.0.2",
--- 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": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/common": "^9.0.2",
--- 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": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/common": "^9.0.2",
--- 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": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/common": "^9.0.2",
--- 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": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/common": "^9.0.2",
--- 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": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/common": "^9.0.2",
--- 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": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/common": "^9.0.2",
--- 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": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/common": "^9.0.2",
--- 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": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/common": "^9.0.2",
--- 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": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/common": "^9.0.2",
--- 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": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/common": "^9.0.2",
--- 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": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/common": "^9.0.2",
--- 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": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/common": "^9.0.2",
--- a/projects/protocol/package.json
+++ b/projects/protocol/package.json
@ -2,7 +2,7 @@
  "name": "@ucap/ng-protocol",
  "version": "0.0.3",
  "publishConfig": {
-    "registry": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/common": "^9.0.2",
--- a/projects/store-authentication/package.json
+++ b/projects/store-authentication/package.json
@ -2,7 +2,7 @@
  "name": "@ucap/ng-store-authentication",
  "version": "0.0.10",
  "publishConfig": {
-    "registry": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/common": "^9.0.2",
--- a/projects/store-chat/package.json
+++ b/projects/store-chat/package.json
@ -2,7 +2,7 @@
  "name": "@ucap/ng-store-chat",
  "version": "0.0.5",
  "publishConfig": {
-    "registry": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/common": "^9.0.2",
--- a/projects/store-group/package.json
+++ b/projects/store-group/package.json
@ -2,7 +2,7 @@
  "name": "@ucap/ng-store-group",
  "version": "0.0.6",
  "publishConfig": {
-    "registry": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/common": "^9.0.2",
--- a/projects/store-organization/package.json
+++ b/projects/store-organization/package.json
@ -2,7 +2,7 @@
  "name": "@ucap/ng-store-organization",
  "version": "0.0.4",
  "publishConfig": {
-    "registry": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/common": "^9.0.0",
--- a/projects/ui-authentication/package.json
+++ b/projects/ui-authentication/package.json
@ -2,7 +2,7 @@
  "name": "@ucap/ng-ui-authentication",
  "version": "0.0.16",
  "publishConfig": {
-    "registry": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/cdk": "^9.0.0",
--- a/projects/ui-group/package.json
+++ b/projects/ui-group/package.json
@ -1,8 +1,8 @@
 {
  "name": "@ucap/ng-ui-group",
-  "version": "0.0.3",
+  "version": "0.0.4",
  "publishConfig": {
-    "registry": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/cdk": "^9.0.0",
--- a/projects/ui-group/src/lib/components/expansion-list.component.html
+++ b/projects/ui-group/src/lib/components/expansion-list.component.html
@ -1,10 +1,5 @@
 <div>
-  <cdk-virtual-scroll-viewport
-    #cvsvList
-    perfectScrollbar
-    fxFlexFill
-    virtualScrollStrategy="virtualScrollStrategy"
-  >
+  <cdk-virtual-scroll-viewport #cvsvList perfectScrollbar fxFlexFill>
    <ng-container
      *cdkVirtualFor="let node of dataSource.expandedData$"
    ></ng-container>
--- a/projects/ui-group/src/lib/components/expansion-list.component.ts
+++ b/projects/ui-group/src/lib/components/expansion-list.component.ts
@ -7,13 +7,12 @@ import {
  EventEmitter,
  ViewChild,
  ContentChild,
-  TemplateRef
+  TemplateRef,
+  ChangeDetectionStrategy,
+  ChangeDetectorRef
 } from '@angular/core';

-import {
-  VirtualScrollStrategy,
-  CdkVirtualScrollViewport
-} from '@angular/cdk/scrolling';
+import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling';
 import { FlatTreeControl } from '@angular/cdk/tree';

 import { MatTreeFlattener, MatTree } from '@angular/material/tree';
@ -47,16 +46,17 @@ export interface FlatNode {
@Component({
  selector: 'ucap-group-expansion-list',
  templateUrl: './expansion-list.component.html',
-  styleUrls: ['./expansion-list.component.scss']
+  styleUrls: ['./expansion-list.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class ExpansionListComponent implements OnInit, OnDestroy {
  @Input()
-  virtualScrollStrategy: VirtualScrollStrategy;
+  displayOrder: NodeType[] = [];

  @Input()
  set profile(userInfo: UserInfo) {
    if (!userInfo) {
-      this.profileNodes = [];
+      this.nodeMap.set(NodeType.Profile, []);
    } else {
      const node: GroupNode = {
        nodeType: NodeType.Profile,
@ -64,7 +64,7 @@ export class ExpansionListComponent implements OnInit, OnDestroy {
        children: []
      };

-      this.profileNodes = [node];
+      this.nodeMap.set(NodeType.Profile, [node]);
    }

    this.refreshNodes();
@ -73,7 +73,7 @@ export class ExpansionListComponent implements OnInit, OnDestroy {
  @Input()
  set favorites(userInfos: UserInfo[]) {
    if (!userInfos || 0 === userInfos.length) {
-      this.favoriteNodes = [];
+      this.nodeMap.set(NodeType.Favorite, []);
    } else {
      const node: GroupNode = {
        nodeType: NodeType.Favorite,
@ -93,7 +93,7 @@ export class ExpansionListComponent implements OnInit, OnDestroy {
        });
      });

-      this.favoriteNodes = [node];
+      this.nodeMap.set(NodeType.Favorite, [node]);
    }

    this.refreshNodes();
@ -102,8 +102,12 @@ export class ExpansionListComponent implements OnInit, OnDestroy {
  @Input()
  set groupBuddies(list: { group: GroupDetailData; buddyList: UserInfo[] }[]) {
    if (!list || 0 === list.length) {
-      this.buddyNodes = [];
+      this.nodeMap.set(NodeType.Default, []);
+      this.nodeMap.set(NodeType.Buddy, []);
    } else {
+      this.nodeMap.set(NodeType.Default, []);
+      this.nodeMap.set(NodeType.Buddy, []);
+
      for (const item of list) {
        let nodeType = NodeType.Buddy;
        if (0 === item.group.seq) {
@ -136,7 +140,11 @@ export class ExpansionListComponent implements OnInit, OnDestroy {
          });
        });

-        this.buddyNodes.push(node);
+        if (NodeType.Buddy === nodeType) {
+          this.nodeMap.get(NodeType.Buddy).push(node);
+        } else {
+          this.nodeMap.get(NodeType.Default).push(node);
+        }
      }
    }

@ -179,18 +187,15 @@ export class ExpansionListComponent implements OnInit, OnDestroy {
  @ContentChild('[ucapGroupExpansionList="buddyHeader"]', { read: TemplateRef })
  buddyHeaderTemplate: TemplateRef<any>;

-  rootNodeList: GroupNode[] = [];
  treeControl: FlatTreeControl<FlatNode>;
  treeFlattener: MatTreeFlattener<GroupNode, FlatNode>;
  dataSource: VirtualScrollTreeFlatDataSource<GroupNode, FlatNode>;

  NodeType = NodeType;

-  private profileNodes: GroupNode[] = [];
-  private favoriteNodes: GroupNode[] = [];
-  private buddyNodes: GroupNode[] = [];
+  private nodeMap: Map<NodeType, GroupNode[]>;

-  constructor() {
+  constructor(private changeDetectorRef: ChangeDetectorRef) {
    this.treeControl = new FlatTreeControl<FlatNode>(
      (node) => node.level,
      (node) => node.expandable
@ -276,11 +281,15 @@ export class ExpansionListComponent implements OnInit, OnDestroy {
    NodeType.Profile !== node.node.nodeType && 0 === node.level;

  private refreshNodes() {
-    this.rootNodeList = [
-      ...this.profileNodes,
-      ...this.favoriteNodes,
-      ...this.buddyNodes
-    ];
-    this.dataSource.data = this.rootNodeList;
+    const rootNode: GroupNode[] = [];
+
+    for (const nodeType of this.displayOrder) {
+      const subNode = this.nodeMap.get(nodeType);
+      if (!!subNode && 0 < subNode.length) {
+        rootNode.push(...subNode);
+      }
+    }
+
+    this.dataSource.data = rootNode;
  }
 }
--- a/projects/ui-organization/package.json
+++ b/projects/ui-organization/package.json
@ -2,7 +2,7 @@
  "name": "@ucap/ng-ui-organization",
  "version": "0.0.2",
  "publishConfig": {
-    "registry": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/cdk": "^9.0.0",
--- 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": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {}
 }
--- a/projects/ui/package.json
+++ b/projects/ui/package.json
@ -2,7 +2,7 @@
  "name": "@ucap/ng-ui",
  "version": "0.0.4",
  "publishConfig": {
-    "registry": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/cdk": "^9.0.0",
--- 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": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/common": "^9.0.2",
--- 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": "http://10.81.13.221:8081/nexus/repository/npm-ucap/"
+    "registry": "https://nexus.loafle.net/repository/npm-ucap/"
  },
  "peerDependencies": {
    "@angular/common": "^9.0.2",