Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin

src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html

@@ -2,7 +2,8 @@
     <div class="titlebox" *ngIf="pattern == 'edit'">
         <div class="titleitembox" cdkDropList cdkDropListOrientation="horizontal" (cdkDropListDropped)="drop($event)">
             <div cdkDrag class="item" *ngFor="let item of planTemplateData;let key = index" (click)="clickTitleItem(item)"
-                [ngClass]="{'selectedItem': selectedItem == item.groupName}" [title]="item.groupName">
+                [ngClass]="{'selectedItem': selectedItem == item.groupName}" [title]="item.groupName"
+                [cdkDragDisabled]="item.groupName == '封面'">
                 {{key + 1}}.{{item.groupName}}
             </div>
         </div>
@@ -174,10 +175,10 @@
                     <span>建筑列表</span>
                 </div>
                 <div class="buildingBody">
-                    <div class="buildName" *ngFor="let item of planTemplateData[1].building;let i=index">
+                    <div class="buildName" *ngFor="let item of selectedContent.building;let i=index">
                         <mat-checkbox class="example-margin" color='primary' [(ngModel)]="item.completed"
                             (change)='clickBuilding(item,i)'></mat-checkbox>
-                        <span>{{item.name}}</span>
+                        <span [title]="item.name">{{item.name}}</span>
                     </div>
                 </div>
             </div>
@@ -680,7 +681,7 @@
                     display: flex;
                     flex-direction: column;
                     overflow-y: auto;">
-                        <div *ngFor="let itemunit of planTemplateData[1].building;let uniti=index"> <!-- style="border-bottom: 3px solid #999;" -->
+                        <div *ngFor="let itemunit of item.building;let uniti=index"> <!-- style="border-bottom: 3px solid #999;" -->
                             <div *ngIf="itemunit.completed">
                                 <div class="unithead" style=" height: 40px;
                                 width: 100%;

src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss

@@ -39,6 +39,7 @@
                 overflow: hidden; /*超出部分隐藏*/
                 white-space: nowrap; /*不换行*/
                 text-overflow: ellipsis; /*超出部分文字以...显示*/
+                user-select: none;
             }
             .item:hover {
                 background: #e8f4fe;
@@ -197,6 +198,9 @@
                     cursor: pointer;
                     height: 40px;
                     width: 100%;
+                    overflow: hidden;/*超出部分隐藏*/
+                    white-space: nowrap;/*不换行*/
+                    text-overflow:ellipsis;/*超出部分文字以...显示*/
                     border-bottom: 1px solid #f2f4f5;
                     .example-margin {
                         width: 14px;
@@ -1209,3 +1213,27 @@
     }
 }
 
+.cdk-drag-preview {
+    height: 36px;
+    line-height: 36px;
+    background: white;
+    color: #8b8c8c;
+    margin: 0 3px;
+    text-align: center;
+    box-sizing: border-box;
+    padding: 0 10px;
+    font-size: 14px;
+    overflow: hidden; /*超出部分隐藏*/
+    white-space: nowrap; /*不换行*/
+    text-overflow: ellipsis; /*超出部分文字以...显示*/
+    box-sizing: border-box;
+    border-radius: 40px;
+    box-shadow: 0 5px 5px -3px rgba(0, 0, 0, 0.2), 0 8px 10px 1px rgba(0, 0, 0, 0.14),
+        0 3px 14px 2px rgba(0, 0, 0, 0.12);
+}
+.cdk-drag-placeholder {
+    opacity: 0;
+}
+.cdk-drag-animating {
+    transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
+}