Oops! Something unexpected happened :/
diff --git a/packages/nc-gui/components/nc/MonthYearSelector.vue b/packages/nc-gui/components/nc/MonthYearSelector.vue
index a012817551..567541c78a 100644
--- a/packages/nc-gui/components/nc/MonthYearSelector.vue
+++ b/packages/nc-gui/components/nc/MonthYearSelector.vue
@@ -95,7 +95,7 @@ const compareYear = (date1: dayjs.Dayjs, date2: dayjs.Dayjs) => {
{{ $t('labels.previous') }}
- {{ isYearPicker ? $t('labels.selectYear') : pageDate.year() }}
+ {{ isYearPicker ? $t('labels.selectYear') : pageDate.year() }}
@@ -114,7 +114,7 @@ const compareYear = (date1: dayjs.Dayjs, date2: dayjs.Dayjs) => {
:class="{
'!bg-brand-50 border-1 !border-brand-500': isMonthSelected(month),
}"
- class="h-9 rounded-lg flex font-medium items-center justify-center hover:(border-1 border-gray-200 bg-gray-100) text-gray-900 cursor-pointer"
+ class="h-9 rounded-lg flex items-center justify-center hover:(border-1 border-gray-200 bg-gray-100) text-gray-900 cursor-pointer"
@click="selectedDate = month"
>
{{ month.format('MMM') }}
@@ -127,7 +127,7 @@ const compareYear = (date1: dayjs.Dayjs, date2: dayjs.Dayjs) => {
:class="{
'!bg-brand-50 !border-1 !border-brand-500': compareYear(year, selectedDate),
}"
- class="h-9 rounded-lg flex font-medium items-center justify-center hover:(border-1 border-gray-200 bg-gray-100) text-gray-900 cursor-pointer"
+ class="h-9 rounded-lg flex items-center justify-center hover:(border-1 border-gray-200 bg-gray-100) text-gray-900 cursor-pointer"
@click="selectedDate = year"
>
{{ year.format('YYYY') }}
diff --git a/packages/nc-gui/components/smartsheet/Cell.vue b/packages/nc-gui/components/smartsheet/Cell.vue
index 56165395fc..22b8d300af 100644
--- a/packages/nc-gui/components/smartsheet/Cell.vue
+++ b/packages/nc-gui/components/smartsheet/Cell.vue
@@ -29,6 +29,7 @@ import {
isJSON,
isManualSaved,
isMultiSelect,
+ isNumericFieldType,
isPercent,
isPhoneNumber,
isPrimary,
@@ -142,14 +143,7 @@ const navigate = (dir: NavigateDir, e: KeyboardEvent) => {
}
const isNumericField = computed(() => {
- return (
- isInt(column.value, abstractType.value) ||
- isFloat(column.value, abstractType.value) ||
- isDecimal(column.value) ||
- isCurrency(column.value) ||
- isPercent(column.value) ||
- isDuration(column.value)
- )
+ return isNumericFieldType(column.value, abstractType.value)
})
// disable contexxtmenu event propagation when cell is in
diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue
index 9dbb379ce3..d44cf5d982 100644
--- a/packages/nc-gui/components/smartsheet/Form.vue
+++ b/packages/nc-gui/components/smartsheet/Form.vue
@@ -31,7 +31,6 @@ import {
onClickOutside,
parseProp,
provide,
- reactive,
ref,
useDebounceFn,
useEventListener,
@@ -42,7 +41,7 @@ import {
useRoles,
useViewColumnsOrThrow,
useViewData,
- watch,
+ useViewsStore,
} from '#imports'
import type { ImageCropperConfig } from '~/lib'
@@ -72,8 +71,6 @@ const enum NcForm {
const { isMobileMode, user } = useGlobal()
-const formRef = ref()
-
const { $api, $e } = useNuxtApp()
const { isUIAllowed } = useRoles()
@@ -82,7 +79,9 @@ const { base } = storeToRefs(useBase())
const { getPossibleAttachmentSrc } = useAttachment()
-let formState = reactive>({})
+const formRef = ref()
+
+const formState = ref>({})
const secondsRemain = ref(0)
@@ -98,6 +97,8 @@ const isPublic = inject(IsPublicInj, ref(false))
const { loadFormView, insertRow, formColumnData, formViewData, updateFormView } = useViewData(meta, view)
+const { preFillFormSearchParams } = storeToRefs(useViewsStore())
+
const reloadEventHook = inject(ReloadViewDataHookInj, createEventHook())
reloadEventHook.on(async () => {
@@ -110,7 +111,7 @@ const { fields, showAll, hideAll } = useViewColumnsOrThrow()
const { state, row } = useProvideSmartsheetRowStore(
meta,
ref({
- row: formState,
+ row: formState.value,
oldRow: {},
rowMeta: { new: true },
}),
@@ -193,6 +194,22 @@ const updateView = useDebounceFn(
{ maxWait: 2000 },
)
+const updatePreFillFormSearchParams = useDebounceFn(() => {
+ if (isLocked.value || !isUIAllowed('dataInsert')) return
+
+ const preFilledData = { ...formState.value, ...state.value }
+
+ const searchParams = new URLSearchParams()
+
+ for (const c of visibleColumns.value) {
+ if (c.title && preFilledData[c.title] && !isVirtualCol(c) && !(UITypes.Attachment === c.uidt)) {
+ searchParams.append(c.title, preFilledData[c.title])
+ }
+ }
+
+ preFillFormSearchParams.value = searchParams.toString()
+}, 250)
+
async function submitForm() {
if (isLocked.value || !isUIAllowed('dataInsert')) return
@@ -206,7 +223,7 @@ async function submitForm() {
}
await insertRow({
- row: { ...formState, ...state.value },
+ row: { ...formState.value, ...state.value },
oldRow: {},
rowMeta: { new: true },
})
@@ -217,9 +234,9 @@ async function submitForm() {
async function clearForm() {
if (isLocked.value || !isUIAllowed('dataInsert')) return
- formState = reactive>({})
+ formState.value = {}
state.value = {}
- await formRef.value.clearValidate()
+ await formRef.value?.clearValidate()
reloadEventHook.trigger()
}
@@ -321,13 +338,6 @@ async function showOrHideColumn(column: Record, show: boolean, isSi
await $api.dbView.formColumnUpdate(column.id, column)
fields.value[fieldIndex] = column as any
- // await saveOrUpdate(
- // {
- // ...column,
- // show,
- // },
- // fieldIndex,
- // )
reloadEventHook.trigger()
@@ -554,6 +564,8 @@ onMounted(async () => {
URL.revokeObjectURL(imageCropperData.value.imageConfig.src)
}
+ preFillFormSearchParams.value = ''
+
isLoadingFormView.value = true
await loadFormView()
setFormData()
@@ -566,6 +578,7 @@ watch(submitted, (v) => {
const intvl = setInterval(() => {
if (--secondsRemain.value < 0) {
submitted.value = false
+ clearForm()
clearInterval(intvl)
}
}, 1000)
@@ -578,25 +591,35 @@ watch(view, (nextView) => {
}
})
-watch([formState, state.value], async () => {
- for (const virtualField in state.value) {
- if (!formState[virtualField]) {
- formState[virtualField] = state.value[virtualField]
+watch(
+ [formState, state],
+ async () => {
+ for (const virtualField in state.value) {
+ formState.value[virtualField] = state.value[virtualField]
}
- }
- try {
- await formRef.value?.validateFields([...Object.keys(formState)])
- } catch (e: any) {
- e.errorFields.map((f: Record) => console.error(f.errors.join(',')))
- }
-})
+ updatePreFillFormSearchParams()
+
+ try {
+ await formRef.value?.validateFields([...Object.keys(formState.value)])
+ } catch (e: any) {
+ e.errorFields.map((f: Record) => console.error(f.errors.join(',')))
+ }
+ },
+ {
+ deep: true,
+ },
+)
watch(activeRow, (newValue) => {
if (newValue) {
- document
- .querySelector(`.nc-form-field-item-${newValue?.replaceAll(' ', '')}`)
- ?.scrollIntoView({ behavior: 'smooth', block: 'center' })
+ const field = document.querySelector(`.nc-form-field-item-${CSS.escape(newValue?.replaceAll(' ', ''))}`)
+
+ if (field) {
+ setTimeout(() => {
+ field?.scrollIntoView({ behavior: 'smooth', block: 'center' })
+ }, 50)
+ }
}
})
@@ -647,7 +670,7 @@ useEventListener(
(e: KeyboardEvent) => {
const cmdOrCtrl = isMac() ? e.metaKey : e.ctrlKey
- switch (e.key.toLowerCase()) {
+ switch (e.key?.toLowerCase()) {
case 's':
if (
cmdOrCtrl &&
@@ -736,7 +759,16 @@ useEventListener(
-
+
{{ $t('activity.submitAnotherForm') }}
@@ -1056,7 +1088,7 @@ useEventListener(