This commit is contained in:
Martin McKeaveney 2020-09-14 15:41:20 +01:00
parent 72e3070ad2
commit 8cd5076f96
6 changed files with 29 additions and 10 deletions

View File

@ -93,7 +93,7 @@
{...props}
name={key} />
</div>
{#if control === Input && !key.startsWith("_")}
{#if control === Input && !key.startsWith('_')}
<button data-cy={`${key}-binding-button`} on:click={dropdown.show}>
<Icon name="edit" />
</button>

View File

@ -116,7 +116,7 @@
control={definition.control}
label={definition.label}
key={definition.key}
value={componentInstance[definition.key]|| componentInstance[definition.key].defaultValue}
value={componentInstance[definition.key] || componentInstance[definition.key].defaultValue}
{componentInstance}
{onChange}
props={{ ...excludeProps(definition, ['control', 'label']) }} />

View File

@ -516,10 +516,30 @@ export default {
key: "datasource",
control: ModelViewSelect,
},
{ label: "Stripe Color", key: "stripeColor", control: Colorpicker, defaultValue: "#FFFFFF" },
{ label: "Border Color", key: "borderColor", control: Colorpicker, defaultValue: "#FFFFFF" },
{ label: "TH Color", key: "backgroundColor", control: Colorpicker, defaultValue: "#FFFFFF" },
{ label: "TH Font Color", key: "color", control: Colorpicker, defaultValue: "#FFFFFF" },
{
label: "Stripe Color",
key: "stripeColor",
control: Colorpicker,
defaultValue: "#FFFFFF",
},
{
label: "Border Color",
key: "borderColor",
control: Colorpicker,
defaultValue: "#FFFFFF",
},
{
label: "TH Color",
key: "backgroundColor",
control: Colorpicker,
defaultValue: "#FFFFFF",
},
{
label: "TH Font Color",
key: "color",
control: Colorpicker,
defaultValue: "#FFFFFF",
},
{ label: "Table", key: "model", control: ModelSelect },
],
},

View File

@ -25,7 +25,7 @@ exports.save = async function(ctx) {
...ctx.request.body,
}
// rename record fields when table column is renamed
// rename record fields when table column is renamed
const { _rename } = modelToSave
if (_rename) {
const records = await db.query(`database/all_${modelToSave._id}`, {
@ -41,7 +41,7 @@ exports.save = async function(ctx) {
delete modelToSave._rename
}
// update schema of non-statistics views when new columns are added
// update schema of non-statistics views when new columns are added
for (let view in modelToSave.views) {
const modelView = modelToSave.views[view]
if (!modelView) continue

View File

@ -105,7 +105,7 @@ function viewTemplate({ field, modelId, groupBy, filters = [], calculation }) {
if (calculation) {
schema = {
...(groupBy ? GROUP_PROPERTY : FIELD_PROPERTY),
...SCHEMA_MAP[calculation]
...SCHEMA_MAP[calculation],
}
}

View File

@ -41,7 +41,6 @@
([field, message]) => `${field} ${message}`
)
async function fetchModel() {
const FETCH_MODEL_URL = `/api/models/${model}`
const response = await _bb.api.get(FETCH_MODEL_URL)