Skip to content

Commit 8769fc0

Browse files
kimorkimusbsync
andauthored
이슈 8703 처리 (#452) (#453)
Co-authored-by: usbsync <[email protected]>
1 parent 7d5b4bb commit 8769fc0

File tree

3 files changed

+18
-12
lines changed

3 files changed

+18
-12
lines changed

src/components/widget/BillBoard.jsx

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,13 @@ const BillBoard = (props) => {
5353
...data,
5454
};
5555
if (data.type) {
56-
newTableData.type = getBillBoardType(data.type)
56+
newTableData.type = data.type;
57+
// newTableData.type = getBillBoardType(data.type);
5758
}
5859
if (data.types) {
5960
Object.keys(data.types).forEach((key) => {
60-
newTableData.types[key] = getBillBoardType(data.types[key]);
61+
newTableData.types[key] = data.types[key];
62+
// newTableData.types[key] = getBillBoardType(data.types[key]);
6163
});
6264
}
6365

@@ -81,9 +83,7 @@ const BillBoard = (props) => {
8183
<div className={isIframe ? theme.center_chart : theme.center}>
8284
<div className={theme.modal}>
8385
<div className={theme.head}>
84-
<div className={theme.text}>
85-
{title}
86-
</div>
86+
<div className={theme.text}>{title}</div>
8787
<div
8888
className={theme.close}
8989
id="chart_btn"
@@ -93,8 +93,14 @@ const BillBoard = (props) => {
9393
/>
9494
</div>
9595
<div className={theme.body}>
96-
<div className={cn(theme.content, theme.billboard)} style={{ minHeight: '300px' }}>
97-
<div className={theme.description} dangerouslySetInnerHTML={ {__html: description} } />
96+
<div
97+
className={cn(theme.content, theme.billboard)}
98+
style={{ minHeight: '300px' }}
99+
>
100+
<div
101+
className={theme.description}
102+
dangerouslySetInnerHTML={{ __html: description }}
103+
/>
98104
<div className={theme.graph_box} ref={chartRef} />
99105
</div>
100106
</div>
@@ -130,6 +136,6 @@ const BillBoard = (props) => {
130136
</div>
131137
</div>
132138
);
133-
}
139+
};
134140

135-
export default pure(BillBoard);
141+
export default pure(BillBoard);

src/components/widget/Chart/Bar.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { useEffect, useRef } from 'react';
2-
import bb, { bar } from 'billboard.js';
2+
import bb from 'billboard.js';
33
import Theme from '@utils/Theme';
44
import '@assets/entry/scss/widget/insight.css';
55
import { GRAPH_COLOR } from '@constants/dataAnalytics';

src/components/widget/Chart/ScatterGrid.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { useRef, useEffect } from 'react';
22
import { corr } from '@utils/dataAnalytics';
3-
import bb, { scatter } from 'billboard.js';
3+
import bb from 'billboard.js';
44
import '@assets/entry/scss/widget/insight.css';
55
import Theme from '@utils/Theme';
66
import _unzip from 'lodash/unzip';
@@ -17,7 +17,7 @@ const ScatterChart = ({ columns, id = 'scatter_matrix', size, zoomIn, opacity })
1717
columns[1][0] += 'x';
1818
}
1919
bb.generate({
20-
data: { columns, type: scatter(), xs: { [columns[0][0]]: columns[1][0] } },
20+
data: { columns, type: 'scatter', xs: { [columns[0][0]]: columns[1][0] } },
2121
bindto: chartRef.current,
2222
axis: {
2323
x: { tick: { text: { show: false }, count: 4, padding: 0 } },

0 commit comments

Comments
 (0)