Browse Source

fix(nc-gui): prefill link issue after clicking clear form btn in form builder

pull/7786/head
Ramesh Mane 9 months ago
parent
commit
b9057d20b7
  1. 6
      packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
  2. 33
      packages/nc-gui/components/smartsheet/Form.vue

6
packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue

@ -7,8 +7,6 @@ const { view: _view, $api } = useSmartsheetStoreOrThrow()
const { $e } = useNuxtApp()
const { getBaseUrl, appInfo } = useGlobal()
const { t } = useI18n()
const { dashboardUrl } = useDashboard()
const viewStore = useViewsStore()
@ -428,14 +426,14 @@ watchEffect(() => {})
<a-radio-group
v-if="formPreFill.preFillEnabled"
:value="formPreFill.preFilledMode || ''"
:value="formPreFill.preFilledMode"
class="nc-field-layout-list"
data-testid="nc-modal-share-view__preFillMode"
@update:value="
(value) => {
formPreFill = {
...formPreFill,
preFilledMode: value || '',
preFilledMode: value,
}
}
"

33
packages/nc-gui/components/smartsheet/Form.vue

@ -31,7 +31,6 @@ import {
onClickOutside,
parseProp,
provide,
reactive,
ref,
useDebounceFn,
useEventListener,
@ -82,7 +81,7 @@ const { getPossibleAttachmentSrc } = useAttachment()
const formRef = ref()
let formState = reactive<Record<string, any>>({})
const formState = ref<Record<string, any>>({})
const secondsRemain = ref(0)
@ -112,7 +111,7 @@ const { fields, showAll, hideAll } = useViewColumnsOrThrow()
const { state, row } = useProvideSmartsheetRowStore(
meta,
ref({
row: formState,
row: formState.value,
oldRow: {},
rowMeta: { new: true },
}),
@ -198,7 +197,7 @@ const updateView = useDebounceFn(
const updatePreFillFormSearchParams = useDebounceFn(() => {
if (isLocked.value || !isUIAllowed('dataInsert')) return
const preFilledData = { ...formState, ...state.value }
const preFilledData = { ...formState.value, ...state.value }
const searchParams = new URLSearchParams()
@ -224,7 +223,7 @@ async function submitForm() {
}
await insertRow({
row: { ...formState, ...state.value },
row: { ...formState.value, ...state.value },
oldRow: {},
rowMeta: { new: true },
})
@ -235,7 +234,7 @@ async function submitForm() {
async function clearForm() {
if (isLocked.value || !isUIAllowed('dataInsert')) return
formState = reactive<Record<string, any>>({})
formState.value = {}
state.value = {}
await formRef.value?.clearValidate()
reloadEventHook.trigger()
@ -592,19 +591,25 @@ watch(view, (nextView) => {
}
})
watch([formState, state.value], async () => {
watch(
[formState, state],
async () => {
for (const virtualField in state.value) {
if (!formState[virtualField]) {
formState[virtualField] = state.value[virtualField]
}
formState.value[virtualField] = state.value[virtualField]
}
updatePreFillFormSearchParams()
try {
await formRef.value?.validateFields([...Object.keys(formState)])
await formRef.value?.validateFields([...Object.keys(formState.value)])
} catch (e: any) {
e.errorFields.map((f: Record<string, any>) => console.error(f.errors.join(',')))
}
})
},
{
deep: true,
},
)
watch(activeRow, (newValue) => {
if (newValue) {
@ -624,10 +629,6 @@ watch([focusLabel, activeRow], () => {
}
})
watch([formState, state], () => {
updatePreFillFormSearchParams()
})
useEventListener(
formRef,
'focusout',

Loading…
Cancel
Save