From d58cfd543ba2fcd16cc09012c579a73ccbf8cc60 Mon Sep 17 00:00:00 2001 From: Valentin Date: Thu, 25 Nov 2021 15:24:57 +0200 Subject: [PATCH] added more keys and fixes for help mode --- src/assets/styles/common-help-mode.scss | 16 +++++- .../help-mode/help-mode.component.scss | 2 +- .../page-header/models/action-config.model.ts | 1 + .../page-header/page-header.component.html | 3 +- .../table-content.component.html | 52 ++++++++++--------- .../table-content/table-content.component.ts | 1 + src/lib/listing/table/table.component.html | 1 + src/lib/listing/table/table.component.ts | 1 + 8 files changed, 49 insertions(+), 28 deletions(-) diff --git a/src/assets/styles/common-help-mode.scss b/src/assets/styles/common-help-mode.scss index 2b5e5ab..9cd680f 100644 --- a/src/assets/styles/common-help-mode.scss +++ b/src/assets/styles/common-help-mode.scss @@ -1,5 +1,5 @@ .help-mode-on-mouse-over { - z-index: 1000; + z-index: 10; position: absolute; top: -5px; left: -5px; @@ -61,3 +61,17 @@ margin-top: 10px; margin-left: 15px; } + +.help-mode-on-mouse-over-reset-filters { + z-index: 20; + padding-left: 4px; +} + +.help-mode-on-mouse-over-dossier-list, +.help-mode-on-mouse-over-document-list { + margin-top: 5px; +} + +.help-mode-on-mouse-over-edit-dossier-attributes { + z-index: 20; +} diff --git a/src/lib/help-mode/help-mode/help-mode.component.scss b/src/lib/help-mode/help-mode/help-mode.component.scss index e848a0c..421d474 100644 --- a/src/lib/help-mode/help-mode/help-mode.component.scss +++ b/src/lib/help-mode/help-mode/help-mode.component.scss @@ -42,7 +42,7 @@ border-right: 8px solid var(--iqser-helpmode-primary); border-top: 8px solid var(--iqser-helpmode-primary); border-bottom: 60px solid var(--iqser-helpmode-primary); - z-index: 10; + z-index: 5; position: absolute; display: flex; justify-content: center; diff --git a/src/lib/listing/page-header/models/action-config.model.ts b/src/lib/listing/page-header/models/action-config.model.ts index 311e3fc..fdb27ab 100644 --- a/src/lib/listing/page-header/models/action-config.model.ts +++ b/src/lib/listing/page-header/models/action-config.model.ts @@ -2,4 +2,5 @@ import { BaseHeaderConfig } from './base-config.model'; export interface ActionConfig extends BaseHeaderConfig { readonly action: ($event: MouseEvent) => void; + readonly helpModeKey?: string; } diff --git a/src/lib/listing/page-header/page-header.component.html b/src/lib/listing/page-header/page-header.component.html index b2aba3f..27f49b3 100644 --- a/src/lib/listing/page-header/page-header.component.html +++ b/src/lib/listing/page-header/page-header.component.html @@ -12,7 +12,7 @@ -
+
@@ -36,6 +36,7 @@ *ngIf="!config.hide" [icon]="config.icon" [tooltip]="config.label" + [iqserHelpMode]="config.helpModeKey" tooltipPosition="below" > diff --git a/src/lib/listing/table-content/table-content.component.html b/src/lib/listing/table-content/table-content.component.html index 877be79..3625c8a 100644 --- a/src/lib/listing/table-content/table-content.component.html +++ b/src/lib/listing/table-content/table-content.component.html @@ -1,27 +1,29 @@ - - - - -
- -
- - -
+
+ + + + +
- -
-
+ + +
+ +
+
+ + +
diff --git a/src/lib/listing/table-content/table-content.component.ts b/src/lib/listing/table-content/table-content.component.ts index 2942d7a..7af8571 100644 --- a/src/lib/listing/table-content/table-content.component.ts +++ b/src/lib/listing/table-content/table-content.component.ts @@ -18,6 +18,7 @@ export class TableContentComponent extends AutoUnsubscribe @Input() itemMouseLeaveFn?: (entity: T) => void; @Input() tableItemClasses?: Record boolean>; @Input() selectionEnabled!: boolean; + @Input() helpModeKey?: 'dossier-list' | 'document-list'; readonly trackBy = trackBy(); @ViewChild(CdkVirtualScrollViewport, { static: true }) readonly scrollViewport!: CdkVirtualScrollViewport; diff --git a/src/lib/listing/table/table.component.html b/src/lib/listing/table/table.component.html index cb6baed..920483d 100644 --- a/src/lib/listing/table/table.component.html +++ b/src/lib/listing/table/table.component.html @@ -29,6 +29,7 @@ [itemSize]="itemSize" [selectionEnabled]="selectionEnabled" [tableItemClasses]="tableItemClasses" + [helpModeKey]="helpModeKey" > extends AutoUnsubscribe impleme @Input() tableItemClasses?: Record boolean>; @Input() itemMouseEnterFn?: (entity: T) => void; @Input() itemMouseLeaveFn?: (entity: T) => void; + @Input() helpModeKey?: 'dossier-list' | 'document-list'; @Output() readonly noDataAction = new EventEmitter(); @ViewChild(TableContentComponent, { static: true }) private readonly _tableContent!: TableContentComponent;