Merge branch 'develop' of http://39.106.78.171:3000/shaojiahao/AX.Angular9DataCollection into develop

src/app/canvas-share-data.service.ts

@@ -7,7 +7,11 @@ export class CanvasShareDataService {
 
   constructor() { }
 
-  selectStorey:any; //选择当前 楼层 数据
+  isChange:boolean = false; //数据 是否改动
+  
+  selectStorey:any = {area: '', details: ''}; //选择当前 楼层 数据
+  selectTemplateData:any; //选择当前 模板数据
+
   originalcompanyBuildingData:any; // 单位/建筑 数据
   originaleveryStoreyData:any; // 总平面图/楼层/区域 楼层数据
 

src/app/ui/collection-tools/collection-tools.component.scss

@@ -93,7 +93,7 @@
     transition: margin-left 0.5s;
     min-width: 150px;
     border: 1px solid #E6EAEE;
-    width: 13%;
+    width: 230px;
     left: 0;
   }
   .functionalDomainRight {

src/app/ui/collection-tools/collection-tools.component.ts

@@ -737,6 +737,9 @@ export class CollectionToolsComponent implements OnInit {
 
   //封装 刷新 tree 数据
   renovateTreeData () {
+    this.canvasData.isChange = false //服务中 数据是否改动 改为false
+    this.isShowAttribute = true //属性栏展示 默认数据
+
     let beforeOneId = this.selectingSitePlan.id || '' //当前 选中 平面图 楼层/区域 id
     let companyBuildingData = JSON.parse(JSON.stringify( this.canvasData.originalcompanyBuildingData || {} )) // 当前 单位/建筑 数据 
     let storeyData = JSON.parse(JSON.stringify( this.canvasData.originaleveryStoreyData || {} )) //当前 楼层 数据
@@ -755,6 +758,7 @@ export class CollectionToolsComponent implements OnInit {
   //陈鹏飞↓↓↓
   //陈鹏飞↓↓↓
   allFireElements:any = []; //当前 单位/建筑 下的消防要素
+  isShowAttribute:boolean = true; //属性栏 是否显示 默认数据
 
   toggleExpandPanel:boolean = false; //可展开面板展开或关闭
   togglePlane:boolean = true; //可展开面板平面图 显隐
@@ -1126,6 +1130,7 @@ export class CollectionToolsComponent implements OnInit {
     this.selectLibrary = item.name
     this.selectImage = items
     this.selectImageIndex = index
+    this.canvasData.selectTemplateData = items
     this.canvas.beginPaint(items)
   }