diff --git a/packages/nc-gui/components/smartsheet-toolbar/ColumnFilter.vue b/packages/nc-gui/components/smartsheet-toolbar/ColumnFilter.vue index 62283b0987..7af198935b 100644 --- a/packages/nc-gui/components/smartsheet-toolbar/ColumnFilter.vue +++ b/packages/nc-gui/components/smartsheet-toolbar/ColumnFilter.vue @@ -158,6 +158,7 @@ defineExpose({ placeholder="Group op" @click.stop @change="saveOrUpdate(filter, i)" + dropdown-class-name="nc-dropdown-filter-logical-op-group" > {{ op.text }} @@ -205,6 +206,7 @@ defineExpose({ :disabled="filter.readOnly" @click.stop @change="filterUpdateCondition(filter, i)" + dropdown-class-name="nc-dropdown-filter-logical-op" > {{ op.text }} @@ -231,6 +233,7 @@ defineExpose({ :disabled="filter.readOnly" hide-details @change="filterUpdateCondition(filter, i)" + dropdown-class-name="nc-dropdown-filter-comp-op" > {{ compOp.text }} diff --git a/scripts/cypress/support/commands.js b/scripts/cypress/support/commands.js index 84020b99a1..10a96a7eeb 100644 --- a/scripts/cypress/support/commands.js +++ b/scripts/cypress/support/commands.js @@ -286,9 +286,9 @@ Cypress.Commands.add('getActiveModal', () => { return cy.get('.ant-modal-content:visible').last(); }); -Cypress.Commands.add('getActiveMenu', (overlayClassName) => { - if (overlayClassName) { - return cy.get(`${overlayClassName} .ant-dropdown-content:visible`); +Cypress.Commands.add('getActiveMenu', (overlaySelector) => { + if (overlaySelector) { + return cy.get(`${overlaySelector} .ant-dropdown-content:visible`); } return cy.get('.ant-dropdown-content:visible').last(); }); @@ -297,7 +297,10 @@ Cypress.Commands.add('getActivePopUp', () => { return cy.get('.ant-menu-submenu-popup:visible').last(); }); -Cypress.Commands.add('getActiveSelection', () => { +Cypress.Commands.add('getActiveSelection', (selector) => { + if(selector) { + return cy.get(`${selector}.ant-select-dropdown:visible`).last(); + } return cy.get('.ant-select-dropdown:visible').last(); });