Merge pull request #30 from mindplates/development

과거 데이터 조회 개선
scouter-contrib · Apr 11, 2018 · 0af795b · 0af795b
2 parents 9b32136 + 031c02f
commit 0af795b
Show file tree

Hide file tree

Showing 6 changed files with 368 additions and 87 deletions.
diff --git a/src/components/Box/Box.js b/src/components/Box/Box.js
@@ -103,7 +103,7 @@ class Box extends Component {
                             {!type && <EmptyBox/>}
                             {type === "clock" && <ClockBox layoutChangeTime={this.props.layoutChangeTime} box={this.props.box} />}
                             {type === "xlogBar" && <XLogBar visible={this.props.visible} layoutChangeTime={this.props.layoutChangeTime} box={this.props.box} data={this.props.data} />}
-                            {type === "xlog" && <XLog visible={this.props.visible} layoutChangeTime={this.props.layoutChangeTime} box={this.props.box} pastTimestamp={this.props.pastTimestamp} data={this.props.data} config={this.props.config} startTime={this.props.data.startTime} />}
+                            {type === "xlog" && <XLog visible={this.props.visible} layoutChangeTime={this.props.layoutChangeTime} box={this.props.box} pastTimestamp={this.props.pastTimestamp} pageCnt={this.props.pageCnt} data={this.props.data} config={this.props.config} startTime={this.props.data.startTime} />}
                             {type === "visitor" && <Visitor visible={this.props.visible} layoutChangeTime={this.props.layoutChangeTime} visitor={this.props.visitor} box={this.props.box} realtime={this.props.realtime} />}
                             {type === "counter" && <LineChart visible={this.props.visible} layoutChangeTime={this.props.layoutChangeTime} time={this.props.counters.time} box={this.props.box} counters={this.props.counters.data} countersHistory={this.props.countersHistory} countersHistoryTimestamp={this.props.countersHistoryTimestamp} countersHistoryFrom={this.props.countersHistoryFrom} countersHistoryTo={this.props.countersHistoryTo} setTitle={this.setTitle} removeTitle={this.removeTitle} showTooltip={this.showTooltip} hideTooltip={this.hideTooltip} />}
                             {this.state.tooltip.show && <Tooltip tooltip={this.state.tooltip}/>}