diff --git a/packages/builder/package.json b/packages/builder/package.json index 599baf4536..132b7b7782 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -63,7 +63,7 @@ } }, "dependencies": { - "@budibase/bbui": "^1.32.0", + "@budibase/bbui": "^1.33.0", "@budibase/client": "^0.1.19", "@budibase/colorpicker": "^1.0.1", "@sentry/browser": "5.19.1", diff --git a/packages/builder/src/components/common/DatePicker.svelte b/packages/builder/src/components/common/DatePicker.svelte index ded25b5d87..ec9d41a17b 100644 --- a/packages/builder/src/components/common/DatePicker.svelte +++ b/packages/builder/src/components/common/DatePicker.svelte @@ -12,6 +12,5 @@
-
diff --git a/packages/builder/src/components/database/DataTable/popovers/Filter.svelte b/packages/builder/src/components/database/DataTable/popovers/Filter.svelte index 1cf8e9acab..be40a66291 100644 --- a/packages/builder/src/components/database/DataTable/popovers/Filter.svelte +++ b/packages/builder/src/components/database/DataTable/popovers/Filter.svelte @@ -71,7 +71,16 @@ } function addFilter() { - view.filters = [...view.filters, {}] + view.filters.push({}) + view.filters = view.filters + } + + function isMultipleChoice(field) { + return ( + viewModel.schema[field].constraints && + viewModel.schema[field].constraints.inclusion && + viewModel.schema[field].constraints.inclusion.length + ) } @@ -108,10 +117,18 @@ {/each} - + {#if filter.key && isMultipleChoice(filter.key)} + + {:else} + + {/if} removeFilter(idx)} /> {/each} diff --git a/packages/builder/src/components/userInterface/EventsEditor/EventPropertyControl.svelte b/packages/builder/src/components/userInterface/EventsEditor/EventPropertyControl.svelte index c27d1aaa3d..52986b0efd 100644 --- a/packages/builder/src/components/userInterface/EventsEditor/EventPropertyControl.svelte +++ b/packages/builder/src/components/userInterface/EventsEditor/EventPropertyControl.svelte @@ -12,7 +12,7 @@ - + - import { Select, Label } from "@budibase/bbui" + import { DataList, Label } from "@budibase/bbui" import { store } from "builderStore" export let parameters @@ -7,12 +7,12 @@
- +