Browse Source

fix: update table input field dropdown border color and pagination dropdown

pull/7148/head
Ramesh Mane 11 months ago
parent
commit
34fc6f4100
  1. 2
      packages/nc-gui/components/cell/DatePicker.vue
  2. 2
      packages/nc-gui/components/cell/DateTimePicker.vue
  3. 2
      packages/nc-gui/components/cell/GeoData.vue
  4. 2
      packages/nc-gui/components/cell/MultiSelect.vue
  5. 2
      packages/nc-gui/components/cell/SingleSelect.vue
  6. 2
      packages/nc-gui/components/cell/TimePicker.vue
  7. 2
      packages/nc-gui/components/cell/YearPicker.vue
  8. 8
      packages/nc-gui/components/dashboard/settings/BaseAudit.vue
  9. 2
      packages/nc-gui/components/general/language/index.vue
  10. 7
      packages/nc-gui/components/nc/Pagination.vue
  11. 10
      packages/nc-gui/components/nc/Select.vue
  12. 2
      packages/nc-gui/components/smartsheet/column/DateOptions.vue
  13. 4
      packages/nc-gui/components/smartsheet/column/DateTimeOptions.vue
  14. 2
      packages/nc-gui/components/smartsheet/column/DurationOptions.vue
  15. 2
      packages/nc-gui/components/smartsheet/column/EditOrAdd.vue
  16. 2
      packages/nc-gui/components/smartsheet/column/SelectOptions.vue
  17. 2
      packages/nc-gui/components/smartsheet/grid/Table.vue
  18. 2
      packages/nc-gui/components/smartsheet/header/Menu.vue
  19. 2
      packages/nc-gui/components/smartsheet/toolbar/RowHeight.vue
  20. 2
      packages/nc-gui/components/template/Editor.vue

2
packages/nc-gui/components/cell/DatePicker.vue

@ -226,7 +226,7 @@ const clickHandler = () => {
:placeholder="placeholder" :placeholder="placeholder"
:allow-clear="!readOnly && !localState && !isPk" :allow-clear="!readOnly && !localState && !isPk"
:input-read-only="true" :input-read-only="true"
:dropdown-class-name="`${randomClass} nc-picker-date ${open ? 'active' : ''}`" :dropdown-class-name="`${randomClass} nc-picker-date children:border-1 children:border-gray-200 ${open ? 'active' : ''} `"
:open="isOpen" :open="isOpen"
@click="clickHandler" @click="clickHandler"
@update:open="updateOpen" @update:open="updateOpen"

2
packages/nc-gui/components/cell/DateTimePicker.vue

@ -273,7 +273,7 @@ const isColDisabled = computed(() => {
:placeholder="placeholder" :placeholder="placeholder"
:allow-clear="!readOnly && !localState && !isPk" :allow-clear="!readOnly && !localState && !isPk"
:input-read-only="true" :input-read-only="true"
:dropdown-class-name="`${randomClass} nc-picker-datetime ${open ? 'active' : ''}`" :dropdown-class-name="`${randomClass} nc-picker-datetime children:border-1 children:border-gray-200 ${open ? 'active' : ''}`"
:open="isOpen" :open="isOpen"
@click="clickHandler" @click="clickHandler"
@ok="open = !open" @ok="open = !open"

2
packages/nc-gui/components/cell/GeoData.vue

@ -100,7 +100,7 @@ const openInOSM = () => {
</div> </div>
<div v-else data-testid="nc-geo-data-lat-long-set">{{ latLongStr }}</div> <div v-else data-testid="nc-geo-data-lat-long-set">{{ latLongStr }}</div>
<template #overlay> <template #overlay>
<a-form :model="formState" class="flex flex-col w-max-64" @finish="handleFinish"> <a-form :model="formState" class="flex flex-col w-max-64 border-1 border-gray-200" @finish="handleFinish">
<a-form-item> <a-form-item>
<div class="flex mt-4 items-center mx-2"> <div class="flex mt-4 items-center mx-2">
<div class="mr-2">{{ $t('labels.lat') }}:</div> <div class="mr-2">{{ $t('labels.lat') }}:</div>

2
packages/nc-gui/components/cell/MultiSelect.vue

@ -387,7 +387,7 @@ const selectedOpts = computed(() => {
:open="isOpen && editAllowed" :open="isOpen && editAllowed"
:disabled="readOnly || !editAllowed" :disabled="readOnly || !editAllowed"
:class="{ 'caret-transparent': !hasEditRoles }" :class="{ 'caret-transparent': !hasEditRoles }"
:dropdown-class-name="`nc-dropdown-multi-select-cell ${isOpen ? 'active' : ''}`" :dropdown-class-name="`nc-dropdown-multi-select-cell border-1 border-gray-200 ${isOpen ? 'active' : ''}`"
@search="search" @search="search"
@keydown.stop @keydown.stop
> >

2
packages/nc-gui/components/cell/SingleSelect.vue

@ -291,7 +291,7 @@ const selectedOpt = computed(() => {
:open="isOpen && editAllowed" :open="isOpen && editAllowed"
:disabled="readOnly || !editAllowed" :disabled="readOnly || !editAllowed"
:show-arrow="hasEditRoles && !readOnly && active && vModel === null" :show-arrow="hasEditRoles && !readOnly && active && vModel === null"
:dropdown-class-name="`nc-dropdown-single-select-cell ${isOpen && active ? 'active' : ''}`" :dropdown-class-name="`nc-dropdown-single-select-cell border-1 border-gray-200 ${isOpen && active ? 'active' : ''}`"
:show-search="!isMobileMode && isOpen && active" :show-search="!isMobileMode && isOpen && active"
@select="onSelect" @select="onSelect"
@keydown="onKeydown($event)" @keydown="onKeydown($event)"

2
packages/nc-gui/components/cell/TimePicker.vue

@ -136,7 +136,7 @@ useSelectedCellKeyupListener(active, (e: KeyboardEvent) => {
:allow-clear="!readOnly && !localState && !isPk" :allow-clear="!readOnly && !localState && !isPk"
:input-read-only="true" :input-read-only="true"
:open="isOpen" :open="isOpen"
:popup-class-name="`${randomClass} nc-picker-time ${open ? 'active' : ''}`" :popup-class-name="`${randomClass} nc-picker-time children:border-1 children:border-gray-200 ${open ? 'active' : ''}`"
@click="open = (active || editable) && !open" @click="open = (active || editable) && !open"
@ok="open = !open" @ok="open = !open"
> >

2
packages/nc-gui/components/cell/YearPicker.vue

@ -121,7 +121,7 @@ useSelectedCellKeyupListener(active, (e: KeyboardEvent) => {
:allow-clear="(!readOnly && !localState && !isPk) || isEditColumn" :allow-clear="(!readOnly && !localState && !isPk) || isEditColumn"
:input-read-only="true" :input-read-only="true"
:open="isOpen" :open="isOpen"
:dropdown-class-name="`${randomClass} nc-picker-year ${open ? 'active' : ''}`" :dropdown-class-name="`${randomClass} nc-picker-year children:border-1 children:border-gray-200 ${open ? 'active' : ''}`"
@click="open = (active || editable) && !open" @click="open = (active || editable) && !open"
@change="open = (active || editable) && !open" @change="open = (active || editable) && !open"
@ok="open = !open" @ok="open = !open"

8
packages/nc-gui/components/dashboard/settings/BaseAudit.vue

@ -136,12 +136,13 @@ const columns = [
:total="+totalRows" :total="+totalRows"
show-less-items show-less-items
@change="loadAudits" @change="loadAudits"
class="pagination"
/> />
</div> </div>
</div> </div>
</template> </template>
<style lang="scss"> <style lang="scss" scoped>
.nc-audit-table pre { .nc-audit-table pre {
display: table; display: table;
table-layout: fixed; table-layout: fixed;
@ -150,4 +151,9 @@ const columns = [
font-size: unset; font-size: unset;
font-family: unset; font-family: unset;
} }
.pagination {
.ant-select-dropdown {
@apply !border-1 !border-gray-200;
}
}
</style> </style>

2
packages/nc-gui/components/general/language/index.vue

@ -9,7 +9,7 @@
</div> </div>
<template #overlay> <template #overlay>
<a-menu class="nc-scrollbar-dark-md min-w-50 max-h-90vh overflow-auto !p-1 m-1 rounded-md"> <a-menu class="nc-scrollbar-dark-md min-w-50 max-h-90vh overflow-auto !p-1 m-1 rounded-md border-1 border-gray-200">
<GeneralLanguageMenu /> <GeneralLanguageMenu />
</a-menu> </a-menu>
</template> </template>

7
packages/nc-gui/components/nc/Pagination.vue

@ -90,7 +90,12 @@ const pagesList = computed(() => {
</component> </component>
<div v-if="!isMobileMode" class="text-gray-600"> <div v-if="!isMobileMode" class="text-gray-600">
<a-select v-model:value="current" class="!mr-[2px]" :options="pagesList"> <a-select
v-model:value="current"
class="!mr-[2px]"
dropdown-class-name="border-1 border-gray-200"
:options="pagesList"
>
<template #suffixIcon> <template #suffixIcon>
<GeneralIcon icon="arrowDown" class="text-gray-500 nc-select-expand-btn" /> <GeneralIcon icon="arrowDown" class="text-gray-500 nc-select-expand-btn" />
</template> </template>

10
packages/nc-gui/components/nc/Select.vue

@ -15,7 +15,13 @@ const emits = defineEmits(['update:value', 'change'])
const placeholder = computed(() => props.placeholder) const placeholder = computed(() => props.placeholder)
const dropdownClassName = computed(() => props.dropdownClassName) const dropdownClassName = computed(() => {
let className = 'nc-select-dropdown border-1 border-gray-200'
if (props.dropdownClassName) {
className += ` ${props.dropdownClassName}`
}
return className
})
const showSearch = computed(() => props.showSearch) const showSearch = computed(() => props.showSearch)
@ -37,7 +43,7 @@ const onChange = (value: string) => {
v-model:value="vModel" v-model:value="vModel"
:placeholder="placeholder" :placeholder="placeholder"
class="nc-select" class="nc-select"
:dropdown-class-name="dropdownClassName ? `nc-select-dropdown ${dropdownClassName}` : 'nc-select-dropdown'" :dropdown-class-name="dropdownClassName"
:show-search="showSearch" :show-search="showSearch"
:filter-option="filterOption" :filter-option="filterOption"
:dropdown-match-select-width="dropdownMatchSelectWidth" :dropdown-match-select-width="dropdownMatchSelectWidth"

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

@ -17,7 +17,7 @@ if (!vModel.value.meta?.date_format) {
<template> <template>
<a-form-item :label="$t('labels.dateFormat')"> <a-form-item :label="$t('labels.dateFormat')">
<a-select v-model:value="vModel.meta.date_format" dropdown-class-name="nc-dropdown-date-format"> <a-select v-model:value="vModel.meta.date_format" dropdown-class-name="nc-dropdown-date-format border-1 border-gray-200">
<a-select-option v-for="(format, i) of dateFormats" :key="i" :value="format"> <a-select-option v-for="(format, i) of dateFormats" :key="i" :value="format">
<div class="flex flex-row items-center"> <div class="flex flex-row items-center">
<div class="text-xs"> <div class="text-xs">

4
packages/nc-gui/components/smartsheet/column/DateTimeOptions.vue

@ -22,14 +22,14 @@ if (!vModel.value.meta?.time_format) {
<template> <template>
<a-form-item :label="$t('labels.dateFormat')"> <a-form-item :label="$t('labels.dateFormat')">
<a-select v-model:value="vModel.meta.date_format" class="nc-date-select" dropdown-class-name="nc-dropdown-date-format"> <a-select v-model:value="vModel.meta.date_format" class="nc-date-select" dropdown-class-name="nc-dropdown-date-format border-1 border-gray-200">
<a-select-option v-for="(format, i) of dateFormats" :key="i" :value="format"> <a-select-option v-for="(format, i) of dateFormats" :key="i" :value="format">
{{ format }} {{ format }}
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
<a-form-item :label="$t('labels.timeFormat')"> <a-form-item :label="$t('labels.timeFormat')">
<a-select v-model:value="vModel.meta.time_format" class="nc-time-select" dropdown-class-name="nc-dropdown-time-format"> <a-select v-model:value="vModel.meta.time_format" class="nc-time-select" dropdown-class-name="nc-dropdown-time-format border-1 border-gray-200">
<a-select-option v-for="(format, i) of timeFormats" :key="i" :value="format"> <a-select-option v-for="(format, i) of timeFormats" :key="i" :value="format">
{{ format }} {{ format }}
</a-select-option> </a-select-option>

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

@ -31,7 +31,7 @@ vModel.value.meta = {
<a-col :span="24"> <a-col :span="24">
<a-form-item :label="$t('labels.durationFormat')"> <a-form-item :label="$t('labels.durationFormat')">
<a-select v-model:value="vModel.meta.duration" class="w-52" dropdown-class-name="nc-dropdown-duration-option"> <a-select v-model:value="vModel.meta.duration" class="w-52" dropdown-class-name="nc-dropdown-duration-option border-1 border-gray-200">
<a-select-option v-for="(duration, i) of durationOptionList" :key="i" :value="duration.id"> <a-select-option v-for="(duration, i) of durationOptionList" :key="i" :value="duration.id">
{{ duration.title }} {{ duration.title }}
</a-select-option> </a-select-option>

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

@ -271,7 +271,7 @@ if (props.fromTableExplorer) {
show-search show-search
class="nc-column-type-input !rounded" class="nc-column-type-input !rounded"
:disabled="isKanban || readOnly" :disabled="isKanban || readOnly"
dropdown-class-name="nc-dropdown-column-type " dropdown-class-name="nc-dropdown-column-type border-1 border-gray-200"
@change="onUidtOrIdTypeChange" @change="onUidtOrIdTypeChange"
@dblclick="showDeprecated = !showDeprecated" @dblclick="showDeprecated = !showDeprecated"
> >

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

@ -339,7 +339,7 @@ const loadListData = async ($state: any) => {
<a-dropdown <a-dropdown
v-model:visible="colorMenus[index]" v-model:visible="colorMenus[index]"
:trigger="['click']" :trigger="['click']"
overlay-class-name="nc-dropdown-select-color-options" overlay-class-name="nc-dropdown-select-color-options rounded-md overflow-hidden border-1 border-gray-200 "
> >
<template #overlay> <template #overlay>
<LazyGeneralColorPicker <LazyGeneralColorPicker

2
packages/nc-gui/components/smartsheet/grid/Table.vue

@ -1804,7 +1804,7 @@ onKeyStroke('ArrowDown', onDown)
<template #overlay> <template #overlay>
<div class="relative overflow-visible min-h-17 w-10"> <div class="relative overflow-visible min-h-17 w-10">
<div <div
class="absolute -top-19 flex flex-col h-34.5 w-70 bg-white rounded-lg justify-start overflow-hidden" class="absolute -top-19 flex flex-col h-34.5 w-70 bg-white rounded-lg border-1 border-gray-200 justify-start overflow-hidden"
style="box-shadow: 0px 4px 6px -2px rgba(0, 0, 0, 0.06), 0px -12px 16px -4px rgba(0, 0, 0, 0.1)" style="box-shadow: 0px 4px 6px -2px rgba(0, 0, 0, 0.06), 0px -12px 16px -4px rgba(0, 0, 0, 0.1)"
:class="{ :class="{
'-left-44': !isAddNewRecordGridMode, '-left-44': !isAddNewRecordGridMode,

2
packages/nc-gui/components/smartsheet/header/Menu.vue

@ -291,7 +291,7 @@ const onInsertAfter = () => {
<GeneralIcon icon="arrowDown" class="text-grey h-full text-grey nc-ui-dt-dropdown cursor-pointer outline-0 mr-2" /> <GeneralIcon icon="arrowDown" class="text-grey h-full text-grey nc-ui-dt-dropdown cursor-pointer outline-0 mr-2" />
</div> </div>
<template #overlay> <template #overlay>
<a-menu class="shadow bg-white nc-column-options"> <a-menu class="shadow bg-white border-1 border-gray-200 nc-column-options">
<a-menu-item @click="onEditPress"> <a-menu-item @click="onEditPress">
<div class="nc-column-edit nc-header-menu-item"> <div class="nc-column-edit nc-header-menu-item">
<component :is="iconMap.edit" class="text-gray-700 mx-0.65 my-0.75" /> <component :is="iconMap.edit" class="text-gray-700 mx-0.65 my-0.75" />

2
packages/nc-gui/components/smartsheet/toolbar/RowHeight.vue

@ -65,7 +65,7 @@ useMenuCloseOnEsc(open)
</div> </div>
<template #overlay> <template #overlay>
<div <div
class="w-full bg-white shadow-lg menu-filter-dropdown border-1 border-gray-50 rounded-md overflow-hidden" class="w-full bg-white shadow-lg menu-filter-dropdown border-1 border-gray-200 rounded-md overflow-hidden"
data-testid="nc-height-menu" data-testid="nc-height-menu"
> >
<div class="flex flex-col w-full text-sm" @click.stop> <div class="flex flex-col w-full text-sm" @click.stop>

2
packages/nc-gui/components/template/Editor.vue

@ -913,7 +913,7 @@ watch(modelRef, async () => {
class="w-52" class="w-52"
show-search show-search
:filter-option="filterOption" :filter-option="filterOption"
dropdown-class-name="nc-dropdown-template-uidt" dropdown-class-name="nc-dropdown-template-uidt border-1 border-gray-200"
@change="handleUIDTChange(record, table)" @change="handleUIDTChange(record, table)"
> >
<a-select-option v-for="(option, i) of uiTypeOptions" :key="i" :value="option.value"> <a-select-option v-for="(option, i) of uiTypeOptions" :key="i" :value="option.value">

Loading…
Cancel
Save