Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

commented code removed and widgetId used to created chart to differentiate b/w multiple charts in editor

Browse Source
This commit is contained in:
vicky_primathon.in 2020-03-20 17:46:53 +05:30
parent 00f511e1be
commit 65b1e85e6a
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/client/src/components/designSystems/appsmith/ChartComponent.tsx
View File

@ -3,13 +3,6 @@ import { ChartType, ChartData } from "widgets/ChartWidget";
import styled from "styled-components";
import { invisible } from "constants/DefaultTheme";
import _ from "lodash";
/*
import ReactFC from "react-fusioncharts";
import FusionCharts from "fusioncharts";
import Column2D from "fusioncharts/fusioncharts.charts";
import FusionTheme from "fusioncharts/themes/fusioncharts.theme.fusion";
ReactFC.fcRoot(FusionCharts, Column2D, FusionTheme);
*/
const FusionCharts = require("fusioncharts");
const Charts = require("fusioncharts/fusioncharts.charts");
const FusionTheme = require("fusioncharts/themes/fusioncharts.theme.fusion");
@ -22,6 +15,7 @@ export interface ChartComponentProps {
xAxisName: string;
yAxisName: string;
chartName: string;
widgetId: string;
isVisible?: boolean;
}
@ -67,7 +61,7 @@ class ChartComponent extends React.Component<ChartComponentProps> {
createGraph = () => {
const chartConfig = {
type: this.getChartType(this.props.chartType),
renderAt: "chart-container",
renderAt: this.props.widgetId + "chart-container",
width: "100%",
height: "100%",
dataFormat: "json",
@ -111,7 +105,12 @@ class ChartComponent extends React.Component<ChartComponentProps> {
}
render() {
return <CanvasContainer {...this.props} id="chart-container" />;
return (
<CanvasContainer
{...this.props}
id={this.props.widgetId + "chart-container"}
/>
);
}
}

1
app/client/src/widgets/ChartWidget.tsx
View File

@ -25,6 +25,7 @@ class ChartWidget extends BaseWidget<ChartWidgetProps, WidgetState> {
yAxisName={this.props.yAxisName}
chartName={this.props.chartName}
chartData={this.props.chartData}
widgetId={this.props.widgetId}
/>
);
}