Merge pull request #612 from Budibase/bugfixes

import error with events panel
This commit is contained in:
Martin McKeaveney 2020-09-14 17:10:01 +01:00 committed by GitHub
commit b83fa7c373
3 changed files with 5 additions and 11 deletions

View File

@ -4,8 +4,6 @@ on:
# Trigger the workflow on push with tags, # Trigger the workflow on push with tags,
# but only for the master branch # but only for the master branch
push: push:
branches:
- master
tags: tags:
- 'v*' - 'v*'

View File

@ -1,5 +1,5 @@
<script> <script>
import { Input, DataList } from "@budibase/bbui" import { Input, DataList, Select } from "@budibase/bbui"
import { find, map, keys, reduce, keyBy } from "lodash/fp" import { find, map, keys, reduce, keyBy } from "lodash/fp"
import { pipe } from "components/common/core" import { pipe } from "components/common/core"
import { EVENT_TYPE_MEMBER_NAME } from "components/common/eventHandlers" import { EVENT_TYPE_MEMBER_NAME } from "components/common/eventHandlers"
@ -29,7 +29,7 @@
{/each} {/each}
</Select> </Select>
{:else if parameter.name === 'url'} {:else if parameter.name === 'url'}
<DataList editable on:change bind:value={parameter.value}> <DataList on:change bind:value={parameter.value}>
<option value="" /> <option value="" />
{#each $store.allScreens as screen} {#each $store.allScreens as screen}
<option value={screen.route}>{screen.props._instanceName}</option> <option value={screen.route}>{screen.props._instanceName}</option>

View File

@ -1,6 +1,6 @@
<script> <script>
// accepts an array of field names, and outputs an object of { FieldName: value } // accepts an array of field names, and outputs an object of { FieldName: value }
import { DataList, Label, TextButton, Spacer } from "@budibase/bbui" import { DataList, Label, TextButton, Spacer, Select } from "@budibase/bbui"
import { store, backendUiStore } from "builderStore" import { store, backendUiStore } from "builderStore"
import fetchBindableProperties from "builderStore/fetchBindableProperties" import fetchBindableProperties from "builderStore/fetchBindableProperties"
import { CloseCircleIcon, AddIcon } from "components/common/Icons" import { CloseCircleIcon, AddIcon } from "components/common/Icons"
@ -81,18 +81,14 @@
{/each} {/each}
</Select> </Select>
<Label size="m" color="dark">Value</Label> <Label size="m" color="dark">Value</Label>
<Select <DataList secondary bind:value={field.value} on:blur={rebuildParameters}>
editable
secondary
bind:value={field.value}
on:blur={rebuildParameters}>
<option value="" /> <option value="" />
{#each bindableProperties as bindableProp} {#each bindableProperties as bindableProp}
<option value={toBindingExpression(bindableProp.readableBinding)}> <option value={toBindingExpression(bindableProp.readableBinding)}>
{bindableProp.readableBinding} {bindableProp.readableBinding}
</option> </option>
{/each} {/each}
</Select> </DataList>
<div class="remove-field-container"> <div class="remove-field-container">
<TextButton text small on:click={removeField(field)}> <TextButton text small on:click={removeField(field)}>
<CloseCircleIcon /> <CloseCircleIcon />