Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-22 16:38:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Bugfixesfor charts widget

Browse source
This commit is contained in:
navaneeth 2021-05-21 10:38:21 +05:30
parent a6ebc25a8f
commit ce636619d4
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
frontend/src/Editor/Components/Chart.jsx
View file

@ -54,25 +54,30 @@ export const Chart = function Chart({
}
}
useEffect(() => {
let data = resolveReferences(dataString, currentState, []);
const data = resolveReferences(dataString, currentState, []);
if(typeof data === 'string') {
useEffect(() => {
let rawData = data || [];
if(typeof rawData === 'string') {
try {
data = JSON.parse(dataString);
} catch (err) { data = []; }
rawData = JSON.parse(dataString);
} catch (err) { rawData = []; }
}
if(!Array.isArray(rawData)) { rawData = []; }
const newData = [{
type: chartType || 'line',
x: data.map((item) => item["x"]),
y: data.map((item) => item["y"]),
x: rawData.map((item) => item["x"]),
y: rawData.map((item) => item["y"]),
marker: { color: markerColor }
}];
setChartData(newData);
}, [dataString]);
}, [data]);
return (
<div