diff --git a/packages/nc-gui-v2/components.d.ts b/packages/nc-gui-v2/components.d.ts index 35b9712b59..9dc137dc31 100644 --- a/packages/nc-gui-v2/components.d.ts +++ b/packages/nc-gui-v2/components.d.ts @@ -103,6 +103,7 @@ declare module '@vue/runtime-core' { MdiCheck: typeof import('~icons/mdi/check')['default'] MdiChevronDown: typeof import('~icons/mdi/chevron-down')['default'] MdiClose: typeof import('~icons/mdi/close')['default'] + MdiCloseBox: typeof import('~icons/mdi/close-box')['default'] MdiCloseCircle: typeof import('~icons/mdi/close-circle')['default'] MdiCloseThick: typeof import('~icons/mdi/close-thick')['default'] MdiCodeJson: typeof import('~icons/mdi/code-json')['default'] @@ -127,6 +128,7 @@ declare module '@vue/runtime-core' { MdiEyeOffOutline: typeof import('~icons/mdi/eye-off-outline')['default'] MdiFileDocumentOutline: typeof import('~icons/mdi/file-document-outline')['default'] MdiFileExcel: typeof import('~icons/mdi/file-excel')['default'] + MdiFileEyeOutline: typeof import('~icons/mdi/file-eye-outline')['default'] MdiFlag: typeof import('~icons/mdi/flag')['default'] MdiFlashOutline: typeof import('~icons/mdi/flash-outline')['default'] MdiFolder: typeof import('~icons/mdi/folder')['default'] diff --git a/packages/nc-gui-v2/components/cell/Url.vue b/packages/nc-gui-v2/components/cell/Url.vue index 7b3e4b584e..cd123ef0ac 100644 --- a/packages/nc-gui-v2/components/cell/Url.vue +++ b/packages/nc-gui-v2/components/cell/Url.vue @@ -2,6 +2,7 @@ import type { VNodeRef } from '@vue/runtime-core' import { message } from 'ant-design-vue' import { ColumnInj, EditModeInj, computed, inject, isValidURL } from '#imports' +import MaterialSymbolsWarning from '~icons/material-symbols/warning' interface Props { modelValue?: string | null @@ -22,13 +23,13 @@ const vModel = computed({ get: () => value, set: (val) => { localState.value = val - if (!column.value.meta?.validate || (val && isValidURL(val))) { + if (!column.value.meta?.validate || (val && isValidURL(val)) || !val) { emit('update:modelValue', val) } }, }) -const isValid = computed(() => value && isValidURL(value)) +const isValid = computed(() => !column.value.meta?.validate || (value && isValidURL(value))) const url = computed(() => { if (!value || !isValidURL(value)) return '' @@ -55,11 +56,22 @@ watch(