テキストが空の場合共有メモのオーバービューを表示しない。

NanasuNANA · Dec 23, 2023 · b71ef7b · b71ef7b
1 parent ac50189
commit b71ef7b
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/app/component/game-table/game-table.component.html b/src/app/component/game-table/game-table.component.html
@@ -5,9 +5,9 @@
     <div id="app-game-table" class="game-table table-image is-3d" [style.background-image]="'url(' + tableImage.url + ')' | safe: 'style'" #gameObjects>
       <canvas class="grid-canvas is-fill is-pointer-events-none" #gridCanvas [ngStyle]="{'transform': 'translateZ(' + (gridHeight + 0.1) + 'px)', 'clip': clipCss}"></canvas>
       <div class="is-fill is-3d is-pointer-events-none">
-        <ng-container *ngFor="let terrain of terrains; trackBy: trackByGameObject">
-          <ng-container *ngIf="terrain.detailDataElement && 0 < terrain.detailDataElement.children.length"><terrain class="is-3d" [style.z-index]="terrain.height > 0 ? 0 : 1" [terrain]="terrain" [appTooltip]="terrain"></terrain></ng-container>
-          <ng-container *ngIf="!terrain.detailDataElement || terrain.detailDataElement.children.length <= 0"><terrain class="is-3d" [style.z-index]="terrain.height > 0 ? 0 : 1" [terrain]="terrain"></terrain></ng-container>
+        <ng-container *ngFor="let terrain of terrains; trackBy: trackByGameObject; index as z">
+          <ng-container *ngIf="terrain.detailDataElement && 0 < terrain.detailDataElement.children.length"><terrain class="is-3d" [style.z-index]="z + (terrain.height > 0 ? 0 : 10000)" [terrain]="terrain" [appTooltip]="terrain"></terrain></ng-container>
+          <ng-container *ngIf="!terrain.detailDataElement || terrain.detailDataElement.children.length <= 0"><terrain class="is-3d" [style.z-index]="z + (terrain.height > 0 ? 0 : 10000)" [terrain]="terrain"></terrain></ng-container>
         </ng-container>
       </div>
       <div class="is-fill is-3d is-pointer-events-none">
@@ -16,7 +16,10 @@
           <ng-container *ngIf="!mask.detailDataElement || mask.detailDataElement.children.length <= 0"><game-table-mask class="is-3d" [gameTableMask]="mask" [ngStyle]="{'z-index': z, 'transform': 'translateZ(' + (z * 0.0001) +'px)'}"></game-table-mask></ng-container>
         </ng-container>
       </div>
-      <text-note class="is-3d" *ngFor="let textNote of textNotes; trackBy: trackByGameObject" [textNote]="textNote" [appTooltip]="textNote" [ngStyle]="{'z-index' : textNote.zindex}"></text-note>
+      <ng-container *ngFor="let textNote of textNotes; trackBy: trackByGameObject">
+        <text-note *ngIf="textNote.text != null && textNote.text.trim() != ''"class="is-3d" [textNote]="textNote" [appTooltip]="textNote" [ngStyle]="{'z-index' : textNote.zindex}"></text-note>
+        <text-note *ngIf="textNote.text == null || textNote.text.trim() === ''" class="is-3d" [textNote]="textNote" [ngStyle]="{'z-index' : textNote.zindex}"></text-note>
+      </ng-container>
       <card-stack class="is-3d" *ngFor="let cardStack of cardStacks; trackBy: trackByGameObject" [cardStack]="cardStack" [appTooltip]="cardStack" [ngStyle]="{'z-index' : cardStack.zindex, 'transform': 'translateZ(' + (cardStack.zindex * 0.001) +'px)'}"></card-stack>
       <card class="is-3d" *ngFor="let card of cards; trackBy: trackByGameObject" [card]="card" [appTooltip]="card" [ngStyle]="{'z-index' : card.zindex, 'transform': 'translateZ(' + (card.zindex * 0.001) +'px)'}"></card>
       <range class="is-3d" *ngFor="let range of ranges; trackBy: trackByGameObject" [range]="range" [appTooltip]="range"></range>