From 1b889449f13e1a83054c8e957dd4690afafd2065 Mon Sep 17 00:00:00 2001 From: DarkPhoenix2704 Date: Sun, 8 Oct 2023 20:05:09 +0000 Subject: [PATCH 1/9] feat(nc-gui): kanban card design --- .../nc-gui/components/smartsheet/Kanban.vue | 83 +++++++++++++------ 1 file changed, 56 insertions(+), 27 deletions(-) diff --git a/packages/nc-gui/components/smartsheet/Kanban.vue b/packages/nc-gui/components/smartsheet/Kanban.vue index b9fd4b1e62..368f12528f 100644 --- a/packages/nc-gui/components/smartsheet/Kanban.vue +++ b/packages/nc-gui/components/smartsheet/Kanban.vue @@ -107,7 +107,9 @@ const hasEditPermission = computed(() => isUIAllowed('dataEdit')) const fields = inject(FieldsInj, ref([])) -const fieldsWithoutCover = computed(() => fields.value.filter((f) => f.id !== kanbanMetaData.value?.fk_cover_image_col_id)) +const fieldsWithoutDisplay = computed(() => fields.value.filter((f) => !isPrimary(f))) + +const displayField = computed(() => meta.value?.columns?.find((c) => c.pv && fields.value.includes(c)) ?? null) const coverImageColumn: any = computed(() => meta.value?.columnsById @@ -520,22 +522,21 @@ watch(
-
-
- -
-
+

+ + + +

+ +
+
+
+
- + +
-
+
+
-
From 93b5ef743acbad16367c44c8c378083fbc33e078 Mon Sep 17 00:00:00 2001 From: DarkPhoenix2704 Date: Sun, 8 Oct 2023 20:05:09 +0000 Subject: [PATCH 2/9] fix: kanban image not loading --- packages/nc-gui/components/smartsheet/Kanban.vue | 2 +- packages/nocodb/src/db/BaseModelSqlv2.ts | 2 +- packages/nocodb/src/helpers/getAst.ts | 13 +++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/packages/nc-gui/components/smartsheet/Kanban.vue b/packages/nc-gui/components/smartsheet/Kanban.vue index 368f12528f..7894307028 100644 --- a/packages/nc-gui/components/smartsheet/Kanban.vue +++ b/packages/nc-gui/components/smartsheet/Kanban.vue @@ -564,7 +564,7 @@ watch(