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

wip

This commit is contained in:
Gerard Burns 2024-04-12 09:41:31 +01:00
parent 4a80af1bc6
commit fcca165a2e
4 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/bbui/src/Tooltip/Context.svelte
View File

@ -157,6 +157,8 @@
border-radius: 5px; border-radius: 5px;
box-sizing: border-box; box-sizing: border-box;
opacity: 0;
overflow: hidden;
border: 1px solid var(--grey-4); border: 1px solid var(--grey-4);
transition: width 300ms ease-in, height 300ms ease-in, top 300ms ease-in, left 300ms ease-in; transition: width 300ms ease-in, height 300ms ease-in, top 300ms ease-in, left 300ms ease-in;

5
packages/builder/src/components/design/settings/controls/FieldContext/FieldContext.svelte
View File

@ -64,6 +64,11 @@
{setExplanationSubject} {setExplanationSubject}
/> />
{/if} {/if}
{#if messages.includes(messageConstants.chartDatetime)}
<JSONPrimitivesOnly
{setExplanationSubject}
/>
{/if}
</div> </div>

2
packages/builder/src/components/design/settings/controls/FieldContext/typography/Text.svelte
View File

@ -7,6 +7,7 @@
const punctuation = [" ", ",", "."] const punctuation = [" ", ",", "."]
// TODO regex might work here now
const getWords = (value) => { const getWords = (value) => {
if (typeof value !== "string") { if (typeof value !== "string") {
return []; return [];
@ -37,7 +38,6 @@
} }
$: words = getWords(value) $: words = getWords(value)
$: console.log(words);
</script> </script>
{#if words.length} {#if words.length}

6
packages/client/src/components/app/charts/BarChart.svelte
View File

@ -97,12 +97,14 @@
// Add data // Add data
let useDates = false let useDates = false
if (schema[labelColumn]) { if (schema[labelColumn]) {
console.log("in here?");
const labelFieldType = schema[labelColumn].type const labelFieldType = schema[labelColumn].type
if (horizontal) { if (horizontal) {
builder = builder.yType(labelFieldType).xUnits(yAxisUnits) builder = builder.yType(labelFieldType).xUnits(yAxisUnits)
} else { } else {
builder = builder.xType(labelFieldType).yUnits(yAxisUnits) builder = builder.xType(labelFieldType).yUnits(yAxisUnits)
} }
console.log(labelFieldType);
useDates = labelFieldType === "datetime" useDates = labelFieldType === "datetime"
} }
const series = (valueColumns ?? []).map(column => ({ const series = (valueColumns ?? []).map(column => ({
@ -110,6 +112,8 @@
data: data.map(row => { data: data.map(row => {
if (!useDates) { if (!useDates) {
const value = get(row, column); const value = get(row, column);
console.log("one");
console.log(value);
if (Array.isArray(value)) { if (Array.isArray(value)) {
return null; return null;
@ -121,6 +125,8 @@
return value; return value;
} else { } else {
console.log("two");
console.log([row[labelColumn], row[column]]);
return [row[labelColumn], row[column]] return [row[labelColumn], row[column]]
} }
}), }),