Browse Source

fix: form view double border issue

pull/7298/head
Ramesh Mane 8 months ago
parent
commit
4bce0c5846
  1. 12
      packages/nc-gui/components/smartsheet/Form.vue
  2. 2
      packages/nc-gui/components/smartsheet/column/DefaultValue.vue

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

@ -739,7 +739,7 @@ const onFormItemClick = (element: any) => {
<a-form-item <a-form-item
v-if="isVirtualCol(element)" v-if="isVirtualCol(element)"
:name="element.title" :name="element.title"
class="!mb-0 nc-input-required-error" class="!mb-0 nc-input-required-error nc-form-input-item"
:rules="[ :rules="[
{ {
required: isRequired(element, element.required), required: isRequired(element, element.required),
@ -761,7 +761,7 @@ const onFormItemClick = (element: any) => {
<a-form-item <a-form-item
v-else v-else
:name="element.title" :name="element.title"
class="!mb-0 nc-input-required-error" class="!mb-0 nc-input-required-error nc-form-input-item"
:rules="[ :rules="[
{ {
required: isRequired(element, element.required), required: isRequired(element, element.required),
@ -934,4 +934,12 @@ const onFormItemClick = (element: any) => {
} }
} }
} }
.nc-form-input-item .nc-data-cell {
@apply !border-none rounded-none;
&:focus-within {
@apply !border-none;
}
}
</style> </style>

2
packages/nc-gui/components/smartsheet/column/DefaultValue.vue

@ -47,7 +47,7 @@ watch(
<div class="!my-3 text-xs">{{ $t('placeholder.defaultValue') }}</div> <div class="!my-3 text-xs">{{ $t('placeholder.defaultValue') }}</div>
<div class="flex flex-row gap-2"> <div class="flex flex-row gap-2">
<div <div
class="border-1 flex items-center w-full px-3 my-[-4px] border-gray-300 rounded-md sm:min-h-[32px] flex items-center focus-within:(border-brand-500 shadow-none ring-0)" class="border-1 flex items-center w-full px-3 my-[-4px] border-gray-300 rounded-md sm:min-h-[32px] xs:min-h-13 flex items-center focus-within:(border-brand-500 shadow-none ring-0)"
:class="{ :class="{
'!border-brand-500': editEnabled, '!border-brand-500': editEnabled,
}" }"

Loading…
Cancel
Save