github
/
nocodb
mirror of https://github.com/nocodb/nocodb
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

fic(nc-gui): tab and on click field issue

pull/7664/head
Ramesh Mane 7 months ago
parent
86c7b94477
commit
24a9ae18b4
2 changed files with 81 additions and 63 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
  2. 127
      packages/nc-gui/components/smartsheet/Form.vue

17
packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
Unescape View File

@ -1,7 +1,6 @@
<script lang="ts" setup> <script lang="ts" setup>
import type { ColumnType, KanbanType, ViewType } from 'nocodb-sdk' import type { ColumnType, KanbanType, ViewType } from 'nocodb-sdk'
import { ViewTypes } from 'nocodb-sdk' import { ViewTypes } from 'nocodb-sdk'
import tinycolor from 'tinycolor2'
import { useMetas } from '#imports' import { useMetas } from '#imports'
const { view: _view, $api } = useSmartsheetStoreOrThrow() const { view: _view, $api } = useSmartsheetStoreOrThrow()
@ -255,22 +254,6 @@ async function updateSharedView() {
return true return true
} }
function onChangeTheme(color: string) {
if (!activeView.value?.meta) return
const tcolor = tinycolor(color)
if (tcolor.isValid()) {
const complement = tcolor.complement()
activeView.value.meta.theme = {
primaryColor: color,
accentColor: complement.toHex8String(),
}
saveTheme()
}
}
const isPublicShared = computed(() => { const isPublicShared = computed(() => {
return !!activeView.value?.uuid return !!activeView.value?.uuid
}) })

127
packages/nc-gui/components/smartsheet/Form.vue
Unescape View File

@ -1,6 +1,7 @@
<script setup lang="ts"> <script setup lang="ts">
import type { VNodeRef } from '@vue/runtime-core' import type { VNodeRef } from '@vue/runtime-core'
import Draggable from 'vuedraggable' import Draggable from 'vuedraggable'
import tinycolor from 'tinycolor2'
import { Pane, Splitpanes } from 'splitpanes' import { Pane, Splitpanes } from 'splitpanes'
import 'splitpanes/dist/splitpanes.css' import 'splitpanes/dist/splitpanes.css'
import { RelationTypes, UITypes, ViewTypes, getSystemColumns, isLinksOrLTAR, isVirtualCol } from 'nocodb-sdk' import { RelationTypes, UITypes, ViewTypes, getSystemColumns, isLinksOrLTAR, isVirtualCol } from 'nocodb-sdk'
@ -115,6 +116,8 @@ const submitted = ref(false)
const activeRow = ref('') const activeRow = ref('')
const isTabPressed = ref(false)
const isLoadingFormView = ref(false) const isLoadingFormView = ref(false)
const focusLabel: VNodeRef = (el) => { const focusLabel: VNodeRef = (el) => {
@ -311,7 +314,7 @@ function setFormData() {
show_blank_form: !!(formViewData.value?.show_blank_form ?? 0), show_blank_form: !!(formViewData.value?.show_blank_form ?? 0),
meta: { meta: {
hide_branding: false, hide_branding: false,
theme_color: '#F9F9FA', background_color: '#F9F9FA',
...(parseProp(formViewData.value?.meta) ?? {}), ...(parseProp(formViewData.value?.meta) ?? {}),
}, },
} }
@ -395,6 +398,7 @@ const columnSupportsScanning = (elementType: UITypes) =>
onClickOutside(draggableRef, () => { onClickOutside(draggableRef, () => {
activeRow.value = '' activeRow.value = ''
isTabPressed.value = false
}) })
onMounted(async () => { onMounted(async () => {
@ -410,26 +414,55 @@ watch(view, (nextView) => {
} }
}) })
watch(activeRow, () => { watch(activeRow, (newValue) => {
if (activeRow.value) { if (newValue) {
document.querySelector(`.nc-form-field-list-item-${activeRow.value}`)?.scrollIntoView({ behavior: 'smooth', block: 'center' }) document.querySelector(`.nc-form-field-item-${newValue}`)?.scrollIntoView({ behavior: 'smooth', block: 'center' })
} }
}) })
const onFormItemClick = (element: any) => { const onFormItemClick = (element: any) => {
if (isLocked.value || !isEditable) return if (isLocked.value || !isEditable) return
activeRow.value = element.title activeRow.value = element.title
isTabPressed.value = false
} }
useEventListener(document, 'focusout', (e: FocusEvent) => { const handleChangeBackground = (color: string) => {
const nextActiveFieldTitle = const tcolor = tinycolor(color)
e?.relatedTarget?.getAttribute('data-title') || if (tcolor.isValid()) {
e?.relatedTarget?.offsetParent?.closest('.nc-form-focus-element')?.getAttribute('data-title') ;(formViewData.value?.meta as Record<string, any>).background_color = color
if (activeRow.value && nextActiveFieldTitle && activeRow.value !== nextActiveFieldTitle) { updateView()
activeRow.value = nextActiveFieldTitle
} }
}) }
useEventListener(
formRef,
'focusout',
(e: FocusEvent) => {
const nextActiveFieldTitle =
(e?.relatedTarget as HTMLElement)?.getAttribute('data-title') ||
(e?.relatedTarget as HTMLElement)?.offsetParent?.closest('.nc-form-focus-element')?.getAttribute('data-title')
if (activeRow.value && nextActiveFieldTitle && activeRow.value !== nextActiveFieldTitle) {
if (isTabPressed.value) {
activeRow.value = nextActiveFieldTitle
}
}
isTabPressed.value = false
},
true,
)
useEventListener(
formRef,
'keydown',
(e: KeyboardEvent) => {
if (e.key === 'Tab') {
isTabPressed.value = true
} else {
isTabPressed.value = false
}
},
true,
)
</script> </script>
<template> <template>
@ -448,7 +481,7 @@ useEventListener(document, 'focusout', (e: FocusEvent) => {
<div <div
v-if="submitted" v-if="submitted"
class="h-full p-6" class="h-full p-6"
:style="{background:(formViewData?.meta as Record<string,any>).theme_color || '#F9F9FA'}" :style="{background:(formViewData?.meta as Record<string,any>).background_color || '#F9F9FA'}"
data-testid="nc-form-wrapper-submit" data-testid="nc-form-wrapper-submit"
> >
<GeneralFormBanner :banner-image-url="formViewData?.banner_image_url" /> <GeneralFormBanner :banner-image-url="formViewData?.banner_image_url" />
@ -505,7 +538,7 @@ useEventListener(document, 'focusout', (e: FocusEvent) => {
<div <div
v-else-if="formViewData" v-else-if="formViewData"
class="flex-1 h-full overflow-auto nc-form-scrollbar p-6" class="flex-1 h-full overflow-auto nc-form-scrollbar p-6"
:style="{background:(formViewData?.meta as Record<string,any>).theme_color || '#F9F9FA'}" :style="{background:(formViewData?.meta as Record<string,any>).background_color || '#F9F9FA'}"
> >
<div :class="isEditable ? 'min-w-[616px] overflow-x-auto nc-form-scrollbar' : ''"> <div :class="isEditable ? 'min-w-[616px] overflow-x-auto nc-form-scrollbar' : ''">
<!-- for future implementation of cover image --> <!-- for future implementation of cover image -->
@ -634,7 +667,7 @@ useEventListener(document, 'focusout', (e: FocusEvent) => {
}" }"
:data-title="element.title" :data-title="element.title"
data-testid="nc-form-fields" data-testid="nc-form-fields"
@click="onFormItemClick(element)" @click.stop="onFormItemClick(element)"
> >
<div v-if="activeRow !== element.title"> <div v-if="activeRow !== element.title">
<div> <div>
@ -667,27 +700,29 @@ useEventListener(document, 'focusout', (e: FocusEvent) => {
</NcTooltip> </NcTooltip>
<span v-if="element.required" class="text-red-500">&nbsp;*</span> <span v-if="element.required" class="text-red-500">&nbsp;*</span>
</div> </div>
<div class="flex gap-2 items-center"> <a-form-item class="my-0 !mb-2">
<span <div class="flex gap-2 items-center">
class="text-gray-500 mr-2" <span
@click=" class="text-gray-500 mr-2"
() => { @click="
element.required = !element.required () => {
updateColMeta(element) element.required = !element.required
} updateColMeta(element)
" }
> "
{{ $t('general.required') }} >
</span> {{ $t('general.required') }}
<a-switch </span>
v-model:checked="element.required" <a-switch
v-e="['a:form-view:field:mark-required']" v-model:checked="element.required"
class="nc-form-input-required" v-e="['a:form-view:field:mark-required']"
data-testid="nc-form-input-required" class="nc-form-input-required"
size="small" data-testid="nc-form-input-required"
@change="updateColMeta(element)" size="small"
/> @change="updateColMeta(element)"
</div> />
</div>
</a-form-item>
</div> </div>
<!-- Field Body --> <!-- Field Body -->
@ -729,7 +764,7 @@ useEventListener(document, 'focusout', (e: FocusEvent) => {
<div class="flex space-x-4 items-center"> <div class="flex space-x-4 items-center">
<a-switch <a-switch
v-model:checked="element.enable_scanner" v-model:checked="element.enable_scanner"
v-e="['a:form-view:field:mark-enable-scaner']" v-e="['a:form-view:field:mark-enable-scanner']"
size="small" size="small"
@change="updateColMeta(element)" @change="updateColMeta(element)"
/> />
@ -763,7 +798,10 @@ useEventListener(document, 'focusout', (e: FocusEvent) => {
class="relative" class="relative"
@click.stop=" @click.stop="
() => { () => {
activeRow = '' isTabPressed = false
if (activeRow !== element.title) {
activeRow = ''
}
} }
" "
> >
@ -951,10 +989,10 @@ useEventListener(document, 'focusout', (e: FocusEvent) => {
:key="field.id" :key="field.id"
class="w-full p-2 flex flex-row items-center border-b-1 last:border-none border-gray-200" class="w-full p-2 flex flex-row items-center border-b-1 last:border-none border-gray-200"
:class="[ :class="[
`nc-form-field-list-item-${field.title}`, `nc-form-field-item-${field.title}`,
`${activeRow === field.title ? 'bg-brand-50 font-medium' : 'hover:bg-gray-50'}`, `${activeRow === field.title ? 'bg-brand-50 font-medium' : 'hover:bg-gray-50'}`,
]" ]"
:data-testid="`nc-form-field-list-item-${field.title}`" :data-testid="`nc-form-field-item-${field.title}`"
> >
<component :is="iconMap.drag" class="flex-none cursor-move !h-4 !w-4 text-gray-600 mr-1" /> <component :is="iconMap.drag" class="flex-none cursor-move !h-4 !w-4 text-gray-600 mr-1" />
<div <div
@ -1000,10 +1038,10 @@ useEventListener(document, 'focusout', (e: FocusEvent) => {
<div class="text-base font-bold text-gray-900">Appearance Settings</div> <div class="text-base font-bold text-gray-900">Appearance Settings</div>
<div> <div>
<div class="text-gray-800">Form Theme</div> <div class="text-gray-800">Background Color</div>
<div class="flex justify-start"> <div class="flex justify-start">
<LazyGeneralColorPicker <LazyGeneralColorPicker
v-model="(formViewData.meta as Record<string,any>).theme_color" :model-value="(formViewData.meta as Record<string,any>).background_color"
:colors="[ :colors="[
'#FFFFFF', '#FFFFFF',
'#FFDBD9', '#FFDBD9',
@ -1028,10 +1066,7 @@ useEventListener(document, 'focusout', (e: FocusEvent) => {
]" ]"
:is-new-design="true" :is-new-design="true"
class="nc-form-theme-color-picker !p-0 !-ml-1" class="nc-form-theme-color-picker !p-0 !-ml-1"
@input="(el:string)=>{ @input="handleChangeBackground"
(formViewData?.meta as Record<string,any>).theme_color = el
updateView()
}"
/> />
</div> </div>
</div> </div>

Write Preview
Loading…
Cancel
Save