Browse Source

[新增]取消框选后隐藏素材属性

zhuzhou
邵佳豪 4 years ago
parent
commit
b1c64d506e
  1. 2
      src/app/ui/collection-tools-building/collection-tools.component.html
  2. 3
      src/app/ui/collection-tools-building/collection-tools.component.ts
  3. 2
      src/app/ui/collection-tools-plan/collection-tools.component.html
  4. 5
      src/app/ui/collection-tools-plan/collection-tools.component.ts
  5. 2
      src/app/ui/collection-tools/collection-tools.component.html
  6. 3
      src/app/ui/collection-tools/collection-tools.component.ts

2
src/app/ui/collection-tools-building/collection-tools.component.html

@ -318,7 +318,7 @@
</div> </div>
<!-- 框选多个素材属性 --> <!-- 框选多个素材属性 -->
<div class="assetsproperty" style="user-select: none" *ngIf="isMultipleAsset"> <div class="assetsproperty" style="user-select: none" *ngIf="isShowProperty && isMultipleAsset">
<div *ngIf="multipleAsset.InteractiveMode == 0"> <div *ngIf="multipleAsset.InteractiveMode == 0">
<p>宽度(像素)</p> <p>宽度(像素)</p>
<input type="number" class="biginput" [(ngModel)]="multipleAsset.Width" (input)="multipleAssetWidthInput()" [disabled]="!isEditPattern || (firstMultipleAssetData.assetData.GameMode == 0 && !pattern)"> <input type="number" class="biginput" [(ngModel)]="multipleAsset.Width" (input)="multipleAssetWidthInput()" [disabled]="!isEditPattern || (firstMultipleAssetData.assetData.GameMode == 0 && !pattern)">

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

@ -635,6 +635,7 @@ export class CollectionToolsBuildingComponent implements OnInit {
this.setAssetsProperty(this.canvas.selection.first().assetData) this.setAssetsProperty(this.canvas.selection.first().assetData)
}else if(this.canvas.selection.size()){ }else if(this.canvas.selection.size()){
// console.log('多选') // console.log('多选')
this.isShowProperty = true
this.multipleAssetData = this.canvas.selection.all() this.multipleAssetData = this.canvas.selection.all()
this.firstMultipleAssetData = this.canvas.selection.first() this.firstMultipleAssetData = this.canvas.selection.first()
this.multipleAsset = { this.multipleAsset = {
@ -671,6 +672,8 @@ export class CollectionToolsBuildingComponent implements OnInit {
}); });
}) })
}) })
}else if(this.canvas.selection.size() == 0){
this.isShowProperty = false
} }
}, this) }, this)

2
src/app/ui/collection-tools-plan/collection-tools.component.html

@ -296,7 +296,7 @@
</div> </div>
</div> </div>
<!-- 框选多个素材属性 --> <!-- 框选多个素材属性 -->
<div class="assetsproperty" style="user-select: none" *ngIf="isMultipleAsset"> <div class="assetsproperty" style="user-select: none" *ngIf="isShowProperty && isMultipleAsset">
<div *ngIf="multipleAsset.InteractiveMode == 0"> <div *ngIf="multipleAsset.InteractiveMode == 0">
<p>宽度(像素)</p> <p>宽度(像素)</p>
<input type="number" class="biginput" [(ngModel)]="multipleAsset.Width" (input)="multipleAssetWidthInput()" [disabled]="!isEditPattern || (firstMultipleAssetData.assetData.GameMode == 0 && !pattern)"> <input type="number" class="biginput" [(ngModel)]="multipleAsset.Width" (input)="multipleAssetWidthInput()" [disabled]="!isEditPattern || (firstMultipleAssetData.assetData.GameMode == 0 && !pattern)">

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

@ -629,6 +629,7 @@ export class CollectionToolsPlanComponent implements OnInit {
firstMultipleAssetData:any//当前多选的第一个素材 firstMultipleAssetData:any//当前多选的第一个素材
ngOnInit(): void { ngOnInit(): void {
let _this = this let _this = this
AxMessageSystem.addListener('selectionChanged', ()=>{ AxMessageSystem.addListener('selectionChanged', ()=>{
if(this.canvas.selection.size() == 1){//如果是单选 if(this.canvas.selection.size() == 1){//如果是单选
this.isMultipleAsset = false this.isMultipleAsset = false
@ -636,6 +637,7 @@ export class CollectionToolsPlanComponent implements OnInit {
this.setAssetsProperty(this.canvas.selection.first().assetData) this.setAssetsProperty(this.canvas.selection.first().assetData)
}else if(this.canvas.selection.size()){ }else if(this.canvas.selection.size()){
// console.log('多选') // console.log('多选')
this.isShowProperty = true
this.multipleAssetData = this.canvas.selection.all() this.multipleAssetData = this.canvas.selection.all()
this.firstMultipleAssetData = this.canvas.selection.first() this.firstMultipleAssetData = this.canvas.selection.first()
this.multipleAsset = { this.multipleAsset = {
@ -673,6 +675,8 @@ export class CollectionToolsPlanComponent implements OnInit {
}) })
}) })
// console.log(666,_this.multipleAsset.PropertyInfos) // console.log(666,_this.multipleAsset.PropertyInfos)
}else if(this.canvas.selection.size() == 0){
this.isShowProperty = false
} }
}, this) }, this)
@ -831,6 +835,7 @@ export class CollectionToolsPlanComponent implements OnInit {
// }) // })
// 监听canvas组件取消选中素材事件 // 监听canvas组件取消选中素材事件
this.canvas.on("deselect",obj=>{ this.canvas.on("deselect",obj=>{
console.log(77777)
this.isShowProperty = false this.isShowProperty = false
}) })
//监听数据变化后 //监听数据变化后

2
src/app/ui/collection-tools/collection-tools.component.html

@ -370,7 +370,7 @@
</div> </div>
</div> </div>
<!-- 框选多个素材属性 --> <!-- 框选多个素材属性 -->
<div class="assetsproperty" style="user-select: none" *ngIf="isMultipleAsset"> <div class="assetsproperty" style="user-select: none" *ngIf="isShowProperty && isMultipleAsset">
<div *ngIf="multipleAsset.InteractiveMode == 0"> <div *ngIf="multipleAsset.InteractiveMode == 0">
<p>宽度(像素)</p> <p>宽度(像素)</p>
<input type="number" class="biginput" [(ngModel)]="multipleAsset.Width" (input)="multipleAssetWidthInput()" [disabled]="!isEditPattern || (firstMultipleAssetData.assetData.GameMode == 0 && !pattern)"> <input type="number" class="biginput" [(ngModel)]="multipleAsset.Width" (input)="multipleAssetWidthInput()" [disabled]="!isEditPattern || (firstMultipleAssetData.assetData.GameMode == 0 && !pattern)">

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

@ -647,6 +647,7 @@ export class CollectionToolsComponent implements OnInit {
this.setAssetsProperty(this.canvas.selection.first().assetData) this.setAssetsProperty(this.canvas.selection.first().assetData)
}else if(this.canvas.selection.size()){ }else if(this.canvas.selection.size()){
// console.log('多选') // console.log('多选')
this.isShowProperty = true
this.multipleAssetData = this.canvas.selection.all() this.multipleAssetData = this.canvas.selection.all()
this.firstMultipleAssetData = this.canvas.selection.first() this.firstMultipleAssetData = this.canvas.selection.first()
this.multipleAsset = { this.multipleAsset = {
@ -683,6 +684,8 @@ export class CollectionToolsComponent implements OnInit {
}); });
}) })
}) })
}else if(this.canvas.selection.size() == 0){
this.isShowProperty = false
} }
}, this) }, this)

Loading…
Cancel
Save