From 477813feef88788391c42552d5c2bd4ed9427059 Mon Sep 17 00:00:00 2001 From: Gerard Burns Date: Fri, 5 Apr 2024 09:46:22 +0100 Subject: [PATCH] working --- packages/bbui/src/Tooltip/Context.svelte | 8 -- .../controls/FieldContext/Chart.svelte | 75 ++++++++++++++++++- .../controls/FieldContext/Property.svelte | 31 ++++++++ .../settings/controls/MultiFieldSelect.svelte | 3 +- .../components/grid/cells/HeaderCell.svelte | 1 + 5 files changed, 105 insertions(+), 13 deletions(-) create mode 100644 packages/builder/src/components/design/settings/controls/FieldContext/Property.svelte diff --git a/packages/bbui/src/Tooltip/Context.svelte b/packages/bbui/src/Tooltip/Context.svelte index d477783950..442672a9c1 100644 --- a/packages/bbui/src/Tooltip/Context.svelte +++ b/packages/bbui/src/Tooltip/Context.svelte @@ -9,7 +9,6 @@ $: target = getContext(Context.PopoverRoot) || "#app" - export let arbitrary = "" let hovering = false let wrapper let currentTooltip @@ -31,17 +30,10 @@ } const updatePosition = (anchor, currentTooltip, previousTooltip, wrapper) => { - if (arbitrary === "foo") { - console.log(currentTooltip, previousTooltip); - } - requestAnimationFrame(() => { if (anchor == null || currentTooltip == null || previousTooltip == null || wrapper == null) { return; } - if (arbitrary === "foo") { - console.log("past here"); - } const rect = anchor.getBoundingClientRect(); diff --git a/packages/builder/src/components/design/settings/controls/FieldContext/Chart.svelte b/packages/builder/src/components/design/settings/controls/FieldContext/Chart.svelte index 290adc7a86..9e96997e9e 100644 --- a/packages/builder/src/components/design/settings/controls/FieldContext/Chart.svelte +++ b/packages/builder/src/components/design/settings/controls/FieldContext/Chart.svelte @@ -3,6 +3,7 @@ import { getDatasourceForProvider, getSchemaForDatasource } from "dataBinding" import { selectedScreen } from "stores/builder" import { createEventDispatcher } from "svelte" + import Property from './Property.svelte' export let supportLevelClass = '' export let supportLevelIcon = "" @@ -17,6 +18,12 @@ export let errors = [] export let warnings = [] + export let schema + + $: { + console.log(schema) + } + let root = null; const getDocLink = (columnType) => { @@ -26,12 +33,21 @@ if (columnType === "Text") { return "https://docs.budibase.com/docs/text" } - if (columnType === "attachment") { + if (columnType === "Attachment") { return "https://docs.budibase.com/docs/attachments" } - if (columnType === "array") { + if (columnType === "Multi-select") { return "https://docs.budibase.com/docs/multi-select" } + if (columnType === "JSON") { + return "https://docs.budibase.com/docs/json" + } + if (columnType === "Date/Time") { + return "https://docs.budibase.com/docs/datetime" + } + if (columnType === "User") { + return "https://docs.budibase.com/docs/user" + } return "" } @@ -146,13 +162,61 @@ {#if sidecar}
{#if sidecarSubject === "column"} +
+ {columnName} +
+
+
+ {#if schema.type === "string"} + + {:else if schema.type === "datetime"} + + + + + {:else if schema.type === "number"} + + + {:else if schema.type === "json"} + + {/if} + +
{:else if sidecarSubject === "support"} Data/Component Compatibility
@@ -195,7 +259,7 @@ 'Required' Constraint
- A 'required' contraint can be applied to columns to ensure a value is always present. If a column doesn't have this constraint, then rows may be missing values. + A 'required' contraint can be applied to columns to ensure a value is always present. If a column doesn't have this constraint, then its value for a particular row could he missing.
{/if}
@@ -210,6 +274,9 @@ .heading { font-weight: 600; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } .section { diff --git a/packages/builder/src/components/design/settings/controls/FieldContext/Property.svelte b/packages/builder/src/components/design/settings/controls/FieldContext/Property.svelte new file mode 100644 index 0000000000..c929072fed --- /dev/null +++ b/packages/builder/src/components/design/settings/controls/FieldContext/Property.svelte @@ -0,0 +1,31 @@ + + +
+ +{#if pre} +
+{value}
+
+{:else} + + {name} + + - + + {value} + +{/if} +
+ + diff --git a/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte index d53dbbf0a9..56bc79e6a8 100644 --- a/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte +++ b/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte @@ -204,7 +204,8 @@ > { editIsOpen = true + console.log(column.schema); await tick() dispatch("edit-column", column.schema) }