diff --git a/erdblick_app/app/inspection.panel.component.ts b/erdblick_app/app/inspection.panel.component.ts index 12c80616..3d7e535d 100644 --- a/erdblick_app/app/inspection.panel.component.ts +++ b/erdblick_app/app/inspection.panel.component.ts @@ -35,7 +35,23 @@ interface InspectorTab { - ` + `, + styles: [ + `@layer erdblick { + .inspector-title { + display: flex; + gap: 4px; + justify-content: center; + align-items: center; + + .p-button { + width: 30px; + height: 30px; + margin: 0; + } + } + }`, + ] }) export class InspectionPanelComponent implements OnInit { diff --git a/erdblick_app/app/sourcedata.panel.component.ts b/erdblick_app/app/sourcedata.panel.component.ts index a8bf2c11..d846ddf8 100644 --- a/erdblick_app/app/sourcedata.panel.component.ts +++ b/erdblick_app/app/sourcedata.panel.component.ts @@ -45,9 +45,7 @@ import {TreeTable} from "primeng/treetable"; - + {{ col.header }} @@ -55,9 +53,7 @@ import {TreeTable} from "primeng/treetable"; - + @@ -182,22 +178,23 @@ export class SourceDataPanelComponent implements OnInit { selectItemWithAddress(address: bigint) { let searchAddress: any = address; + let addressInRange: any; if (this.addressFormat == coreLib.SourceDataAddressFormat.BIT_RANGE) { searchAddress = { offset: address >> BigInt(32) & BigInt(0xFFFFFFFF), size: address & BigInt(0xFFFFFFFF), } - } - console.log(`Highlighting item with address`, searchAddress); - const addressLow = typeof searchAddress === 'object' ? searchAddress['offset'] : searchAddress; - const addressHigh = addressLow + (typeof searchAddress === 'object' ? searchAddress['size'] : searchAddress); + const addressLow = typeof searchAddress === 'object' ? searchAddress['offset'] : searchAddress; + const addressHigh = addressLow + (typeof searchAddress === 'object' ? searchAddress['size'] : searchAddress); - let addressInRange = (addr: any) => { - if (typeof addr === 'object') { + addressInRange = (addr: any) => { return addr.offset >= addressLow && addr.offset + addr.size <= addressHigh; } - return addr == searchAddress + } else { + addressInRange = (addr: any) => { + return addr == searchAddress; + } } // Virtual row index (visible row index) of the first highlighted row, or undefined. @@ -230,6 +227,7 @@ export class SourceDataPanelComponent implements OnInit { } }; + console.log(`Highlighting item with address`, searchAddress); this.treeData.forEach((item: TreeTableNode, index) => { select(item, [], false, index); }); @@ -251,6 +249,4 @@ export class SourceDataPanelComponent implements OnInit { this.clearFilter(); } } - - protected readonly HTMLInputElement = HTMLInputElement; } diff --git a/package-lock.json b/package-lock.json index 71e08b5d..f938ce07 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28,7 +28,7 @@ "js-yaml": "^4.1.0", "material-icons": "^1.13.12", "primeicons": "^7.0.0", - "primeng": "^17.18.0", + "primeng": "17.18.7", "rxjs": "~7.8.1", "stream-browserify": "^3.0.0", "stream-http": "^3.2.0",