From ce72a3747896fda855e3dc1b916a11e891709837 Mon Sep 17 00:00:00 2001 From: Muhammed Mustafa Date: Tue, 10 Oct 2023 06:48:00 +0000 Subject: [PATCH 1/4] fix(nc-gui): Specific db fix --- .../nc-gui/components/smartsheet/column/EditOrAdd.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue index 2198d253bd..290ce81239 100644 --- a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue +++ b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue @@ -66,7 +66,7 @@ const isForm = inject(IsFormInj, ref(false)) const isKanban = inject(IsKanbanInj, ref(false)) -const { isMysql, isMssql } = useBase() +const { isMysql, isMssql, isXcdbBase } = useBase() const reloadDataTrigger = inject(ReloadViewDataHookInj) @@ -86,9 +86,9 @@ const showDeprecated = ref(false) const uiTypesOptions = computed(() => { return [ - ...uiTypes.filter( - (t) => geoDataToggleCondition(t) && (!isEdit.value || !t.virtual) && (!t.deprecated || showDeprecated.value), - ), + ...uiTypes + .filter((t) => geoDataToggleCondition(t) && (!isEdit.value || !t.virtual) && (!t.deprecated || showDeprecated.value)) + .filter((t) => !(t.name === UITypes.SpecificDBType && isXcdbBase(meta.value?.source_id))), ...(!isEdit.value && meta?.value?.columns?.every((c) => !c.pk) ? [ { From 0b07f0f89ab076dfdf8d1a895483a34d10d09d21 Mon Sep 17 00:00:00 2001 From: Muhammed Mustafa Date: Tue, 10 Oct 2023 06:48:00 +0000 Subject: [PATCH 2/4] fix(nc-gui): Checkbox col option UI fix --- packages/nc-gui/components/cell/Checkbox.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/nc-gui/components/cell/Checkbox.vue b/packages/nc-gui/components/cell/Checkbox.vue index edf550808b..be70d8d314 100644 --- a/packages/nc-gui/components/cell/Checkbox.vue +++ b/packages/nc-gui/components/cell/Checkbox.vue @@ -91,7 +91,11 @@ useSelectedCellKeyupListener(active, (e) => { }" @click="onClick(false, $event)" > -
+
Date: Tue, 10 Oct 2023 06:48:00 +0000 Subject: [PATCH 3/4] fix(nc-gui): Attachment col option UI fix --- packages/nc-gui/components/smartsheet/column/EditOrAdd.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue index 290ce81239..d4962a971a 100644 --- a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue +++ b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue @@ -214,7 +214,7 @@ if (props.fromTableExplorer) { 'bg-white': !props.fromTableExplorer, 'w-[400px]': !props.embedMode, '!w-[600px]': formState.uidt === UITypes.Formula && !props.embedMode, - '!w-[500px]': formState.uidt === UITypes.Attachment && !props.embedMode, + '!w-[500px]': formState.uidt === UITypes.Attachment && !props.embedMode && !appInfo.ee, 'shadow-lg border-1 border-gray-50 shadow-gray-100 rounded-md p-6': !embedMode, }" @keydown="handleEscape" From b362ebee0b807ffca2c7ac028ff9e5151ebedecd Mon Sep 17 00:00:00 2001 From: Muhammed Mustafa Date: Tue, 10 Oct 2023 06:48:00 +0000 Subject: [PATCH 4/4] fix(nc-gui): Added show more for SpecificDBType --- packages/nc-gui/components/smartsheet/column/EditOrAdd.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue index d4962a971a..9fea597e9d 100644 --- a/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue +++ b/packages/nc-gui/components/smartsheet/column/EditOrAdd.vue @@ -331,7 +331,7 @@ if (props.fromTableExplorer) {