From 069e64b799cbb4f7ce9e47c259af060d7fd44ef4 Mon Sep 17 00:00:00 2001 From: luosongbai <15272473386@163.com> Date: Wed, 22 Sep 2021 11:45:25 +0800 Subject: [PATCH] 1 --- web/src/x.min.js | 19 ++++++++++++------- web/srczip/logic/dashboard.js | 19 ++++++++++++------- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/web/src/x.min.js b/web/src/x.min.js index 5d49768..11e55b6 100644 --- a/web/src/x.min.js +++ b/web/src/x.min.js @@ -4829,13 +4829,18 @@ var X = window.X || { modeldata:function(d,val,type){ var eventdata = []; if(d['query']){ - var timeParticleSize = d['query']['eventView']['timeParticleSize']; - var granularity = '' - if(timeParticleSize){ - X.granularity(timeParticleSize,function(d){ - granularity = d; - }); - } + if(d.cat == "retention"){ + var timeParticleSize = d['query']['eventView']['unitNum']; + }else { + var timeParticleSize = d['query']['eventView']['timeParticleSize']; + } + + var granularity = '' + if(timeParticleSize){ + X.granularity(timeParticleSize,function(d){ + granularity = d; + }); + } } diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js index 0047264..8dfb1cf 100644 --- a/web/srczip/logic/dashboard.js +++ b/web/srczip/logic/dashboard.js @@ -719,13 +719,18 @@ modeldata:function(d,val,type){ var eventdata = []; if(d['query']){ - var timeParticleSize = d['query']['eventView']['timeParticleSize']; - var granularity = '' - if(timeParticleSize){ - X.granularity(timeParticleSize,function(d){ - granularity = d; - }); - } + if(d.cat == "retention"){ + var timeParticleSize = d['query']['eventView']['unitNum']; + }else { + var timeParticleSize = d['query']['eventView']['timeParticleSize']; + } + + var granularity = '' + if(timeParticleSize){ + X.granularity(timeParticleSize,function(d){ + granularity = d; + }); + } }