Fixed sorting
This commit is contained in:
parent
c9b967b9d0
commit
b8d27cc682
@ -31,7 +31,8 @@
|
|||||||
"icmplib==3.0.4",
|
"icmplib==3.0.4",
|
||||||
"ariadne==0.20.1",
|
"ariadne==0.20.1",
|
||||||
"cryptography==41.0.4",
|
"cryptography==41.0.4",
|
||||||
"discord==2.3.2"
|
"discord==2.3.2",
|
||||||
|
"bs4==0.0.1"
|
||||||
],
|
],
|
||||||
"DevDependencies": [
|
"DevDependencies": [
|
||||||
"cpl-cli==2023.4.0.post3",
|
"cpl-cli==2023.4.0.post3",
|
||||||
|
4
web/package-lock.json
generated
4
web/package-lock.json
generated
@ -1,11 +1,11 @@
|
|||||||
{
|
{
|
||||||
"name": "kdb-web",
|
"name": "web",
|
||||||
"version": "1.2.0",
|
"version": "1.2.0",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "kdb-web",
|
"name": "web",
|
||||||
"version": "1.2.0",
|
"version": "1.2.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@angular/animations": "^15.1.4",
|
"@angular/animations": "^15.1.4",
|
||||||
|
@ -5,9 +5,11 @@ import { ComponentWithTable } from "../../../base/component-with-table";
|
|||||||
export class HideableComponent {
|
export class HideableComponent {
|
||||||
@HostBinding("class.hidden-column")
|
@HostBinding("class.hidden-column")
|
||||||
get hidden() {
|
get hidden() {
|
||||||
return !(this.parent?.isColumnVisible(this.column) ?? true);
|
const column = this.subColumn ?? this.column;
|
||||||
|
return !(this.parent?.isColumnVisible(column) ?? true);
|
||||||
};
|
};
|
||||||
|
|
||||||
@Input() column!: string;
|
@Input() column!: string;
|
||||||
|
@Input() subColumn!: string;
|
||||||
@Input() parent!: ComponentWithTable;
|
@Input() parent!: ComponentWithTable;
|
||||||
}
|
}
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
<ng-content></ng-content>
|
<ng-content></ng-content>
|
||||||
</ng-template>
|
</ng-template>
|
||||||
|
|
||||||
<div *ngIf="sortable; else without" [pSortableColumn]="column">
|
<div *ngIf="sortable; else without" [pSortableColumn]="subColumn ?? column">
|
||||||
<ng-container *ngTemplateOutlet="content"></ng-container>
|
<ng-container *ngTemplateOutlet="content"></ng-container>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -72,10 +72,10 @@
|
|||||||
</div>
|
</div>
|
||||||
</th>
|
</th>
|
||||||
|
|
||||||
<th hideable-th="level" [parent]="this" [sortable]="true">
|
<th hideable-th="level" subColumn="level.min_xp" [parent]="this" [sortable]="true">
|
||||||
<div class="table-header-label">
|
<div class="table-header-label">
|
||||||
<div class="table-header-text">{{'common.level' | translate}}</div>
|
<div class="table-header-text">{{'common.level' | translate}}</div>
|
||||||
<p-sortIcon field="level.name" class="table-header-icon"></p-sortIcon>
|
<p-sortIcon field="level" class="table-header-icon"></p-sortIcon>
|
||||||
</div>
|
</div>
|
||||||
</th>
|
</th>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user