diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts
index c808898..74156e4 100644
--- a/src/app/ui/collection-tools/collection-tools.component.ts
+++ b/src/app/ui/collection-tools/collection-tools.component.ts
@@ -330,15 +330,14 @@ export class CollectionToolsComponent implements OnInit {
firecategoriesDivMouseDown(e){
document.onmousemove = (ev) => {
let bodyHeight = document.body.clientHeight //网页宽度
+ console.log(this.element.nativeElement.querySelector('#firecategories').clientHeight)
let maxHeight = this.element.nativeElement.querySelector('#rightDiv').clientHeight - 35 //最大宽度
if(bodyHeight - ev.clientY >= maxHeight){
- this.element.nativeElement.querySelector('#firecategories').style.height = maxHeight + 'px'
- this.element.nativeElement.querySelector('#property').style.height = 35 + 'px'
+ this.element.nativeElement.querySelector('#firecategories').style.height = maxHeight+ 'px'
+ this.element.nativeElement.querySelector('#property').style.height = 35+ 'px'
}else{
- let sucai = this.element.nativeElement.querySelector('#firecategories').style.height = bodyHeight - ev.clientY ;
-
- this.element.nativeElement.querySelector('#property').style.height = this.element.nativeElement.querySelector('#rightDiv').clientHeight - sucai
-
+ this.element.nativeElement.querySelector('#firecategories').style.height = (bodyHeight - ev.clientY) + 'px' ;
+ this.element.nativeElement.querySelector('#property').style.height = (this.element.nativeElement.querySelector('#rightDiv').clientHeight - this.element.nativeElement.querySelector('#firecategories').clientHeight) + 'px'
}
}
document.onmouseup = () => {
@@ -520,7 +519,16 @@ export class CollectionToolsComponent implements OnInit {
// this.setAssetsProperty(this.proObject) //测试
}
-
+ ngAfterViewInit(): void {
+ // 监听canvas组件选中素材事件
+ this.canvas.on("select",obj=>{
+ console.log(99999999999,obj)
+ })
+ // 监听canvas组件取消选中素材事件
+ this.canvas.on("deselect ",obj=>{
+ console.log(99999999999,obj)
+ })
+ }
//点击基本信息名称
basicInfoClick(){
this.basicInfo = !this.basicInfo