Skip to content

Commit b551e81

Browse files
authored
Merge pull request #5618 from Countly/anna/next
[SER-1969] Two searchboxes for column selector
2 parents 7c8af2d + 237ca2c commit b551e81

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

frontend/express/public/javascripts/countly/vue/templates/datatable.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
:hide-default-tabs="true"
2323
:hide-all-options-tab="true"
2424
:show-search="true"
25+
:showSelectedCount="true"
2526
:options="availableDynamicCols"
2627
v-model="controlParams.selectedDynamicCols">
2728
<template v-slot:trigger>

frontend/express/public/javascripts/countly/vue/templates/selectx.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<div class="cly-vue-select-x__header">
5353
<div class="bu-level">
5454
<div class="cly-vue-select-x__title" :data-test-id="testId + '-select-x-title'" v-if="title">{{title}}</div>
55-
<div class='bu-level-right text-small color-cool-gray-50' v-if="showSelectedCount">{{selectedCountText}}</div>
55+
<div class='bu-level-right text-small color-cool-gray-50 bu-pb-4' v-if="showSelectedCount">{{selectedCountText}}</div>
5656
</div>
5757
<div class="cly-vue-select-x__header-slot" v-if="!!$scopedSlots.header">
5858
<slot name="header" :active-tab-id="activeTabId" :tabs="publicTabs" :update-tab="updateTabFn"></slot>
@@ -89,6 +89,7 @@
8989
v-show="showList"
9090
v-if="mode === 'single-list'"
9191
:bordered="false"
92+
:searchable="false"
9293
:options="getMatching(tab.options)"
9394
@change="handleValueChange"
9495
:hasRemovableOptions="hasRemovableOptions"
@@ -107,6 +108,7 @@
107108
v-else-if="mode === 'multi-check'"
108109
:test-id="testId + '-checklistbox'"
109110
:disable-non-selected="disableNonSelected"
111+
:searchable="false"
110112
:bordered="false"
111113
:options="getMatching(tab.options)"
112114
@change="handleValueChange"
@@ -120,6 +122,7 @@
120122
:disable-non-selected="disableNonSelected"
121123
:sortable="true"
122124
:bordered="false"
125+
:searchable="false"
123126
:persistColumnOrderKey="persistColumnOrderKey"
124127
ref="checkListBox"
125128
:options="getMatching(tab.options)"

0 commit comments

Comments
 (0)