Browse Source

fix: Fixed issue with search data and sort list menu

pull/6539/head
Muhammed Mustafa 1 year ago
parent
commit
e97202ad55
  1. 7
      packages/nc-gui/components/smartsheet/toolbar/SearchData.vue
  2. 9
      packages/nc-gui/components/smartsheet/toolbar/SortListMenu.vue

7
packages/nc-gui/components/smartsheet/toolbar/SearchData.vue

@ -100,7 +100,7 @@ watch(columns, () => {
</div> </div>
<div <div
:class="{ :class="{
'hidden group-hover:block': !isMobileMode, 'invisible group-hover:visible': !isMobileMode,
'text-gray-700': isMobileMode, 'text-gray-700': isMobileMode,
}" }"
> >
@ -115,6 +115,7 @@ watch(columns, () => {
</div> </div>
<a-select <a-select
v-model:value="search.field" v-model:value="search.field"
v-e="['c:search:field:select:open']"
:open="isDropdownOpen" :open="isDropdownOpen"
size="small" size="small"
:dropdown-match-select-width="false" :dropdown-match-select-width="false"
@ -122,7 +123,7 @@ watch(columns, () => {
class="py-1 !absolute top-0 left-0 w-full h-full z-10 text-xs opacity-0" class="py-1 !absolute top-0 left-0 w-full h-full z-10 text-xs opacity-0"
@change="onPressEnter" @change="onPressEnter"
> >
<a-select-option v-for="op of columns" :key="op.value" :value="op.value"> <a-select-option v-for="op of columns" :key="op.value" v-e="['c:search:field:select']" :value="op.value">
<div class="text-[0.75rem] flex items-center -ml-1 gap-2"> <div class="text-[0.75rem] flex items-center -ml-1 gap-2">
<SmartsheetHeaderIcon class="text-sm" :column="op.column" /> <SmartsheetHeaderIcon class="text-sm" :column="op.column" />
{{ op.label }} {{ op.label }}
@ -135,7 +136,7 @@ watch(columns, () => {
v-model:value="search.query" v-model:value="search.query"
size="small" size="small"
class="text-xs w-40" class="text-xs w-40"
:placeholder="`${$t('general.searchIn')} ${columns?.find((column) => column.value === search.field)?.label}`" :placeholder="`${$t('general.searchIn')} ${displayColumnLabel}`"
:bordered="false" :bordered="false"
data-testid="search-data-input" data-testid="search-data-input"
@press-enter="onPressEnter" @press-enter="onPressEnter"

9
packages/nc-gui/components/smartsheet/toolbar/SortListMenu.vue

@ -183,14 +183,7 @@ watch(open, () => {
:trigger="['click']" :trigger="['click']"
overlay-class-name="nc-toolbar-dropdown" overlay-class-name="nc-toolbar-dropdown"
> >
<NcButton <NcButton v-e="['c:sort:add']" class="!text-brand-500" type="text" size="small" @click.stop="showCreateSort = true">
v-e="['c:sort:add']"
class="!text-brand-500"
type="text"
size="small"
@click.stop="showCreateSort = true"
@click.stop="deleteSort(sort, i)"
>
<div class="flex gap-1 items-center"> <div class="flex gap-1 items-center">
<component :is="iconMap.plus" /> <component :is="iconMap.plus" />
<!-- Add Sort Option --> <!-- Add Sort Option -->

Loading…
Cancel
Save