diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts index 1a52a69..acaba99 100644 --- a/src/app/ui/collection-tools/collection-tools.component.ts +++ b/src/app/ui/collection-tools/collection-tools.component.ts @@ -30,8 +30,7 @@ export class CollectionToolsComponent implements OnInit { isTemplate:node.isTemplate, isNewElement:node.isNewElement, isLook:node.isLook, - isLookPattern:node.isLookPattern || null, - node:node + isLookPattern:node.isLookPattern || null }; } treeControl = new FlatTreeControl(node => node.level, node => node.expandable); @@ -388,7 +387,6 @@ export class CollectionToolsComponent implements OnInit { this.canvas.on("select",obj=>{ //选中素材属性注入函数 this.setAssetsProperty(obj.assetData) - console.log(obj.assetData) }) // 监听canvas组件取消选中素材事件 this.canvas.on("deselect",obj=>{ @@ -600,10 +598,11 @@ export class CollectionToolsComponent implements OnInit { if(storeyData){ for(let key in storeyData.data){ + storeyData.data[key].isLookPattern = true if(element.id == storeyData.data[key].FireElementId){ storeyData.data[key].isTemplate = false storeyData.data[key].isLook = true - storeyData.data[key].isLookPattern = true + element.isNewElement = true //该节点children是否存在新添加的真实素材 标识 //定义查看模式下能看到的元素 @@ -627,16 +626,17 @@ export class CollectionToolsComponent implements OnInit { if (!element.parentId) { treeData.push(element) } }); this.dataSource.data = treeData + console.log(this.dataSource.data) this.treeControl.expandAll() } //点击树节点 clickTreeNode(node){ - // console.log(node) - if(node.node.Point){ - this.setAssetsProperty(node.node) + if(this.canvasData.originalcompanyBuildingData.data[node.id]){ + this.setAssetsProperty(this.canvasData.originalcompanyBuildingData.data[node.id]) + }else if(this.canvasData.originaleveryStoreyData.data[node.id]){ + this.setAssetsProperty(this.canvasData.originaleveryStoreyData.data[node.id]) } - } //点击数节点的显示隐藏icon @@ -779,6 +779,7 @@ export class CollectionToolsComponent implements OnInit { order: 999, parentId: null, tag: "INPUT", + isLookPattern : true } this.allFireElements.push(other) return true