From 093a2583f0d554ecf8270f6fc368752e8deb2556 Mon Sep 17 00:00:00 2001 From: Tobias Klika Date: Mon, 3 Jan 2022 15:28:12 +0100 Subject: [PATCH] table filter works --- .../components/ui-table-filter-overlay.vue | 66 ++++--- .../app/components/ui-table-filter.vue | 64 +++--- .../app/components/ui-table.vue | 1 + .../app/editor/_fields/countrypicker.vue | 17 -- .../app/editor/_fields/media.vue | 43 ---- .../app/editor/_fields/nested.vue | 185 ------------------ .../app/editor/_fields/select.vue | 82 -------- zero.Backoffice.UI/app/editor/compile.ts | 10 +- .../app/editor/fields/select.vue | 15 +- zero.Backoffice.UI/app/editor/register.ts | 1 + .../media/components/media-previews.vue | 18 +- .../app/modules/media/pages/overview/drop.vue | 1 - .../app/modules/settings/demo.vue | 2 +- .../modules/translations/schemas/editor.ts | 13 +- .../Resources/Localization/zero.en-us.json | 1 + 15 files changed, 115 insertions(+), 404 deletions(-) delete mode 100644 zero.Backoffice.UI/app/editor/_fields/countrypicker.vue delete mode 100644 zero.Backoffice.UI/app/editor/_fields/media.vue delete mode 100644 zero.Backoffice.UI/app/editor/_fields/nested.vue delete mode 100644 zero.Backoffice.UI/app/editor/_fields/select.vue diff --git a/zero.Backoffice.UI/app/components/ui-table-filter-overlay.vue b/zero.Backoffice.UI/app/components/ui-table-filter-overlay.vue index a4a4f16c..b22813e5 100644 --- a/zero.Backoffice.UI/app/components/ui-table-filter-overlay.vue +++ b/zero.Backoffice.UI/app/components/ui-table-filter-overlay.vue @@ -1,15 +1,15 @@  \ No newline at end of file diff --git a/zero.Backoffice.UI/app/editor/_fields/media.vue b/zero.Backoffice.UI/app/editor/_fields/media.vue deleted file mode 100644 index 18e05821..00000000 --- a/zero.Backoffice.UI/app/editor/_fields/media.vue +++ /dev/null @@ -1,43 +0,0 @@ - - - - \ No newline at end of file diff --git a/zero.Backoffice.UI/app/editor/_fields/nested.vue b/zero.Backoffice.UI/app/editor/_fields/nested.vue deleted file mode 100644 index b78ba867..00000000 --- a/zero.Backoffice.UI/app/editor/_fields/nested.vue +++ /dev/null @@ -1,185 +0,0 @@ - - - \ No newline at end of file diff --git a/zero.Backoffice.UI/app/editor/_fields/select.vue b/zero.Backoffice.UI/app/editor/_fields/select.vue deleted file mode 100644 index f822af7f..00000000 --- a/zero.Backoffice.UI/app/editor/_fields/select.vue +++ /dev/null @@ -1,82 +0,0 @@ - - - - \ No newline at end of file diff --git a/zero.Backoffice.UI/app/editor/compile.ts b/zero.Backoffice.UI/app/editor/compile.ts index ca1e7637..aede6adb 100644 --- a/zero.Backoffice.UI/app/editor/compile.ts +++ b/zero.Backoffice.UI/app/editor/compile.ts @@ -4,7 +4,7 @@ import { Zero } from "../core"; import { ZeroEditor } from "./editor"; import { createBlueprintConfig } from "./editor-blueprint"; import { ZeroEditorCanvasBase, ZeroEditorTab } from "./editor-canvas"; -import { ZeroEditorFieldConfiguration } from "./editor-field"; +import { ZeroEditorFieldConfiguration, ZeroEditorFieldFilterPreview } from "./editor-field"; import { localize } from '../services/localization'; @@ -57,6 +57,7 @@ export interface ZeroCompiledEditorField horizontal: boolean; sort: number; columns: number; + preview?: ZeroEditorFieldFilterPreview; } @@ -122,7 +123,12 @@ export function compileField(zero: Zero, editor: ZeroEditor, field: ZeroEditorFi classes: field.configuration.classes, horizontal: field.configuration.horizontal, sort: field.configuration.sort, - columns: 12 + columns: 12, + preview: field.configuration.preview ? { + icon: field.configuration.preview.icon || 'fth-square', + selected: field.configuration.preview.selected || (x => !!x), + value: field.configuration.preview.value || (x => x ? x : null) + } : null } as ZeroCompiledEditorField; diff --git a/zero.Backoffice.UI/app/editor/fields/select.vue b/zero.Backoffice.UI/app/editor/fields/select.vue index a02415f1..02645526 100644 --- a/zero.Backoffice.UI/app/editor/fields/select.vue +++ b/zero.Backoffice.UI/app/editor/fields/select.vue @@ -1,6 +1,6 @@