Skip to content

Commit

Permalink
Merge pull request #268 from scouter-contrib/hotfix/xlog-drag
Browse files Browse the repository at this point in the history
xlog flow view 클릭 이벤트 오류 수정함
  • Loading branch information
kranian authored Mar 30, 2021
2 parents 97c2031 + afdb9c9 commit b5f4799
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 6 deletions.
2 changes: 1 addition & 1 deletion docker/.env
Original file line number Diff line number Diff line change
@@ -1 +1 @@
PAPER_VERSION=2.6.4-dev
PAPER_VERSION=2.6.5-snapshot
2 changes: 1 addition & 1 deletion docker/Dockerfile-Dev
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ COPY default.conf /etc/nginx/conf.d/default.conf
WORKDIR /var/www
COPY ./scouter-paper.zip ./
## install
RUN apk add -U tzdata wget unzip;cp /usr/share/zoneinfo/Asia/Seoul /etc/localtime; wget ${INSTALL_URL};unzip scouter-paper.zip;rm -f scouter-paper.zip
RUN apk add -U tzdata wget unzip;cp /usr/share/zoneinfo/Asia/Seoul /etc/localtime;unzip scouter-paper.zip;rm -f scouter-paper.zip
14 changes: 14 additions & 0 deletions src/common/ElementType.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,20 @@ export default class ElementType {
DISPATCH : "4",
THREAD : "5",

isDetailSupport(value) {
switch(value){
case this.SERVICE:
case this.SQL :
case this.DISPATCH :
case this.THREAD :
return true;
case this.API_CALL :
case this.USER :
default:
return false;
}
},

toString(value) {
switch(value){
case this.USER : return "USER";
Expand Down
2 changes: 1 addition & 1 deletion src/common/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import moment from "moment";
import {Dictionary, DictType} from "./dictionary";

export const version = "2.6.4";
export const version = "2.6.5-snapshot";

export function getData(key) {
let ls = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,11 @@ class XlogFlowGraph extends Component {
that.tip.hide(d,this);
})
.on('click', (d)=> {
that.tip.hide(d,this);
d3.event.stopPropagation();
this.props.clickContent(d.data);
if(ElementType.defaultProps.isDetailSupport(d.data.type)) {
that.tip.hide(d, this);
d3.event.stopPropagation();
this.props.clickContent(d.data);
}
// that.scope.handleSelectSpan(d);
});

Expand Down

0 comments on commit b5f4799

Please sign in to comment.