working charts

This commit is contained in:
Jan Prochazka
2021-03-19 20:31:36 +01:00
parent 489c9a905c
commit 7b625c6073
2 changed files with 15 additions and 10 deletions

View File

@@ -85,6 +85,7 @@
} }
} }
$: { $: {
$extensions;
if (config.labelColumn && sql && conid && database) { if (config.labelColumn && sql && conid && database) {
handleLoadData(); handleLoadData();
} }

View File

@@ -49,7 +49,7 @@
} }
function createChartData(freeData, labelColumn, dataColumns, colorSeed, chartType, dataColumnColors) { function createChartData(freeData, labelColumn, dataColumns, colorSeed, chartType, dataColumnColors) {
if (!freeData || !labelColumn || !dataColumns || !freeData.rows || dataColumns.length == 0) return [{}, {}]; if (!freeData || !labelColumn || !dataColumns || !freeData.rows || dataColumns.length == 0) return null;
const colors = randomcolor({ const colors = randomcolor({
count: _.max([freeData.rows.length, dataColumns.length, 1]), count: _.max([freeData.rows.length, dataColumns.length, 1]),
seed: colorSeed, seed: colorSeed,
@@ -106,8 +106,8 @@
let clientWidth; let clientWidth;
let clientHeight; let clientHeight;
$: dataColumns = extractDataColumns(values); $: dataColumns = extractDataColumns($values);
$: dataColumnColors = extractDataColumnColors(values, dataColumns); $: dataColumnColors = extractDataColumnColors($values, dataColumns);
$: chartData = createChartData( $: chartData = createChartData(
data, data,
@@ -120,6 +120,8 @@
</script> </script>
<div class="wrapper" bind:clientWidth bind:clientHeight> <div class="wrapper" bind:clientWidth bind:clientHeight>
{#if chartData}
{#key `${$values.chartType}|${clientWidth}|${clientHeight}`}
<ChartCore <ChartCore
width={clientWidth} width={clientWidth}
height={clientHeight} height={clientHeight}
@@ -127,6 +129,8 @@
type={$values.chartType} type={$values.chartType}
options={chartData[1]} options={chartData[1]}
/> />
{/key}
{/if}
</div> </div>
<style> <style>