MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into removing-uikit-04 

# Conflicts:
#	packages/builder/src/components/common/DatePicker.svelte
#	packages/builder/src/components/workflow/SetupPanel/ParamInputs/ComponentSelector.svelte
This commit is contained in:
Victoria Sloan 2020-09-01 21:20:56 +01:00
parent 1d4e86621e 556e18a706
commit 73a8edb7dc
4 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/builder/src/components/common/ValuesList.svelte
View File

@ -17,9 +17,9 @@
<div class="margin"> <div class="margin">
<label class="label">{label}</label> <label class="label">{label}</label>
<div class="uk-form-controls">
<textarea value={valuesText} on:change={inputChanged} /> <textarea value={valuesText} on:change={inputChanged} />
</div>
</div> </div>
<style> <style>

14
packages/builder/src/components/workflow/SetupPanel/ParamInputs/ModelSelector.svelte
View File

@ -5,12 +5,10 @@
</script> </script>
<div class="bb-margin-xl block-field"> <div class="bb-margin-xl block-field">
<div class="uk-form-controls"> <select class="budibase__input" bind:value>
<select class="budibase__input" bind:value> <option value="" />
<option value="" /> {#each $backendUiStore.models as model}
{#each $backendUiStore.models as model} <option value={model}>{model.name}</option>
<option value={model}>{model.name}</option> {/each}
{/each} </select>
</select>
</div>
</div> </div>

14
packages/builder/src/components/workflow/SetupPanel/ParamInputs/RecordSelector.svelte
View File

@ -6,20 +6,18 @@
</script> </script>
<div class="bb-margin-xl block-field"> <div class="bb-margin-xl block-field">
<div class="uk-form-controls"> <select class="budibase__input" bind:value={value.model}>
<select class="budibase__input" bind:value={value.model}> {#each $backendUiStore.models as model}
{#each $backendUiStore.models as model} <option value={model}>{model.name}</option>
<option value={model}>{model.name}</option> {/each}
{/each} </select>
</select>
</div>
</div> </div>
{#if value.model} {#if value.model}
<div class="bb-margin-xl block-field"> <div class="bb-margin-xl block-field">
<Label size="s" forAttr={'fields'}>Fields</Label> <Label size="s" forAttr={'fields'}>Fields</Label>
{#each Object.keys(value.model.schema) as field} {#each Object.keys(value.model.schema) as field}
<div class="uk-form-controls bb-margin-xl"> <div class="bb-margin-xl">
<Input bind:value={value[field]} label={field} /> <Input bind:value={value[field]} label={field} />
</div> </div>
{/each} {/each}

2
packages/standard-components/dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long