Browse Source

fix(nc-gui): apply parseProp on column meta

pull/5307/head
Wing-Kam Wong 2 years ago
parent
commit
d683319219
  1. 8
      packages/nc-gui/components/cell/Url.vue

8
packages/nc-gui/components/cell/Url.vue

@ -8,6 +8,7 @@ import {
inject, inject,
isValidURL, isValidURL,
message, message,
parseProp,
ref, ref,
useCellUrlConfig, useCellUrlConfig,
useI18n, useI18n,
@ -39,7 +40,7 @@ const vModel = computed({
get: () => value, get: () => value,
set: (val) => { set: (val) => {
localState.value = val localState.value = val
if (!column.value.meta?.validate || (val && isValidURL(val)) || !val) { if (!parseProp(column.value.meta)?.validate || (val && isValidURL(val)) || !val) {
emit('update:modelValue', val) emit('update:modelValue', val)
} }
}, },
@ -63,7 +64,7 @@ const focus: VNodeRef = (el) => (el as HTMLInputElement)?.focus()
watch( watch(
() => editEnabled.value, () => editEnabled.value,
() => { () => {
if (column.value.meta?.validate && !editEnabled.value && localState.value && !isValidURL(localState.value)) { if (parseProp(column.value.meta)?.validate && !editEnabled.value && localState.value && !isValidURL(localState.value)) {
message.error(t('msg.error.invalidURL')) message.error(t('msg.error.invalidURL'))
localState.value = undefined localState.value = undefined
return return
@ -126,6 +127,3 @@ watch(
</div> </div>
</div> </div>
</template> </template>
<!--
-->

Loading…
Cancel
Save