From b1c64d506eb8bc6f016b8d19118d824c40969ef1 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Wed, 27 Jan 2021 10:39:48 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E5=8F=96=E6=B6=88=E6=A1=86?=
 =?UTF-8?q?=E9=80=89=E5=90=8E=E9=9A=90=E8=97=8F=E7=B4=A0=E6=9D=90=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collection-tools.component.html                          | 2 +-
 .../collection-tools-building/collection-tools.component.ts  | 3 +++
 .../ui/collection-tools-plan/collection-tools.component.html | 2 +-
 .../ui/collection-tools-plan/collection-tools.component.ts   | 5 +++++
 src/app/ui/collection-tools/collection-tools.component.html  | 2 +-
 src/app/ui/collection-tools/collection-tools.component.ts    | 3 +++
 6 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/app/ui/collection-tools-building/collection-tools.component.html b/src/app/ui/collection-tools-building/collection-tools.component.html
index a3b1434..ede2dc6 100644
--- a/src/app/ui/collection-tools-building/collection-tools.component.html
+++ b/src/app/ui/collection-tools-building/collection-tools.component.html
@@ -318,7 +318,7 @@
         
           </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">
               <p>宽度(像素)</p>
               <input type="number" class="biginput" [(ngModel)]="multipleAsset.Width" (input)="multipleAssetWidthInput()" [disabled]="!isEditPattern || (firstMultipleAssetData.assetData.GameMode == 0 && !pattern)">
diff --git a/src/app/ui/collection-tools-building/collection-tools.component.ts b/src/app/ui/collection-tools-building/collection-tools.component.ts
index 99d4520..1cf70e0 100644
--- a/src/app/ui/collection-tools-building/collection-tools.component.ts
+++ b/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)
       }else if(this.canvas.selection.size()){
         // console.log('多选')
+        this.isShowProperty = true
         this.multipleAssetData = this.canvas.selection.all()
         this.firstMultipleAssetData = this.canvas.selection.first()
         this.multipleAsset = {
@@ -671,6 +672,8 @@ export class CollectionToolsBuildingComponent implements OnInit {
             });
           }) 
         })
+      }else if(this.canvas.selection.size() == 0){
+        this.isShowProperty = false
       }
     }, this)
 
diff --git a/src/app/ui/collection-tools-plan/collection-tools.component.html b/src/app/ui/collection-tools-plan/collection-tools.component.html
index 9985e7b..31a4da6 100644
--- a/src/app/ui/collection-tools-plan/collection-tools.component.html
+++ b/src/app/ui/collection-tools-plan/collection-tools.component.html
@@ -296,7 +296,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">
               <p>宽度(像素)</p>
               <input type="number" class="biginput" [(ngModel)]="multipleAsset.Width" (input)="multipleAssetWidthInput()" [disabled]="!isEditPattern || (firstMultipleAssetData.assetData.GameMode == 0 && !pattern)">
diff --git a/src/app/ui/collection-tools-plan/collection-tools.component.ts b/src/app/ui/collection-tools-plan/collection-tools.component.ts
index e434e0c..c2aeac9 100644
--- a/src/app/ui/collection-tools-plan/collection-tools.component.ts
+++ b/src/app/ui/collection-tools-plan/collection-tools.component.ts
@@ -629,6 +629,7 @@ export class CollectionToolsPlanComponent implements OnInit {
   firstMultipleAssetData:any//当前多选的第一个素材
   ngOnInit(): void {
     let _this = this
+    
     AxMessageSystem.addListener('selectionChanged', ()=>{
       if(this.canvas.selection.size() == 1){//如果是单选
         this.isMultipleAsset = false
@@ -636,6 +637,7 @@ export class CollectionToolsPlanComponent implements OnInit {
         this.setAssetsProperty(this.canvas.selection.first().assetData)
       }else if(this.canvas.selection.size()){
         // console.log('多选')
+        this.isShowProperty = true
         this.multipleAssetData = this.canvas.selection.all()
         this.firstMultipleAssetData = this.canvas.selection.first()
         this.multipleAsset = {
@@ -673,6 +675,8 @@ export class CollectionToolsPlanComponent implements OnInit {
           }) 
         })
         // console.log(666,_this.multipleAsset.PropertyInfos)
+      }else if(this.canvas.selection.size() == 0){
+        this.isShowProperty = false
       }
     }, this)
 
@@ -831,6 +835,7 @@ export class CollectionToolsPlanComponent implements OnInit {
     // })
     // 监听canvas组件取消选中素材事件
     this.canvas.on("deselect",obj=>{
+      console.log(77777)
       this.isShowProperty = false
     })
     //监听数据变化后
diff --git a/src/app/ui/collection-tools/collection-tools.component.html b/src/app/ui/collection-tools/collection-tools.component.html
index 34a7582..fcc81e6 100644
--- a/src/app/ui/collection-tools/collection-tools.component.html
+++ b/src/app/ui/collection-tools/collection-tools.component.html
@@ -370,7 +370,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">
               <p>宽度(像素)</p>
               <input type="number" class="biginput" [(ngModel)]="multipleAsset.Width" (input)="multipleAssetWidthInput()" [disabled]="!isEditPattern || (firstMultipleAssetData.assetData.GameMode == 0 && !pattern)">
diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts
index 34893d5..14799a7 100644
--- a/src/app/ui/collection-tools/collection-tools.component.ts
+++ b/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)
       }else if(this.canvas.selection.size()){
         // console.log('多选')
+        this.isShowProperty = true
         this.multipleAssetData = this.canvas.selection.all()
         this.firstMultipleAssetData = this.canvas.selection.first()
         this.multipleAsset = {
@@ -683,6 +684,8 @@ export class CollectionToolsComponent implements OnInit {
             });
           }) 
         })
+      }else if(this.canvas.selection.size() == 0){
+        this.isShowProperty = false
       }
     }, this)