leguadmin/xfrontend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

111

Browse Source
This commit is contained in:
罗松柏 2021-07-30 11:07:01 +08:00
parent 1f87f4ec17
commit 34ca2b32d8
3 changed files with 55 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/pages/analysis.html
View File

@ -306,8 +306,12 @@
<div class="analysis-custom-event-type">触发用户数</div>
</div>
</div>
{{# if(item.formatname == undefined){ }}
<div class="ant-select-selector" data-index="{{index}}">两位小数</div>
{{# } else { }}
<div class="ant-select-selector" data-index="{{index}}">{{item.formatname}}</div>
{{# } }}
<!-- <div class="ant-select-selector">两位小数</div> -->
</div>
<!-- 操作按钮 -->
<div class="analysis-con-left-screen-list-right-box">

27
web/src/x.min.js vendored
View File

@ -1608,7 +1608,9 @@ var X = window.X || {
"filts":[],//过滤项
"condrelation":'and',
"customEvent":'',
"eventNameDisplay":''//重命名指标
"eventNameDisplay":'',//重命名指标
"format":'float',
"formatname":'两位小数'
}
data.events.push(defaultindicator);
X.laytpldata("#analysis-con-left-screen-list-dot",data.events,".analysis-con-left-screen-list-box");
@ -1939,7 +1941,9 @@ var X = window.X || {
"filts":[],//过滤项
"condrelation":'and',
"customEvent":'',
"eventNameDisplay":''//重命名指标
"eventNameDisplay":'',//重命名指标
"format":'float',
"formatname":'两位小数'
}
data['events'].push(defaultindicator);
@ -2004,6 +2008,25 @@ var X = window.X || {
data['events'][index]['eventNameDisplay'] = $(this).val();
});
$(document).off('click','.ant-select-selector').on('click','.ant-select-selector',function(){
var obj = $(this);
var offset = obj.offset();
var index = $(this).attr("data-index");
var downlist = [
{title:'两位小数',id:'float'},
{title:'百分比',id:'percent'},
{title:'取整',id:'integer'},
];
X.querycriteriapop(downlist,'dropdownlist',offset.left,offset.top+obj.height(),function(val){
if(val != undefined){
obj.html(val.title);
data['events'][index]['format'] = val.id;
data['events'][index]['formatname'] = val.title;
}
})
});
//分组项
var cat = "event";
$(document).off('click','.analysis-footadd___2D4YB').on('click','.analysis-footadd___2D4YB',function(){

27
web/srczip/logic/analysis.js
View File

@ -84,7 +84,9 @@
"filts":[],//过滤项
"condrelation":'and',
"customEvent":'',
"eventNameDisplay":''//重命名指标
"eventNameDisplay":'',//重命名指标
"format":'float',
"formatname":'两位小数'
}
data.events.push(defaultindicator);
X.laytpldata("#analysis-con-left-screen-list-dot",data.events,".analysis-con-left-screen-list-box");
@ -415,7 +417,9 @@
"filts":[],//过滤项
"condrelation":'and',
"customEvent":'',
"eventNameDisplay":''//重命名指标
"eventNameDisplay":'',//重命名指标
"format":'float',
"formatname":'两位小数'
}
data['events'].push(defaultindicator);
@ -480,6 +484,25 @@
data['events'][index]['eventNameDisplay'] = $(this).val();
});
$(document).off('click','.ant-select-selector').on('click','.ant-select-selector',function(){
var obj = $(this);
var offset = obj.offset();
var index = $(this).attr("data-index");
var downlist = [
{title:'两位小数',id:'float'},
{title:'百分比',id:'percent'},
{title:'取整',id:'integer'},
];
X.querycriteriapop(downlist,'dropdownlist',offset.left,offset.top+obj.height(),function(val){
if(val != undefined){
obj.html(val.title);
data['events'][index]['format'] = val.id;
data['events'][index]['formatname'] = val.title;
}
})
});
//分组项
var cat = "event";
$(document).off('click','.analysis-footadd___2D4YB').on('click','.analysis-footadd___2D4YB',function(){